aruba 0.4.7 → 0.4.8

data/.travis.yml

@@ -1,4 +1,14 @@
-rvm:
-  - 1.8.7
-  - 1.9.2
+rvm: 
   - 1.9.3
+  - 1.9.2
+  - 1.8.7
+# whitelist
+branches:
+  only:
+    - master
+
+notifications:
+  email:
+    - cukes-devs@googlegroups.com
+  irc:
+    - "irc.freenode.org#cucumber"

data/History.md

@@ -1,3 +1,9 @@
+## [v0.4.8](https://github.com/cucumber/aruba/compare/v0.4.7...v0.4.8)
+
+* Add before_run hook (Matt Wynne)
+* Add JRuby performance tweaks (#93 Myron Marston / Matt Wynne)
+* Invalid/Corrupt spec file for 0.4.7 - undefined method call for nil:Nilclass (#47 Aslak Hellesøy)
+
 ## [v0.4.7](https://github.com/cucumber/aruba/compare/v0.4.6...v0.4.7)
 
 * Remove rdiscount dependency. (#85 Aslak Hellesøy)

data/aruba.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'aruba'
-  s.version     = '0.4.7'
+  s.version     = '0.4.8'
   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}"
@@ -10,8 +10,8 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://github.com/cucumber/aruba'
 
   s.add_runtime_dependency 'cucumber', '>= 1.1.1'
-  s.add_runtime_dependency 'childprocess', '>= 0.2.2'
-  s.add_runtime_dependency 'ffi', '1.0.9' # https://github.com/ffi/ffi/issues/176
+  s.add_runtime_dependency 'childprocess', '>= 0.2.3'
+  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/features/before_run_hooks.feature

@@ -0,0 +1,61 @@
+Feature: before_run hooks
+
+  You can configure Aruba to run blocks of code before it runs
+  each command.
+  
+  The command will be passed to the block.
+  
+  Scenario: Run a simple command with a before hook
+    Given a file named "test.rb" with:
+      """
+      $: << '../../lib'
+      require 'aruba/api'
+      
+      Aruba.configure do |config|
+        config.before_run do |cmd|
+          puts "about to run `#{cmd}`"
+        end
+      end
+      
+      include Aruba::Api
+      run_simple("echo 'running'")
+      puts all_stdout
+      """
+    When I run `ruby test.rb`
+    Then it should pass with:
+      """
+      about to run `echo 'running'`
+      running
+      """
+  
+  # This should move into a spec
+  Scenario: Use something from the context where the command was run
+    Given a file named "test.rb" with:
+      """
+      $: << '../../lib'
+      require 'aruba/api'
+
+      Aruba.configure do |config|
+        config.before_run do |cmd|
+          puts "I can see @your_context=#{@your_context}"
+        end
+      end
+
+      class Test
+        include Aruba::Api
+        
+        def test
+          @your_context = "something"
+          run_simple("echo 'running'")
+          puts all_stdout
+        end
+      end
+      
+      Test.new.test
+      """
+    When I run `ruby test.rb`
+    Then it should pass with:
+      """
+      I can see @your_context=something
+      running
+      """

data/lib/aruba.rb

@@ -1 +1 @@
-# Load nothing - just keep the file here to keep bundler happy.
+# Load nothing - just keep the file here to keep bundler happy.

data/lib/aruba/api.rb

@@ -1,9 +1,14 @@
 require 'fileutils'
 require 'rbconfig'
+require 'rspec/expectations'
 require 'aruba/process'
+require 'aruba/config'
+require 'aruba/jruby' if RUBY_PLATFORM == 'java'
 
 module Aruba
   module Api
+    include RSpec::Matchers
+
     def in_current_dir(&block)
       _mkdir(current_dir)
       Dir.chdir(current_dir, &block)
@@ -253,6 +258,8 @@ module Aruba
       cmd = detect_ruby(cmd)
 
       in_current_dir do
+        Aruba.config.hooks.execute(:before_run, cmd, self)
+        
         announce_or_puts("$ cd #{Dir.pwd}") if @announce_dir
         announce_or_puts("$ #{cmd}") if @announce_cmd
 

data/lib/aruba/config.rb

@@ -0,0 +1,44 @@
+module Aruba
+  class Config
+    attr_reader :hooks
+    
+    def initialize
+      @hooks = Hooks.new
+    end
+    
+    # Register a hook to be called before Aruba runs a command
+    def before_run(&block)
+      @hooks.append(:before_run, block)
+    end
+  end
+  
+  #nodoc
+  class Hooks
+    def initialize
+      @store = Hash.new do |hash, key|
+        hash[key] = []
+      end
+    end
+    
+    def append(label, block)
+      @store[label] << block
+    end
+    
+    def execute(label, *args, context)
+      @store[label].each do |block|
+        context.instance_exec(*args, &block)
+      end
+    end
+  end
+  
+  class << self
+    attr_accessor :config
+
+    def configure
+      yield config
+    end
+    
+  end
+  
+  self.config = Config.new
+end

data/lib/aruba/cucumber.rb

@@ -1,5 +1,5 @@
 require 'aruba/api'
-require 'aruba/hooks'
+require 'aruba/cucumber/hooks'
 require 'aruba/reporting'
 
 World(Aruba::Api)

data/lib/aruba/jruby.rb

@@ -0,0 +1,7 @@
+Aruba.configure do |config|
+  config.before_run do
+    # ideas taken from: http://blog.headius.com/2010/03/jruby-startup-time-tips.html
+    set_env('JRUBY_OPTS', '-X-C') # disable JIT since these processes are so short lived
+    set_env('JAVA_OPTS', '-d32')  # force jRuby to use client JVM for faster startup times
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: aruba
 version: !ruby/object:Gem::Version
-  version: 0.4.7
+  version: 0.4.8
   prerelease: 
 platform: ruby
 authors:
@@ -12,11 +12,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-09 00:00:00.000000000 Z
+date: 2011-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &2169217200 !ruby/object:Gem::Requirement
+  requirement: &2154130540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -24,32 +24,32 @@ dependencies:
         version: 1.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *2169217200
+  version_requirements: *2154130540
 - !ruby/object:Gem::Dependency
   name: childprocess
-  requirement: &2169216360 !ruby/object:Gem::Requirement
+  requirement: &2154129760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.2
+        version: 0.2.3
   type: :runtime
   prerelease: false
-  version_requirements: *2169216360
+  version_requirements: *2154129760
 - !ruby/object:Gem::Dependency
   name: ffi
-  requirement: &2169215480 !ruby/object:Gem::Requirement
+  requirement: &2154129000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
       - !ruby/object:Gem::Version
-        version: 1.0.9
+        version: 1.0.11
   type: :runtime
   prerelease: false
-  version_requirements: *2169215480
+  version_requirements: *2154129000
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2169214760 !ruby/object:Gem::Requirement
+  requirement: &2154144360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -57,10 +57,10 @@ dependencies:
         version: 2.7.0
   type: :runtime
   prerelease: false
-  version_requirements: *2169214760
+  version_requirements: *2154144360
 - !ruby/object:Gem::Dependency
   name: bcat
-  requirement: &2169214160 !ruby/object:Gem::Requirement
+  requirement: &2154142940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -68,10 +68,10 @@ dependencies:
         version: 0.6.1
   type: :development
   prerelease: false
-  version_requirements: *2169214160
+  version_requirements: *2154142940
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2169213540 !ruby/object:Gem::Requirement
+  requirement: &2154141800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -79,10 +79,10 @@ dependencies:
         version: 1.6.8
   type: :development
   prerelease: false
-  version_requirements: *2169213540
+  version_requirements: *2154141800
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2169212940 !ruby/object:Gem::Requirement
+  requirement: &2154141000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -90,7 +90,7 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *2169212940
+  version_requirements: *2154141000
 description: CLI Steps for Cucumber, hand-crafted for you in Aruba
 email: cukes@googlegroups.com
 executables: []
@@ -109,6 +109,7 @@ files:
 - aruba.gemspec
 - config/.gitignore
 - cucumber.yml
+- features/before_run_hooks.feature
 - features/exit_statuses.feature
 - features/file_system_commands.feature
 - features/flushing.feature
@@ -119,8 +120,10 @@ files:
 - features/support/env.rb
 - lib/aruba.rb
 - lib/aruba/api.rb
+- lib/aruba/config.rb
 - lib/aruba/cucumber.rb
-- lib/aruba/hooks.rb
+- lib/aruba/cucumber/hooks.rb
+- lib/aruba/jruby.rb
 - lib/aruba/process.rb
 - lib/aruba/reporting.rb
 - templates/css/console.css
@@ -151,7 +154,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1641933628197378255
+      hash: -1312847667383042518
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -160,14 +163,15 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1641933628197378255
+      hash: -1312847667383042518
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
-summary: aruba-0.4.7
+summary: aruba-0.4.8
 test_files:
+- features/before_run_hooks.feature
 - features/exit_statuses.feature
 - features/file_system_commands.feature
 - features/flushing.feature