rails_apps_composer 2.4.11 → 2.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 64ba215e7b77575c286faa2d39e74edaaa9afb66
-  data.tar.gz: 30df9d4448e44f4d8da249a3fe10350b86679f2b
+  metadata.gz: 004fa66d78dd32e045ff2368ec6354b029787cb2
+  data.tar.gz: e78d06ee9655948a86376509a5b3291ca12a09b7
 SHA512:
-  metadata.gz: b65940dcd8715b4e4ba017ef7498940b8be213150dfbdb8a97bee70dd883fc1bc127ea5c9b5018d13ae61d73ba562e30b5eb098d8a75e429f87561b0e1f67009
-  data.tar.gz: 71081f8697f2bd1ba8793d7b4c37157ab46fa64e49107c6c0ca9c6f7813f5ade39e06e7733b241e035e8ea7dec3d0f64bbfe8c680dbbc5a531ba7e7ee3fae3d6
+  metadata.gz: 7ff0f9b2b6c0d4d57e3956fd37887869868581a0495f63ac035548a2602800bce61479c5eb90501963a2804612ed89e0be6c1ac3bc9a1d7abb0fcac23d828a78
+  data.tar.gz: b39f0fb854fa1b64f00db509b05ff33d99666cd8e5fd195a64f42c39103988484dd8462090476b2254c832850f4467904a6f9d170f73ceb7bd4038e17cb3064a

data/recipes/apps4.rb

@@ -13,7 +13,7 @@ if prefer :apps4, 'learn-rails'
   add_gem 'sqlite3', :group => :development
   add_gem 'pg', :group => :production
   add_gem 'thin', :group => :production
-  add_gem 'rails_on_heroku', :group => :production
+  add_gem 'rails_12factor', :group => :production
 
   # >-------------------------------[ after_everything ]--------------------------------<
 
@@ -61,13 +61,7 @@ if prefer :apps4, 'learn-rails'
     copy_from_repo 'app/views/user_mailer/contact_email.html.erb', :repo => repo
     copy_from_repo 'app/views/user_mailer/contact_email.text.erb', :repo => repo
     copy_from_repo 'app/views/visitors/new.html.erb', :repo => repo
-
-    # >-------------------------------[ Layouts ]--------------------------------<
-
-    # if view files were installed previously, navogation links will be created
-    if prefer :frontend, 'bootstrap'
-      generate 'layout bootstrap2 -f'
-    end
+    copy_from_repo 'app/views/layouts/_navigation.html.erb', :repo => repo
 
     # >-------------------------------[ Routes ]--------------------------------<
 
@@ -77,10 +71,7 @@ if prefer :apps4, 'learn-rails'
 
     # >-------------------------------[ Assets ]--------------------------------<
 
-    copy_from_repo 'app/assets/javascripts/application.js', :repo => repo
     copy_from_repo 'app/assets/javascripts/segmentio.js', :repo => repo
-    copy_from_repo 'app/assets/stylesheets/application.css.scss', :repo => repo
-    copy_from_repo 'app/assets/stylesheets/bootstrap_and_overrides.css.scss', :repo => repo
 
     ### GIT ###
     git :add => '-A' if prefer :git, true
@@ -130,13 +121,7 @@ if prefer :apps4, 'rails-bootstrap'
 
     copy_from_repo 'app/views/pages/about.html.erb', :repo => repo
     copy_from_repo 'app/views/visitors/new.html.erb', :repo => repo
-
-    # >-------------------------------[ Layouts ]--------------------------------<
-
-    # if view files were installed previously, navogation links will be created
-    if prefer :frontend, 'bootstrap'
-      generate 'layout bootstrap2 -f'
-    end
+    copy_from_repo 'app/views/layouts/_navigation.html.erb', :repo => repo
 
     # >-------------------------------[ Routes ]--------------------------------<
 
@@ -146,9 +131,7 @@ if prefer :apps4, 'rails-bootstrap'
 
     # >-------------------------------[ Assets ]--------------------------------<
 
-    copy_from_repo 'app/assets/javascripts/application.js', :repo => repo
-    copy_from_repo 'app/assets/stylesheets/application.css.scss', :repo => repo
-    copy_from_repo 'app/assets/stylesheets/bootstrap_and_overrides.css.scss', :repo => repo
+    # no assets
 
     ### GIT ###
     git :add => '-A' if prefer :git, true

data/recipes/extras.rb

@@ -111,11 +111,8 @@ case RbConfig::CONFIG['host_os']
   when /linux/i
     prefs[:jsruntime] = yes_wizard? "Add 'therubyracer' JavaScript runtime (for Linux users without node.js)?" unless prefs.has_key? :jsruntime
     if prefs[:jsruntime]
-      # was it already added for bootstrap-less?
-      unless prefer :bootstrap, 'less'
-        say_wizard "recipe adding 'therubyracer' JavaScript runtime gem"
-        add_gem 'therubyracer', :group => :assets, :platform => :ruby
-      end
+      say_wizard "recipe adding 'therubyracer' JavaScript runtime gem"
+      add_gem 'therubyracer', :platform => :ruby
     end
 end
 

data/recipes/frontend.rb

@@ -3,12 +3,19 @@
 
 after_bundler do
   say_wizard "recipe running after 'bundle install'"
-  ### LAYOUTS ###
-  copy_from_repo 'app/views/layouts/application.html.erb'
-  copy_from_repo 'app/views/layouts/application-bootstrap.html.erb', :prefs => 'bootstrap'
-  copy_from_repo 'app/views/layouts/_messages.html.erb'
-  copy_from_repo 'app/views/layouts/_messages-bootstrap.html.erb', :prefs => 'bootstrap'
-  copy_from_repo 'app/views/layouts/_navigation.html.erb'
+  # set up a front-end framework using the rails_layout gem
+  case prefs[:frontend]
+    when 'simple'
+      generate 'layout simple -f'
+    when 'bootstrap2'
+      generate 'layout bootstrap2 -f'
+    when 'bootstrap3'
+      generate 'layout bootstrap3 -f'
+    when 'foundation4'
+      generate 'layout foundation4 -f'
+  end
+
+  # specialized navigation partials
   if prefer :authorization, 'cancan'
     case prefs[:authentication]
       when 'devise'
@@ -21,35 +28,7 @@ after_bundler do
     copy_from_repo 'app/views/layouts/_navigation-omniauth.html.erb', :prefs => 'omniauth'
   end
   copy_from_repo 'app/views/layouts/_navigation-subdomains_app.html.erb', :prefs => 'subdomains_app'
-  ## APPLICATION NAME
-  application_layout_file = Dir['app/views/layouts/application.html.*'].first
-  navigation_partial_file = Dir['app/views/layouts/_navigation.html.*'].first
-  gsub_file application_layout_file, /App_Name/, "#{app_name.humanize.titleize}"
-  gsub_file navigation_partial_file, /App_Name/, "#{app_name.humanize.titleize}"
-  ### CSS ###
-  copy_from_repo 'app/assets/stylesheets/application.css.scss'
-  copy_from_repo 'app/assets/stylesheets/application-bootstrap.css.scss', :prefs => 'bootstrap'
-  if prefer :bootstrap, 'less'
-    generate 'bootstrap:install'
-    insert_into_file 'app/assets/stylesheets/bootstrap_and_overrides.css.less', "body { padding-top: 60px; }\n", :after => "@import \"twitter/bootstrap/bootstrap\";\n"
-  elsif prefer :bootstrap, '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', <<-RUBY
-@import "bootstrap";
-body { padding-top: 60px; }
-@import "bootstrap-responsive";
-RUBY
-  elsif prefer :frontend, 'foundation'
-    insert_into_file 'app/assets/stylesheets/application.css.scss', " *= require foundation_and_overrides\n", :after => "require_self\n"
-  elsif prefer :frontend, 'skeleton'
-    copy_from 'https://raw.github.com/necolas/normalize.css/master/normalize.css', 'app/assets/stylesheets/normalize.css'
-    copy_from 'https://raw.github.com/dhgamache/Skeleton/master/stylesheets/base.css', 'app/assets/stylesheets/base.css'
-    copy_from 'https://raw.github.com/dhgamache/Skeleton/master/stylesheets/layout.css', 'app/assets/stylesheets/layout.css'
-    copy_from 'https://raw.github.com/dhgamache/Skeleton/master/stylesheets/skeleton.css', 'app/assets/stylesheets/skeleton.css'
-  elsif prefer :frontend, 'normalize'
-    copy_from 'https://raw.github.com/necolas/normalize.css/master/normalize.css', 'app/assets/stylesheets/normalize.css'
-  end
-  remove_file 'app/assets/stylesheets/application.css'
+
   ### GIT ###
   git :add => '-A' if prefer :git, true
   git :commit => '-qm "rails_apps_composer: front-end framework"' if prefer :git, true

data/recipes/gems.rb

@@ -99,21 +99,20 @@ add_gem 'fabrication', :group => [:development, :test] if prefer :fixtures, 'fab
 add_gem 'machinist', :group => :test if prefer :fixtures, 'machinist'
 
 ## Front-end Framework
-add_gem 'bootstrap-sass', '~> 2.3.2.2' if prefer :bootstrap, 'sass'
-add_gem 'rails_layout', :group => :development if prefer :bootstrap, 'sass'
-if prefer :frontend, 'foundation'
-  if rails_4?
-    add_gem 'compass-rails', '~> 2.0.alpha.0'
-  else
-    add_gem 'compass-rails', :group => assets_group
-  end
-end
-add_gem 'zurb-foundation', :group => assets_group if prefer :frontend, 'foundation'
-if prefer :bootstrap, 'less'
-  add_gem 'less-rails', :group => assets_group
-  add_gem 'twitter-bootstrap-rails', :group => assets_group
-  # install gem 'therubyracer' to use Less
-  add_gem 'therubyracer', :group => assets_group, :platform => :ruby
+add_gem 'rails_layout', :group => :development
+case prefs[:frontend]
+  when 'bootstrap2'
+    add_gem 'bootstrap-sass', '~> 2.3.2.2'
+  when 'bootstrap3'
+    add_gem 'bootstrap-sass', '>= 3.0.0.0'
+  when 'foundation4'
+    if rails_4?
+      add_gem 'zurb-foundation'
+      add_gem 'compass-rails', '~> 2.0.alpha.0'
+    else
+      add_gem 'zurb-foundation', :group => assets_group
+      add_gem 'compass-rails', '~> 1.0.3', :group => assets_group
+    end
 end
 
 ## Email
@@ -139,11 +138,7 @@ if prefer :authorization, 'cancan'
 end
 
 ## Form Builder
-if rails_4?
-  add_gem 'simple_form', '>= 3.0.0.rc' if prefer :form_builder, 'simple_form'
-else
-  add_gem 'simple_form' if prefer :form_builder, 'simple_form'
-end
+add_gem 'simple_form' if prefer :form_builder, 'simple_form'
 
 ## Membership App
 if prefer :railsapps, 'rails-stripe-membership-saas'
@@ -232,16 +227,21 @@ end # after_bundler
 
 ### GENERATORS ###
 after_bundler do
-  ## Front-end Framework
-  generate 'foundation:install' if prefer :frontend, 'foundation'
   ## Form Builder
   if prefer :form_builder, 'simple_form'
-    if prefer :frontend, 'bootstrap'
-      say_wizard "recipe installing simple_form for use with Twitter Bootstrap"
-      generate 'simple_form:install --bootstrap'
-    else
-      say_wizard "recipe installing simple_form"
-      generate 'simple_form:install'
+    case prefs[:frontend]
+      when 'bootstrap2'
+        say_wizard "recipe installing simple_form for use with Twitter Bootstrap"
+        generate 'simple_form:install --bootstrap'
+      when 'bootstrap3'
+        say_wizard "recipe installing simple_form for use with Twitter Bootstrap"
+        generate 'simple_form:install --bootstrap'
+      when 'foundation4'
+        say_wizard "recipe installing simple_form for use with Zurb Foundation"
+        generate 'simple_form:install --foundation'
+      else
+        say_wizard "recipe installing simple_form"
+        generate 'simple_form:install'
     end
   end
   ## Figaro Gem
@@ -257,6 +257,7 @@ after_bundler do
 # For example, setting:
 # GMAIL_USERNAME: Your_Gmail_Username
 # makes 'Your_Gmail_Username' available as ENV["GMAIL_USERNAME"]
+
 FILE
     end
   end

data/recipes/railsapps.rb

@@ -48,7 +48,6 @@ case prefs[:apps4]
     prefs[:integration] = false
     prefs[:fixtures] = false
     prefs[:frontend] = false
-    prefs[:bootstrap] = false
     prefs[:email] = false
     prefs[:authentication] = false
     prefs[:devise_modules] = false
@@ -66,8 +65,7 @@ case prefs[:apps4]
     prefs[:unit_test] = false
     prefs[:integration] = false
     prefs[:fixtures] = false
-    prefs[:frontend] = 'bootstrap'
-    prefs[:bootstrap] = 'sass'
+    prefs[:frontend] = 'foundation4'
     prefs[:email] = 'gmail'
     prefs[:authentication] = false
     prefs[:devise_modules] = false
@@ -83,8 +81,7 @@ case prefs[:apps4]
     prefs[:unit_test] = false
     prefs[:integration] = false
     prefs[:fixtures] = false
-    prefs[:frontend] = 'bootstrap'
-    prefs[:bootstrap] = 'sass'
+    prefs[:frontend] = 'bootstrap2'
     prefs[:email] = 'none'
     prefs[:authentication] = false
     prefs[:devise_modules] = false
@@ -110,8 +107,7 @@ case prefs[:railsapps]
     prefs[:unit_test] = 'rspec'
     prefs[:integration] = 'cucumber'
     prefs[:fixtures] = 'factory_girl'
-    prefs[:frontend] = 'bootstrap'
-    prefs[:bootstrap] = 'sass'
+    prefs[:frontend] = 'bootstrap2'
     prefs[:email] = 'gmail'
     prefs[:authentication] = 'devise'
     prefs[:devise_modules] = 'default'
@@ -127,8 +123,7 @@ case prefs[:railsapps]
     prefs[:unit_test] = 'rspec'
     prefs[:integration] = 'cucumber'
     prefs[:fixtures] = 'factory_girl'
-    prefs[:frontend] = 'bootstrap'
-    prefs[:bootstrap] = 'sass'
+    prefs[:frontend] = 'bootstrap2'
     prefs[:email] = 'gmail'
     prefs[:authentication] = 'devise'
     prefs[:devise_modules] = 'default'
@@ -144,8 +139,7 @@ case prefs[:railsapps]
     prefs[:unit_test] = 'rspec'
     prefs[:integration] = 'cucumber'
     prefs[:fixtures] = 'factory_girl'
-    prefs[:frontend] = 'bootstrap'
-    prefs[:bootstrap] = 'sass'
+    prefs[:frontend] = 'bootstrap2'
     prefs[:email] = 'mandrill'
     prefs[:authentication] = 'devise'
     prefs[:devise_modules] = 'confirmable'
@@ -177,8 +171,7 @@ case prefs[:railsapps]
     prefs[:unit_test] = 'rspec'
     prefs[:integration] = 'cucumber'
     prefs[:fixtures] = 'factory_girl'
-    prefs[:frontend] = 'bootstrap'
-    prefs[:bootstrap] = 'sass'
+    prefs[:frontend] = 'bootstrap2'
     prefs[:email] = 'gmail'
     prefs[:authentication] = 'devise'
     prefs[:devise_modules] = 'default'

data/recipes/readme.rb

@@ -47,11 +47,9 @@ after_everything do
   gsub_file "README.textile", /RSpec/, "RSpec and Machinist" if prefer :fixtures, 'machinist'
 
   # Front-end Framework
-  gsub_file "README.textile", /Front-end Framework: None/, "Front-end Framework: Twitter Bootstrap (Sass)" if prefer :bootstrap, 'sass'
-  gsub_file "README.textile", /Front-end Framework: None/, "Front-end Framework: Twitter Bootstrap (Less)" if prefer :bootstrap, 'less'
-  gsub_file "README.textile", /Front-end Framework: None/, "Front-end Framework: Zurb Foundation" if prefer :frontend, 'foundation'
-  gsub_file "README.textile", /Front-end Framework: None/, "Front-end Framework: Skeleton" if prefer :frontend, 'skeleton'
-  gsub_file "README.textile", /Front-end Framework: None/, "Front-end Framework: Normalized CSS" if prefer :frontend, 'normalize'
+  gsub_file "README.textile", /Front-end Framework: None/, "Front-end Framework: Twitter Bootstrap 2.3 (Sass)" if prefer :frontend, 'bootstrap2'
+  gsub_file "README.textile", /Front-end Framework: None/, "Front-end Framework: Twitter Bootstrap 3.0 (Sass)" if prefer :frontend, 'bootstrap3'
+  gsub_file "README.textile", /Front-end Framework: None/, "Front-end Framework: Zurb Foundation" if prefer :frontend, 'foundation4'
 
   # Form Builder
   gsub_file "README.textile", /Form Builder: None/, "Form Builder: SimpleForm" if prefer :form_builder, 'simple_form'

data/recipes/setup.rb

@@ -60,17 +60,8 @@ end
 
 ## Front-end Framework
 if recipes.include? 'frontend'
-  prefs[:frontend] = multiple_choice "Front-end framework?", [["None", "none"], ["Twitter Bootstrap", "bootstrap"],
-    ["Zurb Foundation", "foundation"], ["Skeleton", "skeleton"], ["Just normalize CSS for consistent styling", "normalize"]] unless prefs.has_key? :frontend
-  if prefer :frontend, 'bootstrap'
-    case HOST_OS
-      when /mswin|windows/i
-        prefs[:bootstrap] = multiple_choice "Twitter Bootstrap version?", [["Twitter Bootstrap (Sass)", "sass"]] unless prefs.has_key? :bootstrap
-      else
-        prefs[:bootstrap] = multiple_choice "Twitter Bootstrap version?", [["Twitter Bootstrap (Less)", "less"],
-          ["Twitter Bootstrap (Sass)", "sass"]] unless prefs.has_key? :bootstrap
-    end
-  end
+  prefs[:frontend] = multiple_choice "Front-end framework?", [["None", "none"], ["Zurb Foundation 4.0", "foundation4"],
+    ["Twitter Bootstrap 3.0", "bootstrap3"], ["Twitter Bootstrap 2.3", "bootstrap2"], ["Simple CSS", "simple"]] unless prefs.has_key? :frontend
 end
 
 ## Email

data/templates/layout.erb

@@ -186,11 +186,7 @@ end
 # >-----------------------------[ Run 'Bundle Install' ]-------------------------------<
 
 say_wizard "Installing gems. This will take a while."
-if prefs.has_key? :bundle_path
-  run "bundle install --without production --path #{prefs[:bundle_path]}"
-else
-  run 'bundle install --without production'
-end
+run 'bundle install --without production'
 say_wizard "Updating gem paths."
 Gem.clear_paths
 # >-----------------------------[ Run 'After Bundler' Callbacks ]-------------------------------<

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.4.11"
+  VERSION = "2.4.12"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.4.11
+  version: 2.4.12
 platform: ruby
 authors:
 - Daniel Kehoe
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-20 00:00:00.000000000 Z
+date: 2013-11-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -192,7 +192,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rails_apps_composer
-rubygems_version: 2.1.3
+rubygems_version: 2.0.7
 signing_key: 
 specification_version: 4
 summary: A version of the RailsWizard gem with custom recipes for Rails starter apps.