aruba 0.1.4 → 0.1.5

data/History.txt

@@ -1,3 +1,11 @@
+== 0.1.5
+* Added ability to map rvm versions to a specific version with config/aruba-rvm.yml. (Aslak Hellesøy)
+* Check for presence of files. (Aslak Hellesøy)
+* Allow specification of rvm gemsets. (Aslak Hellesøy)
+* Detect ruby commands and use current ruby when rvm is not explicitly used. (Aslak Hellesøy)
+* Added support for rvm, making it possible to choose Ruby interpreter. (Aslak Hellesøy)
+* Added @announce-cmd, @announce-stdout and @announce tags, useful for seeing what's executed and outputted. (Aslak Hellesøy)
+
 == 0.1.4
 * New step definition for appending to a file (Aslak Hellesøy)
 

data/Rakefile

@@ -1,14 +1,15 @@
+# -*- encoding: utf-8 -*-
 require 'rubygems'
 require 'rake'
 
 begin
   require 'jeweler'
   Jeweler::Tasks.new do |gem|
-    gem.version = "0.1.4"
+    gem.version = "0.1.5"
     gem.name = "aruba"
     gem.summary = %Q{CLI Steps for Cucumber}
     gem.description = %Q{CLI Steps for Cucumber, hand-crafted for you in Aruba}
-    gem.email = "cukes@groups.google.com"
+    gem.email = "cukes@googlegroups.com"
     gem.homepage = "http://github.com/aslakhellesoy/aruba"
     gem.authors = ["Aslak Hellesøy", "David Chelimsky"]
     gem.add_development_dependency "rspec", ">= 1.3.0"
@@ -22,17 +23,12 @@ end
 begin
   require 'cucumber/rake/task'
 
-  namespace :cucumber do
-    Cucumber::Rake::Task.new(:pass) do |t|
-      t.cucumber_opts = '--tags ~@fail'
-    end
-
-    Cucumber::Rake::Task.new(:fail) do |t|
-      t.cucumber_opts = '--tags @fail --wip'
-    end
+  Cucumber::Rake::Task.new do |t|
+    t.cucumber_opts = %w{--tags ~@jruby} unless defined?(JRUBY_VERSION)
+    t.rcov = true
   end
 
-  task :cucumber => [:check_dependencies, 'cucumber:pass', 'cucumber:fail']
+  task :cucumber => :check_dependencies
 rescue LoadError
   task :cucumber do
     abort "Cucumber is not available. In order to run features, you must: sudo gem install cucumber"

data/aruba.gemspec

@@ -5,13 +5,13 @@
 
 Gem::Specification.new do |s|
   s.name = %q{aruba}
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aslak Helles\303\270y", "David Chelimsky"]
-  s.date = %q{2010-02-23}
+  s.date = %q{2010-02-26}
   s.description = %q{CLI Steps for Cucumber, hand-crafted for you in Aruba}
-  s.email = %q{cukes@groups.google.com}
+  s.email = %q{cukes@googlegroups.com}
   s.extra_rdoc_files = [
     "LICENSE",
      "README.rdoc"
@@ -24,10 +24,12 @@ Gem::Specification.new do |s|
      "README.rdoc",
      "Rakefile",
      "aruba.gemspec",
+     "config/.gitignore",
      "features/exit_statuses.feature",
      "features/file_system_commands.feature",
      "features/output.feature",
-     "features/step_definitions/aruba_steps.rb",
+     "features/running_ruby.feature",
+     "features/step_definitions/aruba_dev_steps.rb",
      "features/support/env.rb",
      "lib/aruba.rb",
      "lib/aruba/api.rb",

data/config/.gitignore

@@ -0,0 +1 @@
+aruba-rvm.yml

data/features/exit_statuses.feature

@@ -12,3 +12,10 @@ Feature: exit statuses
     When I run "ruby -e 'exit 56'"
     Then the exit status should be 56
     And the exit status should not be 0
+
+  Scenario: Successfully run something
+    When I successfully run "ruby -e 'exit 0'"
+
+  Scenario: Unsuccessfully run something
+    When I do aruba I successfully run "ruby -e 'exit 10'"
+    Then aruba should fail with "got: 10"

data/features/file_system_commands.feature

@@ -48,10 +48,30 @@ Feature: file system commands
     When I run "ruby example.rb"
     Then the exit status should be 1
 
-  @fail
   Scenario: Holler if cd to bad dir
     Given a file named "foo/bar/example.rb" with:
       """
       puts "hello world"
       """
-    When I cd to "foo/nonexistant"
+    When I do aruba I cd to "foo/nonexistant"
+    Then aruba should fail with "tmp/aruba/foo/nonexistant is not a directory"
+
+  Scenario: Check for presence of a subset of files
+    Given an empty file named "lorem/ipsum/dolor"
+    Given an empty file named "lorem/ipsum/sit"
+    Given an empty file named "lorem/ipsum/amet"
+    Then the following files should exist:
+      | lorem/ipsum/dolor |
+      | lorem/ipsum/amet  |
+
+  Scenario: Check for absence of files
+    Then the following files should not exist:
+      | lorem/ipsum/dolor |
+
+  Scenario: Check file contents
+    Given a file named "foo" with:
+      """
+      hello world
+      """
+    Then the file "foo" should contain "hello world"
+    And the file "foo" should not contain "HELLO WORLD"

data/features/output.feature

@@ -8,19 +8,23 @@ Feature: Output
     When I run "ruby -e 'puts \"hello world\"'"
     Then I should see "hello world"
 
+  Scenario: Detect subset of one-line output
+    When I run "echo 'hello world'"
+    Then I should see "hello world"
+
   Scenario: Detect absence of one-line output
     When I run "ruby -e 'puts \"hello world\"'"
     Then I should not see "good-bye"
 
   Scenario: Detect subset of multiline output
-    When I run "ruby -e 'puts \"hello\nworld\"'"
+    When I run "ruby -e 'puts \"hello\\nworld\"'"
     Then I should see:
       """
       hello
       """
 
   Scenario: Detect subset of multiline output
-    When I run "ruby -e 'puts \"hello\nworld\"'"
+    When I run "ruby -e 'puts \"hello\\nworld\"'"
     Then I should not see:
       """
       good-bye
@@ -31,7 +35,7 @@ Feature: Output
     Then I should see exactly "hello world\n"
 
   Scenario: Detect exact multiline output
-    When I run "ruby -e 'puts \"hello\nworld\"'"
+    When I run "ruby -e 'puts \"hello\\nworld\"'"
     Then I should see exactly:
       """
       hello
@@ -39,26 +43,29 @@ Feature: Output
 
       """
 
+  @announce
   Scenario: Match passing exit status and partial output
-    When I run "ruby -e 'puts \"hello\nworld\"'"
+    When I run "ruby -e 'puts \"hello\\nworld\"'"
     Then it should pass with:
       """
       hello
       """
 
+  @announce-stdout
   Scenario: Match failing exit status and partial output
-    When I run "ruby -e 'puts \"hello\nworld\";exit 99'"
+    When I run "ruby -e 'puts \"hello\\nworld\";exit 99'"
     Then it should fail with:
       """
       hello
       """
-      
+
+  @announce-cmd
   Scenario: Match output in stdout
-    When I run "ruby -e 'puts \"hello\nworld\"'"
+    When I run "ruby -e 'puts \"hello\\nworld\"'"
     Then the stdout should contain "hello"
     Then the stderr should not contain "hello"
 
   Scenario: Match output in stderr
-    When I run "ruby -e 'STDERR.puts \"hello\nworld\";exit 99'"
+    When I run "ruby -e 'STDERR.puts \"hello\\nworld\";exit 99'"
     Then the stderr should contain "hello"
     Then the stdout should not contain "hello"

data/features/running_ruby.feature

@@ -0,0 +1,74 @@
+@announce
+Feature: Running ruby
+  In order to test a Ruby-based CLI app
+  I want to have control over what Ruby version is used,
+  possibly using a different Ruby than the one I launch Cucumber with.
+
+  Scenario: Run with ruby 1.9.1
+    Given I am using rvm "1.9.1"
+    When I run "ruby -e 'puts RUBY_VERSION'"
+    Then I should see "ruby-1.9.1-p378"
+    And I should not see "rvm usage"
+
+  Scenario: Run with ruby JRuby
+    Given I am using rvm "jruby-1.4.0"
+    When I run "ruby -e 'puts JRUBY_VERSION'"
+    Then I should see "1.4.0"
+    And I should not see "rvm usage"
+
+  Scenario: Specify both rvm and gemset
+    Given I am using rvm "1.9.1"
+    And I am using rvm gemset "a-gemset-where-nothing-is-installed-except-default-rvm-gems"
+    When I run "gem list"
+    Then I should see:
+      """
+
+      rake (0.8.7)
+      rubygems-update (1.3.5)
+
+      """
+
+  Scenario: Find the version of ruby 1.9.1
+    Given I am using rvm "1.9.1"
+    When I run "ruby --version"
+    Then I should see "1.9.1"
+
+  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"
+
+  Scenario: Use current ruby
+    When I run "ruby --version"
+    Then I should see the current Ruby version
+
+  Scenario: Use current ruby and a gem bin file
+    When I run "rake --version"
+    Then I should see "rake, version"
+
+  # I have trouble running rvm 1.8.7 in OS X Leopard, which is
+  # ruby-1.8.7-p249 (It segfaults rather often). However, a previous
+  # patchlevel of 1.8.7 runs fine for me: ruby-1.8.7-tv1_8_7_174
+  #
+  # In order to provide some level of flexibility (and readability)
+  # it should be possible to set up a mapping from a version specified
+  # in Gherkin to an *actual* version.
+  #
+  # In order to make this scenario pass you therefore need to install
+  # ruby-1.8.7-tv1_8_7_174 with rvm.
+  Scenario: Specify an alias for an rvm
+    Given I have a local file named "config/aruba-rvm.yml" with:
+      """
+      1.8.7: ruby-1.8.7-tv1_8_7_174
+      """
+    And I am using rvm "1.8.7"
+    When I run "ruby --version"
+    Then I should see "patchlevel 174"
+
+  # To verify this, make sure current rvm is *not* JRuby and run:
+  #
+  #   ~/.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'"
+    Then I should see the JRuby version

data/features/step_definitions/aruba_dev_steps.rb

@@ -0,0 +1,23 @@
+Given /^I have a local file named "([^\"]*)" with:$/ do |filename, content|
+  File.open(filename, 'w') {|io| io.write(content)}
+end
+
+When /^I do aruba (.*)$/ do |aruba_step|
+  begin
+    When(aruba_step)
+  rescue => e
+    @aruba_exception = e
+  end
+end
+
+Then /^I should see the JRuby version$/ do
+  Then %{I should see "#{JRUBY_VERSION}"}
+end
+
+Then /^I should see the current Ruby version$/ do
+  Then %{I should see "#{RUBY_VERSION}"}
+end
+
+Then /^aruba should fail with "([^\"]*)"$/ do |error_message|
+  @aruba_exception.message.should =~ compile_and_escape(error_message)
+end

data/features/support/env.rb

@@ -1,5 +1,6 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__) + '/../../lib')
 require 'aruba'
+require 'fileutils'
 
 begin
   # rspec-2
@@ -8,3 +9,7 @@ rescue LoadError
   # rspec-1
   require 'spec/expectations'
 end
+
+Before do
+  FileUtils.rm(Dir['config/*.yml'])
+end

data/lib/aruba/api.rb

@@ -1,4 +1,5 @@
 require 'tempfile'
+require 'rbconfig'
 
 module Aruba
 module Api
@@ -39,6 +40,30 @@ module Api
     end
   end
 
+  def check_file_presence(paths, expect_presence)
+    in_current_dir do
+      paths.each do |path|
+        if expect_presence
+          File.should be_file(path)
+        else
+          File.should_not be_file(path)
+        end
+      end
+    end
+  end
+
+  def check_file_content(file, partial_content, expect_match)
+    regexp = compile_and_escape(partial_content)
+    in_current_dir do
+      content = IO.read(file)
+      if expect_match
+        content.should match(regexp)
+      else
+        content.should_not match(regexp)
+      end
+    end
+  end
+
   def _mkdir(dir_name)
     FileUtils.mkdir_p(dir_name) unless File.directory?(dir_name)
   end
@@ -55,18 +80,62 @@ module Api
     @last_stdout + (@last_stderr == '' ? '' : "\n#{'-'*70}\n#{@last_stderr}")
   end
 
-  def run(command)
+  def use_rvm(rvm_ruby_version)
+    if File.exist?('config/aruba-rvm.yml')
+      @rvm_ruby_version = YAML.load_file('config/aruba-rvm.yml')[rvm_ruby_version] || rvm_ruby_version
+    else
+      @rvm_ruby_version = rvm_ruby_version
+    end
+  end
+
+  def use_rvm_gemset(rvm_gemset)
+    @rvm_gemset = rvm_gemset
+  end
+
+  def run(cmd)
+    cmd = detect_ruby_script(cmd)
+    cmd = detect_ruby(cmd)
+
+    announce("$ #{cmd}") if @announce_cmd
+
     stderr_file = Tempfile.new('cucumber')
     stderr_file.close
     in_current_dir do
       mode = RUBY_VERSION =~ /^1\.9/ ? {:external_encoding=>"UTF-8"} : 'r'
-      IO.popen("#{command} 2> #{stderr_file.path}", mode) do |io|
+      IO.popen("#{cmd} 2> #{stderr_file.path}", mode) do |io|
         @last_stdout = io.read
+
+        announce(@last_stdout) if @announce_stdout
       end
 
       @last_exit_status = $?.exitstatus
     end
     @last_stderr = IO.read(stderr_file.path)
   end
+
+  def detect_ruby(cmd)
+    if cmd =~ /^ruby\s/
+      cmd.gsub(/^ruby\s/, "#{current_ruby} ")
+    else
+      cmd
+    end
+  end
+
+  def detect_ruby_script(cmd)
+    if cmd =~ /^(?:cucumber|gem|jeweler|rails|rake|rspec|spec)\s/
+      "ruby -S #{cmd}"
+    else
+      cmd
+    end
+  end
+
+  def current_ruby
+    if @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'])
+    end
+  end
 end
 end

data/lib/aruba/cucumber.rb

@@ -6,6 +6,27 @@ Before do
   FileUtils.rm_rf(current_dir)
 end
 
+Before('@announce-cmd') do
+  @announce_cmd = true
+end
+
+Before('@announce-stdout') do
+  @announce_stdout = true
+end
+
+Before('@announce') do
+  @announce_stdout = true
+  @announce_cmd = true
+end
+
+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)
+end
+
 Given /^a directory named "([^\"]*)"$/ do |dir_name|
   create_dir(dir_name)
 end
@@ -14,6 +35,10 @@ Given /^a file named "([^\"]*)" with:$/ do |file_name, file_content|
   create_file(file_name, file_content)
 end
 
+Given /^an empty file named "([^\"]*)"$/ do |file_name|
+  create_file(file_name, "")
+end
+
 When /^I append to "([^\"]*)" with:$/ do |file_name, file_content|
   append_to_file(file_name, file_content)
 end
@@ -26,6 +51,11 @@ When /^I run "(.*)"$/ do |cmd|
   run(unescape(cmd))
 end
 
+When /^I successfully run "(.*)"$/ do |cmd|
+  run(unescape(cmd))
+  @last_exit_status.should == 0
+end
+
 Then /^I should see "([^\"]*)"$/ do |partial_output|
   combined_output.should =~ compile_and_escape(partial_output)
 end
@@ -59,12 +89,12 @@ Then /^the exit status should not be (\d+)$/ do |exit_status|
 end
 
 Then /^it should (pass|fail) with:$/ do |pass_fail, partial_output|
+  Then "I should see:", partial_output
   if pass_fail == 'pass'
     @last_exit_status.should == 0
   else
     @last_exit_status.should_not == 0
   end
-  Then "I should see:", partial_output
 end
 
 Then /^the stderr should contain "([^\"]*)"$/ do |partial_output|
@@ -82,3 +112,19 @@ end
 Then /^the stdout should not contain "([^\"]*)"$/ do |partial_output|
   @last_stdout.should_not =~ compile_and_escape(partial_output)
 end
+
+Then /^the following files should exist:$/ do |files|
+  check_file_presence(files.raw.map{|file_row| file_row[0]}, true)
+end
+
+Then /^the following files should not exist:$/ do |files|
+  check_file_presence(files.raw.map{|file_row| file_row[0]}, false)
+end
+
+Then /^the file "([^\"]*)" should contain "([^\"]*)"$/ do |file, partial_content|
+  check_file_content(file, partial_content, true)
+end
+
+Then /^the file "([^\"]*)" should not contain "([^\"]*)"$/ do |file, partial_content|
+  check_file_content(file, partial_content, false)
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 1
-  - 4
-  version: 0.1.4
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - "Aslak Helles\xC3\xB8y"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-23 00:00:00 +01:00
+date: 2010-02-26 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,7 +47,7 @@ dependencies:
   type: :development
   version_requirements: *id002
 description: CLI Steps for Cucumber, hand-crafted for you in Aruba
-email: cukes@groups.google.com
+email: cukes@googlegroups.com
 executables: []
 
 extensions: []
@@ -63,10 +63,12 @@ files:
 - README.rdoc
 - Rakefile
 - aruba.gemspec
+- config/.gitignore
 - features/exit_statuses.feature
 - features/file_system_commands.feature
 - features/output.feature
-- features/step_definitions/aruba_steps.rb
+- features/running_ruby.feature
+- features/step_definitions/aruba_dev_steps.rb
 - features/support/env.rb
 - lib/aruba.rb
 - lib/aruba/api.rb