aruba 0.4.10 → 0.4.11

data/.rspec

@@ -0,0 +1 @@
+--color

data/History.md

@@ -1,3 +1,7 @@
+## [v0.4.11](https://github.com/cucumber/aruba/compare/v0.4.10...v0.4.11)
+* Fix duplicated output (#91 Robert Wahler, Matt Wynne)
+* Fix Gemspec format (#101 Matt Wynne)
+
 ## [v0.4.10](https://github.com/cucumber/aruba/compare/v0.4.9...v0.4.10)
 * Fix broken JRuby file following rename of hook (Thomas Reynolds)
 * Add terminate method to API (Taylor Carpenter)

data/Rakefile

@@ -12,8 +12,14 @@ Cucumber::Rake::Task.new do |t|
   t.cucumber_opts = opts 
 end
 
-task :spec do
-  sh('rspec --color')
+require 'rspec/core/rake_task'
+desc "Run RSpec"
+RSpec::Core::RakeTask.new do |spec|
+  spec.pattern = 'spec/**/*_spec.rb'
+  spec.rspec_opts = ['--color', '--format nested']
 end
 
-task :default => [:spec, :cucumber]
+desc "Run tests, both RSpec and Cucumber"
+task :test => [:spec, :cucumber]
+
+task :default => :test

data/aruba.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'aruba'
-  s.version     = '0.4.10'
+  s.version     = '0.4.11'
   s.authors     = ["Aslak Hellesøy", "David Chelimsky", "Mike Sassak", "Matt Wynne"]
   s.description = 'CLI Steps for Cucumber, hand-crafted for you in Aruba'
   s.summary     = "aruba-#{s.version}"
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
 
   s.add_runtime_dependency 'cucumber', '>= 1.1.1'
   s.add_runtime_dependency 'childprocess', '>= 0.2.3'
-  s.add_runtime_dependency 'ffi', '1.0.11'
+  s.add_runtime_dependency 'ffi', '>= 1.0.11'
   s.add_runtime_dependency 'rspec', '>= 2.7.0'
   s.add_development_dependency 'bcat', '>= 0.6.1'
   s.add_development_dependency 'rdiscount', '>= 1.6.8'

data/lib/aruba/api.rb

@@ -267,8 +267,8 @@ module Aruba
       in_current_dir do
         Aruba.config.hooks.execute(:before_cmd, self, cmd)
 
-        announce_or_puts("$ cd #{Dir.pwd}") if @announce_dir
-        announce_or_puts("$ #{cmd}") if @announce_cmd
+        announcer.dir(Dir.pwd)
+        announcer.cmd(cmd)
 
         process = Process.new(cmd, exit_timeout, io_wait)
         register_process(cmd, process)
@@ -359,7 +359,7 @@ module Aruba
     end
 
     def set_env(key, value)
-      announce_or_puts(%{$ export #{key}="#{value}"}) if @announce_env
+      announcer.env(key, value)
       original_env[key] = ENV.delete(key)
       ENV[key] = value
     end
@@ -384,13 +384,58 @@ module Aruba
     end
 
     def stop_process(process)
-      @last_exit_status = process.stop(@aruba_keep_ansi)
-      announce_or_puts(process.stdout(@aruba_keep_ansi)) if @announce_stdout
-      announce_or_puts(process.stderr(@aruba_keep_ansi)) if @announce_stderr
+      @last_exit_status = process.stop(announcer, @aruba_keep_ansi)
     end
 
     def terminate_process(process)
       process.terminate(@aruba_keep_ansi)
     end
+
+    def announcer
+      Announcer.new(self, 
+                    :stdout => @announce_stdout, 
+                    :stderr => @announce_stderr,
+                    :dir => @announce_dir,
+                    :cmd => @announce_cmd,
+                    :env => @announce_env)
+    end
+
+    class Announcer
+      def initialize(session, options = {})
+        @session, @options = session, options
+      end
+
+      def stdout(content)
+        return unless @options[:stdout]
+        print content
+      end
+
+      def stderr(content)
+        return unless @options[:stderr]
+        print content
+      end
+
+      def dir(dir)
+        return unless @options[:dir]
+        print "$ cd #{dir}"
+      end
+
+      def cmd(cmd)
+        return unless @options[:cmd]
+        print "$ #{cmd}"
+      end
+
+      def env(key, value)
+        return unless @options[:env]
+        print %{$ export #{key}="#{value}"}
+      end
+
+      private
+
+      def print(message)
+        @session.announce_or_puts(message)
+      end
+    end
+
   end
 end

data/lib/aruba/process.rb

@@ -48,12 +48,14 @@ module Aruba
       end
     end
 
-    def stop(keep_ansi)
-      if @process
-        stdout(keep_ansi) && stderr(keep_ansi) # flush output
+    def stop(reader, keep_ansi)
+      return unless @process
+      unless @process.exited?
+        reader.stdout stdout(keep_ansi)
+        reader.stderr stderr(keep_ansi)
         @process.poll_for_exit(@exit_timeout)
-        @process.exit_code
       end
+      @process.exit_code
     end
 
     def terminate(keep_ansi)

data/spec/aruba/api_spec.rb

@@ -0,0 +1,49 @@
+require 'spec_helper'
+
+describe Aruba::Api  do
+
+  before(:each) do
+    klass = Class.new {
+      include Aruba::Api
+
+      def set_tag(tag_name, value)
+        self.instance_variable_set "@#{tag_name.to_s}", value
+      end
+
+      def announce_or_puts(*args)
+        p caller[0..2]
+      end
+    }
+    @aruba = klass.new
+  end
+
+  describe 'current_dir' do
+    it "should return the current dir as 'tmp/aruba'" do
+      @aruba.current_dir.should match(/^tmp\/aruba$/)
+    end
+  end
+
+  describe 'tags' do
+    describe '@announce_stdout' do
+
+      context 'enabled' do
+        it "should announce to stdout exactly once" do
+          @aruba.should_receive(:announce_or_puts).once
+          @aruba.set_tag(:announce_stdout, true)
+          @aruba.run_simple("ruby -e 'puts \"hello world\"'", false)
+          @aruba.all_output.should match(/hello world/)
+        end
+      end
+
+      context 'disabled' do
+        it "should not announce to stdout" do
+          @aruba.should_not_receive(:announce_or_puts)
+          @aruba.set_tag(:announce_stdout, false)
+          @aruba.run_simple("ruby -e 'puts \"hello world\"'", false)
+          @aruba.all_output.should match(/hello world/)
+        end
+      end
+    end
+
+  end
+end

data/spec/aruba/process_spec.rb

@@ -0,0 +1,33 @@
+require 'aruba/process'
+
+module Aruba
+  describe Process do
+
+    let(:process) { Process.new('echo "yo"', 0, 0.1) }
+
+    describe "#stdout" do
+      before { process.run! }
+
+      it "returns the stdout" do
+        process.stdout(false).should == "yo\n"
+      end
+
+      it "returns all the stdout, every time you call it" do
+        process.stdout(false).should == "yo\n"
+        process.stdout(false).should == "yo\n"
+      end
+
+    end
+
+    describe "#stop" do
+      before { process.run! }
+
+      it "sends any output to the reader" do
+        reader = stub.as_null_object
+        reader.should_receive(:stdout).with("yo\n")
+        process.stop(reader, false)
+      end
+    end
+
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,8 @@
+require 'rspec/core'
+require 'aruba/api'
+
+RSpec.configure do |config|
+  config.filter_run :focus => true
+  config.run_all_when_everything_filtered = true
+  config.treat_symbols_as_metadata_keys_with_true_values = true
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aruba
 version: !ruby/object:Gem::Version
-  version: 0.4.10
+  version: 0.4.11
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-24 00:00:00.000000000 Z
+date: 2011-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2156939920 !ruby/object:Gem::Requirement
+  requirement: &2156140500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,10 +24,10 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2156939920
+  version_requirements: *2156140500
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &2156939200 !ruby/object:Gem::Requirement
+  requirement: &2156139860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -35,21 +35,21 @@ dependencies:
         version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2156939200
+  version_requirements: *2156139860
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &2156938420 !ruby/object:Gem::Requirement
+  requirement: &2156139040 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - =
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: 1.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *2156938420
+  version_requirements: *2156139040
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2156936800 !ruby/object:Gem::Requirement
+  requirement: &2156137020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *2156936800
+  version_requirements: *2156137020
 - !ruby/object:Gem::Dependency
   name: bcat
-  requirement: &2156936240 !ruby/object:Gem::Requirement
+  requirement: &2156135300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *2156936240
+  version_requirements: *2156135300
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2156935720 !ruby/object:Gem::Requirement
+  requirement: &2156134580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *2156935720
+  version_requirements: *2156134580
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2156935260 !ruby/object:Gem::Requirement
+  requirement: &2152010020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,7 +90,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2156935260
+  version_requirements: *2152010020
 description: CLI Steps for Cucumber, hand-crafted for you in Aruba
 email: cukes@googlegroups.com
 executables: []
@@ -99,6 +99,7 @@ extra_rdoc_files: []
 files:
 - .document
 - .gitignore
+- .rspec
 - .rvmrc
 - .travis.yml
 - Gemfile
@@ -126,7 +127,10 @@ files:
 - lib/aruba/jruby.rb
 - lib/aruba/process.rb
 - lib/aruba/reporting.rb
+- spec/aruba/api_spec.rb
 - spec/aruba/hooks_spec.rb
+- spec/aruba/process_spec.rb
+- spec/spec_helper.rb
 - templates/css/console.css
 - templates/css/filesystem.css
 - templates/css/pygments-autumn.css
@@ -155,7 +159,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -344874369697524024
+      hash: -1684218897228509684
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -164,13 +168,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -344874369697524024
+      hash: -1684218897228509684
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: aruba-0.4.10
+summary: aruba-0.4.11
 test_files:
 - features/before_cmd_hooks.feature
 - features/exit_statuses.feature
@@ -181,4 +185,7 @@ test_files:
 - features/output.feature
 - features/step_definitions/aruba_dev_steps.rb
 - features/support/env.rb
+- spec/aruba/api_spec.rb
 - spec/aruba/hooks_spec.rb
+- spec/aruba/process_spec.rb
+- spec/spec_helper.rb