aruba 0.1.7 → 0.1.8

data/History.txt

@@ -1,3 +1,8 @@
+== 0.1.8
+* Use // instead of "" for "I should see matching" step. (Aslak Hellesøy)
+* Replace rvm gemset character '%' with '@' for rvm 0.1.24 (#5 Ashley Moran)
+* Support gem bundler, making it easier to specify gems. (Aslak Hellesøy)
+
 == 0.1.7
 * New @announce-stderr tag (Robert Wahler)
 * New "I should see matching" steps using Regexp (Robert Wahler)

data/Rakefile

@@ -5,7 +5,7 @@ require 'rake'
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.version = "0.1.7"
+    gem.version = "0.1.8"
     gem.name = "aruba"
     gem.summary = %Q{CLI Steps for Cucumber}
     gem.description = %Q{CLI Steps for Cucumber, hand-crafted for you in Aruba}
@@ -13,7 +13,7 @@ begin
     gem.homepage = "http://github.com/aslakhellesoy/aruba"
     gem.authors = ["Aslak Hellesøy", "David Chelimsky"]
     gem.add_development_dependency "rspec", ">= 1.3.0"
-    gem.add_development_dependency "cucumber", ">= 0.6.2"
+    gem.add_development_dependency "cucumber", ">= 0.7.0.beta.6"
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/features/output.feature

@@ -47,7 +47,7 @@ Feature: Output
   Scenario: Detect subset of one-line output with regex
     When I run "ruby --version"
     Then I should see "ruby"
-    And I should see matching "ruby ([\d]+\.[\d]+\.[\d]+) \(.*$"
+    And I should see matching /ruby ([\d]+\.[\d]+\.[\d]+)(p\d+)? \(.*$/
 
   @announce
   Scenario: Detect subset of multiline output with regex

data/features/running_ruby.feature

@@ -16,18 +16,25 @@ Feature: Running ruby
     Then I should see "1.4.0"
     And I should not see "rvm usage"
 
-  Scenario: Specify both rvm and gemset
+  Scenario: Install gems with bundler
     Given I am using rvm "1.9.1"
-    And I am using rvm gemset "a-gemset-where-nothing-is-installed-except-default-rvm-gems"
+    And I am using rvm gemset "a-new-gemset-where-no-gems-are-installed" with Gemfile:
+      """
+      gem 'diff-lcs', '1.1.2'
+      """
     When I run "gem list"
-    Then I should see:
+    Then I should see matching:
       """
-
-      rake (0.8.7)
-      rubygems-update (1.3.5)
-
+      bundler \(\d+\.+\d+\.+\d+\)
+      diff-lcs \(\d+\.+\d+\.+\d+\)
       """
 
+  Scenario: Specify both rvm and gemset
+    Given I am using rvm "1.9.1"
+    And I am using an empty rvm gemset "a-new-gemset-where-no-gems-are-installed"
+    When I run "gem list | wc -l"
+    Then I should see exactly "       2\n"
+
   Scenario: Find the version of ruby 1.9.1
     Given I am using rvm "1.9.1"
     When I run "ruby --version"
@@ -36,7 +43,7 @@ Feature: Running ruby
   Scenario: Find the version of cucumber on ruby 1.9.1
     Given I am using rvm "1.9.1"
     When I run "cucumber --version"
-    Then I should see "0.6.2"
+    Then I should see matching /\d+\.+\d+\.+\d+/
 
   Scenario: Use current ruby
     When I run "ruby --version"
@@ -70,5 +77,5 @@ Feature: Running ruby
   #   ~/.rvm/rubies/jruby-1.4.0/bin/jruby -S cucumber features/running_ruby.feature -n "launched Cucumber"
   @jruby
   Scenario: Don't use rvm, but default to same Ruby as the one that launched Cucumber
-    When I run "ruby -e 'puts JRUBY_VERSION'"
+    When I run "ruby -e 'puts JRUBY_VERSION if defined?(JRUBY_VERSION)'"
     Then I should see the JRuby version

data/features/step_definitions/aruba_dev_steps.rb

@@ -11,6 +11,7 @@ When /^I do aruba (.*)$/ do |aruba_step|
 end
 
 Then /^I should see the JRuby version$/ do
+  pending "This must be manually run in JRuby" unless defined?(JRUBY_VERSION)
   Then %{I should see "#{JRUBY_VERSION}"}
 end
 

data/lib/aruba/api.rb

@@ -88,11 +88,31 @@ module Api
     end
   end
 
-  def use_rvm_gemset(rvm_gemset)
+  def use_rvm_gemset(rvm_gemset, empty_gemset)
     @rvm_gemset = rvm_gemset
+    if empty_gemset
+      delete_rvm_gemset(rvm_gemset)
+      create_rvm_gemset(rvm_gemset)
+    end
+  end
+  
+  def delete_rvm_gemset(rvm_gemset)
+    raise "You haven't specified what ruby version rvm should use." if @rvm_ruby_version.nil?
+    run "rvm --force gemset delete #{@rvm_ruby_version}@#{rvm_gemset}"
+  end
+  
+  def create_rvm_gemset(rvm_gemset)
+    raise "You haven't specified what ruby version rvm should use." if @rvm_ruby_version.nil?
+    run "rvm --create #{@rvm_ruby_version}@#{rvm_gemset}"
+  end
+
+  def install_gems(gemfile)
+    create_file("Gemfile", gemfile)
+    run("gem install bundler")
+    run("bundle install")
   end
 
-  def run(cmd)
+  def run(cmd, fail_on_error=true)
     cmd = detect_ruby_script(cmd)
     cmd = detect_ruby(cmd)
 
@@ -113,6 +133,11 @@ module Api
     @last_stderr = IO.read(stderr_file.path)
 
     announce(@last_stderr) if @announce_stderr
+
+    if(@last_exit_status != 0 && fail_on_error)
+      fail("Exit status was #{@last_exit_status}. Output:\n#{combined_output}")
+    end
+
     @last_stderr
   end
 
@@ -136,7 +161,7 @@ module Api
 
   def current_ruby
     if @rvm_ruby_version
-      rvm_ruby_version_with_gemset = @rvm_gemset ? "#{@rvm_ruby_version}%#{@rvm_gemset}" : @rvm_ruby_version
+      rvm_ruby_version_with_gemset = @rvm_gemset ? "#{@rvm_ruby_version}@#{@rvm_gemset}" : @rvm_ruby_version
       "rvm #{rvm_ruby_version_with_gemset} ruby"
     else
       File.join(Config::CONFIG['bindir'], Config::CONFIG['ruby_install_name'])

data/lib/aruba/cucumber.rb

@@ -28,8 +28,13 @@ Given /^I am using rvm "([^\"]*)"$/ do |rvm_ruby_version|
   use_rvm(rvm_ruby_version)
 end
 
-Given /^I am using rvm gemset "([^\"]*)"$/ do |rvm_gemset|
-  use_rvm_gemset(rvm_gemset)
+Given /^I am using( an empty)? rvm gemset "([^\"]*)"$/ do |empty_gemset, rvm_gemset|
+  use_rvm_gemset(rvm_gemset, empty_gemset)
+end
+
+Given /^I am using rvm gemset "([^\"]*)" with Gemfile:$/ do |rvm_gemset, gemfile|
+  use_rvm_gemset(rvm_gemset, true)
+  install_gems(gemfile)
 end
 
 Given /^a directory named "([^\"]*)"$/ do |dir_name|
@@ -53,14 +58,11 @@ When /^I cd to "([^\"]*)"$/ do |dir|
 end
 
 When /^I run "(.*)"$/ do |cmd|
-  run(unescape(cmd))
+  run(unescape(cmd), false)
 end
 
 When /^I successfully run "(.*)"$/ do |cmd|
   run(unescape(cmd))
-  if(@last_exit_status != 0)
-    fail("Exit status was #{@last_exit_status}. Output:\n#{combined_output}")
-  end
 end
 
 Then /^I should see "([^\"]*)"$/ do |partial_output|
@@ -91,7 +93,7 @@ end
 # you don't need regex, use "I should see" instead since
 # that way, you don't have to escape regex characters that
 # appear naturally in the output
-Then /^I should see matching "([^\"]*)"$/ do |partial_output|
+Then /^I should see matching \/([^\/]*)\/$/ do |partial_output|
   combined_output.should =~ /#{partial_output}/
 end
  

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 7
-  version: 0.1.7
+  - 8
+  version: 0.1.8
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-05 00:00:00 +01:00
+date: 2010-04-28 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -41,9 +41,11 @@ dependencies:
       - !ruby/object:Gem::Version 
         segments: 
         - 0
+        - 7
+        - 0
+        - beta
         - 6
-        - 2
-        version: 0.6.2
+        version: 0.7.0.beta.6
   type: :development
   version_requirements: *id002
 description: CLI Steps for Cucumber, hand-crafted for you in Aruba