cukesalad 0.8.0 → 0.8.1

data/Examples/Calculator/Gemfile

@@ -1,5 +1,5 @@
 source :rubygems
-gem "cukesalad", ">=0.7"
+gem "cukesalad", ">=0.8.1"
 gem "rspec", ">=2.5.0", :require => 'spec'
 gem "capybara", ">=0.4.1.2"
 gem "sinatra", ">=1.2.0"

data/Examples/Calculator/Gemfile.lock

@@ -20,19 +20,19 @@ GEM
       xpath (~> 0.1.4)
     childprocess (0.2.2)
       ffi (~> 1.0.6)
-    cucumber (1.0.2)
+    cucumber (1.0.6)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.5)
+      gherkin (~> 2.4.18)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.5)
-    cukesalad (0.8.0)
+      term-ansicolor (>= 1.0.6)
+    cukesalad (0.8.1)
       aruba (= 0.4.3)
-      cucumber (= 1.0.2)
+      cucumber (= 1.0.6)
       rspec (>= 2.5.0)
     diff-lcs (1.1.3)
     ffi (1.0.9)
-    gherkin (2.4.18)
+    gherkin (2.4.21)
       json (>= 1.4.6)
     json (1.5.4)
     json_pure (1.5.4)
@@ -83,7 +83,7 @@ PLATFORMS
 
 DEPENDENCIES
   capybara (>= 0.4.1.2)
-  cukesalad (>= 0.7)
+  cukesalad (>= 0.8.1)
   rspec (>= 2.5.0)
   sinatra (>= 1.2.0)
   sinatra-reloader (= 0.5.0)

data/Examples/Calculator/README.md

@@ -6,13 +6,21 @@ Setup the environment:
 
     bundle install
 
-Then you can run the examples:
+Then you can run the examples quickly (via rack_test):
 
-    bundle exec cucumber
+    rake check:features
 
-To run these via a web front end, use:
+To run these via a web browser, use:
 
-    bundle exec cucumber -p alternative
+    rake check:features:front_door
+
+To run these via rack_test, use:
+
+    rake check:features:side_door
+
+To run these against the calculator API, use:
+
+    rake check:features:back_door
 
 To run the Calculator app
 

data/Examples/Calculator/Rakefile

@@ -0,0 +1,42 @@
+require 'rubygems'
+require 'bundler'
+
+namespace :check do
+  require 'rspec/core'
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:design) do |spec|
+    spec.pattern = FileList['spec/**/*_spec.rb']
+    spec.rspec_opts = "-cfd"
+  end
+
+  require 'cucumber/rake/task'
+  Cucumber::Rake::Task.new(:features)
+
+  namespace :features do
+    Cucumber::Rake::Task.new(:back_door) do |wip|
+      wip.cucumber_opts = "-p back_door"
+    end
+
+    Cucumber::Rake::Task.new(:side_door) do |wip|
+      wip.cucumber_opts = "-p side_door"
+    end
+
+    Cucumber::Rake::Task.new(:front_door) do |wip|
+      wip.cucumber_opts = "-p front_door"
+    end
+  end
+
+  desc "Check absolutely everything!"
+  task :everything => [
+    'check:design', 
+    'check:features:back_door',
+    'check:features:side_door', 
+    'check:features:front_door'
+  ]
+end
+
+desc "Check design and features"
+task :default => [
+  'check:design', 
+  'check:features:side_door'
+]

data/Examples/Calculator/cucumber.yml

@@ -1,4 +1,6 @@
-default: --exclude features/lib/alternative/
-front_door: -r features/lib/browser/ -r features/support/env.rb -r features/lib/default/tasks/ 
+default: -p side_door
+front_door: --exclude features/lib/roles/back_door --exclude features/lib/roles/side_door
+side_door: --exclude features/lib/roles/back_door --exclude features/lib/roles/front_door
+back_door: --exclude features/lib/roles/front_door --exclude features/lib/roles/side_door
 autotest: --color
 autotest-all: --color

data/Examples/Calculator/features/README.md

@@ -0,0 +1,18 @@
+These scenarios are examples of what you might write using [cukesalad](http://cukesalad.info).
+
+cukesalad is an extension to cucumber that does away with regular expression. 
+
+The examples are for your **typical calculator**. To 'automate' this:
+
+    When I add, the number '1' to the number '2'
+
+You might write something like this:
+
+    in_order_to 'add', the_number: :first_number, and_the_number: :second_number do
+      enter the :first_number 
+      press :plus
+      enter the :second_number 
+      press :equals
+    end
+
+You can find the code behind these [on Github](https://github.com/RiverGlide/CukeSalad/tree/master/Examples/Calculator).

data/Examples/Calculator/features/a_place_to_start.feature

@@ -5,5 +5,5 @@ Feature: A Place To Start
 
 Scenario: Let's Begin
 	Given I am a Calculating Individual
-	When  I attempt to switch on the calculator
+	When  I switch on the calculator
 	Then  I should see the answer '0'

data/Examples/Calculator/features/complex_calculations.feature

@@ -5,7 +5,7 @@ Feature: Complex Calculations
 
 Scenario Outline: Get the result of a more complex calculation
   Given I am a calculating individual
-  When I attempt to calculate, with the following '<calculation>'
+  When I calculate, with the following '<calculation>'
   Then I should see the answer '<correct_result>'
 
 Examples:

data/Examples/Calculator/features/lib/{default/roles → roles/back_door}/calculating_individual.rb

@@ -1,5 +1,4 @@
 require 'calculator'
-require 'calculator_operations'
 
 module CalculatingIndividual
 
@@ -9,7 +8,7 @@ module CalculatingIndividual
 
   def switch_on_the_calculator
     @calculator = Calculator.new
-    @operate_with = CalculatorOperations::OPERATIONS
+    @operate_with = Calculator::OPERATIONS
   end
 
   def enter value

data/Examples/Calculator/features/lib/roles/front_door/calculating_individual.rb

@@ -0,0 +1,11 @@
+require 'web_calculator'
+require 'web_calculating_individual'
+require 'capybara/dsl'
+
+Capybara.app = WebCalculator
+Capybara.default_driver = :selenium
+
+module CalculatingIndividual
+
+  include WebCalculatingIndividual
+end

data/Examples/Calculator/features/lib/roles/side_door/calculating_individual.rb

@@ -0,0 +1,11 @@
+require 'web_calculator'
+require 'web_calculating_individual'
+require 'capybara/dsl'
+
+Capybara.app = WebCalculator
+Capybara.default_driver = :rack_test
+
+module CalculatingIndividual
+
+  include WebCalculatingIndividual
+end

data/Examples/Calculator/features/lib/{default/tasks → tasks}/reference/calculations.rb

@@ -1,4 +1,3 @@
-require 'calculator_operations'
 
 module Calculations
   
@@ -7,10 +6,10 @@ module Calculations
   end
   
   def enter_numbers_and_operators_for sum
-    operators = CalculatorOperations::OPERATORS
+    operators = Calculator::OPERATORS
     sum.each do | token |
       enter token.to_i if token =~ /\d+/
-      press operators[token] if operators.include? token
+      press operators[token].to_sym if operators.include? token
     end
   end
 end

data/Examples/Calculator/features/typical_workflow.feature

@@ -5,7 +5,7 @@ Feature: Typical Calculator Workflow
 
 Scenario Outline: See what I expect based on specific interactions
   Given I am a calculating individual
-  When I attempt to calculate: with the following '<interactions>'
+  When I calculate, with the following '<interactions>'
   Then I should see the answer '<expected>'
 
 Examples:

data/Examples/Calculator/lib/calculator.rb

@@ -1,6 +1,9 @@
 
 class Calculator
  
+  OPERATIONS = { 'plus' => '+', 'minus' => '-', 'equals' => '=' }
+  OPERATORS = OPERATIONS.invert 
+
   attr_reader :display
 
   def initialize

data/Examples/Calculator/{features/lib/browser/roles/calculating_web_user.rb → lib/web_calculating_individual.rb}

@@ -1,16 +1,7 @@
-# To run with this version of the Calculating Individual:
-# cucumber --profile alternative 
-
-require 'web_calculator'
-require 'capybara'
 require 'capybara/dsl'
+module WebCalculatingIndividual
 
-Capybara.app = WebCalculator
-Capybara.default_driver = :selenium
-
-module CalculatingIndividual
-
-  include Capybara
+  include Capybara::DSL
 
   def role_preparation
     switch_on_the_calculator

data/Examples/Calculator/lib/web_calculator.rb

@@ -3,7 +3,6 @@ require 'erb'
 
 $:.unshift(File.dirname(__FILE__), '.')
 require 'calculator'
-require 'calculator_operations'
 
 class WebCalculator < Sinatra::Base
 
@@ -15,7 +14,7 @@ class WebCalculator < Sinatra::Base
 
   helpers do
     def available_operations
-      CalculatorOperations::OPERATIONS
+      Calculator::OPERATIONS
     end
 
     def operate_with operator

data/Gemfile.lock

@@ -1,9 +1,9 @@
 PATH
   remote: .
   specs:
-    cukesalad (0.8.0)
+    cukesalad (0.8.1)
       aruba (= 0.4.3)
-      cucumber (= 1.0.2)
+      cucumber (= 1.0.6)
       rspec (>= 2.5.0)
 
 GEM
@@ -21,30 +21,27 @@ GEM
     builder (3.0.0)
     childprocess (0.2.2)
       ffi (~> 1.0.6)
-    cucumber (1.0.2)
+    cucumber (1.0.6)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (~> 2.4.5)
+      gherkin (~> 2.4.18)
       json (>= 1.4.6)
-      term-ansicolor (>= 1.0.5)
+      term-ansicolor (>= 1.0.6)
     diff-lcs (1.1.3)
     ffi (1.0.9)
-    ffi (1.0.9-java)
-    gherkin (2.4.18)
-      json (>= 1.4.6)
-    gherkin (2.4.18-java)
+    gherkin (2.4.21)
       json (>= 1.4.6)
     json (1.4.6)
     json (1.4.6-java)
     mime-types (1.16)
-    rack (1.3.2)
-    rake (0.8.7)
+    rack (1.3.3)
+    rake (0.9.2)
     rdiscount (1.6.8)
     relish (0.3.0)
       archive-tar-minitar (~> 0.5.2)
       json (~> 1.4.6)
       rest-client (~> 1.6.1)
-    rest-client (1.6.3)
+    rest-client (1.6.7)
       mime-types (>= 1.16)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
@@ -63,5 +60,5 @@ PLATFORMS
 DEPENDENCIES
   bundler (~> 1.0.0)
   cukesalad!
-  rake (~> 0.8.7)
+  rake (~> 0.9.2)
   relish (= 0.3.0)

data/VERSION

@@ -1 +1 @@
-0.8.0
+0.8.1

data/cukesalad.gemspec

@@ -25,11 +25,11 @@ Gem::Specification.new do |s|
   s.default_executable = "cukesalad"
   s.require_paths      = ["lib"]
 
-  s.add_runtime_dependency "cucumber", "1.0.2" # Version 1.0.4 experiences following error: 'Illformed requirement ["#<Syck::DefaultKey:0x000001034764a0> 0.8.4"]'
+  s.add_runtime_dependency "cucumber", "1.0.6"
   s.add_runtime_dependency "rspec",    ">=2.5.0"
   s.add_runtime_dependency "aruba",    "0.4.3"
 
   s.add_development_dependency "bundler", "~> 1.0.0"
-  s.add_development_dependency "rake", "~> 0.8.7"
+  s.add_development_dependency "rake", "~> 0.9.2"
   s.add_development_dependency "relish", "= 0.3.0"
 end

data/features/creating_a_new_project.feature

@@ -5,8 +5,8 @@ Feature: Creating a New Project
 
   Scenario: Set up your project and verify that you can use CukeSalad
     Given you are a Step Free Cuker
-    And   you were able to interactively run, the command 'cukesalad' and type 'y'
-    And you were able to create a file: at 'features/hello_cukesalad.feature' containing
+    And you interactively ran, the command 'cukesalad' and typed 'y'
+    And you create a file: at 'features/hello_cukesalad.feature' containing
       """
       Feature: Hello CukeSalad
 

data/features/defining_roles/define_a_role.feature

@@ -7,32 +7,31 @@ Feature: Define the Role
     Given you are a Step Free Cuker
 
   Scenario: We'll tell you what you need to do to establish the role
-    Given you did not create a role: called 'NewCustomer'
-    When  you attempt to run a scenario: containing
+    When you run a scenario, containing
       """
       Given I am a New Customer
       """
     Then you should see it has 'failed'
     And  you should see a reply that includes:
-      """
-            I can't find a role called 'NewCustomer'. Have you created it?
-            e.g.
-              module NewCustomer
-              end
-      """
-
-  Scenario: Once you've created the role, you see the step pass
-    Given you did create a role: called 'NewCustomer'
-    When  you attempt to run a scenario: containing
     """
-    Given I am a New Customer
+          I can't find a role called 'NewCustomer'. Have you created it?
+          e.g.
+            module NewCustomer
+            end
     """
+
+  Scenario: Once you've created the role, you see the step pass
+    Given you have created a role, named 'NewCustomer'
+    When  you run a scenario: containing
+      """
+      Given I am a New Customer
+      """
     Then you should see it has 'passed'
 
   Scenario: Roles which grammatically required an 'an'
-    Given you did create a role: called 'UnregisteredCustomer'
+    Given you have created a role, named 'UnregisteredCustomer'
     When  you attempt to run a scenario: containing
-    """
-    Given I am an Unregistered Customer
-    """
+      """
+      Given I am an Unregistered Customer
+      """
     Then you should see it has 'passed'

data/features/defining_roles/prepare_the_actor_for_the_role.feature

@@ -5,32 +5,31 @@ Feature: Prepare the actor for the role
 
   Scenario: Initialization
     Given you are a Step Free Cuker
-    And you were able to create a file, at 'features/roles/role_with_prep.rb' containing
-    """
-    module RoleWithPrep
-      def role_preparation
-        do_something_important
-      end
+    And you have created a file, at 'features/roles/role_with_prep.rb' containing
+      """
+      module RoleWithPrep
+        def role_preparation
+          do_something_important
+        end
 
-      def do_something_important
-        @something = 'something important was done'
-      end
+        def do_something_important
+          @something = 'something important was done'
+        end
 
-      def see_what_was_done
-        @something
+        def see_what_was_done
+          @something
+        end
       end
-    end
-    """
-    And you were able to create a task, called 'see that' containing
-    """
-    in_order_to 'see that' do
-      see_what_was_done
-    end
-    """
-    When you attempt to run a scenario, containing
-    """
-    Given I am a Role With Prep
-    Then I should see that 'something important was done'
-    """
+      """
+    And you have created a task, called 'see that' containing
+      """
+      in_order_to 'see that' do
+        see_what_was_done
+      end
+      """
+    When you run a scenario, containing
+      """
+      Given I am a Role With Prep
+      Then I should see that 'something important was done'
+      """
     Then you should see it has 'passed'
-

data/features/defining_tasks/define_a_task.feature

@@ -6,14 +6,13 @@ Feature: Define a Task
 
   Background:
     Given you are a Step Free Cuker
-    And   you were able to create a role: called 'NewCustomer'
+    And you have created a role, named 'NewCustomer'
 
   Scenario: We'll tell you what you need to do to describe the task
-    Given you did not create a task: called 'do something'
-    When  you attempt to run a scenario: containing
+    When  you run a scenario: containing
       """
       Given I am a New Customer
-      And I was able to do something
+      When I do something
       """
     Then you should see it has 'failed'
     And  you should see a reply that includes:
@@ -21,17 +20,55 @@ Feature: Define a Task
             I can't find a task called 'do something'. Have you created it?
             e.g.
               in_order_to 'do something' do
-                # the actions
+                raise "TODO: You need to explain how to 'do something'"
               end
       """
 
-  Scenario Outline: Once you've created the task, you see the step pass
-    Given you were able to create a task: called 'do something'
-    When  you attempt to run a scenario: containing
-    """
-    Given I am a New Customer
-    <step using the task>
-    """
+  Scenario: Once you've created a task, you can use it in a Given step 
+    Given you have created a task, called 'done something'
+    When you run a scenario, containing
+      """
+      Given I am a New Customer
+      And I have done something
+      """
+    Then you should see it has 'passed'
+
+  Scenario: Tasks can be used in a When step too
+    Given you have created a task, called 'do something'
+    When you run a scenario, containing
+      """
+      Given I am a New Customer
+      When I do something
+      """
+    Then you should see it has 'passed'
+
+  Scenario: You can reuse a step between a Given and a When step
+    Given you have created a task, called 'do something'
+    When you run a scenario, containing
+      """
+      Given I am a New Customer
+      And you were able to do something
+      When I do something
+      """
+    Then you should see it has 'passed'
+
+  Scenario: Tasks can contain numbers
+    Given you have created a task: called 'do something for 123Company'
+    When you run a scenario: containing
+      """
+      Given I am a New Customer
+      When I do something for 123Company
+      """
+    Then you should see it has 'passed'
+
+  Scenario Outline: There are all sorts of ways you can say things
+    Given you have created a task, called 'do something'
+    And you have created a task, called 'done something'
+    When you run a scenario: containing
+      """
+      Given I am a New Customer
+      <step using the task>
+      """
     Then you should see it has 'passed'
 
     Examples:
@@ -42,54 +79,13 @@ Feature: Define a Task
       | Given you were able to do something |
       | And   you were able to do something |
       | But   you did do something          |
-      | When  I attempt to do something     |
-      | And   I attempt to do something     |
+      | When  I do something                |
+      | And   I do something                |
       | And   I did do something            |
-      | When  you attempt to do something   |
-      | And   you attempt to do something   |
+      | When  you do something              |
+      | And   you do something              |
       | And   you did do something          |
       | Then  I should do something         |
       | And   I should do something         |
       | Then  you should do something       |
       | And   you should do something       |
-
-  Scenario Outline: Once you've created the task, you see the step pass
-    Given you were able to create a task: called 'do something for 123Company'
-    When  you attempt to run a scenario: containing
-    """
-    Given I am a New Customer
-    <step using the task>
-    """
-    Then you should see it has 'passed'
-
-    Examples:
-      | step using the task                                |
-      | Given I was able to do something for 123Company    |
-      | And   I was able to do something for 123Company    |
-      | But   I did do something for 123Company            |
-      | Given you were able to do something for 123Company |
-      | And   you were able to do something for 123Company |
-      | But   you did do something for 123Company          |
-      | When  I attempt to do something for 123Company     |
-      | And   I attempt to do something for 123Company     |
-      | And   I did do something for 123Company            |
-      | When  you attempt to do something for 123Company   |
-      | And   you attempt to do something for 123Company   |
-      | And   you did do something for 123Company          |
-      | Then  I should do something for 123Company         |
-      | And   I should do something for 123Company         |
-      | Then  you should do something for 123Company       |
-      | And   you should do something for 123Company       |
-
-  Scenario Outline: Once you've created the task, you see the step pass
-    Given you were able to create a task: called 'have something'
-    When  you attempt to run a scenario: containing
-    """
-    Given I am a New Customer
-    <step using the task>
-    """
-    Then you should see it has 'passed'
-
-    Examples:
-      | step using the task                 |
-      | Given I have something              |

data/features/defining_tasks/define_a_task_with_arguments.feature

@@ -6,7 +6,7 @@ Feature: Define a Task with arguments
 
   Background:
     Given you are a Step Free Cuker
-    And   you were able to create a role: called 'NewCustomer'
+    And   you have created a role, named 'NewCustomer'
     
   Scenario Outline: A task can accept arguments
     Given you were able to create a task, called 'do some task' containing
@@ -19,12 +19,12 @@ Feature: Define a Task with arguments
     When  you attempt to run a scenario: called 'something' containing
     """
     Given I am a New Customer
-    When I attempt to <task_with_argument>
+    When I <do a task with an argument>
     """
     Then you should see it has 'passed'
 
     Examples:
-      | task_with_argument             |
+      | do a task with an argument          |
       | do some task: with 'information' |
       | do some task, with 'information' |
       | do some task: with "information" |

data/features/defining_tasks/remember_information_between_steps.feature

@@ -5,22 +5,22 @@ Feature: Remember information between steps
 
   Background:
     Given you are a Step Free Cuker
-    And   you were able to create a role, called 'NewCustomer'
+    And you have created a role, named 'NewCustomer'
 
   Scenario: You can reuse information
-    Given you were able to create a task, called 'do something' containing
+    Given you have created a task, called 'do something' containing
       """
       in_order_to 'do something', remembering: :value do
         take_note_of :some_key, the( :value )
       end
       """
-    And you were able to create a task, called 'find that the thing remembered was' containing
+    And you have created a task, called 'find that the thing remembered was' containing
       """
       in_order_to 'find that the thing remembered was' do
         recall :some_key
       end
       """
-    When you attempt to run a scenario, containing
+    When you run a scenario, containing
       """
       Given I am a New Customer
       When I attempt to do something, remembering 'a value'
@@ -30,13 +30,13 @@ Feature: Remember information between steps
 
   Scenario: You'll get feedback if you ask for something that wasn't noted
     Given you did not previously take note of something
-    And you were able to create a task, called 'find that the thing remembered was' containing
+    And you have created a task, called 'find that the thing remembered was' containing
     """
     in_order_to 'find that the thing remembered was' do
       recall :some_key
     end
     """
-    When I attempt to run a scenario, containing
+    When I run a scenario, containing
       """
       Given I am a New Customer
       Then I should find that the thing remembered was 'a value'
@@ -46,4 +46,3 @@ Feature: Remember information between steps
       """
             You tried to recall ':some_key' but no previous step appears to have taken note of that information
       """
-

data/features/expectations/expressing_expectations.feature

@@ -5,32 +5,32 @@ Feature: Expressing expectations
 
   Background:
     Given you are a Step Free Cuker
-    And   you were able to create a file, at 'features/roles/role_with_answers.rb' containing
-    """
-    module RoleWithAnswers
-      def see_the_answer
-        get_the_answer_from_the_application
-      end
+    And   you have created a file, at 'features/roles/role_with_answers.rb' containing
+      """
+      module RoleWithAnswers
+        def see_the_answer
+          get_the_answer_from_the_application
+        end
 
-      def get_the_answer_from_the_application
-        # Pretending to get the answer from the application
-        return 'correct answer'
+        def get_the_answer_from_the_application
+          # Pretending to get the answer from the application
+          return 'correct answer'
+        end
+      end
+      """
+    And you have created a task, called 'see the answer is' containing
+      """
+      in_order_to 'see the answer is' do
+        see_the_answer
       end
-    end
-    """
-    And you were able to create a task, called 'see the answer is' containing
-    """
-    in_order_to 'see the answer is' do
-      see_the_answer
-    end
-    """
+      """
 
   Scenario Outline: Simple Expectation
-    When you attempt to run a scenario, containing
-    """
-    Given I am a Role With Answers
-    Then I should see the answer is <answer>
-    """
+    When you run a scenario, containing
+      """
+      Given I am a Role With Answers
+      Then I should see the answer is <answer>
+      """
     Then you should see it has 'passed'
 
     Examples:

data/features/lib/tasks/create_a_file.rb

@@ -1,3 +1,5 @@
-in_order_to "CreateAFile", at: :path, containing: :content do
-  write_file( the(:path), the(:content ))
+['create a file', 'created a file'].each do | create_a_new_file |
+  in_order_to create_a_new_file, at: :path, containing: :content do
+    write_file( the(:path), the(:content ))
+  end
 end

data/features/lib/tasks/create_a_role.rb

@@ -1,4 +1,3 @@
-#TODO: Consider exposing this detail in the examples since it shows you what to do
-in_order_to 'create a role', called: :name_of_role do
-  write_file 'features/lib/roles/my_role.rb', "module #{the :name_of_role}\nend"
+in_order_to 'created a role', named: :role_name do
+  write_file 'features/lib/roles/my_role.rb', "module #{the :role_name}\nend"
 end

data/features/lib/tasks/create_a_task.rb

@@ -1,12 +1,14 @@
-in_order_to 'create a task', called: :name_of_task, containing: :code do
-  file_name = the( :name_of_task ).gsub(" ", "_")
-  
-  default_content = 
-    "in_order_to '#{the :name_of_task}' do
-      #nothing 
-    end" 
-  content = the :code
-  content = default_content if content.nil?
+['create a task', 'created a task'].each do | create_a_new_task |
+  in_order_to create_a_new_task, called: :name_of_task, containing: :code do
+    file_name = the( :name_of_task ).gsub(" ", "_")
+    
+    default_content = 
+      "in_order_to '#{the :name_of_task}' do
+        #nothing 
+      end" 
+    content = the :code
+    content = default_content if content.nil?
 
-  write_file "features/lib/tasks/#{file_name}.rb", content
+    write_file "features/lib/tasks/#{file_name}.rb", content
+  end
 end

data/features/lib/tasks/interactively_run.rb

@@ -1,4 +1,4 @@
-in_order_to "interactively run", the_command: :command, and_type: :answer do
+in_order_to "interactively ran", the_command: :command, and_typed: :answer do
   @aruba_timeout_seconds = 10
   run_interactive unescape( the :command )
   type "#{the :answer}\n"

data/features/lib/tasks/run_a_scenario.rb

@@ -1,4 +1,4 @@
-in_order_to "RunAScenario", containing: :steps do
+in_order_to 'run a scenario', containing: :steps do
   write_file 'features/a.feature', "Feature: A Feature
 
   Scenario: A Scenario

data/lib/cukesalad/cucumber_steps.rb

@@ -11,7 +11,7 @@ Given /^(?:I am|you are) a(?:n)? ([a-zA-Z ]+)$/ do |role|
   @actor = CukeSalad::Actor.new(role)
 end
 
-When /^(?:I (?!am)|you (?!are))(?:attempt to |was able to |were able to |did )?((?!should)[A-Z a-z\d_-]*)(?:[:|,] (.*))?:?$/ do | this_task, details, *and_more |
+When /^(?:I (?!am)|you (?!are))(?:attempt to |was able to |were able to |did |have )?((?!should)[A-Z a-z\d_-]*)(?:[:|,] (.*))?:?$/ do | this_task, details, *and_more |
   info = understand_the details unless details.nil?
   info[info.keys.last] = and_more[0] unless and_more.empty?
   @actor.perform this_task, info unless info.nil?

data/lib/cukesalad/director.rb

@@ -19,7 +19,7 @@ module CukeSalad
       begin
         find_directives_for name
       rescue NameError
-        raise "I can't find a task called '#{ something }'. Have you created it?\ne.g.\n  in_order_to '#{ something }' do\n    # the actions\n  end\n\n" 
+        raise "I can't find a task called '#{ something }'. Have you created it?\ne.g.\n  in_order_to '#{ something }' do\n    raise \"TODO: You need to explain how to '#{ something }'\"\n  end\n\n" 
       end
     end
 

data/lib/cukesalad/version.rb

@@ -1,3 +1,3 @@
 module CukeSalad
-  VERSION = "0.8.0"
+  VERSION = "0.8.1"
 end

metadata

@@ -2,7 +2,7 @@
 name: cukesalad
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.8.0
+  version: 0.8.1
 platform: ruby
 authors: 
 - RiverGlide
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-09-14 00:00:00 Z
+date: 2011-09-17 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
@@ -19,7 +19,7 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        version: 1.0.2
+        version: 1.0.6
   type: :runtime
   prerelease: false
   version_requirements: *id001
@@ -63,7 +63,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.8.7
+        version: 0.9.2
   type: :development
   prerelease: false
   version_requirements: *id005
@@ -93,25 +93,28 @@ files:
 - Examples/Calculator/Gemfile
 - Examples/Calculator/Gemfile.lock
 - Examples/Calculator/README.md
+- Examples/Calculator/Rakefile
 - Examples/Calculator/cucumber.yml
 - Examples/Calculator/features/LOOK_MA_NO_STEP_DEFS.txt
+- Examples/Calculator/features/README.md
 - Examples/Calculator/features/a_place_to_start.feature
 - Examples/Calculator/features/addition.feature
 - Examples/Calculator/features/complex_calculations.feature
-- Examples/Calculator/features/lib/browser/roles/calculating_web_user.rb
-- Examples/Calculator/features/lib/default/roles/calculating_individual.rb
-- Examples/Calculator/features/lib/default/tasks/arithmetic/add.rb
-- Examples/Calculator/features/lib/default/tasks/arithmetic/calculate.rb
-- Examples/Calculator/features/lib/default/tasks/arithmetic/subtract.rb
-- Examples/Calculator/features/lib/default/tasks/questions/see_the_answer.rb
-- Examples/Calculator/features/lib/default/tasks/reference/calculations.rb
-- Examples/Calculator/features/lib/default/tasks/switch_on_the_calculator.rb
+- Examples/Calculator/features/lib/roles/back_door/calculating_individual.rb
+- Examples/Calculator/features/lib/roles/front_door/calculating_individual.rb
+- Examples/Calculator/features/lib/roles/side_door/calculating_individual.rb
+- Examples/Calculator/features/lib/tasks/arithmetic/add.rb
+- Examples/Calculator/features/lib/tasks/arithmetic/calculate.rb
+- Examples/Calculator/features/lib/tasks/arithmetic/subtract.rb
+- Examples/Calculator/features/lib/tasks/questions/see_the_answer.rb
+- Examples/Calculator/features/lib/tasks/reference/calculations.rb
+- Examples/Calculator/features/lib/tasks/switch_on_the_calculator.rb
 - Examples/Calculator/features/subtraction.feature
 - Examples/Calculator/features/support/env.rb
 - Examples/Calculator/features/typical_workflow.feature
 - Examples/Calculator/lib/calculator.rb
-- Examples/Calculator/lib/calculator_operations.rb
 - Examples/Calculator/lib/config.ru
+- Examples/Calculator/lib/web_calculating_individual.rb
 - Examples/Calculator/lib/web_calculator.rb
 - Examples/Calculator/spec/calculator_spec.rb
 - Examples/Calculator/spec/web_calculator_spec.rb
@@ -183,7 +186,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2889682039650591259
+      hash: -189885101072141451
       segments: 
       - 0
       version: "0"
@@ -192,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2889682039650591259
+      hash: -189885101072141451
       segments: 
       - 0
       version: "0"

data/Examples/Calculator/lib/calculator_operations.rb

@@ -1,4 +0,0 @@
-module CalculatorOperations
-  OPERATORS = { '+' => :plus, '-' => :minus, '=' => :equals }
-  OPERATIONS = { 'plus' => :+, 'minus' => :-, 'equals' => '=' }
-end