da-suspenders 1.2.0 → 1.2.1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.2.1 (2012-02-03)
+ * Add --with-mongoid option to create an app with Mongoid instead of ActiveRecord/MySQL.
+ * Use bleeding edge versions of compass and compass-rails to make it work with Rails 3.2.
+ * Update gem dependency to Rails 3.2.1.
+ 
 ## 1.2.0 (2012-02-03)
  * Updated to use Rails 3.2.1
  * Removed ie6 and ie7 stylesheets.

data/Rakefile

@@ -19,11 +19,12 @@ namespace :test do
 end
 
 namespace :test_project do
-  desc 'Suspend a new project. Pass REPO=... to change the Suspenders repo (defaults to dir with Rakefile).'
+  desc 'Suspend a new project. Pass WITH_MONGOID=1 to use mongoid. Pass REPO=... to change the Suspenders repo (defaults to dir with Rakefile).'
   task :generate do
     FileUtils.rm_rf(TEST_PROJECT)
     repo = (ENV['REPO'] || "file://#{Dir.pwd}").to_s
-    sh 'ruby', 'bin/da-suspenders', 'create', TEST_PROJECT, repo
+    with_mongoid = ENV["WITH_MONGOID"] ? "--with-mongoid" : ""
+    sh 'ruby', 'bin/da-suspenders', 'create', TEST_PROJECT, with_mongoid, repo
   end
 
   desc 'Remove a suspended project'

data/bin/da-suspenders

@@ -6,13 +6,13 @@ require File.expand_path(File.dirname(__FILE__) + "/../lib/errors")
 include DaSuspenders::Errors
 
 def usage
-  "Usage: #{File.basename(__FILE__)} create new_project_name"
+  "Usage: #{File.basename(__FILE__)} create new_project_name [--with-mongoid]"
 end
 
 case ARGV[0]
 when 'create', '--create'
   begin
-    DaSuspenders::Create.run!(ARGV[1], ARGV[2])
+    DaSuspenders::Create.run!(ARGV[1], ARGV[2], ARGV[3])
   rescue DaSuspenders::InvalidInput => e
     error_with_message(e.message)
   end

data/da-suspenders.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = ">= 1.3.6"
 
-  s.add_dependency('rails', '3.0.7')
+  s.add_dependency('rails', '3.2.1')
   s.add_dependency('bundler', '~> 1.0.10')
   s.add_dependency('trout', '~> 0.3')
 

data/features/running_cucumber.feature

@@ -1,23 +1,41 @@
 Feature: Running cucumber in the generated project
   
-  Scenario: jQuery and Modernizr work in the generated project
+  Scenario: The generated project works correctly
     Given I drop and create the required databases
     And I generate "scaffold user username:string"
     And I run the rake task "db:migrate"
-    And I create a file named "features/js_test.feature" with:
+    And I create a file named "features/test.feature" with:
       """
-      Feature: Javascript
+      Feature: The application works correctly
+      
         @javascript
-        Scenario: Test jQuery and Modernizr
+        Scenario: jQuery and Modernizr work correctly
           When I visit the users page
           Then the javascript expression "$('html').hasClass('js')" should return "true"
           And the javascript expression "$('html').hasClass('no-js')" should return "false"
+
+        Scenario: Stylesheets are generated correctly
+          Given there are no cached assets
+          When I visit the application stylesheet
+          Then it should contain the css rules from formtastic
       """
-    And I create a file named "features/step_definitions/user_steps.rb" with:
+    And I create a file named "features/step_definitions/test_steps.rb" with:
       """
       When /^I visit the users page/ do
         visit "/users"
       end
+      
+      Given /^there are no cached assets$/ do
+        FileUtils.rm_rf ["#{Rails.root}/tmp/cache/assets", "#{Rails.root}/tmp/cache/sass"]
+      end
+
+      When /^I visit the application stylesheet$/ do
+        visit "/assets/application.css"
+      end
+
+      Then /^it should contain the css rules from formtastic$/ do
+        page.should have_content ".formtastic"
+      end
       """
     When I run the rake task "cucumber"
     Then I see a successful response in the shell

data/lib/create.rb

@@ -5,18 +5,20 @@ require File.expand_path(File.dirname(__FILE__) + "/errors")
 
 module DaSuspenders
   class Create
-    attr_accessor :project_path, :repo
+    attr_accessor :project_path, :with_mongoid, :repo
 
-    def self.run!(project_path, repo)
-      creator = self.new(project_path, repo)
+    def self.run!(project_path, with_mongoid, repo)
+      creator = self.new(project_path, with_mongoid == "--with-mongoid", repo)
       creator.create_project!
     end
 
-    def initialize(project_path, repo)
+    def initialize(project_path, with_mongoid, repo)
       self.project_path = project_path
+      self.with_mongoid = with_mongoid
       self.repo = repo
       validate_project_path
       validate_project_name
+      check_for_mongod_process if with_mongoid
     end
 
     def create_project!
@@ -24,9 +26,11 @@ module DaSuspenders
         rails new #{project_path} \
           --template="#{template}" \
           --database=mysql \
-          --skip-test-unit
+          --skip-test-unit \
+          #{'--skip-active-record' if with_mongoid}
       COMMAND
       ENV["REPO"] = repo if repo
+      ENV["WITH_MONGOID"] = "1" if with_mongoid
       exec(command)
     end
 
@@ -50,6 +54,12 @@ module DaSuspenders
       end
     end
 
+    def check_for_mongod_process
+      unless system("ps aux | grep mongod | grep -vq grep")
+        raise InvalidInput.new("mongod process not found (mongod must be running when using --with-mongoid)")
+      end
+    end
+    
     def template
       File.expand_path(File.dirname(__FILE__) + "/../template/da-suspenders.rb")
     end

data/lib/da-suspenders/version.rb

@@ -1,3 +1,3 @@
 module DaSuspenders
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

data/template/da-suspenders.rb

@@ -30,6 +30,13 @@ end
 def create_gemfile_and_install_gems
   say "Creating Gemfile and installing gems (this may take a while)", :yellow
   trout "Gemfile"
+  if ENV["WITH_MONGOID"]
+    inject_into_file "Gemfile",
+                     %Q{gem "mongoid", "~> 2.4"\n} +
+                     %Q{gem "bson_ext", "~> 1.5"},
+                     :after => 'gem "mysql"'
+    gsub_file "Gemfile", 'gem "mysql"', ""
+  end
   run "bundle install"
 end
   
@@ -85,6 +92,11 @@ def create_application_layout_and_views
   trout "app/views/shared/_flashes.html.erb"
 end
 
+def install_mongoid
+  say "Installing Mongoid", :yellow
+  generate "mongoid:config"
+end
+
 def install_misc_support_files
   say "Installing miscellaneous support files", :yellow
   trout "config/initializers/errors.rb"
@@ -135,12 +147,13 @@ end
 
 create_gemfile_and_install_gems
 add_staging_environment
-setup_database
+setup_database unless ENV["WITH_MONGOID"]
 setup_german_locale
 setup_viennese_timezone
-disable_timestamped_migrations
+disable_timestamped_migrations unless ENV["WITH_MONGOID"]
 update_generators_config
 create_application_layout_and_views
+install_mongoid if ENV["WITH_MONGOID"]
 install_misc_support_files
 install_app_config
 install_compass

data/template/trout/Gemfile

@@ -11,7 +11,8 @@ group :assets do
   gem 'sass-rails',   '~> 3.2.3'
   gem 'coffee-rails', '~> 3.2.1'
   gem 'uglifier', '>= 1.0.3'
-  gem "compass", "~> 0.12.rc.0"
+  gem 'compass', :git => 'git://github.com/chriseppstein/compass.git', :branch => 'no_rails_integration'
+  gem 'compass-rails', :git => 'git://github.com/Compass/compass-rails.git'
 end
 
 gem "app_config", :git => "git://github.com/die-antwort/app_config.git"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: da-suspenders
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 29
   prerelease: 
   segments: 
   - 1
   - 2
-  - 0
-  version: 1.2.0
+  - 1
+  version: 1.2.1
 platform: ruby
 authors: 
 - thoughtbot
@@ -26,12 +26,12 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 13
         segments: 
         - 3
-        - 0
-        - 7
-        version: 3.0.7
+        - 2
+        - 1
+        version: 3.2.1
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency