wagon_rails 0.4.5 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e458fb32b803cee5752b38d1b4495534ffd1a3c0
-  data.tar.gz: 89ba7a5db760eb51fed6f9dd48e49926fc16428f
+  metadata.gz: 101f5777d7f8ff5143d2ecf6f8913939e596ca53
+  data.tar.gz: 8fa073d4efc86ff13b7d6f25848d66fac7970e26
 SHA512:
-  metadata.gz: ecb3379164c74e240974ee032a93d07717cdf842fac1d31558dbefd8cd7efcd34ebbfe822fd6ba457e86c0599f8dcf42bb1ab0d41188fa42e6cbe7bb79b5305f
-  data.tar.gz: 94b247f3e1b7c627a4a9ef9258c77040d040eb20c0c264e6fad3adeb200cad365afc696615577224d2e5ae401ece964f57cfbc9495c71c741d1cfa72e45b0ff0
+  metadata.gz: 80b68176f1268d5d35ae34c5120b5a54ec8bafd69c78b2c68fc192b59ff09a693c84da49401aad80f1a8d78f5825039f1aca1e13b46de047370635b0e3110b66
+  data.tar.gz: 1d45893a873a0c1ab1782bda7913d2500f76e029ebabc9abff739bef20141694d1c7c145a462f9cd3751ce68231e106bdff011e5f45222407698f2f2c3270d54

data/.ruby-version

@@ -1 +1 @@
-2.2.0
+2.2.2

data/Gemfile.lock

@@ -1,43 +1,44 @@
 PATH
   remote: .
   specs:
-    wagon_rails (0.1.0)
+    wagon_rails (0.4.6)
       bundler (~> 1.3)
-      rails (= 4.2.0)
+      colorize (~> 0.7)
+      rails (= 4.2.3)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    actionmailer (4.2.0)
-      actionpack (= 4.2.0)
-      actionview (= 4.2.0)
-      activejob (= 4.2.0)
+    actionmailer (4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
       mail (~> 2.5, >= 2.5.4)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-    actionpack (4.2.0)
-      actionview (= 4.2.0)
-      activesupport (= 4.2.0)
-      rack (~> 1.6.0)
+    actionpack (4.2.3)
+      actionview (= 4.2.3)
+      activesupport (= 4.2.3)
+      rack (~> 1.6)
       rack-test (~> 0.6.2)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    actionview (4.2.0)
-      activesupport (= 4.2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
       erubis (~> 2.7.0)
       rails-dom-testing (~> 1.0, >= 1.0.5)
-      rails-html-sanitizer (~> 1.0, >= 1.0.1)
-    activejob (4.2.0)
-      activesupport (= 4.2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    activejob (4.2.3)
+      activesupport (= 4.2.3)
       globalid (>= 0.3.0)
-    activemodel (4.2.0)
-      activesupport (= 4.2.0)
+    activemodel (4.2.3)
+      activesupport (= 4.2.3)
       builder (~> 3.1)
-    activerecord (4.2.0)
-      activemodel (= 4.2.0)
-      activesupport (= 4.2.0)
+    activerecord (4.2.3)
+      activemodel (= 4.2.3)
+      activesupport (= 4.2.3)
       arel (~> 6.0)
-    activesupport (4.2.0)
+    activesupport (4.2.3)
       i18n (~> 0.7)
       json (~> 1.7, >= 1.7.7)
       minitest (~> 5.1)
@@ -45,86 +46,62 @@ GEM
       tzinfo (~> 1.1)
     arel (6.0.0)
     builder (3.2.2)
-    capybara (2.3.0)
-      mime-types (>= 1.16)
-      nokogiri (>= 1.3.3)
-      rack (>= 1.0.0)
-      rack-test (>= 0.5.4)
-      xpath (~> 2.0)
-    diff-lcs (1.2.5)
+    colorize (0.7.5)
     erubis (2.7.0)
-    globalid (0.3.3)
+    globalid (0.3.5)
       activesupport (>= 4.1.0)
-    hike (1.2.3)
     i18n (0.7.0)
-    json (1.8.2)
-    loofah (2.0.1)
+    json (1.8.3)
+    loofah (2.0.2)
       nokogiri (>= 1.5.9)
     mail (2.6.3)
       mime-types (>= 1.16, < 3)
-    mime-types (2.4.3)
-    mini_portile (0.6.0)
-    minitest (5.5.1)
-    multi_json (1.10.1)
-    nokogiri (1.6.2.1)
-      mini_portile (= 0.6.0)
-    rack (1.6.0)
-    rack-test (0.6.2)
+    mime-types (2.6.1)
+    mini_portile (0.6.2)
+    minitest (5.7.0)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    rack (1.6.4)
+    rack-test (0.6.3)
       rack (>= 1.0)
-    rails (4.2.0)
-      actionmailer (= 4.2.0)
-      actionpack (= 4.2.0)
-      actionview (= 4.2.0)
-      activejob (= 4.2.0)
-      activemodel (= 4.2.0)
-      activerecord (= 4.2.0)
-      activesupport (= 4.2.0)
+    rails (4.2.3)
+      actionmailer (= 4.2.3)
+      actionpack (= 4.2.3)
+      actionview (= 4.2.3)
+      activejob (= 4.2.3)
+      activemodel (= 4.2.3)
+      activerecord (= 4.2.3)
+      activesupport (= 4.2.3)
       bundler (>= 1.3.0, < 2.0)
-      railties (= 4.2.0)
+      railties (= 4.2.3)
       sprockets-rails
     rails-deprecated_sanitizer (1.0.3)
       activesupport (>= 4.2.0.alpha)
-    rails-dom-testing (1.0.5)
+    rails-dom-testing (1.0.6)
       activesupport (>= 4.2.0.beta, < 5.0)
       nokogiri (~> 1.6.0)
       rails-deprecated_sanitizer (>= 1.0.1)
-    rails-html-sanitizer (1.0.1)
+    rails-html-sanitizer (1.0.2)
       loofah (~> 2.0)
-    railties (4.2.0)
-      actionpack (= 4.2.0)
-      activesupport (= 4.2.0)
+    railties (4.2.3)
+      actionpack (= 4.2.3)
+      activesupport (= 4.2.3)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
     rake (10.4.2)
-    rspec (2.99.0)
-      rspec-core (~> 2.99.0)
-      rspec-expectations (~> 2.99.0)
-      rspec-mocks (~> 2.99.0)
-    rspec-core (2.99.0)
-    rspec-expectations (2.99.0)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.99.0)
-    sprockets (2.12.3)
-      hike (~> 1.2)
-      multi_json (~> 1.0)
+    sprockets (3.2.0)
       rack (~> 1.0)
-      tilt (~> 1.1, != 1.3.0)
-    sprockets-rails (2.2.4)
+    sprockets-rails (2.3.2)
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
     thor (0.19.1)
-    thread_safe (0.3.4)
-    tilt (1.4.1)
+    thread_safe (0.3.5)
     tzinfo (1.2.2)
       thread_safe (~> 0.1)
-    xpath (2.0.0)
-      nokogiri (~> 1.3)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  capybara (~> 2.2, >= 2.2.0)
-  rspec (~> 2.0)
   wagon_rails!

data/README.md

@@ -63,7 +63,6 @@ It includes application gems like:
 - [Simple Form](https://github.com/plataformatec/simple_form) for form markup and style
 - [High Voltage](https://github.com/thoughtbot/high_voltage) for static pages
 - [Devise](https://github.com/plataformatec/devise) for user authentication
-- [Pundit](https://github.com/elabs/pundit) for user authorization
 - [Paperclip](https://github.com/thoughtbot/paperclip) for file attachment and S3 upload.
 - [Bootstrap](https://github.com/twbs/bootstrap-sass) to jump start the design with a solid responsive grid and basic UI components.
 - [Font Awesome](https://github.com/FortAwesome/font-awesome-sass) to get a nice iconography
@@ -87,6 +86,16 @@ add a `deploy` script to the `bin` repository. Simply deploy with:
 $ deploy  # git push heroku + rake db:migrate + restart
 ```
 
+## Option
+
+You can enable [Pundit](https://github.com/elabs/pundit) for user authorization, open
+the Gemfile, uncomment the `pundit` gem. Then:
+
+```bash
+$ bundle install
+$ rails g pundit:install
+```
+
 ## Credits
 
 WagonRails is a fork of [thoughtbot/suspenders](https://github.com/thoughtbot/suspenders),

data/lib/wagon_rails/app_builder.rb

@@ -169,10 +169,9 @@ module WagonRails
     end
 
     def setup_stylesheets
-      remove_file 'app/assets/stylesheets/application.css'
-      run 'rm -r app/assets/stylesheets'
-      run 'curl -L https://github.com/lewagon/rails-stylesheets/archive/master.zip > stylesheets.zip'
-      run 'unzip stylesheets.zip -d app/assets && rm stylesheets.zip && mv app/assets/rails-stylesheets-master app/assets/stylesheets'
+      run 'rm -rf app/assets/stylesheets'
+      run 'curl -L https://github.com/lewagon/rails-stylesheets/archive/master.zip > app/assets/stylesheets.zip'
+      run 'cd app/assets &&  unzip stylesheets.zip && rm stylesheets.zip && mv rails-stylesheets-master stylesheets & cd ../..'
     end
 
     def setup_javascripts
@@ -287,8 +286,12 @@ production:
       generate 'devise User'
     end
 
-    def generate_pundit
-      generate 'pundit:install'
+    # def generate_pundit
+    #   generate 'pundit:install'
+    # end
+
+    def generate_annotate
+      generate 'annotate:install'
     end
 
     def install_navbar

data/lib/wagon_rails/generators/app_generator.rb

@@ -101,6 +101,7 @@ module WagonRails
       build :setup_foreman
       build :setup_paperclip
       build :copy_application_yml
+      build :generate_annotate
     end
 
     def setup_stylesheets
@@ -126,7 +127,7 @@ module WagonRails
       build :generate_user
       build :install_navbar
       build :generate_devise_views
-      build :generate_pundit
+      # build :generate_pundit
       build :setup_application_controller
     end
 
@@ -177,14 +178,17 @@ module WagonRails
     end
 
     def first_commit
-      build :commit, "New rails app generated with lewagon/wagon-rails gem"
+      build :commit, "New rails app generated with lewagon/wagon_rails gem"
     end
 
     def first_push
-      build :first_push
+      unless options[:skip_github]
+        build :first_push
+      end
     end
 
     def outro
+      run "cd #{defined_app_name}"
       say ""
       say "----> Open config/initializers/devise.rb and update the `mailer_sender`"
       say ""

data/lib/wagon_rails/version.rb

@@ -1,5 +1,5 @@
 module WagonRails
-  RAILS_VERSION = "4.2.0"
+  RAILS_VERSION = "4.2.3"
   RUBY_VERSION = IO.read("#{File.dirname(__FILE__)}/../../.ruby-version").strip
-  VERSION = "0.4.5"
+  VERSION = "0.4.6"
 end

data/templates/Gemfile.erb

@@ -9,7 +9,7 @@ gem "simple_form"
 gem "country_select"
 gem "high_voltage"
 gem "devise"
-gem "pundit"
+# gem "pundit"
 gem "paperclip"
 gem "aws-sdk", "< 2.0"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: wagon_rails
 version: !ruby/object:Gem::Version
-  version: 0.4.5
+  version: 0.4.6
 platform: ruby
 authors:
 - ssaunier
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-28 00:00:00.000000000 Z
+date: 2015-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.0
+        version: 4.2.3
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
@@ -118,7 +118,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.2.0
+      version: 2.2.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -126,7 +126,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Generate a Rails app using Le Wagon's best practices (FullStack Bootcamp)