haiti 0.0.2 → 0.0.3

data/Readme.md

@@ -20,6 +20,13 @@ To run tests
 Todo
 ====
 
+**These would actually be useful right now**
+
+* All existing defs can take single or double quotes
+* Failures on stdout also display stderr
+* step def for does not include
+
+**These should just generally be done**
 * Add tests showing that curlies get interpreted where expected
 * Add tests proving that bin gets stuck in the path
 * Add tests for negative assertions (currently if all step defs were empty, this would pass the suite)

data/haiti.gemspec

@@ -9,9 +9,9 @@ Gem::Specification.new do |s|
   s.email       = ["josh.cheek@gmail.com"]
   s.homepage    = "https://github.com/JoshCheek/haiti"
   s.summary     = %q{Simple Cucumber steps for command line programs}
-  s.description = "Aruba provides Cucumber helpers for command line programs, but it's way more sophisticated than I can understand, " \
-                  "so I wind up reinventing that wheel in miniature for a lot of projects. This is just an extraction of that. "       \
-                  "It aims to be simple and easy to understand/extend."
+  s.description = "Extraction of cucumber helpers for running binaries that I wind up writing ad-hoc for many projects. " \
+                  "It is minimal which lowers the barrier for entry, making it easy to understand/extend."                \
+                  "If you need something more powerful, there is Aruba."
   s.license     = "WTFPL"
 
   s.files         = `git ls-files`.split("\n")

data/lib/haiti/command_line_helpers.rb

@@ -28,30 +28,22 @@ module Haiti
     end
 
     def in_proving_grounds(&block)
-      Dir.chdir proving_grounds_dir, &block
-    end
-
-    def proving_grounds_dir
-      config.proving_grounds_dir
+      Dir.chdir config.proving_grounds_dir, &block
     end
 
     def make_proving_grounds
-      FileUtils.mkdir_p proving_grounds_dir
-    end
-
-    def bin_dir
-      config.bin_dir
+      FileUtils.mkdir_p config.proving_grounds_dir
     end
 
     def path_to(filename)
-      in_proving_grounds { File.join proving_grounds_dir, filename }
+      in_proving_grounds { File.join config.proving_grounds_dir, filename }
     end
 
     # workaround for Ruby 2.0 bug where passing the new path as the first arg wasn't working
     # bug report submitted here: http://bugs.ruby-lang.org/issues/8004
     def with_bin_in_path
       original_path = ENV['PATH']
-      ENV['PATH'] = "#{bin_dir}:#{ENV['PATH']}"
+      ENV['PATH'] = "#{config.bin_dir}:#{ENV['PATH']}"
       yield
     ensure
       ENV['PATH'] = original_path

data/lib/haiti/step_definitions.rb

@@ -1,12 +1,50 @@
-Given('the file "$filename" "$body"')        { |filename, body|       Haiti::CommandLineHelpers.write_file filename, eval_curlies(body) }
-Given('the file "$filename":')               { |filename, body|       Haiti::CommandLineHelpers.write_file filename, eval_curlies(body) }
-Given('the stdin content "$content"')        { |content|              @stdin_data = eval_curlies(content) }
-Given('the stdin content:')                  { |content|              @stdin_data = eval_curlies(content) }
-When('I run "$command"')                     { |command|              @last_executed = Haiti::CommandLineHelpers.execute command, @stdin_data }
-When("I run '$command'")                     { |command|              @last_executed = Haiti::CommandLineHelpers.execute command, @stdin_data }
-Then(/^(stderr|stdout) is:$/)                { |stream_name, output|  @last_executed.send(stream_name).chomp.should == eval_curlies(output) }
-Then(/^(stderr|stdout) is ["'](.*?)["']$/)   { |stream_name, output|  @last_executed.send(stream_name).chomp.should == eval_curlies(output) }
-Then(/^(stderr|stdout) is empty$/)           { |stream_name|          @last_executed.send(stream_name).should == '' }
-Then(/^(stderr|stdout) is not empty$/)       { |stream_name|          @last_executed.send(stream_name).chomp.should_not be_empty }
-Then(/^(stderr|stdout) includes "([^"]*)"$/) { |stream_name, content| @last_executed.send(stream_name).should include eval_curlies(content) }
-Then('the exit status is $status')           { |status|               @last_executed.exitstatus.to_s.should == status }
+define_steps = lambda do |*matchers, &definition|
+  matchers.each { |matcher| Given matcher, &definition }
+end
+
+define_steps.call(
+  'the file "$filename" "$body"',
+  'the file "$filename":'
+) { |filename, body| Haiti::CommandLineHelpers.write_file filename, eval_curlies(body) }
+
+define_steps.call(
+  'the stdin content "$content"',
+  'the stdin content:'
+) { |content| @stdin_data = eval_curlies(content) }
+
+
+define_steps.call(
+  'I run "$command"',
+  "I run '$command'",
+) { |command| @last_executed = Haiti::CommandLineHelpers.execute command, @stdin_data }
+
+define_steps.call(
+  /^(stderr|stdout) is:$/,
+  /^(stderr|stdout) is "(.*?)"$/,
+  /^(stderr|stdout) is '(.*?)'$/
+) { |stream_name, output|  @last_executed.send(stream_name).chomp.should == eval_curlies(output) }
+
+define_steps.call(
+  /^(stderr|stdout) is empty$/
+) { |stream_name| @last_executed.send(stream_name).should == '' }
+
+define_steps.call(
+  /^(stderr|stdout) is not empty$/
+) { |stream_name| @last_executed.send(stream_name).chomp.should_not be_empty }
+
+define_steps.call(
+  /^(stderr|stdout) includes "(.*?)"$/
+) { |stream_name, content| @last_executed.send(stream_name).should include eval_curlies(content) }
+
+define_steps.call(
+  /^(stderr|stdout) includes:$/
+) { |stream_name, content| @last_executed.send(stream_name).should include eval_curlies(content) }
+
+define_steps.call(
+  'the exit status is $status'
+) { |status| @last_executed.exitstatus.to_s.should == status }
+
+define_steps.call(
+  /^(stderr|stdout) does not include "(.*?)"$/,
+  /^(stderr|stdout) does not include:$/
+) { |stream_name, content| @last_executed.send(stream_name).should_not include eval_curlies(content) }

data/lib/haiti/version.rb

@@ -1,3 +1,3 @@
 module Haiti
-  VERSION = '0.0.2'
+  VERSION = '0.0.3'
 end

data/test/bin/repeat_this_back_to_me

@@ -0,0 +1,3 @@
+#!/usr/bin/env ruby
+
+puts ARGV.join(' ')

data/test/features/config.feature

@@ -0,0 +1,14 @@
+Feature: Configuring Haiti
+  In order for Haiti to know how to put binaries in your path and where to execute,
+  you must configure it.
+
+  Scenario: bin is in path
+    When I run "repeat_this_back_to_me thank you for your patience"
+    Then stdout is "thank you for your patience"
+
+  Scenario: execution happens in the proving grounds
+    When I run "pwd"
+    Then stdout is "{{Haiti.config.proving_grounds_dir}}"
+    Given the file "my_file" "my_body"
+    When I run "cat my_file"
+    Then stdout is "my_body"

data/test/features/then_stream_is.feature

@@ -53,11 +53,54 @@ Feature:
     Then stderr is not empty
 
   # stdout includes
-  Scenario: stdout includes
+  Scenario: stdout includes inline
     When I run "ruby -e '$stdout.puts %(abc)'"
     Then stdout includes "b"
 
+  Scenario: stdout includes multiline
+    When I run "ruby -e '5.times { |i| $stdout.puts i }'"
+    Then stdout includes:
+    """
+    2
+    3
+    """
+
   # stderr includes
-  Scenario: stderr includes
+  Scenario: stderr includes inline
     When I run "ruby -e '$stderr.puts %(abc)'"
     Then stderr includes "b"
+
+  Scenario: stderr includes multiline
+    When I run "ruby -e '5.times { |i| $stderr.puts i }'"
+    Then stderr includes:
+    """
+    2
+    3
+    """
+
+  # stdout does not include
+  Scenario: stdout does not include, inline
+    When I run "ruby -e '$stdout.puts %(abc)'"
+    Then stdout does not include "z"
+
+  Scenario: stdout does not include multiline
+    When I run "ruby -e '5.times { |i| $stdout.puts i }'"
+    Then stdout does not include:
+    """
+    3
+    2
+    """
+
+  # stderr does not include
+  Scenario: stderr does not include inline
+    When I run "ruby -e '$stderr.puts %(abc)'"
+    Then stderr does not include "z"
+
+  Scenario: stderr does not include multiline
+    When I run "ruby -e '5.times { |i| $stderr.puts i }'"
+    Then stderr does not include:
+    """
+    3
+    2
+    """
+

metadata

@@ -2,14 +2,14 @@
 name: haiti
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Josh Cheek
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-26 00:00:00.000000000 Z
+date: 2013-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -43,10 +43,9 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
     none: false
-description: Aruba provides Cucumber helpers for command line programs, but it's way
-  more sophisticated than I can understand, so I wind up reinventing that wheel in
-  miniature for a lot of projects. This is just an extraction of that. It aims to
-  be simple and easy to understand/extend.
+description: Extraction of cucumber helpers for running binaries that I wind up writing
+  ad-hoc for many projects. It is minimal which lowers the barrier for entry, making
+  it easy to understand/extend.If you need something more powerful, there is Aruba.
 email:
 - josh.cheek@gmail.com
 executables: []
@@ -64,6 +63,8 @@ files:
 - test/.gitignore
 - test/Gemfile
 - test/Gemfile.lock
+- test/bin/repeat_this_back_to_me
+- test/features/config.feature
 - test/features/given_the_file.feature
 - test/features/given_the_stdin_content.feature
 - test/features/support/env.rb
@@ -98,6 +99,8 @@ summary: Simple Cucumber steps for command line programs
 test_files:
 - test/Gemfile
 - test/Gemfile.lock
+- test/bin/repeat_this_back_to_me
+- test/features/config.feature
 - test/features/given_the_file.feature
 - test/features/given_the_stdin_content.feature
 - test/features/support/env.rb