blueberry_rails 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 85a5471d088ab01e2c8f67de92f4efed8ea7e484
-  data.tar.gz: 413aca5512b2bca982e358a6aa9f59d2e6dd4e85
+  metadata.gz: aef7a2456317efb5451806b0ee5131c606bc6a16
+  data.tar.gz: 1d993bdf5adb37aa9c33cb06967725328ea39c95
 SHA512:
-  metadata.gz: 7ce5feb5a3b0932b12c8bca4e47a964bbe5bb0ddf734a026ba6073aabf25a475a733343a3538090058730f9a31efb9151f0a66c696a60903fc10bbaa076f4bcb
-  data.tar.gz: 0c2a9c95003732e1aece8365755465fd293d45da7d31dece163800993fa4dfbb5b89b3620439cd6e9afa545e2f79bac2261b87333cbe52e2a9fc0fd54d82ffe5
+  metadata.gz: 1893a6a91d753c54e265380bfc9bb18192813cc9127253c429f3d7431bf8b1cd4e919a83099a308e4723dd88a8f2726ac2d8d1e1886474904accd862a91d3b46
+  data.tar.gz: 77f130fa5224c4cd00a71add39c96b1aa5ccaaec9bcc986b4ed6b6ee6398644a64d4ad11078f146d0986239ad9bdc7c9aced4f223e0a35d309177fcd3fd28fd2

data/.hound.yml

@@ -0,0 +1,9 @@
+coffee_script:
+  enabled: true
+
+ruby:
+  enabled: true
+  config_file: .rubocop.yml
+
+scss:
+  enabled: true

data/.rubocop.yml

@@ -0,0 +1,278 @@
+AllCops:
+  Exclude:
+    - db/schema.rb
+    - bin/*
+  RunRailsCops: true
+
+AbcSize:
+  Enabled: false
+
+AccessorMethodName:
+  Enabled: true
+
+ActionFilter:
+  Enabled: true
+
+Alias:
+  Enabled: true
+
+AlignHash:
+  EnforcedHashRocketStyle: table
+  EnforcedColonStyle: table
+
+ArrayJoin:
+  Enabled: true
+
+AsciiComments:
+  Enabled: false
+
+AsciiIdentifiers:
+  Enabled: true
+
+Attr:
+  Enabled: true
+
+BlockNesting:
+  Enabled: false
+
+CaseEquality:
+  Enabled: false
+
+CharacterLiteral:
+  Enabled: false
+
+ClassAndModuleChildren:
+  Enabled: true
+
+ClassLength:
+  Enabled: false
+
+ClassVars:
+  Enabled: true
+
+CollectionMethods:
+  PreferredMethods:
+    collect: map
+    collect!: map!
+    detect: find
+    reduce: inject
+    find_all: select
+
+ColonMethodCall:
+  Enabled: true
+
+CommentAnnotation:
+  Enabled: false
+
+CyclomaticComplexity:
+  Enabled: false
+
+Delegate:
+  Enabled: false
+
+DeprecatedHashMethods:
+  Enabled: true
+
+Documentation:
+  Enabled: false
+
+DotPosition:
+  EnforcedStyle: trailing
+
+DoubleNegation:
+  Enabled: false
+
+EachWithObject:
+  Enabled: true
+
+# TODO When Rubocop adds support for this, use it (probably in 0.26.2)
+# EmptyLinesAroundClassBody:
+#   Enabled: false
+
+# TODO remove when EmptyLinesAroundClassBody is enabled
+EmptyLinesAroundBody:
+  Enabled: false
+
+EmptyLiteral:
+  Enabled: false
+
+Encoding:
+  Enabled: false
+
+EvenOdd:
+  Enabled: true
+
+FileName:
+  Enabled: false
+
+FlipFlop:
+  Enabled: false
+
+FormatString:
+  Enabled: true
+  EnforcedStyle: percent
+
+GlobalVars:
+  Enabled: true
+
+GuardClause:
+  Enabled: false
+
+IfUnlessModifier:
+  Enabled: false
+
+IfWithSemicolon:
+  Enabled: true
+
+InlineComment:
+  Enabled: false
+
+Lambda:
+  Enabled: true
+
+LambdaCall:
+  Enabled: true
+
+LineEndConcatenation:
+  Enabled: true
+
+LineLength:
+  Max: 80
+
+MethodCalledOnDoEndBlock:
+  Enabled: true
+
+MethodLength:
+  Enabled: false
+
+ModuleFunction:
+  Enabled: true
+
+NegatedIf:
+  Enabled: true
+
+NegatedWhile:
+  Enabled: true
+
+Next:
+  Enabled: true
+
+NilComparison:
+  Enabled: true
+
+Not:
+  Enabled: true
+
+NumericLiterals:
+  Enabled: true
+
+OneLineConditional:
+  Enabled: true
+
+OpMethod:
+  Enabled: true
+
+ParameterLists:
+  Enabled: false
+
+PercentLiteralDelimiters:
+  Enabled: false
+
+PerlBackrefs:
+  Enabled: false
+
+PredicateName:
+  NamePrefixBlacklist:
+    - is_
+
+Proc:
+  Enabled: true
+
+RaiseArgs:
+  Enabled: true
+
+RegexpLiteral:
+  Enabled: true
+
+SelfAssignment:
+  Enabled: true
+
+SingleLineBlockParams:
+  Enabled: false
+
+SingleLineMethods:
+  Enabled: false
+
+SignalException:
+  Enabled: false
+
+SpecialGlobalVars:
+  Enabled: true
+
+StringLiterals:
+  EnforcedStyle: single_quotes
+
+VariableInterpolation:
+  Enabled: false
+
+TrailingComma:
+  Enabled: true
+
+TrivialAccessors:
+  Enabled: true
+
+WhenThen:
+  Enabled: true
+
+WhileUntilModifier:
+  Enabled: false
+
+WordArray:
+  Enabled: true
+
+# Lint
+
+AmbiguousOperator:
+  Enabled: false
+
+AmbiguousRegexpLiteral:
+  Enabled: false
+
+AssignmentInCondition:
+  Enabled: false
+
+ConditionPosition:
+  Enabled: false
+
+DeprecatedClassMethods:
+  Enabled: false
+
+ElseLayout:
+  Enabled: false
+
+HandleExceptions:
+  Enabled: false
+
+InvalidCharacterLiteral:
+  Enabled: false
+
+LiteralInCondition:
+  Enabled: false
+
+LiteralInInterpolation:
+  Enabled: false
+
+Loop:
+  Enabled: false
+
+ParenthesesAsGroupedExpression:
+  Enabled: false
+
+RequireParentheses:
+  Enabled: false
+
+UnderscorePrefixedVariableName:
+  Enabled: false
+
+Void:
+  Enabled: false

data/.travis.yml

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

data/README.md

@@ -1,6 +1,6 @@
 # Blueberry Rails [![Build Status](https://secure.travis-ci.org/blueberryapps/blueberry_rails.png?branch=master)](http://travis-ci.org/blueberryapps/blueberry_rails)
 
-A Rails application template used at Blueberry Apps. 
+A Rails application template used at Blueberry Apps.
 
 ## Installation
 
@@ -12,6 +12,20 @@ Then you can run
 
     $ blueberry_rails newproject
 
+### Available options
+
+Twitter bootstrap
+
+    --bootstrap
+
+Devise
+
+    --devise
+
+Devise model
+
+    --devise_model User
+
 ## Gems
 
 Blueberry Rails template contains following gems by default:
@@ -41,7 +55,7 @@ Testing related:
 
 ## Credits
 
-Based on [suspenders](https://github.com/thoughtbot/suspenders/blob/master/README.md) 
+Based on [suspenders](https://github.com/thoughtbot/suspenders/blob/master/README.md)
 gem by [thoughtbot](http://thoughtbot.com/community).
 
 ## Contributing

data/lib/blueberry_rails/app_builder.rb

@@ -4,18 +4,19 @@ module BlueberryRails
     include BlueberryRails::ActionHelpers
 
     def readme
-      template 'README.md.erb', 'README.md'
+      copy_file 'README.md', 'README.md'
     end
 
-    def replace_gemfile
-      remove_file 'Gemfile'
+    def gitignore
+      copy_file 'gitignore_custom', '.gitignore'
+    end
+
+    def gemfile
       template 'Gemfile_custom.erb', 'Gemfile'
     end
 
-    def replace_secret_token
-      template 'secret_token.rb.erb',
-        'config/initializers/secret_token.rb',
-        force: true
+    def secret_token
+      template 'secret_token.rb.erb', 'config/initializers/secret_token.rb'
     end
 
     def disable_xml_params
@@ -54,9 +55,7 @@ module BlueberryRails
 
     def create_application_layout
       remove_file 'app/views/layouts/application.html.erb'
-      template 'layout.html.slim.erb',
-        'app/views/layouts/application.html.slim',
-        force: true
+      copy_file 'layout.html.slim', 'app/views/layouts/application.html.slim'
     end
 
     def create_pryrc
@@ -78,8 +77,7 @@ module BlueberryRails
     end
 
     def configure_rspec
-      remove_file 'spec/spec_helper.rb'
-      copy_file 'spec_helper.rb', 'spec/spec_helper.rb'
+      copy_file 'spec_helper.rb', 'spec/spec_helper.rb', force: true
     end
 
     def test_factories_first
@@ -158,26 +156,33 @@ module BlueberryRails
     end
 
     def setup_capistrano
-      template 'Capfile', 'Capfile'
+      copy_file 'Capfile', 'Capfile'
       template 'deploy.rb.erb', 'config/deploy.rb'
       template 'deploy_production.rb.erb', 'config/deploy/production.rb'
       template 'deploy_staging.rb.erb', 'config/deploy/staging.rb'
       template 'capistrano_dotenv.cap', 'lib/capistrano/tasks/dotenv.cap'
     end
 
+    def configure_simple_form
+      if options[:bootstrap]
+        generate 'simple_form:install --bootstrap'
+      else
+        generate 'simple_form:install'
+      end
+    end
+
     def replace_users_factory
       remove_file 'spec/factories/users.rb'
-      template 'users_factory.rb', 'spec/factories/users.rb'
+      copy_file 'users_factory.rb', 'spec/factories/users.rb'
     end
 
     def replace_root_controller_spec
       remove_file 'spec/controllers/root_controller_spec.rb'
-      template 'root_controller_spec.rb', 'spec/controllers/root_controller_spec.rb'
+      copy_file 'root_controller_spec.rb',
+                'spec/controllers/root_controller_spec.rb'
     end
 
     def setup_gitignore
-      remove_file '.gitignore'
-      copy_file 'gitignore', '.gitignore'
       [ 'spec/lib',
         'spec/controllers',
         'spec/features',

data/lib/blueberry_rails/generators/app_generator.rb

@@ -88,7 +88,7 @@ module BlueberryRails
     end
 
     def configure_app
-      build :replace_secret_token
+      build :secret_token
       build :disable_xml_params
       build :setup_mailer_hosts
       build :remove_turbolinks
@@ -101,6 +101,8 @@ module BlueberryRails
     end
 
     def setup_gems
+      say 'Setting up SimpleForm'
+      build :configure_simple_form
       if options[:devise]
         say 'Setting up devise'
         build :install_devise

data/lib/blueberry_rails/version.rb

@@ -1,7 +1,7 @@
 module BlueberryRails
-  VERSION = '0.3.3'
+  VERSION = '0.3.4'
 
-  RUBY_VERSION = '2.1.5'
+  RUBY_VERSION = '2.2.1'
 
-  RAILS_VERSION = '4.1.9'
+  RAILS_VERSION = '4.2.0'
 end

data/spec/blueberry_rails_spec.rb

@@ -1,64 +1,33 @@
 require 'minitest/autorun'
-require 'fileutils'
+require './spec/support/blueberry_rails_helpers.rb'
 
-class BlueberryRailsTest < Minitest::Unit::TestCase
+class BlueberryRailsTest < Minitest::Test
+  include BlueberryRailsHelpers
 
   def setup
-    FileUtils.rm_rf 'test_project'
+    remove_project_directory
     cmd 'dropdb test_project_development'
     cmd 'dropdb test_project_test'
-
-    %w[RUBYOPT BUNDLE_PATH BUNDLE_BIN_PATH BUNDLE_GEMFILE].each do |key|
-      set_env key, nil
-    end
-  end
-
-  def teardown
-    restore_env
-  end
-
-  def test_rake_runs_cleanly
-    create_project 'test_project'
-    assert run_rake('test_project')
-  end
-
-  def test_rake_runs_cleanly_with_bootstrap_option
-    create_project 'test_project', '--bootstrap'
-    assert run_rake('test_project')
   end
 
-  protected
-
-  def create_project(project_name, options = nil)
-    bin = File.expand_path(File.join('..', 'bin', 'blueberry_rails'), File.dirname(__FILE__))
-    cmd "#{bin} #{project_name} #{options}"
-  end
-
-  def run_rake(project_name)
-    Dir.chdir(project_name) do
-      cmd 'bundle exec rake db:create'
-      cmd 'bundle exec rake db:migrate'
-      cmd('bundle exec rake')
+  def run
+    Bundler.with_clean_env do
+      super
     end
   end
 
-  def cmd(command)
-    system "#{command}"
-  end
+  def test_rake_runs_cleanly
+    create_project
 
-  def original_env
-    @original_env ||= {}
+    assert_exist_file 'config', 'initializers', 'simple_form.rb'
+    assert run_rake
   end
 
-  def set_env(key, value)
-    original_env[key] = ENV.delete(key)
-    ENV[key] = value
-  end
+  def test_rake_runs_with_bootstrap_option
+    create_project '--bootstrap'
 
-  def restore_env
-    original_env.each do |key, val|
-      ENV[key] = val
-    end
+    assert_exist_file 'config', 'initializers', 'simple_form.rb'
+    assert_exist_file 'config', 'initializers', 'simple_form_bootstrap.rb'
+    assert run_rake
   end
-
 end

data/spec/support/blueberry_rails_helpers.rb

@@ -0,0 +1,42 @@
+require 'fileutils'
+
+module BlueberryRailsHelpers
+  APP_NAME = 'test_project'
+
+  def remove_project_directory
+    FileUtils.rm_rf(project_path)
+  end
+
+  def create_project(options = nil)
+    cmd "#{blueberry_rails_bin} #{APP_NAME} #{options}"
+  end
+
+  def run_rake
+    Dir.chdir(project_path) do
+      cmd 'bundle exec rake db:create'
+      cmd 'bundle exec rake db:migrate'
+      cmd 'bundle exec rake db:test:prepare'
+      cmd 'bundle exec rake'
+    end
+  end
+
+  def cmd(command)
+    system "#{command}"
+  end
+
+  def project_path
+    @project_path ||= Pathname.new("#{root_path}/#{APP_NAME}")
+  end
+
+  def blueberry_rails_bin
+    File.join(root_path, 'bin', 'blueberry_rails')
+  end
+
+  def root_path
+    File.expand_path('../../../', __FILE__)
+  end
+
+  def assert_exist_file(*path)
+    assert File.exists?(File.join(project_path, *path))
+  end
+end

data/templates/Gemfile_custom.erb

@@ -1,8 +1,7 @@
 source 'https://rubygems.org'
 
-ruby "<%= BlueberryRails::RUBY_VERSION %>"
-
 gem 'airbrake'
+gem 'autoprefixer-rails'
 <% if options[:bootstrap] -%>
 gem 'bootstrap-sass'
 <% end -%>
@@ -15,10 +14,10 @@ gem 'flutie'
 gem 'jquery-rails'
 gem 'pg'
 gem 'rails', '~> <%= BlueberryRails::RAILS_VERSION %>'
-gem 'sass-rails', '~> 4.0.4'
+gem 'sass-rails', '~> 5.0'
 gem 'simple_form'
 gem 'slim-rails'
-gem 'uglifier', '>= 2.5.0'
+gem 'uglifier', '>= 1.3.0'
 gem 'unicorn'
 
 group :development do
@@ -32,6 +31,7 @@ group :development do
   gem 'mailcatcher'
   gem 'pry-rails'
   gem 'spring'
+  gem 'web-console', '~> 2.0'
 end
 
 group :development, :test do

data/templates/travis.yml.erb

@@ -5,9 +5,7 @@ before_install:
   - sh -e /etc/init.d/xvfb start
 before_script:
   - cp .sample.env .env
-  <% if options[:database] == "postgresql" %>
-  - psql -c 'create database "<%= app_name %>_test";' -U postgres
-  <% end %>
+<% if options[:database] == "postgresql" %>  - psql -c 'create database "<%= app_name %>_test";' -U postgres<% end %>
 branches:
   only:
     - master

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blueberry_rails
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - BlueberryApps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-08 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.2.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.9
+        version: 4.2.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -61,6 +61,8 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".hound.yml"
+- ".rubocop.yml"
 - ".travis.yml"
 - Gemfile
 - LICENSE.txt
@@ -74,9 +76,10 @@ files:
 - lib/blueberry_rails/generators/app_generator.rb
 - lib/blueberry_rails/version.rb
 - spec/blueberry_rails_spec.rb
+- spec/support/blueberry_rails_helpers.rb
 - templates/Capfile
 - templates/Gemfile_custom.erb
-- templates/README.md.erb
+- templates/README.md
 - templates/_flashes.html.slim
 - templates/capistrano_dotenv.cap
 - templates/database.yml.erb
@@ -87,8 +90,8 @@ files:
 - templates/disable_xml_params.rb
 - templates/factories_spec.rb
 - templates/factory_girl_syntax.rb
-- templates/gitignore
-- templates/layout.html.slim.erb
+- templates/gitignore_custom
+- templates/layout.html.slim
 - templates/pryrc.rb
 - templates/root_controller_spec.rb
 - templates/secret_token.rb.erb
@@ -115,9 +118,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: A Rails app template by BlueberryApps
 test_files:
 - spec/blueberry_rails_spec.rb
+- spec/support/blueberry_rails_helpers.rb