locum-best-practices 0.3.0 → 0.4.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d18e463393ee729088d6af916e5ca1fc4c754903
-  data.tar.gz: e076023f6afd0849b9ed899bd99954787b00e1ed
+  metadata.gz: 891fb958d5e5fb264c5fbdeb7ecb4f3b586b4051
+  data.tar.gz: 08eca4aec121e9516b56f127cd7be2ae790e9e6c
 SHA512:
-  metadata.gz: 46de4e3bba774fc02daa55c2c311ec6ac0a08552ee8045b1394ac6116f74ef61775fe3e2c473a24c40938f68a8a1ac01bb988542e0c718a6a9e8d21852d754ca
-  data.tar.gz: 56870fe2886815e5dda2c6cddafc10629fadb0127d99a3d617d9024f96bdd7d647235369380681827d9159656ece9b003b2c62620f9e2f3b84dff640ec70ddeb
+  metadata.gz: dc6c62fcaf17bfa443fdbd2417403119f4c85cd9b4271f445f917639710df3ac799542c6f0aefc61d38bb2c643ae1a2cef00c86527d13b121e2aeb3fbe711883
+  data.tar.gz: 73542ecc4ff7e8c404dbee0af7bc738592d5158a57544226455a03279f66ca918dfd802c75dad18b7a9ec89f3e23b4b5bf03169da4d74a787083f27f952d906b

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 .idea/
 doc/
+*.gem

data/README.md

@@ -1,13 +1,24 @@
 # Locum Best Practices
+This gem makes your configuring deployment on [locum.ru](http://locum.ru/) faster!
 > for Ruby on Rails applications
 
 ## Features
 
 * Deployment
   - Capistrano integration
-  - configuration and stages generator
-  - custom tasks
-  - predefined default [settings](lib/capistrano/snp/defaults.rb)
+  - Configuration generator
+  - Custom tasks
+  - Predefined default [settings](lib/capistrano/locum/defaults.rb)
+  - Pretty logs with [Airbrussh gem](https://github.com/mattbrictson/airbrussh)
+  
+* Environment
+  - All secret variables in one file [application](lib/generators/locum/templates/deploy/config/application.yml.tt)
+  - Variables with [Figaro gem](https://github.com/laserlemon/figaro)
+  - Require keys
+  
+* Web server
+  - Unicorn in requirements
+  - Config predefined  
   
 ## Requirements
 
@@ -30,17 +41,17 @@ And then execute:
 
 ## Usage
 
-## Advanced usage
-
-### Install `gem locum` in your system only. Not include it in gemfile:
+### Install `gem locum` in your system only. Not include it in your gemfile:
 
     gem install locum
   
-### And execute after `cap install`:
+### And execute:
 
-    $ locum cap 
+    $ locum init
+    
+    > You need enter login and password from locum hosting account.
 
-### Add deployment configuration
+### Add deployment configuration:
 
     $ rails g locum:deploy
 
@@ -49,6 +60,8 @@ This creates the following files, you can edit them for your choice.
 ```
 ├── Capfile
 └── config
+    ├── initializers
+    │   └── figaro.rb
     ├── deploy
     │   ├── production.rb
     │   └── testing.rb
@@ -56,6 +69,8 @@ This creates the following files, you can edit them for your choice.
     │   └── testing.rb
     ├── deploy.rb
     ├── newrelic.yml
+    ├── database.yml
+    ├── secrets.yml
     └── application.yml
 ├── .editorconfig  
 └── .rubocop.yml

data/lib/capistrano/locum/defaults.rb

@@ -1,6 +1,6 @@
 namespace :load do
   task :defaults do
-    lock '3.4.0'
+    lock '>= 3.4.0'
     load "config/deploy.rb"
     load "config/deploy/#{fetch(:stage)}.rb" if fetch(:stage)
 
@@ -14,14 +14,13 @@ namespace :load do
     ask :branch,                proc { `git rev-parse --abbrev-ref HEAD`.chomp }.call
 
     set :scm,                   :git
-    set :format,                :pretty
     set :pty,                   true
 
     set :log_level,             :info
     set :keep_releases,         5
     set :env, worker_count:     8
 
-    set :linked_files,          fetch(:linked_files, []) + %w(config/database.yml config/application.yml config/newrelic.yml)
+    set :linked_files,          fetch(:linked_files, []) + %w(config/application.yml public/sitemap.xml)
     set :linked_dirs,           fetch(:linked_dirs, []) + %w(bin log tmp/cache tmp/pids tmp/sockets vendor/bundle public/system public/uploads public/mails)
 
     set :default_environments,  'RAILS_ENV=production'

data/lib/capistrano/tasks/assets.cap

@@ -1,22 +1,29 @@
 namespace :assets do
-  desc 'Assets precompile'
-  task :compile do
+  desc 'Precompile all assets in pipeline'
+  task :precompile do
     on roles(:app, :web, :db) do
       execute "cd #{fetch(:deploy_to)}/current; #{fetch(:production_rake)} assets:precompile"
     end
   end
 
-  desc 'Assets clear'
+  desc 'Clears not actual versions of assets'
   task :clear do
     on roles(:app, :wev, :db) do
       execute "cd #{fetch(:deploy_to)}/current; #{fetch(:production_rake)} assets:clean"
     end
   end
 
-  desc 'Assets nuke'
-  task :nuke do
+  desc 'Clobber?'
+  task :clobber do
     on roles(:app, :wev, :db) do
       execute "cd #{fetch(:deploy_to)}/current; #{fetch(:production_rake)} assets:clobber"
     end
   end
+
+  desc 'Permanent removes all assets'
+  task :explode do
+    on roles(:app, :wev, :db) do
+      execute "cd #{fetch(:deploy_to)}/shared/public; rm -rf assets"
+    end
+  end
 end

data/lib/generators/locum/templates/deploy/Capfile.tt

@@ -7,6 +7,7 @@ require 'capistrano/rails/migrations'
 require 'capistrano/rails/assets'
 require 'capistrano3/unicorn'
 require 'capistrano/rails/console'
+require 'airbrussh/capistrano'
 require 'capistrano/locum'
 
 Dir.glob('lib/capistrano/tasks/*.cap').each { |r| import r }

data/lib/generators/locum/templates/deploy/config/application.yml.tt

@@ -1,3 +1,14 @@
-#host: site host
-#title: application title
-#redis_url: redis server url
+title: 'application_title'
+project: 'project_name'
+
+host: 'host_and_port_to_run'
+redis_url: 'host_redis'
+
+db_user: 'database_user'
+db_password: 'database_password'
+db_host: 'database_host'
+
+secret_development: 'rake secret'
+secret_testing: 'rake secret'
+secret_production: 'rake secret'
+newrelic_key: 'newrelic_licence_key'

data/lib/generators/locum/templates/deploy/config/database.yml.tt

@@ -0,0 +1,15 @@
+default: &default
+  adapter: postgresql
+  encoding: unicode
+  pool: 5
+  user: <%= Figaro.env.db_user %>
+  password: <%= Figaro.env.db_password %>
+
+development:
+  <<: *default
+  database: <%= Figaro.env.project %>
+
+production:
+  <<: *default
+  database: <%= Figaro.env.db_user %>
+  host: <%= Figaro.env.db_host %>

data/lib/generators/locum/templates/deploy/config/initializers/figaro.rb.tt

@@ -0,0 +1,2 @@
+Figaro.require_keys('title', 'project', 'host', 'db_user', 'db_password', 'db_host',
+                    'secret_development', 'secret_testing', 'secret_production')

data/lib/generators/locum/templates/deploy/config/newrelic.yml.tt

@@ -1,11 +1,11 @@
 common: &default_settings
-  license_key: your_licence_key
-  app_name: application_title
+  license_key: <%= Figaro.env.new_relic_key %>
+  app_name: <%= Figaro.env.title %>
   log_level: info
 
 development:
   <<: *default_settings
-  app_name: application_title (Development)
+  app_name: <%= "#{Figaro.env.title} (Development)" %>
   developer_mode: true
   monitor_mode: false
 
@@ -15,7 +15,7 @@ test:
 
 staging:
   <<: *default_settings
-  app_name: application_title (Staging)
+  app_name: <%= "#{Figaro.env.title} (Staging)" %>
 
 production:
   <<: *default_settings

data/lib/generators/locum/templates/deploy/config/secrets.yml.tt

@@ -0,0 +1,8 @@
+development:
+  secret_key_base: <%= Figaro.env.secret_development %>
+
+test:
+  secret_key_base: <%= Figaro.env.secret_testing %>
+
+production:
+  secret_key_base: <%= Figaro.env.secret_production %>

data/lib/generators/locum/templates/deploy/config/unicorn.rb.tt

@@ -0,0 +1 @@
+timeout 30 * 60 * 60 * 24

data/lib/locum_best_practices/version.rb

@@ -1,3 +1,3 @@
 module LocumBestPractices
-  VERSION = '0.3.0'
+  VERSION = '0.4.5'
 end

data/locum-best-practices.gemspec

@@ -6,7 +6,7 @@ Gem::Specification.new do |spec|
   spec.name          = 'locum-best-practices'
   spec.version       = LocumBestPractices::VERSION
   spec.authors       = %w(DarkWater)
-  spec.email         = %w(darkwater666@mail.ru)
+  spec.email         = %w(denis.arushanov@darkcreative.ru)
 
   spec.summary       = 'Simple best practices, used for soft deployment to locum hosting'
   spec.description   = 'Contains deploy configuration'
@@ -25,17 +25,21 @@ Gem::Specification.new do |spec|
 
   spec.required_ruby_version = '>= 2.2.0'
 
-  spec.add_development_dependency 'bundler', '~> 1.10.0'
-  spec.add_development_dependency 'rake', '~> 10.0.0'
+  spec.add_development_dependency 'bundler', '~> 1.10', '>= 1.10.0'
+  spec.add_development_dependency 'rake', '~> 10.0', '>= 10.0.0'
 
-  spec.add_development_dependency 'redcarpet', '~> 1.17.0'
-  spec.add_development_dependency 'yard', '~> 0.7.5'
+  spec.add_development_dependency 'redcarpet', '~> 1.17', '>= 1.17.0'
+  spec.add_development_dependency 'yard', '~> 0.7', '>= 0.7.5'
 
-  spec.add_dependency 'capistrano', '~> 3.4.0'
-  spec.add_dependency 'capistrano-rails', '~> 1.1.0'
-  spec.add_dependency 'capistrano-rvm', '~> 0.1.0'
-  spec.add_dependency 'capistrano3-unicorn', '~> 0.2.0'
-  spec.add_dependency 'capistrano-rails-console', '~> 1.0.0'
+  spec.add_dependency 'capistrano', '~> 3.4', '>= 3.4.0'
+  spec.add_dependency 'capistrano-rails', '~> 1.1', '>= 1.1.0'
+  spec.add_dependency 'capistrano-rvm', '~> 0.1', '>= 0.1.0'
+  spec.add_dependency 'capistrano3-unicorn', '~> 0.2', '>= 0.2.0'
+  spec.add_dependency 'capistrano-rails-console', '~> 1.0', '>= 1.0.0'
+  spec.add_dependency 'figaro', '~> 1.1', '>= 1.1.1'
+  spec.add_dependency 'unicorn', '~> 5.0', '>= 5.0.0'
+  spec.add_dependency 'unicorn-worker-killer', '~> 0.4', '>= 0.4.0'
+  spec.add_dependency 'airbrussh', '~> 1.0', '>= 1.0.0'
 
-  spec.add_development_dependency 'rubocop', '>= 0.3.0'
+  spec.add_development_dependency 'rubocop', '~> 0.3', '>= 0.3.0'
 end

metadata

@@ -1,20 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: locum-best-practices
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.5
 platform: ruby
 authors:
 - DarkWater
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-02-14 00:00:00.000000000 Z
+date: 2016-07-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.10.0
   type: :development
@@ -22,6 +25,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.10'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.10.0
 - !ruby/object:Gem::Dependency
@@ -29,6 +35,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
   type: :development
@@ -36,6 +45,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 10.0.0
 - !ruby/object:Gem::Dependency
@@ -43,6 +55,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.17'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.17.0
   type: :development
@@ -50,6 +65,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.17'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.17.0
 - !ruby/object:Gem::Dependency
@@ -57,6 +75,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.5
   type: :development
@@ -64,6 +85,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.7'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.7.5
 - !ruby/object:Gem::Dependency
@@ -71,6 +95,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.0
   type: :runtime
@@ -78,6 +105,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.4'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 3.4.0
 - !ruby/object:Gem::Dependency
@@ -85,6 +115,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
@@ -92,6 +125,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.1.0
 - !ruby/object:Gem::Dependency
@@ -99,6 +135,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
   type: :runtime
@@ -106,6 +145,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.1'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.1.0
 - !ruby/object:Gem::Dependency
@@ -113,6 +155,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
   type: :runtime
@@ -120,6 +165,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.2'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.2.0
 - !ruby/object:Gem::Dependency
@@ -127,6 +175,89 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.0.0
+- !ruby/object:Gem::Dependency
+  name: figaro
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.1
+- !ruby/object:Gem::Dependency
+  name: unicorn
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '5.0'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 5.0.0
+- !ruby/object:Gem::Dependency
+  name: unicorn-worker-killer
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.4'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.4.0
+- !ruby/object:Gem::Dependency
+  name: airbrussh
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
@@ -134,12 +265,18 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
@@ -147,12 +284,15 @@ dependencies:
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
 description: Contains deploy configuration
 email:
-- darkwater666@mail.ru
+- denis.arushanov@darkcreative.ru
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -177,17 +317,20 @@ files:
 - lib/capistrano/tasks/sidekiq.cap
 - lib/capistrano/tasks/ssh.cap
 - lib/generators/locum/deploy_generator.rb
-- lib/generators/locum/templates/deploy/.editornconfig.tt
+- lib/generators/locum/templates/deploy/.editorconfig.tt
 - lib/generators/locum/templates/deploy/.rubocop.yml.tt
 - lib/generators/locum/templates/deploy/Capfile.tt
 - lib/generators/locum/templates/deploy/config/application.yml.tt
+- lib/generators/locum/templates/deploy/config/database.yml.tt
 - lib/generators/locum/templates/deploy/config/deploy.rb.tt
 - lib/generators/locum/templates/deploy/config/deploy/production.rb.tt
 - lib/generators/locum/templates/deploy/config/deploy/testing.rb.tt
+- lib/generators/locum/templates/deploy/config/initializers/figaro.rb.tt
 - lib/generators/locum/templates/deploy/config/newrelic.yml.tt
+- lib/generators/locum/templates/deploy/config/secrets.yml.tt
+- lib/generators/locum/templates/deploy/config/unicorn.rb.tt
 - lib/locum-best-pratices.rb
 - lib/locum_best_practices/version.rb
-- locum-best-practices-0.2.gem
 - locum-best-practices.gemspec
 homepage: https://github.com/DarkWater666/locum-best-practices
 licenses: []