flexmock 1.3.3 → 2.0.0.rc1

data/lib/flexmock/recorder.rb

@@ -56,9 +56,8 @@ class FlexMock
     # Record an expectation for receiving the method +sym+ with the
     # given arguments.
     def method_missing(sym, *args, &block)
-      location = caller.first
       expectation = @mock.
-        flexmock_define_expectation(location, sym).
+        flexmock_define_expectation(caller, sym).
         and_return(&block)
       if strict?
         args = args.collect { |arg| eq(arg) }

data/lib/flexmock/rspec.rb

@@ -26,15 +26,18 @@ class FlexMock
       SpecModule::Expectations.fail_with(msg) unless yield
     end
 
-    def assert_equal(a, b, msg=nil)
-      message = msg || "Expected equal"
-      make_assertion(message + "\n<#{a}> expected, but was\n<#{b}>") { a == b }
+    def check(msg, &block)
+      check(msg, &block)
     end
 
     class AssertionFailedError < StandardError; end
+
     def assertion_failed_error
       SpecModule::Expectations::ExpectationNotMetError
     end
+    def check_failed_error
+      assertion_failed_error
+    end
   end
 
   @framework_adapter = RSpecFrameworkAdapter.new

data/lib/flexmock/test_unit_integration.rb

@@ -45,6 +45,12 @@ class FlexMock
   class TestUnitFrameworkAdapter
     include Test::Unit::Assertions
 
+    attr_accessor :assertions
+
+    def initialize
+        @assertions = 0
+    end
+
     def make_assertion(msg, &block)
       unless yield
         msg = msg.call if msg.is_a?(Proc)
@@ -55,11 +61,19 @@ class FlexMock
       raise ex
     end
 
+    def check(msg, &block)
+      make_assertion(msg, &block)
+    end
+
     def assertion_failed_error
       defined?(Test::Unit::AssertionFailedError) ?
         Test::Unit::AssertionFailedError :
         MiniTest::Assertion
     end
+
+    def check_failed_error
+      assertion_failed_error
+    end
   end
 
   @framework_adapter = TestUnitFrameworkAdapter.new

data/lib/flexmock/validators.rb

@@ -50,11 +50,12 @@ class FlexMock
       @limit.to_s
     end
 
+    class ValidationFailed < RuntimeError
+    end
+
     def validate_count(n, &block)
-      @exp.flexmock_location_filter do
-        FlexMock.framework_adapter.make_assertion(
-          lambda { construct_validation_count_error_message(n) },
-          &block)
+      unless yield
+        raise ValidationFailed, construct_validation_count_error_message(n)
       end
     end
 

data/lib/flexmock/version.rb

@@ -1,11 +1,3 @@
 class FlexMock
-  module Version
-    NUMBERS = [
-      MAJOR = 1,
-      MINOR = 3,
-      BUILD = 3,
-    ]
-  end
-
-  VERSION = Version::NUMBERS.join('.')
+  VERSION = "2.0.0.rc1"
 end

data/rakelib/metrics.rake

@@ -0,0 +1,40 @@
+METRICS_FILES = FileList['lib/**/*.rb']
+
+task :metrics => [:cane, :flog, :flay]
+
+task :flog, [:all] do |t, args|
+  flags = args.all ? "--all" : ""
+  flags = "-m #{flags}"
+  Bundler.with_clean_env do
+    puts "\nFLOG:"
+    sh "flog #{flags} #{METRICS_FILES}" do |status, flag|
+      if status.nil?
+        puts "Install flog with: 'gem install flog'"
+      end
+    end
+  end
+end
+
+task :flay do
+  Bundler.with_clean_env do
+    puts "\nFLAY:"
+    sh "flay #{METRICS_FILES}" do |status, flag|
+      if status.nil?
+        puts "Install flay with: 'gem install flay'"
+      end
+    end
+  end
+end
+
+task :cane, [:max_line] do |t, args|
+  max_line = args.max_line || 90
+  Bundler.with_clean_env do
+    puts "\nCANE:"
+    sh "cane --style-measure #{max_line} --no-doc" do |status, flag|
+      if status.nil?
+        puts "DBG: [status, flag]=#{[status, flag].inspect}"
+        puts "Install cane with: 'gem install cane'"
+      end
+    end
+  end
+end

data/rakelib/preview.rake

@@ -0,0 +1,4 @@
+
+task :preview do
+  sh "ghpreview #{FileList['README.{md,markdown}']}"
+end

data/rakelib/tags.rake

@@ -0,0 +1,18 @@
+#!/usr/bin/env ruby
+# -*- ruby -*-
+
+module Tags
+  RUBY_FILES = FileList['**/*.rb'].exclude("pkg")
+  PROG = ENV['TAGS'] || 'ctags'
+end
+
+namespace "tags" do
+  desc "Update the Tags file for emacs"
+  task :emacs => Tags::RUBY_FILES do
+    puts "Making Emacs TAGS file"
+    sh "#{Tags::PROG} -e #{Tags::RUBY_FILES}", :verbose => false
+  end
+end
+
+desc "Update the Tags file for emacs"
+task :tags => ["tags:emacs"]

data/todo.txt

@@ -0,0 +1,20 @@
+Short term things to do:
+
+* Explicit => Explicitly
+
+DONE
+
+* Consolidate mock argument matching and spy argument matching
+* Consolidate mock block detection and spy block detection.
+* Consolidate the :on option with mocks
+* Pass through mode for partial mocks
+* Update readme
+* auto-mock class when using base_class
+
+IDEAS
+
+spy.should have_received(:foo).with(arg1, arg2)  # PREFERRED
+spy.should have_received.foo(arg1, arg2)
+
+assert_called spy, :foo, arg1, arg2
+assert_spy(spy).received(:foo).with(arg1, arg2)

metadata

@@ -1,63 +1,66 @@
 --- !ruby/object:Gem::Specification
 name: flexmock
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 2.0.0.rc1
 platform: ruby
 authors:
 - Jim Weirich
+- Sylvain Joyeux
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-20 00:00:00.000000000 Z
-dependencies: []
-description: "\n      FlexMock is a extremely simple mock object class compatible\n
-  \     with the Test::Unit framework.  Although the FlexMock's\n      interface is
-  simple, it is very flexible.\n    "
-email: jim.weirich@gmail.com
+date: 2015-09-12 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+description: "\n    FlexMock is a extremely simple mock object class compatible\n
+  \   with the Minitest framework.  Although the FlexMock's\n    interface is simple,
+  it is very flexible.\n  "
+email: sylvain.joyeux@m4x.org
 executables: []
 extensions: []
-extra_rdoc_files:
-- doc/index.rdoc
-- CHANGES
-- doc/GoogleExample.rdoc
-- doc/releases/flexmock-0.4.0.rdoc
-- doc/releases/flexmock-0.4.1.rdoc
-- doc/releases/flexmock-0.4.2.rdoc
-- doc/releases/flexmock-0.4.3.rdoc
-- doc/releases/flexmock-0.5.0.rdoc
-- doc/releases/flexmock-0.5.1.rdoc
-- doc/releases/flexmock-0.6.0.rdoc
-- doc/releases/flexmock-0.6.1.rdoc
-- doc/releases/flexmock-0.6.2.rdoc
-- doc/releases/flexmock-0.6.3.rdoc
-- doc/releases/flexmock-0.6.4.rdoc
-- doc/releases/flexmock-0.7.0.rdoc
-- doc/releases/flexmock-0.7.1.rdoc
-- doc/releases/flexmock-0.8.0.rdoc
-- doc/releases/flexmock-0.8.2.rdoc
-- doc/releases/flexmock-0.8.3.rdoc
-- doc/releases/flexmock-0.8.4.rdoc
-- doc/releases/flexmock-0.8.5.rdoc
-- doc/releases/flexmock-0.9.0.rdoc
-- doc/releases/flexmock-1.0.0.rdoc
-- doc/releases/flexmock-1.0.3.rdoc
-- doc/releases/flexmock-1.0.4.rdoc
-- doc/releases/flexmock-1.1.0.rdoc
-- doc/releases/flexmock-1.2.0.rdoc
-- doc/releases/flexmock-1.3.0.rdoc
-- doc/releases/flexmock-1.3.1.rdoc
-- doc/examples/rspec_examples_spec.rdoc
-- doc/examples/test_unit_examples_test.rdoc
+extra_rdoc_files: []
 files:
+- ".autotest"
+- ".gitignore"
+- ".togglerc"
+- ".travis.yml"
+- ".yardopts"
 - CHANGES
 - Gemfile
-- Gemfile.lock
 - README.md
 - Rakefile
 - doc/GoogleExample.rdoc
-- doc/examples/rspec_examples_spec.rdoc
-- doc/examples/test_unit_examples_test.rdoc
+- doc/examples/rspec_examples_spec.rb
+- doc/examples/test_unit_examples_test.rb
 - doc/index.rdoc
+- doc/jamis.rb
 - doc/releases/flexmock-0.4.0.rdoc
 - doc/releases/flexmock-0.4.1.rdoc
 - doc/releases/flexmock-0.4.2.rdoc
@@ -85,6 +88,7 @@ files:
 - doc/releases/flexmock-1.3.0.rdoc
 - doc/releases/flexmock-1.3.1.rdoc
 - flexmock.blurb
+- flexmock.gemspec
 - install.rb
 - lib/flexmock.rb
 - lib/flexmock/argument_matchers.rb
@@ -106,6 +110,9 @@ files:
 - lib/flexmock/expectation_recorder.rb
 - lib/flexmock/explicit_needed.rb
 - lib/flexmock/extensions/active_record_model.rb
+- lib/flexmock/minitest.rb
+- lib/flexmock/minitest_extensions.rb
+- lib/flexmock/minitest_integration.rb
 - lib/flexmock/mock_builder.rb
 - lib/flexmock/mock_container.rb
 - lib/flexmock/noop.rb
@@ -126,63 +133,31 @@ files:
 - lib/flexmock/undefined.rb
 - lib/flexmock/validators.rb
 - lib/flexmock/version.rb
-- test/aliasing_test.rb
-- test/assert_spy_called_test.rb
-- test/base_class_test.rb
-- test/based_partials_test.rb
-- test/container_methods_test.rb
-- test/default_framework_adapter_test.rb
-- test/demeter_mocking_test.rb
-- test/deprecated_methods_test.rb
-- test/examples_from_readme_test.rb
-- test/expectation_description_test.rb
-- test/extended_should_receive_test.rb
-- test/flexmodel_test.rb
-- test/mock_builder_test.rb
-- test/naming_test.rb
-- test/new_instances_test.rb
-- test/object_extensions_test.rb
-- test/partial_mock_test.rb
-- test/record_mode_test.rb
-- test/redirect_error.rb
-- test/rspec_integration/integration_spec.rb
-- test/rspec_integration/spy_example_spec.rb
-- test/samples_test.rb
-- test/should_ignore_missing_test.rb
-- test/should_receive_test.rb
-- test/spys_test.rb
-- test/symbol_extensions_test.rb
-- test/test_class_extensions.rb
-- test/test_setup.rb
-- test/test_unit_integration/auto_test_unit_test.rb
-- test/test_unit_integration/minitest_teardown_test.rb
-- test/tu_integration_test.rb
-- test/undefined_test.rb
-homepage: https://github.com/jimweirich/flexmock
-licenses: []
+- rakelib/metrics.rake
+- rakelib/preview.rake
+- rakelib/tags.rake
+- todo.txt
+homepage: https://github.com/doudou/flexmock
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
-rdoc_options:
-- "--title"
-- FlexMock
-- "--main"
-- README.rdoc
-- "--line-numbers"
+rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: Simple and Flexible Mock Objects for Testing

data/Gemfile.lock

@@ -1,20 +0,0 @@
-GEM
-  remote: http://rubygems.org/
-  specs:
-    diff-lcs (1.2.5)
-    rake (10.1.0)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
-
-PLATFORMS
-  ruby
-
-DEPENDENCIES
-  rake (>= 0.9.2.2)
-  rspec (>= 2.0)

data/doc/examples/rspec_examples_spec.rdoc

@@ -1,245 +0,0 @@
-= FlexMock Examples
-    RSpec.configure do |config|
-      config.mock_with :flexmock
-    end
-    
-    describe "Simple Spec" do
-    
-      # Simple stubbing of some methods
-    
-      it "stubs a couple of methods" do
-        m = flexmock(:pi => 3.1416, :e => 2.71)
-        m.pi.should == 3.1416
-        m.e.should == 2.71
-      end
-    end
-    
-    
-    describe "Returning Undefined" do
-    
-      # Create a mock object that returns an undefined object for method calls
-    
-      it "returns undefined values" do
-        m = flexmock("mock")
-        m.should_receive(:divide_by).with(0).
-          and_return_undefined
-    
-        m.divide_by(0).should == FlexMock.undefined
-      end
-    end
-    
-    describe "Multiple Queries and Single Updates" do
-    
-      # Expect multiple queries and a single update
-    
-      # Multiple calls to the query method will be allows, and calls may
-      # have any argument list. Each call to query will return the three
-      # element array [1, 2, 3]. The call to update must have a specific
-      # argument of 5.
-    
-      it "queries the db" do
-        db = flexmock('db')
-        db.should_receive(:query).and_return([1,2,3])
-        db.should_receive(:update).with(5).and_return(nil).once
-    
-        # Test Code
-    
-        db.query
-        db.update(5)
-      end
-    end
-    
-    describe "Ordered Mocks" do
-    
-      # Expect all queries before any updates
-    
-      # All the query message must occur before any of the update
-      # messages.
-    
-      it "queries and updates the database" do
-        db = flexmock('db')
-        db.should_receive(:query).and_return([1,2,3]).ordered
-        db.should_receive(:update).and_return(nil).ordered
-    
-        # test code here
-    
-        db.query
-        db.update
-      end
-    end
-    
-    describe "Ordered Mocks" do
-    
-      # Expect several queries with different parameters
-    
-      # The queries should happen after startup but before finish. The
-      # queries themselves may happen in any order (because they are in
-      # the same order group). The first two queries should happen exactly
-      # once, but the third query (which matches any query call with a
-      # four character parameter) may be called multiple times (but at
-      # least once). Startup and finish must also happen exactly once.
-    
-      # Also note that we use the <code>with</code> method to match
-      # different argument values to figure out what value to return.
-    
-      it "queries the database in a particular order" do
-        db = flexmock('db')
-        db.should_receive(:startup).once.ordered
-        db.should_receive(:query).with("CPWR").and_return(12.3).
-          once.ordered(:queries)
-        db.should_receive(:query).with("MSFT").and_return(10.0).
-          once.ordered(:queries)
-        db.should_receive(:query).with(/^....$/).and_return(3.3).
-          at_least.once.ordered(:queries)
-        db.should_receive(:finish).once.ordered
-    
-        # Test Code
-    
-        db.startup
-        db.query("MSFT")
-        db.query("XYZY")
-        db.query("CPWR")
-        db.finish
-      end
-    end
-    
-    describe "Ordered Mocks" do
-    
-      # Same as above, but using the Record Mode interface
-    
-      # The record mode interface offers much the same features as the
-      # <code>should_receive</code> interface introduced so far, but it
-      # allows the messages to be sent directly to a recording object
-      # rather than be specified indirectly using a symbol.
-    
-    
-      it "records the queries for replay" do
-        db = flexmock('db')
-        db.should_expect do |rec|
-          rec.startup.once.ordered
-          rec.query("CPWR") { 12.3 }.once.ordered(:queries)
-          rec.query("MSFT") { 10.0 }.once.ordered(:queries)
-          rec.query(/^....$/) { 3.3 }.at_least.once.ordered(:queries)
-          rec.finish.once.ordered
-        end
-    
-        # Test Code
-    
-        db.startup
-        db.query("MSFT")
-        db.query("XYZY")
-        db.query("CPWR")
-        db.finish
-      end
-    end
-    
-    describe "Record Mode" do
-    
-      # Using Record Mode to record a known, good algorithm for testing
-    
-      # Record mode is nice when you have a known, good algorithm that can
-      # use a recording mock object to record the steps. Then you compare
-      # the execution of a new algorithm to behavior of the old using the
-      # recorded expectations in the mock. For this you probably want to
-      # put the recorder in _strict_ mode so that the recorded
-      # expectations use exact matching on argument lists, and strict
-      # ordering of the method calls.
-    
-      # <b>Note:</b> This is most useful when there are no queries on the
-      # mock objects, because the query responses cannot be programmed
-      # into the recorder object.
-    
-      it "compares a know algorithm with a new algorithm" do
-        builder = flexmock('builder')
-        builder.should_expect do |rec|
-          rec.should_be_strict
-          known_good_way_to_build_xml(rec)  # record the messages
-        end
-        new_way_to_build_xml(builder)       # compare to new way
-      end
-    
-      def known_good_way_to_build_xml(builder)
-        builder.person
-      end
-    
-      def new_way_to_build_xml(builder)
-        builder.person
-      end
-    
-    end
-    
-    describe "Multiple Return Values" do
-    
-      # Expect multiple calls, returning a different value each time
-    
-      # Sometimes you need to return different values for each call to a
-      # mocked method. This example shifts values out of a list for this
-      # effect.
-    
-      it "returns multiple values" do
-        file = flexmock('file')
-        file.should_receive(:gets).with_no_args.
-          and_return("line 1\n", "line 2\n")
-    
-        # test code here
-    
-        file.gets                   # returns "line 1"
-        file.gets                   # returns "line 2"
-      end
-    end
-    
-    describe "Ignore Unimportant Messages" do
-    
-      # Ignore uninteresting messages
-    
-      # Generally you need to mock only those methods that return an
-      # interesting value or wish to assert were sent in a particular
-      # manner. Use the <code>should_ignore_missing</code> method to turn
-      # on missing method ignoring.
-    
-      it "ignores unimportant messages" do
-        m = flexmock('m')
-        m.should_receive(:an_important_message).and_return(1).once
-        m.should_ignore_missing
-    
-        # Test Code
-    
-        m.an_important_message
-        m.an_unimportant_message
-      end
-    
-      # When <code>should_ignore_missing</code> is enabled, ignored
-      # missing methods will return an undefined object. Any operation on
-      # the undefined object will return the undefined object.
-    
-    end
-    
-    
-    describe "Partial Mocks" do
-    
-      # Mock just one method on an existing object
-    
-      # The Portfolio class calculate the value of a set of stocks by
-      # talking to a quote service via a web service. Since we don't want
-      # to use a real web service in our unit tests, we will mock the
-      # quote service.
-    
-      it "returns the portfolio value" do
-        flexmock(QuoteService).new_instances do |m|
-          m.should_receive(:quote).and_return(100)
-        end
-        port = Portfolio.new
-        value = port.value     # Portfolio calls QuoteService.quote
-        value.should == 100
-      end
-    
-      class QuoteService
-      end
-    
-      class Portfolio
-        def value
-          qs = QuoteService.new
-          qs.quote
-        end
-      end
-    end