terraformation 0.2.1 → 0.2.2

data/Rakefile

@@ -2,18 +2,7 @@ require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'fileutils'
 
-spec = Gem::Specification.new do |s|
-  s.name = "terraformation"
-  s.version = "0.2.1"
-  s.summary = "Generators with a Hashrocket twist"
-  s.email = "info@hashrocket.com"
-  s.homepage = "http://github.com/hashrocket/terraformation"
-  s.has_rdoc = false
-  s.authors = ["Hashrocket"]
-  s.files = %w( LICENSE README.rdoc Rakefile ) + Dir["{bin,rails_generators}/**/*"].sort
-  s.extra_rdoc_files = ["README.rdoc", "LICENSE"]
-  s.executables = ["terrarails"]
-end
+spec = eval(File.read(File.join(File.dirname(__FILE__), 'terraformation.gemspec')))
 
 Rake::GemPackageTask.new(spec) do |package|
   package.gem_spec = spec

data/bin/terrarails

@@ -8,7 +8,12 @@ if instance_of?(Object) # Invoked directly
   elsif ARGV.empty?
     exec('rake', 'rails:template', "LOCATION=#{__FILE__}")
   else
-    exec('rails', '--template', __FILE__, *ARGV)
+    require 'rails/version'
+    if Rails::VERSION::MAJOR >= 3
+      exec('rails', 'new', *ARGV + ['--template', __FILE__])
+    else
+      exec('rails', '--template', __FILE__, *ARGV)
+    end
   end
 end
 
@@ -32,10 +37,10 @@ def self.reformat(*files)
   end
 end
 
-unless File.exist?('config/database.example.yml')
+if File.exist?('config/database.example.yml') && !File.exist?('config/database.example.yml')
   file 'config/database.example.yml', File.read('config/database.yml')
 end
-adapter = YAML.load(File.read('config/database.yml'))['development']['adapter']
+adapter = YAML.load(File.read('config/database.yml'))['development']['adapter'] rescue 'sqlite3'
 
 unlink 'test/performance/browsing_test.rb'
 %w(test/fixtures test/functional test/integration test/performance test/unit).each do |d|
@@ -59,7 +64,11 @@ end
 unlink 'public/images/rails.png'
 unlink 'public/index.html'
 
-application_name = File.basename(root).gsub('_',' ').capitalize
+if respond_to?(:root)
+  application_name = File.basename(root).gsub('_',' ').capitalize
+else
+  application_name = app_name.capitalize
+end
 if File.size('README') == 10011
   unlink 'README'
   file   'README', "= #{application_name}\n"

data/rails_generators/terraformation/templates/web_steps.rb

@@ -10,19 +10,19 @@ When /^I go to (.+)$/ do |page_name|
   visit path_to(page_name)
 end
 
-When /^I press "([^\"]*)"$/ do |button, selector|
+When /^I press "([^\"]*)"$/ do |button|
   click_button(button)
 end
 
-When /^I follow "([^\"]*)"$/ do |link, selector|
+When /^I follow "([^\"]*)"$/ do |link|
   click_link(link)
 end
 
-When /^I fill in "([^\"]*)" with "([^\"]*)"$/ do |field, value, selector|
+When /^I fill in "([^\"]*)" with "([^\"]*)"$/ do |field, value|
   fill_in(field, :with => value)
 end
 
-When /^I fill in "([^\"]*)" for "([^\"]*)"$/ do |value, field, selector|
+When /^I fill in "([^\"]*)" for "([^\"]*)"$/ do |value, field|
   fill_in(field, :with => value)
 end
 
@@ -37,29 +37,29 @@ end
 # TODO: Add support for checkbox, select og option
 # based on naming conventions.
 #
-When /^I fill in the following:$/ do |selector, fields|
+When /^I fill in the following:$/ do |fields|
   fields.rows_hash.each do |name, value|
     When %{I fill in "#{name}" with "#{value}"}
   end
 end
 
-When /^I select "([^\"]*)" from "([^\"]*)"$/ do |value, field, selector|
+When /^I select "([^\"]*)" from "([^\"]*)"$/ do |value, field|
   select(value, :from => field)
 end
 
-When /^I check "([^\"]*)"$/ do |field, selector|
+When /^I check "([^\"]*)"$/ do |field|
   check(field)
 end
 
-When /^I uncheck "([^\"]*)"$/ do |field, selector|
+When /^I uncheck "([^\"]*)"$/ do |field|
   uncheck(field)
 end
 
-When /^I choose "([^\"]*)"$/ do |field, selector|
+When /^I choose "([^\"]*)"$/ do |field|
   choose(field)
 end
 
-When /^I attach the file "([^\"]*)" to "([^\"]*)"$/ do |path, field, selector|
+When /^I attach the file "([^\"]*)" to "([^\"]*)"$/ do |path, field|
   attach_file(field, path)
 end
 
@@ -70,42 +70,42 @@ Then /^I should see JSON:$/ do |expected_json|
   expected.should == actual
 end
 
-Then /^I should see "([^\"]*)"$/ do |text, selector|
+Then /^I should see "([^\"]*)"$/ do |text|
   page.should have_content(text)
 end
 
-Then /^I should see \/([^\/]*)\/$/ do |regexp, selector|
+Then /^I should see \/([^\/]*)\/$/ do |regexp|
   regexp = Regexp.new(regexp)
   page.should have_xpath('//*', :text => regexp)
 end
 
-Then /^I should not see "([^\"]*)"$/ do |text, selector|
+Then /^I should not see "([^\"]*)"$/ do |text|
   page.should have_no_content(text)
 end
 
-Then /^I should not see \/([^\/]*)\/$/ do |regexp, selector|
+Then /^I should not see \/([^\/]*)\/$/ do |regexp|
   regexp = Regexp.new(regexp)
   page.should have_no_xpath('//*', :text => regexp)
 end
 
-Then /^the "([^\"]*)" field should contain "([^\"]*)"$/ do |field, selector, value|
+Then /^the "([^\"]*)" field should contain "([^\"]*)"$/ do |field, value|
   field = find_field(field)
   field_value = (field.tag_name == 'textarea') ? field.text : field.value
   field_value.should =~ /#{value}/
 end
 
-Then /^the "([^\"]*)" field should not contain "([^\"]*)"$/ do |field, selector, value|
+Then /^the "([^\"]*)" field should not contain "([^\"]*)"$/ do |field, value|
   field = find_field(field)
   field_value = (field.tag_name == 'textarea') ? field.text : field.value
   field_value.should_not =~ /#{value}/
 end
 
-Then /^the "([^\"]*)" checkbox should be checked$/ do |label, selector|
+Then /^the "([^\"]*)" checkbox should be checked$/ do |label|
   field_checked = find_field(label)['checked']
   field_checked.should == 'checked'
 end
 
-Then /^the "([^\"]*)" checkbox should not be checked$/ do |label, selector|
+Then /^the "([^\"]*)" checkbox should not be checked$/ do |label|
   field_checked = find_field(label)['checked']
   field_checked.should_not == 'checked'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 1
-  version: 0.2.1
+  - 2
+  version: 0.2.2
 platform: ruby
 authors: 
 - Hashrocket
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-01 00:00:00 -04:00
+date: 2011-02-07 00:00:00 -05:00
 default_executable: 
 dependencies: []
 
@@ -97,6 +97,7 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -104,6 +105,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
@@ -113,7 +115,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Generators with a Hashrocket twist