pickle 0.4.4 → 0.4.5

data/.gitignore

@@ -1,6 +1,17 @@
-pkg
-doc/*
-.yardoc
-pickle-email*
+# system crap
+.DS_Store
+
+# local ruby/gems dev stuff
+.rvmrc
+.bundle
+Gemfile.lock
 cucumber_test_app
-.bundle
+pickle-email*
+
+# built docs
+.yardoc
+doc
+
+# built gems
+pkg
+*.gem

data/Gemfile

@@ -1,20 +1,3 @@
 source "http://rubygems.org"
 
-gem "yard"
-gem "rake"
-gem "cucumber", ">=0.8"
-gem "rspec"
-
-group :test do
-  gem "rspec-rails"
-  gem "rails", "~>2.3"
-  gem "cucumber-rails", ">=0.3.2"
-  gem "factory_girl"
-  gem "machinist"
-  gem "jeweler"
-  gem "rcov"
-  gem "database_cleaner"
-  gem "capybara"
-  gem "webrat"
-  gem "sqlite3-ruby"
-end
+gemspec

data/Gemfile.lock.development

@@ -0,0 +1,151 @@
+PATH
+  remote: .
+  specs:
+    pickle (0.4.5)
+      cucumber (>= 0.8)
+      rake
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    abstract (1.0.0)
+    actionmailer (3.0.5)
+      actionpack (= 3.0.5)
+      mail (~> 2.2.15)
+    actionpack (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      erubis (~> 2.6.6)
+      i18n (~> 0.4)
+      rack (~> 1.2.1)
+      rack-mount (~> 0.6.13)
+      rack-test (~> 0.5.7)
+      tzinfo (~> 0.3.23)
+    activemodel (3.0.5)
+      activesupport (= 3.0.5)
+      builder (~> 2.1.2)
+      i18n (~> 0.4)
+    activerecord (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+      arel (~> 2.0.2)
+      tzinfo (~> 0.3.23)
+    activeresource (3.0.5)
+      activemodel (= 3.0.5)
+      activesupport (= 3.0.5)
+    activesupport (3.0.5)
+    arel (2.0.9)
+    builder (2.1.2)
+    capybara (0.4.1.2)
+      celerity (>= 0.7.9)
+      culerity (>= 0.2.4)
+      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.8)
+    childprocess (0.1.7)
+      ffi (~> 0.6.3)
+    cucumber (0.10.0)
+      builder (>= 2.1.2)
+      diff-lcs (~> 1.1.2)
+      gherkin (~> 2.3.2)
+      json (~> 1.4.6)
+      term-ansicolor (~> 1.0.5)
+    cucumber-rails (0.3.2)
+      cucumber (>= 0.8.0)
+    culerity (0.2.15)
+    database_cleaner (0.6.5)
+    diff-lcs (1.1.2)
+    erubis (2.6.6)
+      abstract (>= 1.0.0)
+    factory_girl (1.3.3)
+    ffi (0.6.3)
+      rake (>= 0.8.7)
+    gherkin (2.3.3)
+      json (~> 1.4.6)
+    git (1.2.5)
+    i18n (0.5.0)
+    json (1.4.6)
+    json_pure (1.5.1)
+    machinist (1.0.6)
+    mail (2.2.15)
+      activesupport (>= 2.3.6)
+      i18n (>= 0.4.0)
+      mime-types (~> 1.16)
+      treetop (~> 1.4.8)
+    mime-types (1.16)
+    nokogiri (1.4.4)
+    polyglot (0.3.1)
+    rack (1.2.1)
+    rack-mount (0.6.13)
+      rack (>= 1.0.0)
+    rack-test (0.5.7)
+      rack (>= 1.0)
+    rails (3.0.5)
+      actionmailer (= 3.0.5)
+      actionpack (= 3.0.5)
+      activerecord (= 3.0.5)
+      activeresource (= 3.0.5)
+      activesupport (= 3.0.5)
+      bundler (~> 1.0)
+      railties (= 3.0.5)
+    railties (3.0.5)
+      actionpack (= 3.0.5)
+      activesupport (= 3.0.5)
+      rake (>= 0.8.7)
+      thor (~> 0.14.4)
+    rake (0.8.7)
+    rcov (0.9.9)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    rspec-rails (2.5.0)
+      actionpack (~> 3.0)
+      activesupport (~> 3.0)
+      railties (~> 3.0)
+      rspec (~> 2.5.0)
+    rubyzip (0.9.4)
+    selenium-webdriver (0.1.3)
+      childprocess (~> 0.1.5)
+      ffi (~> 0.6.3)
+      json_pure
+      rubyzip
+    sqlite3 (1.3.3)
+    sqlite3-ruby (1.3.3)
+      sqlite3 (>= 1.3.3)
+    term-ansicolor (1.0.5)
+    thor (0.14.6)
+    treetop (1.4.9)
+      polyglot (>= 0.3.1)
+    tzinfo (0.3.24)
+    xpath (0.1.3)
+      nokogiri (~> 1.3)
+    yard (0.6.4)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler
+  capybara
+  cucumber-rails (>= 0.3.2)
+  database_cleaner
+  factory_girl
+  git
+  machinist
+  pickle!
+  rack (~> 1.2.1)
+  rails (~> 3.0.5)
+  rcov
+  rspec-rails (~> 2.5.0)
+  sqlite3-ruby
+  yard

data/History.txt

@@ -1,3 +1,11 @@
+== 0.4.5
+development dependency upgrades
+
+* 2 minor improvements
+  * Simplify release process, and change Gemspec handling to facilitate faster failing when a development dep becomes incompatible [Ian White]
+  * Upgrade development to use rspec 2, and a rails 3 application for the features [Ian White]
+
+
 == 0.4.4
 large object space fix, and allow escaped quotes as string values
 

data/README.rdoc

@@ -331,16 +331,16 @@ can build up composite objects with ease
 
 == Run the tests
 
-To get all the dependencies required for developing pickle, do the following
+To run the specs and features, you can start from the last known good set of gem dependencies in Gemfile.lock.development:
 
-  bundle install
+  git clone http://github.com/ianwhite/pickle
+  cd pickle
+  cp Gemfile.lock.development Gemfile.lock
+  bundle
 
-To run the specs do:
+To run the specs & features do:
 
   bundle exec rake spec
-
-To run the features (rails 2.3 only ATM):
-
   bundle exec rake cucumber
 
 == Contributors

data/Rakefile.d/cucumber.rake

@@ -7,17 +7,19 @@ end
 
 desc "setup a rails app for running cucumber"
 file "cucumber_test_app" do
-  puts "** setting up cucumber test app ** (rails 2.3 only at present)"
+  puts "** setting up cucumber test app **"
   Rake::Task['cucumber:setup'].invoke
 end
 
 namespace :cucumber do
   task :setup do
     rm_rf "cucumber_test_app"
-    sh "rails cucumber_test_app"
+    sh "rails new cucumber_test_app"
     cd "cucumber_test_app" do
-      sh "script/generate rspec"
-      sh "script/generate cucumber"
+      sh "echo 'gem \"cucumber-rails\"' >> Gemfile"
+      sh "echo 'gem \"rspec-rails\"' >> Gemfile"
+      sh "echo 'gem \"capybara\"' >> Gemfile"
+      sh "bundle install"
     end
     sh "ln -s #{File.expand_path('.')} cucumber_test_app/vendor/plugins/pickle"
   end

data/Rakefile.d/release.rake

@@ -0,0 +1,44 @@
+# tasks for building and releasing the software
+require 'git'
+require 'pickle/version'
+
+task :build do
+  system "gem build pickle.gemspec"
+end
+
+namespace :release do
+  task :rubygems => :pre do
+    system "gem push pickle-#{Pickle::VERSION}.gem"
+  end
+  
+  task :github => :pre do
+    tag = "v#{Pickle::VERSION}"
+    git = Git.open('.')
+    
+    if (git.tag(tag) rescue nil)
+      raise "** repo is already tagged with: #{tag}"
+    end
+    
+    git.add_tag(tag)
+    git.push('origin', tag)
+  end
+  
+  task :pre => [:spec, :cucumber, :build] do
+    git = Git.open('.')
+    
+    if File.exists?("Gemfile.lock") && File.read("Gemfile.lock") != File.read("Gemfile.lock.development")
+      cp "Gemfile.lock", "Gemfile.lock.development"
+      raise "** Gemfile.lock.development has been updated, please commit these changes."
+    end
+    
+    if (git.status.changed + git.status.added + git.status.deleted).any?
+      raise "** repo is not clean, try committing some files"
+    end
+    
+    if git.object('HEAD').sha != git.object('origin/master').sha
+      raise "** origin does not match HEAD, have you pushed?"
+    end
+  end
+  
+  task :all => ['release:github', 'release:rubygems']
+end

data/Rakefile.d/rspec.rake

@@ -1,7 +1,3 @@
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
-desc "Run the specs"
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_files = FileList['spec/**/*_spec.rb']
-  t.spec_opts  = ["--colour"]
-end
+RSpec::Core::RakeTask.new(:spec)

data/autotest/discover.rb

@@ -0,0 +1,9 @@
+require 'autotest/bundler'
+
+Autotest.add_hook :initialize do |autotest|
+  %w{.git .DS_Store ._* vendor tmp email cucumber_test_app}.each do |exception|
+    autotest.add_exception(exception)
+  end
+end
+
+Autotest.add_discovery { "rspec2" }

data/features/app/app.rb

@@ -1,12 +1,12 @@
 # Routes
-ActionController::Routing::Routes.draw do |map|
-  map.resources :spoons, :controller => 'default'
-  map.resources :forks, :controller => 'default' do |fork|
-    fork.resources :tines, :controller => 'default' do |tine|
-      tine.resources :comments, :controller => 'default'
+Rails.application.routes.draw do
+  resources :spoons, :controller => 'default'
+  resources :forks, :controller => 'default' do
+    resources :tines, :controller => 'default' do
+      resources :comments, :controller => 'default'
     end
   end
-  map.resources :users, :controller => 'default'
+  resources :users, :controller => 'default'
 end
 
 # Migrations
@@ -98,25 +98,21 @@ end
 
 # notifiers
 class Notifier < ActionMailer::Base
-  include ActionController::UrlWriter
+  include Rails.application.routes.url_helpers
   
   # BC 2.1
-  if respond_to?(:view_paths)
-    view_paths << "#{File.dirname(__FILE__)}/views"
-  else
-    self.template_root = "#{File.dirname(__FILE__)}/views"
-  end
+  self.view_paths = "#{File.dirname(__FILE__)}/views"
   
   def user_email(user)
     @recipients  = user.email
     @subject     = 'A user email'
-    @body[:user] = user
-    @body[:path] = user_path(user)
+    @user = user
+    @path = user_path(user)
   end
   
   def email(to, subject, body)
     @recipients  = to
     @subject     = subject
-    @body[:body] = body
+    @body = body
   end
 end

data/features/generator/generators.feature

@@ -6,14 +6,14 @@ Feature: allow pickle to generate steps
 
   Scenario: script/generate pickle on fresh cuke install
     Given cucumber has been freshly generated
-    When I run "script/generate pickle -f"
+    When I run "rails g pickle -f"
     Then the file features/support/pickle.rb should exist
     And the file features/support/pickle.rb should match /require 'pickle\/world'/
     And the file features/step_definitions/pickle_steps.rb should be identical to the local step_definitions/pickle_steps.rb
     
   Scenario: script/generate pickle path on fresh cuke install
     Given cucumber has been freshly generated
-    When I run "script/generate pickle path -f"
+    When I run "rails g pickle --paths -f"
     Then the file features/support/pickle.rb should exist
     And the file features/support/pickle.rb should match /require 'pickle\/world'/
     And the file features/support/pickle.rb should match /require 'pickle\/path\/world'/
@@ -22,7 +22,7 @@ Feature: allow pickle to generate steps
 
   Scenario: script/generate pickle email on fresh cuke install
     Given cucumber has been freshly generated
-    When I run "script/generate pickle email -f"
+    When I run "rails g pickle --email -f"
     Then the file features/support/pickle.rb should exist
     And the file features/support/pickle.rb should match /require 'pickle\/world'/
     And the file features/support/pickle.rb should match /require 'pickle\/email\/world'/
@@ -32,7 +32,7 @@ Feature: allow pickle to generate steps
 
   Scenario: script/generate pickle path email on fresh cuke install
     Given cucumber has been freshly generated
-    When I run "script/generate pickle path email -f"
+    When I run "rails g pickle --paths --email -f"
     Then the file features/support/pickle.rb should exist
     And the file features/support/pickle.rb should be identical to the local support/pickle.rb
     And the file features/support/pickle.rb should match /require 'pickle\/world'/
@@ -46,7 +46,7 @@ Feature: allow pickle to generate steps
   Scenario: regenerating pickle
     Given cucumber has been freshly generated
     And pickle path email has been freshly generated
-    When I run "script/generate pickle path email -f"
+    When I run "rails g pickle --paths --email -f"
     Then the file features/support/pickle.rb should match /require 'pickle\/world'/
     And the file features/support/pickle.rb should match /require 'pickle\/path\/world'/
     And the file features/support/pickle.rb should match /require 'pickle\/email\/world'/

data/features/step_definitions/extra_email_steps.rb

@@ -1,7 +1,7 @@
 Given(/^an email "(.*?)" with body: "(.*?)" is delivered to (.+?)$/) do |subject, body, to|
-  Notifier.deliver_email(to, subject, body)
+  Notifier.email(to, subject, body).deliver
 end
 
 Given(/^#{capture_model}'s email is delivered$/) do |model|
-  Notifier.deliver_user_email(model(model))
+  Notifier.user_email(model!(model)).deliver
 end

data/features/step_definitions/generator_steps.rb

@@ -8,11 +8,11 @@ After('@gen') do
 end
 
 Given(/^cucumber has been freshly generated$/) do
-  `cd #{Rails.root}; script/generate cucumber -f --webrat`
+  `cd #{Rails.root}; rails g cucumber:install -f --capybara`
 end
 
 Given(/^pickle path email has been freshly generated$/) do
-  `cd #{Rails.root}; script/generate -f pickle paths email`
+  `cd #{Rails.root}; rails g pickle paths email -f`
 end
 
 Given(/^env\.rb already requires (.+)$/) do |file|

data/features/step_definitions/path_steps.rb

@@ -10,5 +10,5 @@ When(/^I go to (.+)$/) do |page|
 end
 
 Then(/^I should be at (.+)$/) do |page|
-  request.path.should =~ /#{path_to(page)}/
+  current_url.should =~ /#{path_to(page)}/
 end