terraformation 0.1.2 → 0.1.3

data/Rakefile

@@ -4,8 +4,8 @@ require 'fileutils'
 
 spec = Gem::Specification.new do |s|
   s.name = "terraformation"
-  s.version = "0.1.2"
-  s.summary = "Terraform your app with style"
+  s.version = "0.1.3"
+  s.summary = "Generators with a Hashrocket twist"
   s.email = "info@hashrocket.com"
   s.homepage = "http://github.com/hashrocket/terraformation"
   s.has_rdoc = false
@@ -13,6 +13,10 @@ spec = Gem::Specification.new do |s|
   s.files = %w( LICENSE README.rdoc Rakefile ) + Dir["{bin,rails_generators}/**/*"].sort
   s.extra_rdoc_files = ["README.rdoc", "LICENSE"]
   s.executables = ["terrarails"]
+  s.add_dependency("haml", "2.2.14")
+  s.add_dependency("rspec-rails", "1.2.9")
+  s.add_dependency("cucumber", "0.4.4")
+  s.add_dependency("webrat", "0.5.3")
 end
 
 Rake::GemPackageTask.new(spec) do |package|

data/bin/terrarails

@@ -73,14 +73,14 @@ generate 'terraformation', '--skip', '--full'
 
 gsub_file 'app/helpers/application_helper.rb', /\A# Methods added to this .*\n/, ''
 gsub_file 'config/environment.rb', /(?:^\s*# config\.gem .*\n)+/, <<-EOS
-  config.gem "haml",        :version => ">= 2.2.3"
-  config.gem "rspec-rails", :version => ">= 1.2.7.1", :lib => false
-  config.gem "cucumber",    :version => ">= 0.3.99",  :lib => false
-  config.gem "webrat",      :version => ">= 0.5.3",   :lib => false
+  config.gem 'haml',        :version => '2.2.14'
+  config.gem 'rspec-rails', :version => '1.2.9', :lib => false
+  config.gem 'cucumber',    :version => '0.4.4', :lib => false
+  config.gem 'webrat',      :version => '0.5.3', :lib => false
 EOS
 gsub_file 'config/routes.rb', /^(ActionController::Routing::Routes\.draw do \|map\|\n)(?:^\s*\n|^\s*#.*\n)*/, '\\1'
 
-reformat *Dir.glob('config/environments/*.rb')
+reformat(*Dir.glob('config/environments/*.rb'))
 reformat 'config/environment.rb', 'config/routes.rb', 'config/boot.rb', 'config/initializers/session_store.rb', 'script/about'
 
 if added_cucumber

data/rails_generators/terraformation/templates/application.html.haml.erb

@@ -1,11 +1,11 @@
 !!!
-%html{html_attrs}
+%html{html_attrs(I18n.locale)}
   %head
-    %meta{'http-equiv' => 'Content-Type', :content => 'text/html;charset=utf-8'}
-    %meta{'http-equiv' => 'Content-Script-Type', :content => 'text/javascript'}
+    %meta(http-equiv='Content-Type' content='text/html;charset=utf-8')
+    %meta(http-equiv='Content-Script-Type' content='text/javascript')
     - if protect_against_forgery?
-      %meta{:name => 'authenticity_token', :content => form_authenticity_token}
-    %title= h(@title || "<%= File.basename(destination_path('')).gsub('_', ' ').capitalize %>")
+      %meta(name='authenticity_token' content=form_authenticity_token)
+    %title&= @title || "<%= File.basename(destination_path('')).gsub('_', ' ').capitalize %>"
 <% if exist?("public/stylesheets/blueprint") -%>
     = stylesheet_link_tag 'blueprint/screen', :media => 'screen, projection'
     = stylesheet_link_tag 'blueprint/print', :media => 'print'

data/rails_generators/terraformation/templates/cucumber.rake

@@ -1,16 +1,25 @@
-$LOAD_PATH.unshift(RAILS_ROOT + '/vendor/plugins/cucumber/lib') if File.directory?(RAILS_ROOT + '/vendor/plugins/cucumber/lib')
+# Find vendored gem or plugin of cucumber
+vendored_cucumber_dir = Dir["#{RAILS_ROOT}/vendor/{gems,plugins}/cucumber*"].first
+$LOAD_PATH.unshift("#{vendored_cucumber_dir}/lib") unless vendored_cucumber_dir.nil?
 
 unless ARGV.any? {|a| a =~ /^gems/}
 
 begin
   require 'cucumber/rake/task'
+
+  # Use vendored cucumber binary if possible. If it's not vendored,
+  # Cucumber::Rake::Task will automatically use installed gem's cucumber binary
+  vendored_cucumber_binary = "#{vendored_cucumber_dir}/bin/cucumber" unless vendored_cucumber_dir.nil?
+
   namespace :cucumber do
     Cucumber::Rake::Task.new({:ok => 'db:test:prepare'}, 'Run features that should pass') do |t|
+      t.binary = vendored_cucumber_binary
       t.fork = true # You may get faster startup if you set this to false
       t.cucumber_opts = "--tags ~@wip --strict --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
     end
 
     Cucumber::Rake::Task.new({:wip => 'db:test:prepare'}, 'Run features that are being worked on') do |t|
+      t.binary = vendored_cucumber_binary
       t.fork = true # You may get faster startup if you set this to false
       t.cucumber_opts = "--tags @wip:2 --wip --format #{ENV['CUCUMBER_FORMAT'] || 'pretty'}"
     end

data/rails_generators/terraformation/templates/paths.rb

@@ -17,7 +17,4 @@ module NavigationHelpers
   end
 end
 
-World do |world|
-  world.extend NavigationHelpers
-  world
-end
+World(NavigationHelpers)

data/rails_generators/terraformation/templates/spec_helper.rb

@@ -1,8 +1,10 @@
-ENV["RAILS_ENV"] = "test"
-require File.expand_path(File.dirname(__FILE__) + "/../config/environment")
-require 'spec'
+ENV["RAILS_ENV"] ||= 'test'
+require File.expand_path(File.join(File.dirname(__FILE__),'..','config','environment'))
+require 'spec/autorun'
 require 'spec/rails'
 
+Dir[File.expand_path(File.join(File.dirname(__FILE__),'support','**','*.rb'))].each {|f| require f}
+
 Spec::Runner.configure do |config|
   config.use_transactional_fixtures = true
   config.use_instantiated_fixtures  = false

data/rails_generators/terraformation/terraformation_generator.rb

@@ -43,7 +43,6 @@ class TerraformationGenerator < Rails::Generator::Base
 
         m.file      'rspec:script/autospec',         'script/autospec',    script_options
         m.file      'rspec:script/spec',             'script/spec',        script_options
-        m.file      'rspec:script/spec_server',      'script/spec_server', script_options
 
         m.directory 'spec'
         m.file      'rcov.opts',                     'spec/rcov.opts'
@@ -52,8 +51,9 @@ class TerraformationGenerator < Rails::Generator::Base
       end
 
       if option?(:cucumber)
+        require 'cucumber' # for Cucumber::VERSION
         m.file      'cucumber.rake',                 'lib/tasks/cucumber.rake'
-        m.file      'cucumber',                      'script/cucumber',    script_options
+        m.file      'cucumber:cucumber',             'script/cucumber', script_options
         m.file      'cucumber_environment.rb',       'config/environments/cucumber.rb'
 
         m.directory 'features'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: terraformation
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors: 
 - Hashrocket
@@ -9,10 +9,49 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-22 00:00:00 -05:00
+date: 2009-11-28 00:00:00 -05:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: haml
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 2.2.14
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: rspec-rails
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 1.2.9
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: cucumber
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.4.4
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: webrat
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - "="
+      - !ruby/object:Gem::Version 
+        version: 0.5.3
+    version: 
 description: 
 email: info@hashrocket.com
 executables: 
@@ -42,7 +81,6 @@ files:
 - rails_generators/terraformation/templates/blueprint/print.css
 - rails_generators/terraformation/templates/blueprint/screen.css
 - rails_generators/terraformation/templates/clear_test_default.rake
-- rails_generators/terraformation/templates/cucumber
 - rails_generators/terraformation/templates/cucumber.rake
 - rails_generators/terraformation/templates/cucumber_environment.rb
 - rails_generators/terraformation/templates/gitignore
@@ -106,6 +144,6 @@ rubyforge_project:
 rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
-summary: Terraform your app with style
+summary: Generators with a Hashrocket twist
 test_files: []
 

data/rails_generators/terraformation/templates/cucumber

@@ -1,9 +0,0 @@
-#!/usr/bin/env ruby
-begin
-  load File.expand_path(File.dirname(__FILE__) + "/../vendor/plugins/cucumber/bin/cucumber")
-rescue LoadError => e
-  raise unless e.to_s =~ /cucumber/
-  require 'rubygems'
-  require 'cucumber'
-  load Cucumber::BINARY
-end