aruba-doubles 1.0.1 → 1.1.0

data/aruba-doubles.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'aruba-doubles'
-  s.version     = '1.0.1'
+  s.version     = '1.1.0'
   s.authors     = ['Björn Albers']
   s.email       = ['bjoernalbers@googlemail.com']
   s.description = 'Cucumber Steps to double Command Line Applications'

data/features/define_output.feature

@@ -90,3 +90,12 @@ Feature: Define Output
     Then the exit status should be 0
     And the stdout should be empty
     And the stderr should be empty
+
+  Scenario: Double with multiple outputs
+    Given I double `foo --hello` with "hello, world."
+    And I double `foo --hello --loud` with "HELLO, WORLD!"
+    When I run `foo --hello`
+    Then the stdout should contain "hello, world."
+    But the stdout should not contain "HELLO, WORLD!"
+    When I run `foo --hello --loud`
+    Then the stdout should contain "HELLO, WORLD!"

data/lib/aruba-doubles.rb

@@ -4,9 +4,9 @@ require 'aruba-doubles/double'
 
 module ArubaDoubles
   def double_cmd(cmd, output = {})
-   argv = Shellwords.split(cmd)
-   Double.create(argv.shift) do
-     on(argv, output)
-   end
+    argv = Shellwords.split(cmd)
+    filename = argv.shift
+    double = Double.find(filename) || Double.new(filename)
+    double.create { on argv, output }
   end
 end

data/lib/aruba-doubles/double.rb

@@ -1,7 +1,12 @@
 module ArubaDoubles
   class Double
+
+    @doubles = {}
+
     class << self
 
+      attr_reader :doubles
+
       # Setup the doubles environment.
       def setup
         patch_path
@@ -37,6 +42,10 @@ module ArubaDoubles
         @bindir ||= Dir.mktmpdir
       end
 
+      def find(filename)
+        self.doubles[filename]
+      end
+
       # Iterate over all registered doubles.
       def each
         all.each { |double| yield(double) }
@@ -45,7 +54,7 @@ module ArubaDoubles
       # Return all registered doubles.
       # @return [Array<ArubaDoubles::Double>]
       def all
-        @doubles ||= []
+        self.doubles.values
       end
 
     private
@@ -77,39 +86,37 @@ module ArubaDoubles
       end
     end
 
-    attr_reader   :filename, :output, :matchers
+    attr_reader   :filename, :output
 
     # Instantiate and register new double.
     # @return [ArubaDoubles::Double]
     def initialize(cmd, default_output = {}, &block)
       @filename = cmd
-      @output = {:puts => nil, :warn => nil, :exit => nil}.merge(default_output)
-      @matchers = []
-      self.class.all << self
+      @default_output = {:puts => nil, :warn => nil, :exit => nil}.merge(default_output)
+      @outputs = {}
       self.instance_eval(&block) if block_given?
     end
 
     # Add ARGV matcher with output.
     def on(argv, output = nil)
-      @matchers << [argv, output || default_output]
+      @outputs[argv] = output
     end
 
     # Run the double.
     #
     # This will actually display any outputs if defined and exit.
     def run(argv = ARGV)
-      @matchers.each do |m|
-        expected_argv, output = *m
-        @output = output if argv == expected_argv
-      end
-      puts @output[:puts] if @output[:puts]
-      warn @output[:warn] if @output[:warn]
-      exit @output[:exit] if @output[:exit]
+      output = @outputs[argv] || @default_output
+      puts output[:puts] if output[:puts]
+      warn output[:warn] if output[:warn]
+      exit output[:exit] if output[:exit]
     end
 
     # Create the executable double.
     # @return [String] full path to the double.
-    def create
+    def create(&block)
+      self.instance_eval(&block) if block_given?
+      self.class.doubles[@filename] = self
       content = self.to_ruby
       fullpath = File.join(self.class.bindir, filename)
       #puts "creating double: #{fullpath} with content:\n#{content}" # debug
@@ -117,6 +124,7 @@ module ArubaDoubles
       f.puts content
       f.close
       FileUtils.chmod(0755, File.join(self.class.bindir, filename))
+      self
     end
 
     # Export the double to executable Ruby code.
@@ -127,7 +135,7 @@ module ArubaDoubles
       ruby << "$: << '#{File.expand_path('..', File.dirname(__FILE__))}'"
       ruby << 'require "aruba-doubles"'
       ruby << 'ArubaDoubles::Double.run do'
-      @matchers.each { |argv,output| ruby << "  on #{argv.inspect}, #{output.inspect}" }
+      @outputs.each_pair { |argv,output| ruby << "  on #{argv.inspect}, #{output.inspect}" }
       ruby << 'end'
       ruby.join("\n")
     end

data/spec/aruba-doubles/double_spec.rb

@@ -67,16 +67,6 @@ describe ArubaDoubles::Double do
   end
 
   describe '.new' do
-    it 'should register the double' do
-      d = ArubaDoubles::Double.new('bar')
-      ArubaDoubles::Double.all.should include(d)
-    end
-
-    it 'should initialize all output attributes with nil' do
-      output = ArubaDoubles::Double.new('foo').output
-      output.should eql({:puts => nil, :warn => nil, :exit => nil})
-    end
-
     it 'should execute a given block in the doubles context' do
       double = ArubaDoubles::Double.new('bar') { def hi; "hi" end }
       double.should respond_to(:hi)
@@ -86,6 +76,17 @@ describe ArubaDoubles::Double do
     it 'should raise error on absolute filename'
   end
 
+  describe '.find' do
+    it 'should return a registered double by name' do
+      File.stub(:open).and_return(stub(:puts => nil, :close => nil))
+      FileUtils.stub(:chmod)
+
+      ArubaDoubles::Double.find('registered_double').should be_nil
+      double = ArubaDoubles::Double.create('registered_double')
+      ArubaDoubles::Double.find('registered_double').should eql(double)
+    end
+  end
+
   describe '.run' do
     before do
       @double = double('double', :run => nil)
@@ -193,23 +194,41 @@ describe ArubaDoubles::Double do
   end
 
   describe '#create' do
+    before do
+      File.stub(:open).and_return(stub(:puts => nil, :close => nil))
+      FileUtils.stub(:chmod)
+      ArubaDoubles::Double.stub(:bindir).and_return('/tmp/foo')
+    end
+
     it 'should create the executable command inside the doubles dir' do
       file = double('file', :puts => nil, :close => nil)
-      ArubaDoubles::Double.stub(:bindir).and_return('/tmp/foo')
       File.should_receive(:open).with('/tmp/foo/bar', 'w').and_return(file)
-      FileUtils.stub(:chmod)
       ArubaDoubles::Double.new('bar').create
     end
 
     it 'should make the file executable' do
-      ArubaDoubles::Double.stub(:bindir).and_return('/tmp/foo')
       File.stub(:open).and_return(stub(:puts => nil, :close => nil))
-
       filename = '/tmp/foo/bar'
       FileUtils.should_receive(:chmod).with(0755, filename)
-
       ArubaDoubles::Double.new('bar').create
     end
+
+    it 'should register the double' do
+      double = ArubaDoubles::Double.create('bar')
+      ArubaDoubles::Double.all.should include(double)
+    end
+
+    it 'should return self' do
+      double = ArubaDoubles::Double.new('foo')
+      double.create.should eql(double)
+    end
+
+    it 'should execute a block on that double when given' do
+      double = ArubaDoubles::Double.create('bar')
+      block = Proc.new {}
+      double.should_receive(:instance_eval).with(&block)
+      double.create(&block)
+    end
   end
 
   describe '#to_ruby' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aruba-doubles
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-19 00:00:00.000000000Z
+date: 2012-04-20 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &70327753667980 !ruby/object:Gem::Requirement
+  requirement: &70304475014040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70327753667980
+  version_requirements: *70304475014040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70327753667320 !ruby/object:Gem::Requirement
+  requirement: &70304475013040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70327753667320
+  version_requirements: *70304475013040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70327753666760 !ruby/object:Gem::Requirement
+  requirement: &70304475012120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.9.2.2
   type: :development
   prerelease: false
-  version_requirements: *70327753666760
+  version_requirements: *70304475012120
 - !ruby/object:Gem::Dependency
   name: aruba
-  requirement: &70327753666120 !ruby/object:Gem::Requirement
+  requirement: &70304475011300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 0.4.6
   type: :development
   prerelease: false
-  version_requirements: *70327753666120
+  version_requirements: *70304475011300
 - !ruby/object:Gem::Dependency
   name: guard-cucumber
-  requirement: &70327753665580 !ruby/object:Gem::Requirement
+  requirement: &70304475010300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 0.7.3
   type: :development
   prerelease: false
-  version_requirements: *70327753665580
+  version_requirements: *70304475010300
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70327753664980 !ruby/object:Gem::Requirement
+  requirement: &70304475009200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: 0.5.1
   type: :development
   prerelease: false
-  version_requirements: *70327753664980
+  version_requirements: *70304475009200
 description: Cucumber Steps to double Command Line Applications
 email:
 - bjoernalbers@googlemail.com
@@ -117,7 +117,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3529460096328608826
+      hash: 884917047948355837
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -126,13 +126,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3529460096328608826
+      hash: 884917047948355837
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: aruba-doubles-1.0.1
+summary: aruba-doubles-1.1.0
 test_files:
 - features/define_output.feature
 - features/double_commands.feature