blueberry_rails 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 124c3ff88080e1cce33ee42793b9d72ee9d4f494
-  data.tar.gz: 308737a8df6b9f9d6f79d7717454195349a91a82
+  metadata.gz: 94728753f0b19949d2b6f003de3e94a4451af30c
+  data.tar.gz: a3d0ad6310e09ab70601f65ed839c5d4c613f8e7
 SHA512:
-  metadata.gz: 0fad380c4c1a2e7ca96acc77b5cf21589f09956c0423100dcdcbaa450cd0de0dcd4fc86750b54f2922b02397d21ce23a18152685685124f39988487b25204bcf
-  data.tar.gz: a2b14a49d908d358c448be61ea87ff24307af4ad9086a687e651b6d7ec779377d08cdb2a4cc4300dda9a5127c1529efd2060456fa9d38f576817cd0fc5e8cd2d
+  metadata.gz: dee59d3e3411747d1a69dd4c8a6c691727f66c25c187fcb4e0a9494369684ce306048a3d353cebac5668598328ab98f4798b81cfe6683e4b7806ced8addf52a5
+  data.tar.gz: 296e9a9ce33695cf6f5580eac1b371629655f15dc62f9cb50a2cb6b3635c0309e8d945e2a8489c30cb28a6dcf3223fd3fb3fab61a4b18909e6478eeee6d5a249

data/.travis.yml

@@ -1,7 +1,6 @@
 language: ruby
 script: 'bundle exec rake'
 rvm:
-  - 2.2.1
+  - 2.2.2
 before_install:
   - gem update --system
-

data/lib/blueberry_rails/generators/app_generator.rb

@@ -32,6 +32,9 @@ module BlueberryRails
     class_option :gulp, type: :boolean, aliases: '-g', default: false,
       desc: 'Include Gulp asset pipeline'
 
+    class_option :capistrano, type: :boolean, aliases: '-c', default: false,
+      desc: 'Include Capistrano'
+
     def finish_template
       invoke :blueberry_customization
       super
@@ -47,7 +50,6 @@ module BlueberryRails
       invoke :configure_app
       invoke :remove_routes_comment_lines
       invoke :setup_gems
-      invoke :fix_specs
       invoke :setup_git
       invoke :setup_gulp
     end
@@ -114,14 +116,13 @@ module BlueberryRails
       if options[:devise]
         say 'Setting up devise'
         build :install_devise
+        build :replace_users_factory
+        build :replace_root_controller_spec
+      end
+      if options[:capistrano]
+        say 'Setting up Capistrano'
+        build :setup_capistrano
       end
-      say 'Setting up Capistrano'
-      build :setup_capistrano
-    end
-
-    def fix_specs
-      build :replace_users_factory
-      build :replace_root_controller_spec
     end
 
     def setup_git

data/lib/blueberry_rails/version.rb

@@ -1,7 +1,7 @@
 module BlueberryRails
-  VERSION = '0.3.6'
+  VERSION = '0.3.7'
 
   RUBY_VERSION = '2.2.2'
 
-  RAILS_VERSION = '4.2.1'
+  RAILS_VERSION = '4.2.3'
 end

data/spec/blueberry_rails_spec.rb

@@ -27,6 +27,23 @@ class BlueberryRailsTest < Minitest::Test
     assert run_rake
   end
 
+  def test_rake_runs_with_capistrano_option
+    create_project '--capistrano'
+
+    assert_file_have_content 'Gemfile', 'capistrano'
+
+    assert_exist_file 'Capfile'
+    assert_exist_file 'config/deploy.rb'
+    assert_exist_file 'config/deploy/production.rb'
+    assert_exist_file 'config/deploy/staging.rb'
+  end
+
+  def test_rake_runs_with_capistrano_option
+    create_project '--no-devise'
+
+    assert run_rake
+  end
+
   def test_rake_runs_with_bootstrap_option
     create_project '--bootstrap'
 

data/templates/Gemfile_custom.erb

@@ -28,10 +28,12 @@ group :development do
   gem 'awesome_print'
   gem 'better_errors'
   gem 'binding_of_caller'
+<% if options[:capistrano] -%>
   gem 'capistrano', '~> 3.0.0'
   gem 'capistrano-bundler'
   gem 'capistrano-rails'
   gem 'capistrano-rbenv'
+<% end -%>
   gem 'guard-rspec'
   gem 'mailcatcher'
   gem 'pry-rails'
@@ -58,7 +60,7 @@ group :test do
   gem 'database_cleaner'
   gem 'launchy'
   gem 'poltergeist', '>= 1.5.0'
-  gem 'simplecov', '~> 0.9.1', require: false
+  gem 'simplecov', require: false
   gem 'webmock'
 end
 

data/templates/gitignore_custom.erb

@@ -3,12 +3,12 @@
 *.swo
 *.swp
 .bundle
-.sass-cache/
+.env
 .pry_history
+.sass-cache/
 coverage/*
 config/database.yml
 db/*.sqlite3
-db/schema.rb
 log/*
 public/system
 rerun.txt

data/templates/root_controller_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
 
-describe RootController, :type => :controller do
+describe RootController, type: :controller do
 
-  describe "GET 'index'" do
-    it "returns http success" do
-      get 'index'
+  describe 'GET index' do
+    it 'returns http success' do
+      get :index
       expect(response).to be_success
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blueberry_rails
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - BlueberryApps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-01 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.1
+        version: 4.2.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.2.1
+        version: 4.2.3
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement