cukesalad 0.3.0 → 0.4.0

data/Examples/Calculator/Gemfile

@@ -1,5 +1,6 @@
 source :rubygems
 gem "cucumber", "0.10.0"
+gem "cukesalad", ">=0.3.0"
 gem "rspec", "2.5.0", :require => 'spec'
 gem "capybara", "0.4.1.2"
 gem "sinatra", "1.2.0"

data/Examples/Calculator/Gemfile.lock

@@ -1,6 +1,10 @@
 GEM
   remote: http://rubygems.org/
   specs:
+    aruba (0.3.5)
+      childprocess (>= 0.1.7)
+      cucumber (>= 0.10.0)
+      rspec (>= 2.5.0)
     builder (3.0.0)
     capybara (0.4.1.2)
       celerity (>= 0.7.9)
@@ -20,6 +24,10 @@ GEM
       gherkin (~> 2.3.2)
       json (~> 1.4.6)
       term-ansicolor (~> 1.0.5)
+    cukesalad (0.3.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.7)
@@ -62,5 +70,6 @@ PLATFORMS
 DEPENDENCIES
   capybara (= 0.4.1.2)
   cucumber (= 0.10.0)
+  cukesalad (>= 0.3.0)
   rspec (= 2.5.0)
   sinatra (= 1.2.0)

data/Examples/Calculator/features/support/env.rb

@@ -1,5 +1,4 @@
 $:.unshift(File.dirname(__FILE__) + '/../../lib') #where to find the calculator implementation
-$:.unshift(File.dirname(__FILE__) + '/../../../../lib') #where to find CukeSalad
 
 require 'cukesalad'
 

data/README.md

@@ -36,23 +36,13 @@ Let's see how this works with a simple example...
 
 ## Let's Get started
 
-Create a new project Calculator:
+Create a new project called Calculator:
 
-    mkdir Calculator
-    cd Calculator
-    mkdir features
-    mkdir features/support
-    mkdir features/lib
-    mkdir features/lib/tasks
-    mkdir features/lib/roles
+    cukesalad Calculator
 
-In idiomatic Cucumber style, we use `features/support/env.rb` to require _CukeSalad_: 
+Or, if you have an existing cucumber project that you want to configure to use cukesalad, you can type:
 
-    require 'cukesalad'
-    begin require 'rspec/expectations'; rescue LoadError; require 'spec/expectations'; end
-
-Cucumber will automatically find our project's _roles_ and _tasks_, as it loads
-all .rb files beneath the project's `features/` directory.
+    cukesalad
 
 ## Write Features
 
@@ -75,8 +65,7 @@ Let's take a moment to understand this scenario:
       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.
-Just explain how to do the _task_ using a class...
+To get this working, we don't need to write any steps. Instead, we describe tasks...
 
 ## Create Tasks
 
@@ -85,14 +74,14 @@ 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 "SwitchOnTheCalculator" do
+    in_order_to "switch on the calculator" do
       @calc = 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 "SeeTheAnswer" do
+    in_order_to "see the answer" do
       look_at_the_display
     end
 
@@ -146,7 +135,7 @@ You can have as many name-value pairs as you like.
 
 So, we need a task called `tasks/add.rb` that explains the individual actions required to complete the task:
 
-    in_order_to "Add" do
+    in_order_to "add" do
       enter @value_of(:the_number)
       press :plus
       enter @value_of(:to_the_number)
@@ -157,7 +146,7 @@ Notice how the `value_of` lines use symbols that correspond to the wording `'the
 
 There is some 'syntactic sugar' that we can use to dress this up a little and make it read nicer... a simple attribute mapping:
 
-    in_order_to "Add", the_number: :first_number, to_the_number: :second_number do
+    in_order_to "add", the_number: :first_number, to_the_number: :second_number do
         enter the :first_number
         press :plus
         enter the :second_number

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.4.0

data/bin/cukesalad

@@ -1,10 +1,10 @@
 #!/usr/bin/env ruby
-
 require 'optparse'
 require 'cukesalad/cli'
+CONFIRMATION = 'y'
 
 OptionParser.new do |opts|
-  opts.banner = "Usage: cukesalad [new | configure] project_name"
+  opts.banner = "Usage: cukesalad or cukesalad project"
 
   begin
     opts.parse!(ARGV)
@@ -15,14 +15,47 @@ OptionParser.new do |opts|
   end
 end
 
+def user_confirm_setup? project
+  puts %Q|About to set-up project '#{project}' and configure cukesalad
+The following project structure will be created:
+  #{project}
+  #{project}/features
+  #{project}/features/tasks
+  #{project}/features/roles
+  #{project}/features/support
+  #{project}/features/support/env.rb
+Continue (y/n)?|
+user_confirmed?
+end
+
+def user_confirm_configuration?
+  puts %Q|About to set-up your current project to work with cukesalad
+The following files will be created/modified:
+    features
+    features/tasks
+    features/roles
+    features/support
+    features/support/env.rb
+ Continue (y/n)?|
+ user_confirmed?
+end
+
+def user_confirmed?
+  STDIN.gets.chomp == CONFIRMATION
+end
+
 if ARGV.empty?
-  abort "Usage: cukesalad new <project name>\nOr: cukesalad configure"
-elsif ARGV.first == 'new'
-  project = ARGV[1]
-  puts "Creating project #{project}..."
-  CukeSalad::CLI.create_new_project project 
-  puts "Done!"
-elsif ARGV.first == 'configure'
-  CukeSalad::CLI.configure_existing_project
-  puts "Done!"
+  if user_confirm_configuration?
+    CukeSalad::CLI.configure_existing_project
+  else
+    abort "User aborted"
+  end
+elsif ARGV.first
+  project = ARGV[0]
+  if user_confirm_setup? project
+    CukeSalad::CLI.create_new_project project
+  else
+    abort "User aborted"
+  end
 end
+

data/examples/Calculator/features/support/env.rb

@@ -1,5 +1,4 @@
 $:.unshift(File.dirname(__FILE__) + '/../../lib') #where to find the calculator implementation
-$:.unshift(File.dirname(__FILE__) + '/../../../../lib') #where to find CukeSalad
 
 require 'cukesalad'
 

metadata

@@ -2,7 +2,7 @@
 name: cukesalad
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - RiverGlide
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-20 00:00:00 Z
+date: 2011-04-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: cucumber
@@ -165,7 +165,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 2244599182418509271
+      hash: 2646953412636943422
       segments: 
       - 0
       version: "0"