blueberry_rails 0.2.4 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 59248038b12c11a1eaeffea38a92e4f02d963945
-  data.tar.gz: 84ba9261858f12a05637ae4cf28bd21391df0342
+  metadata.gz: 91ddc717f2b358fbe8ac773d2ad9e0a861e00eef
+  data.tar.gz: d45f1472dd712f6c14146abd46eb925be9e3dc96
 SHA512:
-  metadata.gz: d88ae47ab45dc691be0793ea076c0cdeb0cb72165fa9ad9772e076364729bbdfa561b4a0c80dda8990ced0679948e98528a5a374e21b6df83b6498eb6f8616f7
-  data.tar.gz: 5f9b9e5c529fcd8d09f44478b5bfcf2c14b4305855983452f018c11a9c86498152c4a143d5ead32e794755dcdd8487158d5006accd9fec91cf9b43e6ea86c30b
+  metadata.gz: 990e38a3acca0d77c0d7e852297e30591b0728153fdaf79e5add3af3e806c20c722d48c2738f3a11b1e8de3841e1e962fd4dbd739d346b65acbc882e1d8d9a3d
+  data.tar.gz: ce78aef6ea838f748c008f7c0cff60d68bb0e4c72efec2c20873b9cc6cd3a1dc440dc1dd883c1b955ed5890a8e3e639fc1c3b020e9f76e30828da816131c8c57

data/.travis.yml

@@ -3,6 +3,7 @@ script: 'bundle exec rake'
 rvm:
   - 1.9.3
   - 2.0.0
+  - 2.1.1
 before_install:
   - gem update --system
 

data/blueberry_rails.gemspec

@@ -19,10 +19,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'bundler', '~> 1.3'
-  spec.add_dependency 'rails', '4.0.3'
+  spec.add_dependency 'rails', '4.1.0'
 
   spec.add_development_dependency 'rake'
-  spec.add_development_dependency 'minitest', '~> 4.7'
 
   spec.required_ruby_version = '>= 1.9.2'
 

data/lib/blueberry_rails/app_builder.rb

@@ -122,13 +122,19 @@ module BlueberryRails
     end
 
     def add_ruby_version_file
-      add_file '.ruby-version', "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
+      current_version = RUBY_VERSION.split('.').map(&:to_i)
+      version = if current_version[0] >= 2 && current_version[1] >= 0
+                  RUBY_VERSION
+                else
+                  "#{RUBY_VERSION}-p#{RUBY_PATCHLEVEL}"
+                end
+      add_file '.ruby-version', version
     end
 
     def remove_routes_comment_lines
       replace_in_file 'config/routes.rb',
-                      /Application\.routes\.draw do.*end/m,
-                      "Application.routes.draw do\nend"
+                      /Rails.application\.routes\.draw do.*end/m,
+                      "Rails.application.routes.draw do\nend"
     end
 
     def install_devise
@@ -137,7 +143,7 @@ module BlueberryRails
       remove_routes_comment_lines
       inject_into_file 'config/routes.rb',
                        "  root to: 'root#index'\n",
-                       after: "#{app_const}.routes.draw do\n"
+                       after: "Rails.application.routes.draw do\n"
       if options[:devise_model].present?
         generate 'devise', options[:devise_model]
       end

data/lib/blueberry_rails/generators/app_generator.rb

@@ -4,20 +4,25 @@ require 'rails/generators/rails/app/app_generator'
 module BlueberryRails
   class AppGenerator < Rails::Generators::AppGenerator
 
-    class_option :database, :type => :string, :aliases => '-d', :default => 'postgresql',
-    :esc => "Preconfigure for selected database (options: #{DATABASES.join('/')})"
+    class_option :database, :type => :string, :aliases => '-d',
+      :default => 'postgresql',
+      :desc => "Preconfigure for selected database " +
+               "(options: #{DATABASES.join('/')})"
 
     # class_option :github, :type => :string, :aliases => '-G', :default => nil,
     #   :desc => 'Create Github repository and add remote origin pointed to repo'
 
+    class_option :bootstrap, :type => :boolean, :aliases => '-b',
+      :default => false, :desc => 'Include bootstrap 3'
+
     class_option :devise, :type => :boolean, :aliases => '-D', :default => true,
       :desc => 'Include and generate devise'
 
-    class_option :devise_model, :type => :string, :aliases => '-M', :default => 'User',
-      :desc => 'Name of devise model to generate'
+    class_option :devise_model, :type => :string, :aliases => '-M',
+      :default => 'User', :desc => 'Name of devise model to generate'
 
-    class_option :skip_test_unit, :type => :boolean, :aliases => '-T', :default => true,
-      :desc => 'Skip Test::Unit files'
+    class_option :skip_test_unit, :type => :boolean, :aliases => '-T',
+      :default => true, :desc => 'Skip Test::Unit files'
 
     def finish_template
       invoke :blueberry_customization

data/lib/blueberry_rails/version.rb

@@ -1,3 +1,3 @@
 module BlueberryRails
-  VERSION = "0.2.4"
+  VERSION = "0.3.0"
 end

data/spec/blueberry_rails_spec.rb

@@ -17,23 +17,27 @@ class BlueberryRailsTest < Minitest::Unit::TestCase
     restore_env
   end
 
-  def test_rake_runs_cleanly_first
+  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)
+  def create_project(project_name, options = nil)
     bin = File.expand_path(File.join('..', 'bin', 'blueberry_rails'), File.dirname(__FILE__))
-    cmd "#{bin} #{project_name}"
+    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 db:test:prepare'
       cmd('bundle exec rake')
     end
   end

data/templates/Gemfile_custom.erb

@@ -1,6 +1,9 @@
 source 'https://rubygems.org'
 
 gem 'airbrake'
+<% if options[:bootstrap] -%>
+gem 'bootstrap-sass'
+<% end -%>
 gem 'coffee-rails', '~> 4.0.0'
 <% if options[:devise] -%>
 gem 'devise'
@@ -9,14 +12,15 @@ gem 'dotenv-rails'
 gem 'flutie'
 gem 'jquery-rails'
 gem 'pg'
-gem 'rails', '~> 4.0.3'
-gem 'sass-rails', '~> 4.0.0'
+gem 'rails', '~> 4.1.1'
+gem 'sass-rails', '~> 4.0.3'
 gem 'simple_form'
 gem 'slim-rails'
 gem 'uglifier', '>= 1.3.0'
 
 group :development do
   gem 'better_errors'
+  gem 'binding_of_caller'
   gem 'capistrano', '~> 3.0.0'
   gem 'capistrano-bundler'
   gem 'capistrano-rails'
@@ -24,6 +28,7 @@ group :development do
   gem 'guard-rspec'
   gem 'mailcatcher'
   gem 'pry-rails'
+  gem 'spring'
 end
 
 group :development, :test do

data/templates/layout.html.slim.erb

@@ -3,7 +3,7 @@ html
   head
     title= page_title
     meta charset="utf-8"
-    = stylesheet_link_tag :application, :media => 'all'
+    = stylesheet_link_tag :application, media: 'all'
     = csrf_meta_tags
 
   body class=body_class

data/templates/spec_helper.rb

@@ -10,6 +10,8 @@ require 'capybara/poltergeist'
 
 Dir[Rails.root.join('spec/support/**/*.rb')].each { |file| require file }
 
+ActiveRecord::Migration.maintain_test_schema!
+
 RSpec.configure do |config|
   config.expect_with :rspec do |c|
     c.syntax = :expect

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: blueberry_rails
 version: !ruby/object:Gem::Version
-  version: 0.2.4
+  version: 0.3.0
 platform: ruby
 authors:
 - BlueberryApps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-05-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.0.3
+        version: 4.1.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -52,20 +52,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: minitest
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4.7'
 description: 'A Rails app template by BlueberryApps '
 email:
 - jzajpt@blueberry.cz
@@ -127,7 +113,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: A Rails app template by BlueberryApps