Merge upstream master 20151222

.gitignore

@@ -17,3 +17,4 @@ tags
 *.sublime-project
 deps/*
 .rebar
+.deps.plt

.scripts/tag_with_changelog.sh

@@ -30,12 +30,16 @@ git add CHANGELOG
 # Update version in .app file
 sed -i "" -e "s/{vsn, .*}/{vsn, \"$1\"}/g" src/meck.app.src
 sed -i "" -e "s/@version .*/@version $1/g" doc/overview.edoc
+sed -i "" -e "s/version: \".*\"/version: \"$1\"/g" package.exs
 git add src/meck.app.src
 git add doc/overview.edoc
+git add package.exs
 
 # Commit, tag and push
 git commit -m "Version $1"
 git tag -s $1 -m "Version $
 
 $CHANGELOG"
 git push && git push --tags
+MIX_EXS=package.exs mix hex.publish
+

.travis.yml

@@ -3,8 +3,9 @@ notifications:
   email:
     - hello@alind.io
 otp_release:
+  - 17.4
   - R16B03-1
-  - R16B
   - R15B03
 before_script: "make get-deps"
-script: "make all"
+script: "make test"
+

CHANGELOG

@@ -1,2 +1 @@
-- The return value from passthrough/1 can now be used in expect
-  functions before returning
+

Makefile

@@ -1,5 +1,5 @@
 PLTFILE=$(CURDIR)/.deps.plt
-APP_DEPS=kernel stdlib eunit tools compiler
+APP_DEPS=kernel stdlib eunit tools compiler erts
 ERLFLAGS= -pa $(CURDIR)/.eunit -pa $(CURDIR)/ebin -pa $(CURDIR)/deps/*/ebin
 
 REBAR="./rebar"
@@ -18,7 +18,7 @@ DIALYZER_INC=$(shell test -d include && echo '-I include') $(shell test -d deps
 .PHONY: all rebuild compile doc clean test dialyzer typer get-deps clean-deps \
 	shell clean-plt clean-doc distclean
 
-all: get-deps compile test doc
+all: get-deps compile
 
 rebuild: distclean get-deps all
 

README.md

@@ -1,6 +1,6 @@
-[![Release](http://img.shields.io/github/release/eproxus/meck.svg)](https://github.com/eproxus/meck/releases/latest)
-[![Build Status](http://img.shields.io/travis/eproxus/meck.svg)](http://travis-ci.org/eproxus/meck)
-[![Code Climate](http://img.shields.io/badge/code_climate-17.0-brightgreen.svg)](https://travis-ci.org/eproxus/meck)
+[![Release](http://img.shields.io/github/release/eproxus/meck.svg?style=flat-square)](https://github.com/eproxus/meck/releases/latest)
+[![Build Status](http://img.shields.io/travis/eproxus/meck.svg?style=flat-square)](http://travis-ci.org/eproxus/meck)
+[![Code Climate](http://img.shields.io/badge/code_climate-Erlang_17.4-brightgreen.svg?style=flat-square)](https://travis-ci.org/eproxus/meck)
 
 Meck
 ====
@@ -147,22 +147,33 @@ ok
 Build
 -----
 
-Meck requires `make` and [rebar][1] to build. To build Meck and run tests, go to the Meck
-directory and simply type:
+Meck requires `make` and [rebar][1] to build. To build Meck go to the Meck directory
+and simply type:
 
 ```sh
 make
 ```
 
+In order to run all tests for Meck type the following command from the same directory:
+
+```sh
+make test
+```
+
 Two things might seem alarming when running the tests:
 
   1. Warnings emitted by cover
-  2. En exception printed by SASL
+  2. An exception printed by SASL
 
 Both are expected due to the way Erlang currently prints errors. The
 important line you should look for is `All XX tests passed`, if that
 appears all is correct.
 
+Documentation can be generated through the use of the following command:
+
+```sh
+make doc
+```
 
 <a name='install'>
 
@@ -175,7 +186,7 @@ your `rebar.config` in your project root:
 ```erlang
 {deps, [
  {meck, ".*",
-  {git, "https://github.com/eproxus/meck.git", {tag, "0.8"}}}
+  {git, "https://github.com/eproxus/meck.git", {tag, "0.8.3"}}}
  ]}.
 ```
 
@@ -187,6 +198,53 @@ environment variable.
 
 <a name='contribute'>
 
+Caveats
+-------
+
+Meck will have trouble mocking certain modules since Meck works by
+recompiling and reloading modules. Since Erlang have a flat module
+namespace, replacing a module has to be done globally in the
+Erlang VM. This means certain modules cannot be mocked. The
+following is a non-exhaustive list of modules that can either be
+problematic to mock or not possible at all:
+
+* `erlang`
+* `os`
+* `crypto`
+* `compile`
+* `global`
+* `timer` (possible to mock, but used by some test frameworks, like Elixir's ExUnit)
+
+Also, a meck expectation set up for a function _f_ does not apply to the module-local invocation of _f_ within the mocked module.
+Consider the following module:
+```
+-module(test).
+-export([a/0, b/0, c/0]).
+
+a() ->
+  c().
+
+b() ->
+  ?MODULE:c().
+
+c() ->
+  original.
+```
+Note how the module-local call to `c/0` in `a/0` stays unchanged even though the expectation changes the externally visible behaviour of `c/0`:
+
+```
+3> meck:new(test, [passthrough]).
+ok
+4> meck:expect(test,c,0,changed).
+ok
+5> test:a().
+original
+6> test:b().
+changed
+6> test:c().
+changed
+```
+
 Contribute
 ----------
 
@@ -198,33 +256,16 @@ when developing new features or fixes for meck.
 Should you find yourself using Meck and have issues, comments or
 feedback please [create an issue here on GitHub][4].
 
-Contributors:
-
-- Maxim Vladimirsky (@horkhe)
-- Ryan Zezeski (@rzezeski)
-- David Haglund (@daha)
-- Magnus Henoch (@legoscia)
-- Susan Potter (@mbbx6spp)
-- Andreas Amsenius (@adbl)
-- Anthony Molinaro (@djnym)
-- Matt Campbell (@xenolinguist)
-- Martynas Pumputis (@brb)
-- Shunichi Shinohara (@shino)
-- Miëtek Bak
-- Henry Nystrom
-- Ward Bekker (@wardbekker)
-- Damon Richardson
-- Christopher Meiklejohn
-- Joseph Wayne Norton (@norton)
-- Erkan Yilmaz (@Erkan-Yilmaz)
-- Joe Williams (@joewilliams)
-- Russell Brown
-- Michael Klishin (@michaelklishin)
-- Magnus Klaar
+Meck has been greatly improved by [many contributors]
+(https://github.com/eproxus/meck/graphs/contributors)!
 
+### Donations
+
+If you or your company use Meck and find it useful, Bitcoin donations to the address `1M7pLbBpjkwxffT7kZPKhxiPGKf4eHDqtz` are greatly appreciated!
 
   [1]: https://github.com/eproxus/meck/wiki/0.8-Release-Notes
        "0.8 Release Notes"
   [2]: https://github.com/hyperthunk/hamcrest-erlang "Hamcrest for Erlang"
   [3]: https://github.com/basho/rebar "Rebar - A build tool for Erlang"
   [4]: https://github.com/eproxus/meck/issues "Meck issues"
+

doc/overview.edoc

@@ -16,7 +16,7 @@
 
 @author Adam Lindberg <eproxus@gmail.com>
 @copyright 2011, Adam Lindberg & Erlang Solutions Ltd
-@version "0.7.2"
+@version 0.8.3
 @title meck, a Mocking Library for Erlang
 
 @doc

package.exs

@@ -0,0 +1,45 @@
+defmodule Meck.Mixfile do
+  use Mix.Project
+
+  def project do
+    [
+      app: :meck,
+      version: "0.8.3",
+      description: description,
+      package: package,
+      deps: [],
+    ]
+  end
+
+  defp description do
+    """
+    A mocking framework for Erlang
+    """
+  end
+
+  defp package do
+    [
+      files: [
+        "Makefile",
+        "rebar.config",
+        "test.config",
+        "src",
+        "test/*.erl",
+        "test/cover_test_module.dontcompile",
+        "test/include",
+        "README.md",
+        "LICENSE",
+        "CHANGELOG",
+      ],
+      contributors: [
+        "Adam Lindberg",
+      ],
+      licenses: [
+        "Apache 2.0",
+      ],
+      links: %{
+        "GitHub" => "https://github.com/eproxus/meck",
+      },
+    ]
+  end
+end

rebar.config

@@ -1,7 +1,7 @@
 %% Compiler Options ===========================================================
 {erl_opts, [
     %% Erlang releases after 17 don't put R in front of their name, and also require dict() to be written like dict:dict()
-    {platform_define, "^[0-9]+", namespaced_dicts}, 
+    {platform_define, "^[0-9]+", namespaced_types},
     warn_export_all,
     warn_export_vars,
     warn_shadow_vars,

src/meck.erl

@@ -173,7 +173,7 @@ new(Mod) when is_list(Mod) -> lists:foreach(fun new/1, Mod), ok.
 %%
 %%   <dt>`non_strict'</dt>
 %%   <dd>A mock created with this option will allow setting expectations on
-%%       functions that are not exported from the mocked module. With this
+%%       functions that does not exist in the mocked module. With this
 %%       option on it is even possible to mock non existing modules.</dd>
 %%
 %%   <dt>`{stub_all, '{@link ret_spec()}`}'</dt>
@@ -182,6 +182,13 @@ new(Mod) when is_list(Mod) -> lists:foreach(fun new/1, Mod), ok.
 %%       passed in. It is possible to specify this option as just `stub_all'
 %%       then stubs will return atom `ok'. If used along with `passthrough'
 %%       then `stub_all' is ignored. </dd>
+%%
+%%   <dt>`merge_expects'</dt>
+%%   <dd>The expectations for the function/arity signature are merged with
+%%       existing ones instead of replacing all of them each time an
+%%       expectation is added. Expectations are added to the end of the
+%%       function clause list, meaning that pattern matching will be performed
+%%       in the order the expectations were added.</dd>
 %% </dl>
 -spec new(Mods, Options) -> ok when
       Mods :: Mod | [Mod],

src/meck_code.erl

@@ -28,6 +28,7 @@
 -export([compile_and_load_forms/1]).
 -export([compile_and_load_forms/2]).
 -export([compile_options/1]).
+-export([enable_on_load/2]).
 -export([rename_module/2]).
 
 %% Types
@@ -89,6 +90,14 @@ compile_options(BeamFile) when is_binary(BeamFile) ->
 compile_options(Module) ->
   filter_options(proplists:get_value(options, Module:module_info(compile))).
 
+enable_on_load(Forms, false) ->
+    Map = fun({attribute,L,on_load,{F,A}}) -> {attribute,L,export,[{F,A}]};
+             (Other) -> Other
+          end,
+    lists:map(Map, Forms);
+enable_on_load(Forms, _) ->
+    Forms.
+
 -spec rename_module(erlang_form(), module()) -> erlang_form().
 rename_module([{attribute, Line, module, OldAttribute}|T], NewName) ->
     case OldAttribute of

src/meck_code_gen.erl

@@ -63,7 +63,7 @@ attributes(Mod) ->
     try
         [?attribute(Key, Val) || {Key, Val} <-
             proplists:get_value(attributes, Mod:module_info(), []),
-            Key =/= vsn, Key =/= deprecated]
+            Key =/= vsn, Key =/= deprecated, Key =/= optional_callbacks]
     catch
         error:undef -> []
     end.
@@ -144,7 +144,7 @@ var_name(A) -> list_to_atom("A"++integer_to_list(A)).
 -spec exec(CallerPid::pid(), Mod::atom(), Func::atom(), Args::[any()]) ->
         Result::any().
 exec(Pid, Mod, Func, Args) ->
-    case meck_proc:get_result_spec(Mod, Func, Args) of
+    try meck_proc:get_result_spec(Mod, Func, Args) of
         undefined ->
             meck_proc:invalidate(Mod),
             raise(Pid, Mod, Func, Args, error, function_clause);
@@ -160,6 +160,9 @@ exec(Pid, Mod, Func, Args) ->
             after
                 erase(?CURRENT_CALL)
             end
+    catch
+        error:{not_mocked, Mod} ->
+            apply(Mod, Func, Args)
     end.
 
 -spec handle_exception(CallerPid::pid(), Mod::atom(), Func::atom(),