rails_apps_composer 1.1.6 → 1.1.7

data/README.textile

@@ -72,7 +72,7 @@ $ rails_apps_composer new myapp -r haml
 For example, to build the "rails3-mongoid-devise":http://github.com/RailsApps/rails3-mongoid-devise/ example application, run the command:
 
 <pre>
-$ rails_apps_composer new myapp -r haml rspec cucumber guard mongoid action_mailer devise add_user home_page home_page_users seed_database users_page css_setup html5 navigation cleanup extras git
+$ rails_apps_composer new myapp -r haml rspec cucumber guard mongoid action_mailer devise add_user home_page home_page_users seed_database users_page html5 navigation cleanup extras git
 </pre>
 
 Replace @myapp@ with the name you want for your application.
@@ -120,7 +120,7 @@ h4. Template for Rails 3 + Devise + RSpec + Cucumber
 To build a reusable application template for the "rails3-devise-rspec-cucumber":http://github.com/RailsApps/rails3-devise-rspec-cucumber/ example application, run the command:
 
 <pre>
-$ rake print --silent RECIPES=haml,rspec,cucumber,guard,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,css_setup,html5,navigation,cleanup,extras,git > ~/Desktop/template.txt
+$ rake print --silent RECIPES=haml,rspec,cucumber,guard,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,html5,navigation,cleanup,extras,git > ~/Desktop/template.txt
 </pre>
 
 Then generate the application using the @-T@ flag.
@@ -134,7 +134,7 @@ h4. Template for Rails 3 + Mongoid + Devise
 To build a reusable application template for the "rails3-mongoid-devise":http://github.com/RailsApps/rails3-mongoid-devise/ example application, run the command:
 
 <pre>
-$ rake print --silent RECIPES=haml,rspec,cucumber,guard,mongoid,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,css_setup,html5,navigation,cleanup,extras,git > ~/Desktop/template.txt
+$ rake print --silent RECIPES=haml,rspec,cucumber,guard,mongoid,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,html5,navigation,cleanup,extras,git > ~/Desktop/template.txt
 </pre>
 
 Then generate the application using the @-T -O@ flags.
@@ -148,7 +148,7 @@ h4. Template for Rails 3 + Mongoid + OmniAuth
 To build a reusable application template for the "rails3-mongoid-omniauth":http://github.com/RailsApps/rails3-mongoid-omniauth/ example application, run the command:
 
 <pre>
-$ rake print --silent RECIPES=haml,rspec,cucumber,guard,mongoid,seed_database,add_user,omniauth,home_page,home_page_users,css_setup,html5,navigation,users_page,omniauth_email,cleanup,extras,git > ~/Desktop/template.txt
+$ rake print --silent RECIPES=haml,rspec,cucumber,guard,mongoid,seed_database,add_user,omniauth,home_page,home_page_users,html5,navigation,users_page,omniauth_email,cleanup,extras,git > ~/Desktop/template.txt
 </pre>
 
 Then generate the application using the @-T -O@ flags.
@@ -162,7 +162,7 @@ h4. Template for Rails 3 + Subdomains
 To build a reusable application template for the "rails3-subdomains":https://github.com/RailsApps/rails3-subdomains example application, run the command:
 
 <pre>
-$ rake print --silent RECIPES=haml,rspec,cucumber,guard,mongoid,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,css_setup,subdomains,html5,navigation,cleanup,extras,git > ~/Desktop/template.txt
+$ rake print --silent RECIPES=haml,rspec,cucumber,guard,mongoid,action_mailer,devise,add_user,home_page,home_page_users,seed_database,users_page,subdomains,html5,navigation,cleanup,extras,git > ~/Desktop/template.txt
 </pre>
 
 Then generate the application using the @-T -O@ flags.
@@ -244,15 +244,21 @@ Any issues? Please create a "GitHub issue":http://github.com/RailsApps/rails_app
 
 h2. Credits
 
-This project is based on "Michael Bleigh's RailsWizard gem":https://github.com/intridea/rails_wizard. The original idea for a RailsWizard and the innovative implementation is the work of Michael Bleigh.
+Daniel Kehoe maintains this gem as part of the "RailsApps Project":http://railsapps.github.com/.
+
+This gem is based on "Michael Bleigh's RailsWizard gem":https://github.com/intridea/rails_wizard. The original idea for a RailsWizard and the innovative implementation is the work of Michael Bleigh.
 
 "Fletcher Nichol's":http://silversky.ca/ project  "fnichol/rails-template-recipes":https://github.com/fnichol/rails-template-recipes provides the basis for several recipes.
 
-RSpec, Cucumber, and Yard recipes were contributed by "Ramon Brooker":http://cogniton-mind.tumblr.com/.
+h4. Contributors
 
-Guard recipe contributed by "Ashley Woodard":https://github.com/ashley-woodard.
+* 'inherited_resources' and 'simple_form' recipes contributed by gmgp
+* Slim recipe contributed by "Claudio B.":https://github.com/claudiob
+* MongoLab recipe contributed by "Leo Lou":https://github.com/l4u
+* RSpec, Cucumber, and Yard recipes contributed by "Ramon Brooker":http://cogniton-mind.tumblr.com/.
+* Compass, Backbone, and Guard recipes contributed by "Ashley Woodard":https://github.com/ashley-woodard.
 
-Additional recipes by Daniel Kehoe, "http://danielkehoe.com/":http://danielkehoe.com/.
+h4. What You Can Do
 
 Is the gem useful to you? Follow the project on Twitter:
 "@rails_apps":http://twitter.com/rails_apps

data/recipes/cleanup.rb

@@ -19,11 +19,15 @@ after_bundler do
   gsub_file "README", /App_Name/, "#{app_name.humanize.titleize}"
   gsub_file "README.textile", /App_Name/, "#{app_name.humanize.titleize}"
 
-  # remove commented lines from Gemfile
+  # remove commented lines and multiple blank lines from Gemfile
   # thanks to https://github.com/perfectline/template-bucket/blob/master/cleanup.rb
-  gsub_file "Gemfile", /#.*\n/, "\n"
-  gsub_file "Gemfile", /\n+/, "\n"
+  gsub_file 'Gemfile', /#.*\n/, "\n"
+  gsub_file 'Gemfile', /\n^\s*\n/, "\n"
 
+  # remove commented lines and multiple blank lines from config/routes.rb
+  gsub_file 'config/routes.rb', /  #.*\n/, "\n"
+  gsub_file 'config/routes.rb', /\n^\s*\n/, "\n"
+  
 end
 
 __END__

data/recipes/home_page.rb

@@ -33,6 +33,17 @@ ERB
   # set routes
   gsub_file 'config/routes.rb', /get \"home\/index\"/, 'root :to => "home#index"'
 
+  if recipes.include? 'devise'
+    inject_into_file 'config/routes.rb', :before => "  root :to" do 
+    <<-RUBY
+  authenticated :user do
+    root :to => 'home#index'
+  end
+\n  
+RUBY
+    end
+  end
+
 end
 
 __END__

data/recipes/html5.rb

@@ -2,30 +2,48 @@
 # https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/html5.rb
 
 case config['css_option']
+
   when 'foundation'
     # https://github.com/zurb/foundation-rails
     gem 'zurb-foundation'
-  when 'bootstrap'
+
+  when 'bootstrap_less'
+    # https://github.com/seyhunak/twitter-bootstrap-rails
+    # http://railscasts.com/episodes/328-twitter-bootstrap-basics
+    gem 'twitter-bootstrap-rails', '~> 2.0.3', :group => :assets
+    recipes << 'bootstrap'
+
+  when 'bootstrap_sass'
     # https://github.com/thomas-mcdonald/bootstrap-sass
     # http://rubysource.com/twitter-bootstrap-less-and-sass-understanding-your-options-for-rails-3-1/
     gem 'bootstrap-sass', '~> 2.0.1'
+    recipes << 'bootstrap'
+
 end
 after_bundler do
   say_wizard "HTML5 recipe running 'after bundler'"
   # add a humans.txt file
   get "https://raw.github.com/RailsApps/rails3-application-templates/master/files/humans.txt", "public/humans.txt"
   # install a front-end framework for HTML5 and CSS3
+  remove_file 'app/assets/stylesheets/application.css'
+  get 'https://raw.github.com/gist/1974706/f22d3bd5940e173707c6f7c3e5716eeb36882a08/application.css.scss', 'app/assets/stylesheets/application.css.scss'
   case config['css_option']
-    when 'nothing'
-      say_wizard "no HTML5 front-end framework selected"
+
+    when 'bootstrap_less'
+      say_wizard "installing Twitter Bootstrap HTML5 framework (less) "
+      generate 'bootstrap:install'
+      remove_file 'app/assets/stylesheets/application.css'
+
+    when 'bootstrap_sass'
+      say_wizard "installing Twitter Bootstrap HTML5 framework (sass) "
+      insert_into_file "app/assets/javascripts/application.js", "//= require bootstrap\n", :after => "jquery_ujs\n"
+      create_file "app/assets/stylesheets/bootstrap_and_overrides.css.scss", "\n@import 'bootstrap';\n"
+
     when 'foundation'
       say_wizard "installing Zurb Foundation HTML5 framework"
       insert_into_file "app/assets/javascripts/application.js", "//= require foundation\n", :after => "jquery_ujs\n"
       insert_into_file "app/assets/stylesheets/application.css.scss", " *= require foundation\n", :after => "require_self\n"
-    when 'bootstrap'
-      say_wizard "installing Twitter Bootstrap HTML5 framework"
-      insert_into_file "app/assets/javascripts/application.js", "//= require bootstrap\n", :after => "jquery_ujs\n"
-      insert_into_file "app/assets/stylesheets/application.css.scss", "\n@import 'bootstrap';\n", :after => "*/\n"
+
     when 'skeleton'
       say_wizard "installing Skeleton HTML5 framework"
       get "https://raw.github.com/necolas/normalize.css/master/normalize.css", "app/assets/stylesheets/normalize.css.scss"
@@ -33,9 +51,14 @@ after_bundler do
       get "https://raw.github.com/dhgamache/Skeleton/master/stylesheets/layout.css", "app/assets/stylesheets/layout.css.scss"
       get "https://raw.github.com/dhgamache/Skeleton/master/stylesheets/skeleton.css", "app/assets/stylesheets/skeleton.css.scss"
       get "https://raw.github.com/dhgamache/Skeleton/master/javascripts/tabs.js", "app/assets/javascripts/tabs.js"
+
     when 'normalize'
       say_wizard "normalizing CSS for consistent styling"
       get "https://raw.github.com/necolas/normalize.css/master/normalize.css", "app/assets/stylesheets/normalize.css.scss"
+
+    when 'nothing'
+      say_wizard "no HTML5 front-end framework selected"
+
   end
   # Set up the default application layout
   if recipes.include? 'haml'
@@ -66,5 +89,4 @@ config:
   - css_option:
       type: multiple_choice
       prompt: "Which front-end framework would you like for HTML5 and CSS?"
-      choices: [["None", nothing], ["Zurb Foundation", foundation], ["Twitter Bootstrap", bootstrap], ["Skeleton", skeleton], ["Just normalize CSS for consistent styling", normalize]]
-
+      choices: [["None", nothing], ["Zurb Foundation", foundation], ["Twitter Bootstrap (less)", bootstrap_less], ["Twitter Bootstrap (sass)", bootstrap_sass], ["Skeleton", skeleton], ["Just normalize CSS for consistent styling", normalize]]

data/recipes/inherited_resources.rb

@@ -0,0 +1,23 @@
+# Application template recipe for the rails_apps_composer. Check for a newer version here:
+# https://github.com/gmgp/rails_apps_composer/blob/master/recipes/inherited_resources.rb
+
+if config['inherited_resources']
+  gem 'inherited_resources'
+else
+  recipes.delete('inherited_resources')
+end
+
+
+__END__
+
+name: InheritedResources
+description: "Include inherited_resources "
+author: Gmgp
+
+category: other
+tags: [utilities, configuration]
+
+config:
+  - inherited_resources:
+      type: boolean
+      prompt: Would you like to use 'inherited_resources'?

data/recipes/seed_database.rb

@@ -27,20 +27,25 @@ FILE
   end
 
   if recipes.include? 'devise'
-    # create a default user
-    append_file 'db/seeds.rb' do <<-FILE
+    if recipes.include? 'devise-confirmable'
+      append_file 'db/seeds.rb' do <<-FILE
+puts 'SETTING UP DEFAULT USER LOGIN'
+user = User.create! :name => 'First User', :email => 'user@example.com', :password => 'please', :password_confirmation => 'please', :confirmed_at => DateTime.now
+puts 'New user created: ' << user.name
+FILE
+      end
+    else
+      append_file 'db/seeds.rb' do <<-FILE
 puts 'SETTING UP DEFAULT USER LOGIN'
 user = User.create! :name => 'First User', :email => 'user@example.com', :password => 'please', :password_confirmation => 'please'
 puts 'New user created: ' << user.name
 FILE
-    end
-    if recipes.include? 'devise-confirmable'
-      gsub_file 'db/seeds.rb', /:password_confirmation => 'please'/, ":password_confirmation => 'please', :confirmed_at => DateTime.now"
+      end
     end
   end
-
+  
   run 'bundle exec rake db:seed'
-
+  
 end
 
 __END__

data/recipes/simple_form.rb

@@ -0,0 +1,54 @@
+# Application template recipe for the rails_apps_composer. Check for a newer version here:
+# https://github.com/gmgp/rails_apps_composer/blob/master/recipes/simple_form.rb
+
+case config['form_option']
+  when 'no'
+    say_wizard "Form help recipe skipped."
+  when 'simple_form'
+    gem 'simple_form'
+    # for external test
+    recipes << 'simple_form'
+  when 'simple_form_bootstrap'
+    gem 'simple_form'
+    # for external test
+    recipes << 'simple_form'
+    recipes << 'simple_form_bootstrap'
+  else
+    say_wizard "Form help recipe skipped."
+end
+
+
+
+after_bundler do
+
+  say_wizard "Simple form recipe running 'after bundler'"
+
+  case config['form_option']
+    when 'simple_form'
+      generate 'simple_form:install'
+    when 'simple_form_bootstrap'
+      if recipes.include? 'bootstrap'
+        generate 'simple_form:install --bootstrap'
+      else
+        say_wizard "Bootstrap not found."
+      end
+  end
+end
+
+
+__END__
+
+name: SimpleForm
+description: "Check for 'simple_form'."
+author: Gmgp
+
+category: other
+tags: [utilities, configuration]
+
+before: [html5]
+
+config:
+  - form_option:
+      type: multiple_choice
+      prompt: "Which form gem would you like?"
+      choices: [["None", no], ["simple form", simple_form], ["simple form (bootstrap)", simple_form_bootstrap]]

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "1.1.6"
+  VERSION = "1.1.7"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 1.1.6
+  version: 1.1.7
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-29 00:00:00.000000000 Z
+date: 2012-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2153726080 !ruby/object:Gem::Requirement
+  requirement: &2153522160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153726080
+  version_requirements: *2153522160
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153725580 !ruby/object:Gem::Requirement
+  requirement: &2153521660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 3.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153725580
+  version_requirements: *2153521660
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2153725140 !ruby/object:Gem::Requirement
+  requirement: &2153521220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153725140
+  version_requirements: *2153521220
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153718800 !ruby/object:Gem::Requirement
+  requirement: &2153514800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153718800
+  version_requirements: *2153514800
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153717820 !ruby/object:Gem::Requirement
+  requirement: &2153513940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: 2.5.0
   type: :development
   prerelease: false
-  version_requirements: *2153717820
+  version_requirements: *2153513940
 - !ruby/object:Gem::Dependency
   name: mg
-  requirement: &2153717300 !ruby/object:Gem::Requirement
+  requirement: &2153513460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153717300
+  version_requirements: *2153513460
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2153716660 !ruby/object:Gem::Requirement
+  requirement: &2153512840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: 3.0.0
   type: :development
   prerelease: false
-  version_requirements: *2153716660
+  version_requirements: *2153512840
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2153716220 !ruby/object:Gem::Requirement
+  requirement: &2153512400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,7 +98,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153716220
+  version_requirements: *2153512400
 description: A gem with recipes to create Rails application templates you can use
   to generate Rails starter apps.
 email:
@@ -121,7 +121,6 @@ files:
 - recipes/capybara.rb
 - recipes/cleanup.rb
 - recipes/compass.rb
-- recipes/css_setup.rb
 - recipes/cucumber.rb
 - recipes/devise.rb
 - recipes/extras.rb
@@ -133,6 +132,7 @@ files:
 - recipes/home_page_users.rb
 - recipes/hoptoad.rb
 - recipes/html5.rb
+- recipes/inherited_resources.rb
 - recipes/less.rb
 - recipes/mongohq.rb
 - recipes/mongoid.rb
@@ -145,6 +145,7 @@ files:
 - recipes/sass.rb
 - recipes/seed_database.rb
 - recipes/settingslogic.rb
+- recipes/simple_form.rb
 - recipes/slim.rb
 - recipes/static_page.rb
 - recipes/subdomains.rb
@@ -177,7 +178,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4510411467452003519
+      hash: -4352216921287113977
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -186,7 +187,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 4510411467452003519
+      hash: -4352216921287113977
 requirements: []
 rubyforge_project: rails_apps_composer
 rubygems_version: 1.8.16

data/recipes/css_setup.rb

@@ -1,78 +0,0 @@
-# Application template recipe for the rails_apps_composer. Check for a newer version here:
-# https://github.com/RailsApps/rails_apps_composer/blob/master/recipes/css_setup.rb
-
-after_bundler do
-
-  say_wizard "CssSetup recipe running 'after bundler'"
-
-  # Add a stylesheet with styles for a horizontal menu and flash messages
-  css = <<-CSS
-
-ul.hmenu {
-  list-style: none;
-  margin: 0 0 2em;
-  padding: 0;
-}
-ul.hmenu li {
-  display: inline;
-}
-#flash_notice, #flash_alert {
-  padding: 5px 8px;
-  margin: 10px 0;
-}
-#flash_notice {
-  background-color: #CFC;
-  border: solid 1px #6C6;
-}
-#flash_alert {
-  background-color: #FCC;
-  border: solid 1px #C66;
-}
-
-CSS
-
-  # Add a stylesheet for use with HTML5
-  css_html5 = <<-CSS
-
-header nav ul {
-  list-style: none;
-  margin: 0 0 2em;
-  padding: 0;
-}
-header nav ul li {
-  display: inline;
-}
-#flash_notice, #flash_alert {
-  padding: 5px 8px;
-  margin: 10px 0;
-}
-#flash_notice {
-  background-color: #CFC;
-  border: solid 1px #6C6;
-}
-#flash_alert {
-  background-color: #FCC;
-  border: solid 1px #C66;
-}
-
-CSS
-
-  # rename the application stylesheet to use SCSS
-  copy_file 'app/assets/stylesheets/application.css', 'app/assets/stylesheets/application.css.scss'
-  remove_file 'app/assets/stylesheets/application.css'
-  if recipes.include? 'html5'
-    append_file 'app/assets/stylesheets/application.css.scss', css_html5
-  else
-    append_file 'app/assets/stylesheets/application.css.scss', css
-  end
-  
-end
-
-__END__
-
-name: CssSetup
-description: "Add a stylesheet with styles for a horizontal menu and flash messages."
-author: RailsApps
-
-category: other
-tags: [utilities, configuration]