cukesalad 0.6.1 → 0.7.0

data/.gitignore

@@ -1,5 +1,6 @@
 .rvmrc
 *.swp
+*.swo
 .DS_Store
 
 #rdoc generated

data/Examples/Calculator/Gemfile

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

data/Examples/Calculator/Gemfile.lock

@@ -1,56 +1,57 @@
 GEM
   remote: http://rubygems.org/
   specs:
-    aruba (0.3.6)
-      childprocess (>= 0.1.7)
-      cucumber (>= 0.10.0)
-      rspec (>= 2.5.0)
+    aruba (0.4.3)
+      bcat (>= 0.6.1)
+      childprocess (>= 0.1.9)
+      cucumber (>= 0.10.7)
+      rdiscount (>= 1.6.8)
+      rspec (>= 2.6.0)
+    bcat (0.6.1)
+      rack (~> 1.0)
     builder (3.0.0)
-    capybara (0.4.1.2)
-      celerity (>= 0.7.9)
-      culerity (>= 0.2.4)
+    capybara (1.0.0)
       mime-types (>= 1.16)
       nokogiri (>= 1.3.3)
       rack (>= 1.0.0)
       rack-test (>= 0.5.4)
-      selenium-webdriver (>= 0.0.27)
-      xpath (~> 0.1.3)
-    celerity (0.8.9)
+      selenium-webdriver (~> 0.2.0)
+      xpath (~> 0.1.4)
     childprocess (0.1.9)
       ffi (~> 1.0.6)
-    cucumber (0.10.2)
+    cucumber (1.0.0)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (>= 2.3.5)
+      gherkin (~> 2.4.1)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
-    cukesalad (0.6.1)
+    cukesalad (0.7.0)
       aruba (>= 0.3.5)
       cucumber (>= 0.10.0)
       rspec (>= 2.5.0)
-    culerity (0.2.15)
     diff-lcs (1.1.2)
-    ffi (1.0.8)
-    gherkin (2.3.8)
+    ffi (1.0.9)
+    gherkin (2.4.1)
       json (>= 1.4.6)
-    json (1.5.1)
-    json_pure (1.5.1)
+    json (1.5.3)
+    json_pure (1.5.3)
     mime-types (1.16)
-    nokogiri (1.4.4)
-    rack (1.2.2)
+    nokogiri (1.5.0)
+    rack (1.3.0)
     rack-test (0.6.0)
       rack (>= 1.0)
+    rdiscount (1.6.8)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
       rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.0)
+    rspec-core (2.6.4)
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
     rubyzip (0.9.4)
-    selenium-webdriver (0.2.0)
-      childprocess (>= 0.1.7)
+    selenium-webdriver (0.2.2)
+      childprocess (>= 0.1.9)
       ffi (>= 1.0.7)
       json_pure
       rubyzip
@@ -58,7 +59,7 @@ GEM
       rack (~> 1.1)
       tilt (< 2.0, >= 1.2.2)
     term-ansicolor (1.0.5)
-    tilt (1.3)
+    tilt (1.3.2)
     xpath (0.1.4)
       nokogiri (~> 1.3)
 
@@ -67,6 +68,6 @@ PLATFORMS
 
 DEPENDENCIES
   capybara (>= 0.4.1.2)
-  cukesalad (>= 0.6)
+  cukesalad (>= 0.7)
   rspec (>= 2.5.0)
   sinatra (>= 1.2.0)

data/Examples/Calculator/README.md

@@ -0,0 +1,17 @@
+## Calculator Example
+
+In the current folder...
+
+Setup the environment:
+
+    bundle install
+
+Then you can run the examples:
+
+    bundle exec cucumber
+
+To run these via a web front end, use:
+
+    bundle exec cucumber -p alternative
+
+Enjoy!!

data/Examples/Calculator/features/addition.feature

@@ -5,7 +5,6 @@ Feature: Addition
 	
 Scenario Outline: Find the sum of two numbers
   Given I am a Calculating Individual
-  And I was able to switch on the calculator
   When I attempt to add: the number '<first_number>' and the number '<second_number>'
   Then I should see the answer '<result>'
 

data/Examples/Calculator/features/complex_calculations.feature

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

data/Examples/Calculator/features/lib/alternative/roles/calculating_web_user.rb

@@ -10,10 +10,11 @@ Capybara.default_driver = :rack_test
 
 module CalculatingIndividual
 
-  # Uses a Browser to perform its tasks
   include Capybara
-  # This is not a page object. It is a WebUser, specialised to our application
-  # See the comments in the 'enter' and 'press' method for an explanation of why
+
+  def role_preparation
+    switch_on_the_calculator
+  end
 
   def switch_on_the_calculator
     visit '/'
@@ -21,28 +22,10 @@ module CalculatingIndividual
 
   def enter value
     fill_in 'number', :with => value
-    # Because the calculator is a simple web_app with only
-    # one page we can put the id for the field here. In a more complex web-app
-    # we would pass in the id of the thing to enter
-    # The task would express the action as: enter( :the_number, "10")
-    # Because we can change the id used in our application,
-    # we would just change the id in the application to be 'the_number'.
-    # If we were on a project where we could not change the id 
-    # in the application we would write an 'ApplicationExpert' 
-    # to map :the_number to the id for the field 'number'. Our CalculatingIndividual
-    # would ask the ApplicationExpert for the id of the symbol :the_number
-    # See 'press' below for am explanation of how an ApplicationExpert 
-    # would work 
   end
   
   def press operator
     click_button operator.to_s
-    # Here, our 'operator' happens to also match the id for the button.
-    # If we were on a project where we could not choose what the id
-    # was for buttons, we would write an ApplicationExpert to map 
-    # the symbol used in the task to the symbol for that button. 
-    # The ApplicationExpert would only need to know what page it 
-    # was on to find a mappings class (or yml file) for the fields on that page.
   end
 
   def look_at_the_display

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

@@ -2,6 +2,10 @@ require 'calculator'
 
 module CalculatingIndividual
 
+  def role_preparation
+    switch_on_the_calculator
+  end
+
   def switch_on_the_calculator
     @calculator = Calculator.new
     @operate_with = {

data/Examples/Calculator/features/lib/default/tasks/arithmetic/calculate.rb

@@ -1,4 +1,4 @@
 in_order_to "Calculate", with_the_following: :calculation do
-  see_how_to_do Calculations  
+  see_how_to Calculations  
   follow_the_steps_for the( :calculation ).split(" ")
 end

data/Examples/Calculator/features/subtraction.feature

@@ -5,7 +5,6 @@ Feature: Subtraction
 	
 Scenario Outline: Find the result of subtracting two numbers
   Given I am a Calculating Individual
-  And I was able to switch on the calculator
   When I attempt to subtract, the number '<subtractor>' from the number '<subtractee>'
   Then I should see the answer '<result>'
 

data/Examples/Calculator/features/typical_workflow.feature

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

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cukesalad (0.6.1)
+    cukesalad (0.7.0)
       aruba (>= 0.3.5)
       cucumber (>= 0.10.0)
       rspec (>= 2.5.0)
@@ -9,39 +9,59 @@ PATH
 GEM
   remote: http://rubygems.org/
   specs:
-    aruba (0.3.6)
-      childprocess (>= 0.1.7)
-      cucumber (>= 0.10.0)
-      rspec (>= 2.5.0)
+    archive-tar-minitar (0.5.2)
+    aruba (0.4.3)
+      bcat (>= 0.6.1)
+      childprocess (>= 0.1.9)
+      cucumber (>= 0.10.7)
+      rdiscount (>= 1.6.8)
+      rspec (>= 2.6.0)
+    bcat (0.6.1)
+      rack (~> 1.0)
     builder (3.0.0)
     childprocess (0.1.9)
       ffi (~> 1.0.6)
-    cucumber (0.10.2)
+    cucumber (1.0.0)
       builder (>= 2.1.2)
       diff-lcs (>= 1.1.2)
-      gherkin (>= 2.3.5)
+      gherkin (~> 2.4.1)
       json (>= 1.4.6)
       term-ansicolor (>= 1.0.5)
     diff-lcs (1.1.2)
-    ffi (1.0.8)
-    gherkin (2.3.8)
+    ffi (1.0.9)
+    ffi (1.0.9-java)
+    gherkin (2.4.1)
+      json (>= 1.4.6)
+    gherkin (2.4.1-java)
       json (>= 1.4.6)
-    json (1.5.1)
+    json (1.4.6)
+    json (1.4.6-java)
+    mime-types (1.16)
+    rack (1.3.0)
     rake (0.8.7)
+    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)
+      mime-types (>= 1.16)
     rspec (2.6.0)
       rspec-core (~> 2.6.0)
       rspec-expectations (~> 2.6.0)
       rspec-mocks (~> 2.6.0)
-    rspec-core (2.6.0)
+    rspec-core (2.6.4)
     rspec-expectations (2.6.0)
       diff-lcs (~> 1.1.2)
     rspec-mocks (2.6.0)
     term-ansicolor (1.0.5)
 
 PLATFORMS
+  java
   ruby
 
 DEPENDENCIES
   bundler (~> 1.0.0)
   cukesalad!
   rake (~> 0.8.7)
+  relish (= 0.3.0)

data/Rakefile

@@ -19,8 +19,11 @@ end
 
 require 'cucumber/rake/task'
 Cucumber::Rake::Task.new(:cucumber)
+Cucumber::Rake::Task.new(:wip) do |wip|
+  wip.cucumber_opts = "-p wip"
+end
 
-task :default => :spec
+task :default => [:spec, :cucumber]
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
@@ -31,3 +34,20 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+require 'relish/command'
+namespace :relish do
+  task :create do
+    `relish projects:add RiverGlide/CukeSalad`
+  end
+
+  task :push do
+    `relish push CukeSalad:#{CukeSalad::VERSION}`
+  end
+
+  namespace :version do
+    task :add do
+      `relish versions:add CukeSalad:#{CukeSalad::VERSION}`
+    end
+  end
+end

data/VERSION

@@ -1 +1 @@
-0.6.0
+0.7.0

data/cucumber.yml

@@ -1,4 +1,6 @@
 default: --tags ~@wip --tags ~@todo
+wip: --tags @wip
+todo: --tags @todo
 all: features
 autotest: --color
 autotest-all: --color

data/cukesalad.gemspec

@@ -10,7 +10,12 @@ Gem::Specification.new do |s|
   s.email       = ["talktous@riverglide.com"]
   s.homepage    = "https://github.com/RiverGlide/CukeSalad"
   s.summary     = %q{Friction Free BDD/ATDD with cucumber}
-  s.description = %q{CukeSalad allows you to focus on the tasks at hand - expressing examples, the roles involved in those examples and the tasks that those roles need to perform with the product under development.}
+  s.description = %q{CukeSalad allows you to focus on the tasks at hand - expressing examples, the roles involved in those examples and the tasks that those roles need to perform with the product under development.
+  New in this version:
+    - Single or double quotes can be used for parameters
+    - Single or double quotes can be used for expectations
+    - You can initialise the actor by having a role_preparation method in your role
+  }
 
   s.licenses = ["MIT"]
 
@@ -26,4 +31,5 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "bundler", "~> 1.0.0"
   s.add_development_dependency "rake", "~> 0.8.7"
+  s.add_development_dependency "relish", "= 0.3.0"
 end

data/features/README.markdown

@@ -0,0 +1,299 @@
+# Cuke Salad
+
+_Cucumber, washed and ready to eat for Friction-free ATDD/BDD_
+
+**This is a work in progress - feedback welcome**
+e-mail feedback to <talktous@riverglide.com>
+
+You can see our current list of intended features under issues:
+[https://github.com/RiverGlide/CukeSalad/issues?labels=Feature](https://github.com/RiverGlide/CukeSalad/issues?labels=Feature)
+
+
+## This project has step-free access!
+
+CukeSalad allows you to focus on the task at hand - expressing examples, the roles involved in those examples and what those roles can do with the product under development.
+
+With CukeSalad you don't need to write step-definitions.
+
+Of course, you still have to write some code - but only the code that expresses:
+
+* the roles and the actions they can perform
+* the tasks and the actions involved in completing that task
+
+## Goals->Tasks->Actions
+The terms *"actions"* and *"tasks"* above come from Task Analysis, as used in User Centred Design (UCD) of Human Computer Interfaces (HCI) a.k.a. User Experience (UX):
+
+* *Goal:* What we’re trying to achieve which has one or more…
+* *Tasks:* The high-level work-item that we complete to fulfil the goal, each having one or more…
+* *Actions:* The specific steps or interactions we execute to complete the task.
+
+More information about Goals, Tasks and Actions can be found in this [blog post](http://antonymarcano.com/blog/2011/03/goals-tasks-action/)
+
+Let's see how this works with a simple example...
+
+## Install
+
+    gem install cukesalad
+
+## Let's Get started
+
+Create a new project called Calculator:
+
+    cukesalad Calculator
+
+Or, if you have an existing cucumber project that you want to configure to use cukesalad, you can type:
+
+    cukesalad
+
+## Write Features
+
+In `features/`, let's create our first feature file - `a_place_to_start.feature`:
+
+    Feature: A Place To Start
+    As Callie, a calculating individual
+    I want to know when my calculator is on
+    So that I know when I can start calculating
+
+    Scenario: Let's Begin
+      Given I am a Calculating Individual
+      When  I attempt to switch on the calculator
+      Then  I should see the answer '0'
+
+Let's take a moment to understand this scenario:
+
+    Scenario: Let's Begin
+      Given I am a <some role>
+      When  I attempt to <do some task>
+      Then  I should <ask some question> '<expected answer>'
+
+To get this working, we don't need to write any steps. Instead, we describe tasks...
+
+## Create Tasks
+
+Explaining how to do a _task_ is easy:
+Create a new file, `features/lib/tasks/switch_on_the_calculator.rb`
+
+Remember the step `When  I attempt to switch on the calculator`
+
+    in_order_to "switch on the calculator" do
+      switch_on_the_calculator
+    end
+
+Remember the step `Then  I should see the answer '0'`
+Now we need `task/see_the_answer.rb`
+
+    in_order_to "see the answer" do
+      look_at_the_display
+    end
+
+Now we've explained the _tasks_, we need to define the _role_ that performs them. In
+this example, we need to explain how the `CalculatingIndividual` _role_ works...
+
+## Create Roles
+
+Remember the step `Given I am a Calculating Individual`?
+
+We explain a _role_ by creating a new file
+called `features/lib/roles/calculating_individual.rb`
+
+    module CalculatingIndividual
+
+      def switch_on_the_calculator
+        @calculator = Calculator.new
+      end
+
+      def look_at_the_display
+        @calculator.display
+      end
+    end
+
+You'll need a class called Calculator on the load path of course, but that's it.
+
+From your project folder, run (_note: '%' is our command prompt_)
+
+    % cucumber
+
+We now have our first passing Feature, without creating a single step definition!
+
+## Wash, rinse, repeat
+
+Let's try another scenario...
+
+    Scenario Outline: Find the sum of two numbers
+      Given I am a Calculating Individual
+      And I was able to switch on the calculator
+      When I attempt to add: the number '10' and the number '10'
+      Then I should see the answer '20'
+
+Notice that we've reused 'switch on the calculator'.
+
+The new _When_ step has a slightly different layout.
+Let's examine that for a second... See below. Notice the ':' (colon) after `<do something>` followed by the name-value pairs:
+
+    When I attempt to <do something>: <name> '<value>' <name> '<value>'
+
+You can also use a ',' (comma) in situations where a colon wouldn't quite work:
+
+    When I attempt to <do something>, <name> '<value>' <name> '<value>'
+
+`<do something>` can be as many words as you like. You can have as many name-value pairs as you like.
+
+For this to work we need a task called `tasks/add.rb` that explains the individual actions required to complete the task:
+
+    in_order_to "add" do
+      enter @value_of(:the_number)
+      press :plus
+      enter @value_of(:and_the_number)
+      press :equals
+    end
+
+Notice how the `value_of` lines use symbols that correspond to the wording `'the number '10' to the number '10'` in the "When" step.
+
+There is some 'syntactic sugar' that we can use to dress this up a little and make it read nicer... a simple attribute mapping (using Ruby 1.9.x syntax):
+
+    in_order_to "add", the_number: :first_number, to_the_number: :second_number do
+        enter the :first_number
+        press :plus
+        enter the :second_number
+        press :equals
+    end
+
+All we've done is mapped `:the_number` to `:first_number` and `:to_the_number` to `:second_number`. There is a special method called "the" that allows you to reference the mapped values rather than the symbols derived from the scenario.
+
+Now all we need to do is create the corresponding methods in `calculating_individual.rb`.
+
+    module CalculatingIndividual
+
+      def switch_on_the_calculator
+        @calculator = Calculator.new
+        @operate_with = {
+          plus: :+,
+         minus: :-
+        }
+      end
+
+      def enter value
+        @calculator.enter value.to_i
+      end
+
+      def press next_operator
+        if next_operator == :equals
+          equals
+        else
+          @calculator.get_ready_to @operate_with[next_operator]
+        end
+      end
+
+      def equals
+        @calculator.equals
+      end
+
+      def look_at_the_display
+        @calculator.display
+      end
+    end
+
+Of course you'll have to [implement the calculator too](https://github.com/RiverGlide/CukeSalad/blob/master/Examples/Calculator/lib/calculator.rb)
+
+Now, you can run cucumber again:
+
+    % cucumber
+
+There's no need to write `step_definitions`...
+Simply express the _roles_ and the _tasks_ in clear,
+concise, easy to read classes.
+
+If we want to know what things we can say, instead of trawling through a step-def ruby file, we can look in our tasks folder:
+
+    features/lib/default/tasks/
+    ├── add.rb
+    ├── calculate.rb
+    ├── calculations.rb
+    ├── see_the_answer.rb
+    ├── subtract.rb
+    └── switch_on_the_calculator.rb
+
+You can structure your tasks as you see fit. For example, as the project grows, it might end up looking like this:
+
+    features/lib/default/tasks/
+    ├── all_purpose
+    |   └── calculate.rb
+    ├── arithmetic
+    |   ├── add.rb
+    |   ├── divide.rb
+    |   ├── multiply.rb
+    |   └── subtract.rb
+    ├── extras
+    |   ├── recall_from_memory.rb
+    |   ├── store_in_memory.rb
+    |   └── switch_on_the_calculator.rb
+    ├── questions
+    |   ├── see_the_answer.rb
+    |   ├── see_the_following_indicators.rb
+    |   └── switch_on_the_calculator.rb
+    ├── trigonometry
+    |   ├── sine.rb
+    |   ├── cosine.rb
+    |   └── tangent.rb
+    └── reference_material
+        └── calculations.rb
+
+## Alternative Roles
+
+As our features _describe the value of a calculator application and not its
+implementation_, we have the opportunity to reuse them.
+
+In the Calculator example, we create a new _role_ in
+`./features/lib/alternative/roles/calculating_web_user.rb`, which we can swap
+into our tests using a Cucumber profile defined in `features/cucumber.yml`:
+
+    default --exclude features/lib/alternative/
+    alternative -r features/lib/alternative/ -r features/support/env.rb -r features/lib/default/tasks/
+
+We can run our alternative configuration like so:
+
+  `%cucumber --profile alternative`
+
+The Calculating Web User masquerades as the Calculating Individual from our
+previous example, and provides the same API, allowing us to reuse all of our
+existing features and _tasks_.
+
+The alternative, `./lib/web_calculator.rb`, implementation is a simple [Sinatra](http://www.sinatrarb.com) application,
+which we drive with the [Capybara](http://github.com/jnicklas/capybara) web testing framework.
+
+By writing a single new _role_ class we're able to reuse all of our existing features,
+_tasks_ and even the `Calculator` itself, which the web calculator delegates to in order to do its calculations.
+
+After adding some more scenarios and tasks and an alternative "Calculating Individual" (see below for why), our Calculator directory structure currently looks like this...
+
+    ├── cucumber.yml
+    ├── features
+    │   ├── A_PlaceToStart.feature
+    │   ├── Addition.feature
+    │   ├── Complex_calculations.feature
+    │   ├── Subtraction.feature
+    │   ├── Typical_workflow.feature
+    │   ├── lib
+    │   │   ├── alternative
+    │   │   │   ├── roles
+    │   │   │   │   └── calculating_web_user.rb
+    │   │   │   └── tasks
+    │   │   └── default
+    │   │       ├── roles
+    │   │       │   └── calculating_individual.rb
+    │   │       └── tasks
+    │   │           ├── add.rb
+    │   │           ├── perform.rb
+    │   │           ├── see_the_answer.rb
+    │   │           ├── subtract.rb
+    │   │           └── switch_on_the_calculator.rb
+    │   └── support
+    │       └── env.rb
+    ├── lib
+    │   ├── calculator.rb
+    │   └── web_calculator.rb
+    └── spec
+        ├── calculator_spec.rb
+        └── web_calculator_spec.rb
+
+Take a look around the examples and the code to see how it all works. We hope you enjoy reading as much as we enjoyed writing it.

data/features/{a_new_cukesalad_project.feature → creating_a_new_project.feature}

@@ -1,4 +1,4 @@
-Feature: Cuke Salad
+Feature: Creating a New Project
   As a Step Free Cuker
   You want to set up your project to use use Cuke Salad 
   So that you can start writing scenarios without step definitions 

data/features/define_a_role.feature

@@ -5,7 +5,6 @@ Feature: Define the Role
 
   Background:
     Given you are a Step Free Cuker
-    And   you were able to create a new Cuke Salad project
 
   Scenario: We'll tell you what you need to do to establish the role
     Given you did not create a role: called 'NewCustomer'

data/features/define_a_task.feature

@@ -6,11 +6,10 @@ Feature: Define the Task
 
   Background:
     Given you are a Step Free Cuker
-    And   you were able to create a new Cuke Salad project
     And   you were able to create a role: called 'NewCustomer'
 
   Scenario Outline: Once you've created the task, you see the step pass
-    Given you did create a task: called 'do something'
+    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

data/features/define_a_task_with_arguments.feature

@@ -6,25 +6,33 @@ Feature: Define a Task with arguments
 
   Background:
     Given you are a Step Free Cuker
-    And   you were able to create a new Cuke Salad project
     And   you were able to create a role: called 'NewCustomer'
-    And   you were able to create a task: called 'do something'
     
   Scenario Outline: A task can accept arguments
+    Given you were able to create a task, called 'do some task' containing
+      """
+      in_order_to 'do some task', with: :detail do
+        raise "Expected 'information' in the detail
+        got '#{the :detail}'" unless the( :detail ) == 'information'
+      end
+      """
     When  you attempt to run a scenario: called 'something' containing
     """
     Given I am a New Customer
-    <the_step>
+    When I attempt to <task_with_argument>
     """
     Then you should see it has 'passed'
 
     Examples:
-      | the_step                                |
-      | When I attempt to do something: with 'information' |
-      | When I attempt to do something, with 'information' |
+      | task_with_argument             |
+      | do some task: with 'information' |
+      | do some task, with 'information' |
+      | do some task: with "information" |
+      | do some task, with "information" |
       
   Scenario: A task accepts tables
-    When you attempt to run a scenario, called 'something' containing
+    Given you were able to create a task: called 'do something'
+    When  you attempt to run a scenario, called 'something' containing
       """
       Given I am a New Customer
       When I attempt to do something, with

data/features/expressing_expectations.feature

@@ -0,0 +1,39 @@
+Feature: Expressing expectations
+  As a Step Free Cuker
+  You want to express expectations
+  So that you know whether your scenario has passed
+
+  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
+
+      def get_the_answer_from_the_application
+        # Pretending to get the answer from the application
+        return 'correct 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>
+    """
+    Then you should see it has 'passed'
+
+    Examples:
+      |     answer       |
+      | 'correct answer' |
+      | "correct answer" |

data/features/lib/roles/step_free_cuker.rb

@@ -2,4 +2,19 @@ require 'aruba/api'
 #TODO: Consider wrapping Aruba 
 module StepFreeCuker
   include Aruba::Api
+
+  def role_preparation
+    create_a_new_cuke_salad_project
+  end
+
+  def create_a_new_cuke_salad_project
+    create_dir 'features'
+    create_dir 'features/support'
+    write_file 'features/support/env.rb', "$:.unshift(File.dirname(__FILE__) + '/../../../../lib') #where to find CukeSalad
+               
+               require 'cukesalad'"
+    create_dir 'features/lib'
+    create_dir 'features/lib/roles'
+    create_dir 'features/lib/tasks'
+  end
 end

data/features/lib/tasks/create_a_new_cukesalad_project.rb

@@ -1,11 +1,3 @@
-#TOOO: consider doing this as a feature since it's part of how you set up the project.
-in_order_to "CreateANewCukeSaladProject" do
-  create_dir 'features'
-  create_dir 'features/support'
-  write_file 'features/support/env.rb', "$:.unshift(File.dirname(__FILE__) + '/../../../../lib') #where to find CukeSalad
-             
-             require 'cukesalad'"
-  create_dir 'features/lib'
-  create_dir 'features/lib/roles'
-  create_dir 'features/lib/tasks'
+in_order_to 'create a new cukesalad project' do
+  create_a_new_cuke_salad_project
 end

data/features/lib/tasks/create_a_task.rb

@@ -1,12 +1,12 @@
 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?
+  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

data/features/prepare_the_actor_for_the_role.feature

@@ -0,0 +1,36 @@
+Feature: Prepare the actor for the role
+  As a Step Free Cuker
+  You want the role to initialize some things
+  So that you can define the things that the role always does at the start
+
+  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
+
+      def do_something_important
+        @something = 'something important was done'
+      end
+
+      def see_what_was_done
+        @something
+      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'
+    """
+    Then you should see it has 'passed'
+

data/features/remember_information_between_steps.feature

@@ -5,7 +5,6 @@ Feature: Remember information between steps
 
   Background:
     Given you are a Step Free Cuker
-    And   you were able to create a new Cuke Salad project
     And   you were able to create a role, called 'NewCustomer'
 
   Scenario: You can reuse information

data/lib/cukesalad.rb

@@ -1,2 +1,2 @@
 require 'cukesalad/salad'
-require 'cukesalad/cucumber'
+require 'cukesalad/cucumber_steps'

data/lib/cukesalad/actor.rb

@@ -5,8 +5,8 @@ module CukeSalad
      
     def initialize this_type_of_role, directed_by=Director.new
       @director = directed_by
-      get_into_character_for this_type_of_role
       @note_pad = {}
+      get_into_character_for this_type_of_role
     end
     
     def perform described_task, details = {}
@@ -19,6 +19,7 @@ module CukeSalad
     def get_into_character_for described_role
       the_role = @director.explain_the_role described_role
       see_how_to_do the_role
+      role_preparation
     end
     
     def get_ready_to_perform something
@@ -29,6 +30,11 @@ module CukeSalad
     def see_how_to_do something
       extend something
     end
+    alias :see_how_to :see_how_to_do
+
+    def role_preparation
+      # Does nothing unless you override it from your role
+    end
 
     def value_of(symbol)
       @info[symbol]

data/lib/cukesalad/{cucumber.rb → cucumber_steps.rb}

@@ -26,7 +26,11 @@ Then /^(?:I|you) should ([^':]*)(?: '([^']*)')$/ do | this_question, expect_valu
   @actor.answer( this_question ).to_s.should == expect_value
 end
 
-Then /^(?:I|you) should ([^':]+)$/ do | this_question |
+Then /^(?:I|you) should ([^':]*)(?: "([^"]*)")$/ do | this_question, expect_value |
+  @actor.answer( this_question ).to_s.should == expect_value
+end
+
+Then /^(?:I|you) should ([^'^":]+)$/ do | this_question |
   @actor.answer( this_question )
 end
 

data/lib/cukesalad/director.rb

@@ -10,7 +10,7 @@ module CukeSalad
       begin
         find_directives_for name
       rescue NameError
-        raise "I can't find a role called '#{ name }'. Have you created it?\ne.g.\n  module #{ name }\n  end"
+        raise "I can't find a role called '#{ name }'. Have you created it?\ne.g.\n  module #{ name }\n  end\n\n"
       end
     end
 
@@ -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" 
+        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" 
       end
     end
 

data/lib/cukesalad/specifics.rb

@@ -21,7 +21,7 @@ module CukeSalad
     end
 
     def names_and_values_in details
-      specifics_pattern = /('[^']+')/
+      specifics_pattern = /('[^']+'|"[^"]+")/
       details.split(specifics_pattern)
     end
 
@@ -30,7 +30,7 @@ module CukeSalad
     end
 
     def the_value_from_the item 
-      item.gsub(/(^'|'$)/, '') unless item.nil?
+      item.gsub(/((?:^'|'$)|(?:^"|"$))/, '') unless item.nil?
     end
   end
 end

data/lib/cukesalad/version.rb

@@ -1,3 +1,3 @@
 module CukeSalad
-  VERSION = "0.6.1"
+  VERSION = "0.7.0"
 end

data/spec/cukesalad/specifics_spec.rb

@@ -7,31 +7,38 @@ end
 module CukeSalad
   describe Specifics do
 
-    it "has an item of specific information" do
-      something = NeedingSpecifics.new
-      something.understand_the "specific 'information'"
-      something.value_of(:specific).should == "information"
-    end
+    context 'name value pairs' do
 
-    it "has items of specific information" do
-      something = NeedingSpecifics.new
-      something.understand_the "first 'item' second 'another'"
-      something.value_of(:first).should == "item"
-      something.value_of(:second).should == "another"
-    end
+      [ "specific 'information'",
+        'specific "information"'
+      ].each do | specifics |
+        it "can be found in: #{specifics}" do
+          something = NeedingSpecifics.new
+          something.understand_the specifics
+          something.value_of(:specific).should == "information"
+        end
+      end
+      
+      it "can have more than one name-value pair" do
+        something = NeedingSpecifics.new
+        something.understand_the "first 'item' second 'another'"
+        something.value_of(:first).should == "item"
+        something.value_of(:second).should == "another"
+      end
 
-    it "copes with names having more than one word" do
-      something = NeedingSpecifics.new 
-      something.understand_the "first thing 'item' second thing 'another'"
-      something.value_of(:first_thing).should == "item"
-      something.value_of(:second_thing).should == "another"
-    end
-    
-    it "should cope with values having more than one word" do
-      something = NeedingSpecifics.new
-      something.understand_the "first thing 'item' second thing 'another thing'"
-      something.value_of(:first_thing).should == "item"
-      something.value_of(:second_thing).should == "another thing"
+      it "can have more than one word as the name" do
+        something = NeedingSpecifics.new 
+        something.understand_the "first thing 'item' second thing 'another'"
+        something.value_of(:first_thing).should == "item"
+        something.value_of(:second_thing).should == "another"
+      end
+      
+      it "can have more than one word as the name or value" do
+        something = NeedingSpecifics.new
+        something.understand_the "first thing 'item' second thing 'another thing'"
+        something.value_of(:first_thing).should == "item"
+        something.value_of(:second_thing).should == "another thing"
+      end
     end
 
     context 'the last item' do

metadata

@@ -2,7 +2,7 @@
 name: cukesalad
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.6.1
+  version: 0.7.0
 platform: ruby
 authors: 
 - RiverGlide
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-19 00:00:00 +01:00
+date: 2011-07-03 00:00:00 +01:00
 default_executable: cukesalad
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -68,7 +68,18 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: *id005
-description: CukeSalad allows you to focus on the tasks at hand - expressing examples, the roles involved in those examples and the tasks that those roles need to perform with the product under development.
+- !ruby/object:Gem::Dependency 
+  name: relish
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.3.0
+  type: :development
+  prerelease: false
+  version_requirements: *id006
+description: "CukeSalad allows you to focus on the tasks at hand - expressing examples, the roles involved in those examples and the tasks that those roles need to perform with the product under development.\n  New in this version:\n    - Single or double quotes can be used for parameters\n    - Single or double quotes can be used for expectations\n    - You can initialise the actor by having a role_preparation method in your role\n  "
 email: 
 - talktous@riverglide.com
 executables: 
@@ -82,6 +93,7 @@ files:
 - .rspec
 - Examples/Calculator/Gemfile
 - Examples/Calculator/Gemfile.lock
+- Examples/Calculator/README.md
 - Examples/Calculator/cucumber.yml
 - Examples/Calculator/features/LOOK_MA_NO_STEP_DEFS.txt
 - Examples/Calculator/features/a_place_to_start.feature
@@ -112,10 +124,12 @@ files:
 - bin/cukesalad
 - cucumber.yml
 - cukesalad.gemspec
-- features/a_new_cukesalad_project.feature
+- features/README.markdown
+- features/creating_a_new_project.feature
 - features/define_a_role.feature
 - features/define_a_task.feature
 - features/define_a_task_with_arguments.feature
+- features/expressing_expectations.feature
 - features/lib/roles/step_free_cuker.rb
 - features/lib/tasks/create_a_file.rb
 - features/lib/tasks/create_a_new_cukesalad_project.rb
@@ -129,13 +143,14 @@ files:
 - features/lib/tasks/run_a_scenario.rb
 - features/lib/tasks/see_a_reply.rb
 - features/lib/tasks/see_the_step_has.rb
+- features/prepare_the_actor_for_the_role.feature
 - features/remember_information_between_steps.feature
 - features/support/env.rb
 - lib/cukesalad.rb
 - lib/cukesalad/actor.rb
 - lib/cukesalad/cli.rb
 - lib/cukesalad/codify/const_name.rb
-- lib/cukesalad/cucumber.rb
+- lib/cukesalad/cucumber_steps.rb
 - lib/cukesalad/director.rb
 - lib/cukesalad/salad.rb
 - lib/cukesalad/specifics.rb
@@ -162,7 +177,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3357820802428433430
+      hash: 3570330056691710889
       segments: 
       - 0
       version: "0"
@@ -171,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3357820802428433430
+      hash: 3570330056691710889
       segments: 
       - 0
       version: "0"
@@ -183,10 +198,12 @@ signing_key:
 specification_version: 3
 summary: Friction Free BDD/ATDD with cucumber
 test_files: 
-- features/a_new_cukesalad_project.feature
+- features/README.markdown
+- features/creating_a_new_project.feature
 - features/define_a_role.feature
 - features/define_a_task.feature
 - features/define_a_task_with_arguments.feature
+- features/expressing_expectations.feature
 - features/lib/roles/step_free_cuker.rb
 - features/lib/tasks/create_a_file.rb
 - features/lib/tasks/create_a_new_cukesalad_project.rb
@@ -200,6 +217,7 @@ test_files:
 - features/lib/tasks/run_a_scenario.rb
 - features/lib/tasks/see_a_reply.rb
 - features/lib/tasks/see_the_step_has.rb
+- features/prepare_the_actor_for_the_role.feature
 - features/remember_information_between_steps.feature
 - features/support/env.rb
 - spec/cukesalad/actor_spec.rb