blueberry_rails 0.1.2 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c981cb74af7ec7df5b6f4ebb5872b0ee33d40cf
-  data.tar.gz: 74037ea0c83d48e8e935603d461edf37de278b84
+  metadata.gz: ddc00961037dec35550d81a01209ec15b9236ff8
+  data.tar.gz: f9e0c9a4f44f5b0fed5f25fe972bad8e430e543b
 SHA512:
-  metadata.gz: ef1f5b0d7a01572c4234f8ccdf7567f514e44716accb871b43aba1780dcd5a5770fdbb63a2fd53882d5fbed8e93ecf6722257468fefc8609fdcfaf1a9652a57f
-  data.tar.gz: a6f3771a29246d66e6b5e277203b1b178ca567b0bea9ec711129d208333c20785a1ffabeaa712f45c84697adeefc40f078da06c22c5af41e494c9bab7d68efa4
+  metadata.gz: 4649cf6aeac71649e3073ce058a57f1f765f611c3ff08062fdb0b336b848c7b880e005688ec1005c5d142e857126c4a4f95fb602dbbb7806f8edc093fa83bcc8
+  data.tar.gz: c29f8e2e771a2a1127a65a39266953979acad6ef5a7488ad35b8fa5152d769099d82703b02ae339059410607a9ea010069fe8f1ad457b417a2f5240f3633bebc

data/.gitignore

@@ -12,6 +12,7 @@ lib/bundler/man
 pkg
 rdoc
 spec/reports
+test_project
 test/tmp
 test/version_tmp
 tmp

data/.travis.yml

@@ -0,0 +1,8 @@
+language: ruby
+script: 'bundle exec rake'
+rvm:
+  - 1.9.3
+  - 2.0.0
+before_install:
+  - gem update --system
+

data/README.md

@@ -1,4 +1,4 @@
-# Blueberry Rails
+# 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. 
 

data/Rakefile

@@ -1 +1,9 @@
-require "bundler/gem_tasks"
+require 'bundler/setup'
+require 'bundler/gem_tasks'
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.test_files = Dir.glob('spec/**/*_spec.rb')
+end
+
+task(default: :test)

data/blueberry_rails.gemspec

@@ -6,7 +6,7 @@ require 'blueberry_rails/version'
 Gem::Specification.new do |spec|
   spec.name          = 'blueberry_rails'
   spec.version       = BlueberryRails::VERSION
-  spec.authors       = ['Blueberryapps']
+  spec.authors       = ['BlueberryApps']
   spec.email         = ['jzajpt@blueberry.cz']
   spec.description   = %q{A Rails app template by BlueberryApps }
   spec.summary       = %q{A Rails app template by BlueberryApps}
@@ -16,10 +16,15 @@ Gem::Specification.new do |spec|
   spec.files         = `git ls-files`.split($/)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
-  spec.require_paths = ["lib"]
+  spec.require_paths = ['lib']
 
-  spec.add_development_dependency 'bundler', '~> 1.3'
-  spec.add_development_dependency 'rake'
+  spec.add_dependency 'bundler', '~> 1.3'
   spec.add_dependency 'rails', '4.0.0'
+
+  spec.add_development_dependency 'rake'
+  spec.add_development_dependency 'minitest', '~> 4.7'
+
+  spec.required_ruby_version = '>= 1.9.2'
+
 end
 

data/lib/blueberry_rails/app_builder.rb

@@ -82,8 +82,9 @@ module BlueberryRails
       copy_file 'factories_spec.rb', 'spec/models/factories_spec.rb'
     end
 
-    def enable_factory_girl_syntax
+    def setup_rspec_support_files
       copy_file 'factory_girl_syntax.rb', 'spec/support/factory_girl.rb'
+      copy_file 'database_cleaner_setup.rb', 'spec/support/databse_cleaner.rb'
     end
 
     def init_guard
@@ -143,12 +144,21 @@ module BlueberryRails
     end
 
     def setup_capistrano
-      bundle_command 'exec capify .'
-      remove_file 'config/deploy.rb'
+      template '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'
-      run 'mkdir config/deploy'
+      template 'capistrano_dotenv.cap', 'lib/capistrano/tasks/dotenv.cap'
+    end
+
+    def replace_users_factory
+      remove_file 'spec/factories/users.rb'
+      template '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'
     end
 
     def setup_gitignore

data/lib/blueberry_rails/generators/app_generator.rb

@@ -34,6 +34,7 @@ module BlueberryRails
       invoke :configure_app
       invoke :remove_routes_comment_lines
       invoke :setup_gems
+      invoke :fix_specs
       invoke :setup_git
     end
 
@@ -64,7 +65,7 @@ module BlueberryRails
       say 'Setting up the test environment'
       build :generate_rspec
       build :configure_rspec
-      build :enable_factory_girl_syntax
+      build :setup_rspec_support_files
       build :test_factories_first
       build :init_guard
     end
@@ -101,6 +102,11 @@ module BlueberryRails
       build :setup_capistrano
     end
 
+    def fix_specs
+      build :replace_users_factory
+      build :replace_root_controller_spec
+    end
+
     def setup_git
       say 'Initializing git'
       build :setup_gitignore

data/lib/blueberry_rails/version.rb

@@ -1,3 +1,3 @@
 module BlueberryRails
-  VERSION = "0.1.2"
+  VERSION = "0.2.0"
 end

data/spec/blueberry_rails_spec.rb

@@ -0,0 +1,60 @@
+require 'minitest/autorun'
+require 'fileutils'
+
+class BlueberryRailsTest < Minitest::Unit::TestCase
+
+  def setup
+    FileUtils.rm_rf 'test_project'
+    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_first
+    create_project 'test_project'
+    assert run_rake('test_project')
+  end
+
+  protected
+
+  def create_project(project_name)
+    bin = File.expand_path(File.join('..', 'bin', 'blueberry_rails'), File.dirname(__FILE__))
+    cmd "#{bin} #{project_name}"
+  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
+
+  def cmd(command)
+    system "#{command}"
+  end
+
+  def original_env
+    @original_env ||= {}
+  end
+
+  def set_env(key, value)
+    original_env[key] = ENV.delete(key)
+    ENV[key] = value
+  end
+
+  def restore_env
+    original_env.each do |key, val|
+      ENV[key] = val
+    end
+  end
+
+end

data/templates/Capfile

@@ -0,0 +1,8 @@
+require 'capistrano/setup'
+require 'capistrano/deploy'
+require 'capistrano/bundler'
+require 'capistrano/rbenv'
+require 'capistrano/rails/assets'
+require 'capistrano/rails/migrations'
+
+Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }

data/templates/Gemfile_custom.erb

@@ -16,7 +16,10 @@ gem 'uglifier', '>= 1.3.0'
 
 group :development do
   gem 'better_errors'
-  gem 'capistrano'
+  gem 'capistrano', '~> 3.0.0'
+  gem 'capistrano-bundler'
+  gem 'capistrano-rails'
+  gem 'capistrano-rbenv', github: 'capistrano/rbenv'
   gem 'guard-rails'
   gem 'mailcatcher'
 end

data/templates/capistrano_dotenv.cap

@@ -0,0 +1,24 @@
+namespace :deploy do
+
+  after :updating, 'dotenv:symlink'
+
+end
+
+namespace :dotenv do
+
+  desc "Symlink .env file"
+  task :symlink do
+    on roles(:app) do
+      target = release_path.join('.env')
+      source = shared_path.join('config/dotenv')
+      unless test "[ -L #{target} ]"
+        if test "[ -f #{target} ]"
+          execute :rm, target
+        end
+        execute :ln, '-s', source, target
+      end
+    end
+  end
+
+end
+

data/templates/database_cleaner_setup.rb

@@ -0,0 +1,23 @@
+RSpec.configure do |config|
+
+  config.before(:suite) do
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.strategy = :transaction
+  end
+
+  config.before(:each, :js => true) do
+    DatabaseCleaner.strategy = :truncation
+  end
+
+  config.before(:each) do
+    DatabaseCleaner.start
+  end
+
+  config.after(:each) do
+    DatabaseCleaner.clean
+  end
+
+end

data/templates/deploy.rb.erb

@@ -1,40 +1,28 @@
-require 'bundler/capistrano'
-set :bundle_without, [:darwin, :test]
-
-set :stages, %w(staging production)
-require 'capistrano/ext/multistage'
-
 set :application, '<%= app_name %>'
-set :repository,  'git@github.com:blueberryapps/<%= app_name %>.git'
+set :repo_url,    'git@github.com:blueberryapps/<%= app_name %>.git'
 set :branch,      'master'
+set :scm,         :git
+
+set :format, :pretty
+set :log_level, :debug
 
-default_run_options[:pty] = true
-ssh_options[:forward_agent] = true
+set :linked_files, %w(config/database.yml)
+# set :linked_dirs, %w{bin log tmp/pids tmp/cache tmp/sockets vendor/bundle public/system}
 
-set :use_sudo,       false
-set :deploy_via,     :remote_cache
-set :keep_releases,  3
-set :group_writable, false
-ssh_options[:forward_agent] = true
+set :rbenv_type, :system
+set :rbenv_ruby, `git show #{fetch(:branch)}:.ruby-version`
 
-after 'deploy:restart',     'deploy:cleanup'
-after 'deploy:update_code', 'deploy:symlink_shared'
-load 'deploy/assets'
+set :keep_releases, 5
 
 namespace :deploy do
 
-  task :start do ; end
-  task :stop do ; end
-  task :restart, :roles => :app, :except => { :no_release => true } do
-    run "#{try_sudo} touch #{File.join(current_path, 'tmp', 'restart.txt')}"
+  desc 'Restart application'
+  task :restart do
+    on roles(:app), in: :sequence, wait: 5 do
+      execute :touch, release_path.join('tmp/restart.txt')
+    end
   end
 
-  desc 'Create symbolic links for all shared and platform-specific resources.'
-  task :symlink_shared, roles: [:app] do
-    run "ln -nfs #{shared_path}/config/database.yml #{release_path}/config/database.yml"
-    run "ln -nfs #{shared_path}/system #{release_path}/public/system"
-    run "ln -nfs #{shared_path}/config/dotenv #{release_path}/.env"
-  end
+  after :finishing, 'deploy:cleanup'
 
 end
-

data/templates/deploy_production.rb.erb

@@ -1,5 +1,7 @@
-server 'REPLACE_ME',  :app, :web, :db, primary: true
-set :rails_env,       'production'
-set :user,            '<%= app_name %>_com'
-set :deploy_to,       '/var/www/<%= app_name %>_com'
+set :stage,     :production
+set :rails_env, 'production'
+set :deploy_to, '/var/www/<%= app_name %>_com'
 
+server 'REPLACE_ME',
+       user: '<%= app_name %>',
+       roles: %w(web app db)

data/templates/deploy_staging.rb.erb

@@ -1,5 +1,8 @@
-server 'REPLACE_ME',  :app, :web, :db, primary: true
-set :rails_env,       'staging'
-set :user,            '<%= app_name %>_webapps_cz'
-set :deploy_to,       '/var/www/<%= app_name %>_webpapps_cz'
+set :stage,     :staging
+set :deploy_to, '/var/www/<%= app_name %>_webapps_cz'
+set :rails_env, 'staging'
+
+server 'REPLACE_ME',
+        user: '<%= app_name %>_webapps_cz',
+        roles: %w(web app db)
 

data/templates/root_controller_spec.rb

@@ -0,0 +1,12 @@
+require 'spec_helper'
+
+describe RootController do
+
+  describe "GET 'index'" do
+    it "returns http success" do
+      get 'index'
+      expect(response).to be_success
+    end
+  end
+
+end

data/templates/users_factory.rb

@@ -0,0 +1,6 @@
+FactoryGirl.define do
+  factory :user do
+    sequence(:email) { |n| "joe#{n}@example.com" }
+    password         'joesthebest'
+  end
+end

metadata

@@ -1,57 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: blueberry_rails
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.2.0
 platform: ruby
 authors:
-- Blueberryapps
+- BlueberryApps
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-10 00:00:00.000000000 Z
+date: 2013-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rails
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 4.0.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
-  type: :runtime
+        version: '4.7'
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: '4.7'
 description: 'A Rails app template by BlueberryApps '
 email:
 - jzajpt@blueberry.cz
@@ -60,7 +74,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
+- .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -72,10 +87,14 @@ files:
 - lib/blueberry_rails/app_builder.rb
 - lib/blueberry_rails/generators/app_generator.rb
 - lib/blueberry_rails/version.rb
+- spec/blueberry_rails_spec.rb
+- templates/Capfile
 - templates/Gemfile_custom.erb
 - templates/README.md.erb
 - templates/_flashes.html.slim
+- templates/capistrano_dotenv.cap
 - templates/database.yml.erb
+- templates/database_cleaner_setup.rb
 - templates/deploy.rb.erb
 - templates/deploy_production.rb.erb
 - templates/deploy_staging.rb.erb
@@ -84,8 +103,10 @@ files:
 - templates/factory_girl_syntax.rb
 - templates/gitignore
 - templates/layout.html.slim.erb
+- templates/root_controller_spec.rb
 - templates/secret_token.rb.erb
 - templates/spec_helper.rb
+- templates/users_factory.rb
 homepage: https://github.com/blueberryapps/blueberry_rails
 licenses:
 - MIT
@@ -96,18 +117,19 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.10
 signing_key: 
 specification_version: 4
 summary: A Rails app template by BlueberryApps
-test_files: []
+test_files:
+- spec/blueberry_rails_spec.rb