rails_apps_composer 2.4.30 → 2.4.31

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 87b050ead22899792c467664912c933e1e09214d
-  data.tar.gz: d580c9aed01ba8427f45dffa871fdb8f9da7d83a
+  metadata.gz: 90d48e722aa10ad02d97f0faae7f82c2d3a9b663
+  data.tar.gz: eacc032fa26ba99feac94035b5bcb8c3d753d0c1
 SHA512:
-  metadata.gz: 82d777142ecbf638160b38aecdda7affbd9350663d9f484154a84c26505e8407ba7839a27900708c35ddcdf22a6888622a37d1a79626e70d355afad4188c90c7
-  data.tar.gz: 844e07cd1ab56de7bb911718a61d2c9cd65bc993b2815799e5210d488eca0ad97053617e2880ea3a706e4657f2b57451141b77a92bb5cc1c0e60c0e1858e28ca
+  metadata.gz: cc83adc76ca44681f6648529257f7a975e1f7ca1ed3638f4587f3ddebfab7f2a443d0797b5004ffe68514f8498b6e5df1ab484924a4021c9061fee199a7f114a
+  data.tar.gz: 6553a0cb520950948bc64761e95312856282110f18abb9953031a24669ba26df7f3cf1b1f92c4499f7351c6fe517b690c0e8391719c9dabfc92b118b137f0927

data/README.textile

@@ -422,9 +422,9 @@ Copyright © 2012-2014 Daniel Kehoe
 h2. Useful Links
 
 |_. Getting Started |_. Articles |_. Tutorials |
-| "Learn Rails":http://learn-rails.com/ | "Twitter Bootstrap and Rails":http://railsapps.github.io/twitter-bootstrap-rails.html | "Rails and Bootstrap":http://railsapps.github.io/rails-bootstrap/ |
+| "Learn Rails":http://learn-rails.com/ | "Bootstrap and Rails":http://railsapps.github.io/twitter-bootstrap-rails.html | "Rails and Bootstrap":http://railsapps.github.io/rails-bootstrap/ |
 | "Ruby and Rails":http://railsapps.github.io/ruby-and-rails.html | "Analytics for Rails":http://railsapps.github.io/rails-google-analytics.html | |
-| "What is Ruby on Rails?":http://railsapps.github.io/what-is-ruby-rails.html | "Heroku and Rails":http://railsapps.github.io/rails-heroku-tutorial.html | "Devise with CanCan and Twitter Bootstrap":https://tutorials.railsapps.org/rails3-bootstrap-devise-cancan |
+| "What is Ruby on Rails?":http://railsapps.github.io/what-is-ruby-rails.html | "Heroku and Rails":http://railsapps.github.io/rails-heroku-tutorial.html | "Devise with CanCan and Bootstrap":https://tutorials.railsapps.org/rails3-bootstrap-devise-cancan |
 | "Rails Tutorial":https://tutorials.railsapps.org/rails-tutorial | "JavaScript and Rails":http://railsapps.github.io/rails-javascript-include-external.html | "Rails Membership Site with Stripe":https://tutorials.railsapps.org/rails-stripe-membership-saas |
 | "Installing Rails":http://railsapps.github.io/installing-rails.html | "Rails Environment Variables":http://railsapps.github.io/rails-environment-variables.html | "Rails Subscription Site with Recurly":https://tutorials.railsapps.org/rails-recurly-subscription-saas |
 | "Updating Rails":http://railsapps.github.io/updating-rails.html | "Git and Rails":http://railsapps.github.io/rails-git.html | "Startup Prelaunch Signup Application":http://railsapps.github.io/tutorial-rails-prelaunch-signup.html |

data/recipes/frontend.rb

@@ -16,33 +16,12 @@ after_bundler do
     when 'foundation5'
       generate 'layout:install foundation5 -f'
   end
-  # generate Devise views with appropriate styling
-  if prefer :authentication, 'devise'
-    case prefs[:frontend]
-      when 'bootstrap3'
-        generate 'layout:devise bootstrap3 -f'
-      when 'foundation5'
-        generate 'layout:devise foundation5 -f'
-    end
-  end
 
   ### GIT ###
   git :add => '-A' if prefer :git, true
   git :commit => '-qm "rails_apps_composer: front-end framework"' if prefer :git, true
 end # after_bundler
 
-after_everything do
-  say_wizard "recipe running after everything"
-  # create navigation links using the rails_layout gem
-  generate 'layout:navigation -f'
-  # replace with specialized navigation partials
-  copy_from_repo 'app/views/layouts/_navigation-subdomains_app.html.erb', :prefs => 'subdomains_app'
-
-  ### GIT ###
-  git :add => '-A' if prefer :git, true
-  git :commit => '-qm "rails_apps_composer: navigation links"' if prefer :git, true
-end # after_everything
-
 __END__
 
 name: frontend

data/recipes/gems.rb

@@ -241,10 +241,10 @@ after_bundler do
   if prefer :form_builder, 'simple_form'
     case prefs[:frontend]
       when 'bootstrap2'
-        say_wizard "recipe installing simple_form for use with Twitter Bootstrap"
+        say_wizard "recipe installing simple_form for use with Bootstrap"
         generate 'simple_form:install --bootstrap'
       when 'bootstrap3'
-        say_wizard "recipe installing simple_form for use with Twitter Bootstrap"
+        say_wizard "recipe installing simple_form for use with Bootstrap"
         generate 'simple_form:install --bootstrap'
       when 'foundation4'
         say_wizard "recipe installing simple_form for use with Zurb Foundation"

data/recipes/init.rb

@@ -169,6 +169,23 @@ FILE
   ### GIT ###
   git :add => '-A' if prefer :git, true
   git :commit => '-qm "rails_apps_composer: set up database"' if prefer :git, true
+  ### FRONTEND (must run after database migrations) ###
+  # generate Devise views with appropriate styling
+  if prefer :authentication, 'devise'
+    case prefs[:frontend]
+      when 'bootstrap3'
+        generate 'layout:devise bootstrap3 -f'
+      when 'foundation5'
+        generate 'layout:devise foundation5 -f'
+    end
+  end
+  # create navigation links using the rails_layout gem
+  generate 'layout:navigation -f'
+  # replace with specialized navigation partials
+  copy_from_repo 'app/views/layouts/_navigation-subdomains_app.html.erb', :prefs => 'subdomains_app'
+  ### GIT ###
+  git :add => '-A' if prefer :git, true
+  git :commit => '-qm "rails_apps_composer: navigation links"' if prefer :git, true
 end # after_everything
 
 __END__

data/recipes/readme.rb

@@ -49,8 +49,8 @@ after_everything do
   gsub_file "README.md", /RSpec/, "RSpec and Machinist" if prefer :fixtures, 'machinist'
 
   # Front-end Framework
-  gsub_file "README.md", /Front-end Framework: None/, "Front-end Framework: Twitter Bootstrap 2.3 (Sass)" if prefer :frontend, 'bootstrap2'
-  gsub_file "README.md", /Front-end Framework: None/, "Front-end Framework: Twitter Bootstrap 3.0 (Sass)" if prefer :frontend, 'bootstrap3'
+  gsub_file "README.md", /Front-end Framework: None/, "Front-end Framework: Bootstrap 2.3 (Sass)" if prefer :frontend, 'bootstrap2'
+  gsub_file "README.md", /Front-end Framework: None/, "Front-end Framework: Bootstrap 3.0 (Sass)" if prefer :frontend, 'bootstrap3'
   gsub_file "README.md", /Front-end Framework: None/, "Front-end Framework: Zurb Foundation 4" if prefer :frontend, 'foundation4'
   gsub_file "README.md", /Front-end Framework: None/, "Front-end Framework: Zurb Foundation 5" if prefer :frontend, 'foundation5'
 

data/recipes/setup.rb

@@ -67,7 +67,7 @@ end
 ## Front-end Framework
 if recipes.include? 'frontend'
   prefs[:frontend] = multiple_choice "Front-end framework?", [["None", "none"],
-    ["Twitter Bootstrap 3.0", "bootstrap3"], ["Twitter Bootstrap 2.3", "bootstrap2"],
+    ["Bootstrap 3.0", "bootstrap3"], ["Bootstrap 2.3", "bootstrap2"],
     ["Zurb Foundation 5.0", "foundation5"], ["Zurb Foundation 4.0", "foundation4"],
     ["Simple CSS", "simple"]] unless prefs.has_key? :frontend
 end

data/version.rb

@@ -1,3 +1,3 @@
 module RailsWizard
-  VERSION = "2.4.30"
+  VERSION = "2.4.31"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_apps_composer
 version: !ruby/object:Gem::Version
-  version: 2.4.30
+  version: 2.4.31
 platform: ruby
 authors:
 - Daniel Kehoe