openteam-capistrano 1.0.12 → 1.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b7030132e8e05a25491e2bc13d81a77ee68bd591
-  data.tar.gz: 3b4ba6edef3bf2ec18ac079a38c7648f99366ccf
+  metadata.gz: 6d955585c6c9422fa3460602caa4c252e303dcad
+  data.tar.gz: 1c579d7534cc7faa4fc6174d30d1ef04793a6a0a
 SHA512:
-  metadata.gz: a8ce9172656460cf38cb398095e1eddfb7fcd03947a814e1ab3b07949a725f4bb6ba68977caa11cd499c80244ffb1c1fd8a57c80ae56ddeed46edda590fa15d0
-  data.tar.gz: c2cd608f56eca6fadd2ea38c8eca0ef44eacb52a836da3fff22becf1ec4bc36d5814bdb515262b06d92fd983ceff046e6da1bb6d1888b0d60eaa2cac8954197c
+  metadata.gz: dfe4eda293050b3965f7b3c379d666f9d837efc377876b8a161a5f77f726df81db6373eddab21a8a609329f42dd813b2f94bb633f74824eaf4be8c6269a75862
+  data.tar.gz: db4671740d357f9417cbcbd81bdb4581f1c1f2b2f05cbba12b5b82842d4ac7786722ebf8f9d31c7a1a1cb14c14ebfac58ce4a5fd16067a326e66b0e01ffc6746

data/README.md

@@ -2,20 +2,18 @@
 
 Добавлена поддержка Capistrano v3.
 
+###### Обновлен до версии 3.5
+
 ## Установка
 
 Добавить в Gemfile:
 
-    gem 'openteam-capistrano', '~> 1.0.7'
+    gem 'openteam-capistrano', '~> 1.0.12'
 
 Затем выполнить:
 
     $ bundle
 
-Или установить gem:
-
-    $ gem install openteam-capistrano
-
 ## Использование
 
 * Удаляем все что связано с capistrano v2 (Capfile, config/deploy.rb, config/deploy/)
@@ -24,10 +22,18 @@
 Запускаем генератор:
 
     $ rails g openteam:capistrano:install
-    
+
+Необходимо поправить Capfile, если версия Airbrake >= 4
+
+    $ vim Capfile
+
+  Удалить строчку 4 и раскоментировать 5
+
+Если AirBrake < 4, то ничего делать не надо.
+
 В папке config/deploy/ должны остаться файлы соответствующие стейджам.
 В Capfile необходимо раcкомментировать необходимые задачи для Sidekiq и Whenever если это необходимо.
-    
+
 Деплой приложения:
 
     $ bundle exec cap STAGE deploy
@@ -40,11 +46,14 @@
 
 В Capistrano v3 изменилась схема работы со стейджами - теперь обязательно указывать стейдж при деплое. Опция set :default_stage была удалена.
 
-В папке config/deploy/ должен лежать пустой файл с именем стейджа, деплой должен происходить из бранча с таким же именем что и стейдж. 
+В папке config/deploy/ должен лежать пустой файл с именем стейджа, деплой должен происходить из бранча с таким же именем что и стейдж.
 
-В бренч из которого производится деплой нельзя делать комиты. Разработка ведется в мастере! Перед деплоем делаем: 
+В бренч из которого производится деплой нельзя делать комиты. Разработка ведется в мастере! Перед деплоем делаем:
+
+    $ git checkout STAGE
+    $ git rebase master
+    $ git push
+    $ git checkout master
+    $ bundle exec cap STAGE deploy
 
-    $ git checkout BRANCH
-    $ git rebase master 
-    $ bundle exec cap BRANCH deploy
-    
+###### Если нет необходимости в разделенных ветках (например, приложение очень маленькое и не относится ни к одной из веток разработки (ato, tusur, esp)), то можно использовать ветку master и деплоить из неё.

data/Rakefile

@@ -1 +1 @@
-require "bundler/gem_tasks"
+require 'bundler/gem_tasks'

data/lib/generators/openteam/capistrano/templates/Capfile

@@ -1,14 +1,14 @@
 require 'capistrano/setup'
 require 'capistrano/deploy'
+require 'slackistrano/capistrano'
 
-require 'airbrake/capistrano3'
 require 'capistrano-db-tasks'
 require 'capistrano3/unicorn'
 require 'capistrano/rvm'
 require 'capistrano/bundler'
 require 'capistrano/rails/assets'
 require 'capistrano/rails/migrations'
-#require 'capistrano/sidekiq'
-#require 'whenever/capistrano'
+# require 'capistrano/sidekiq'
+# require 'whenever/capistrano'
 
 require 'openteam/capistrano/tasks'

data/lib/generators/openteam/capistrano/templates/config/deploy.rb

@@ -1 +1,4 @@
 require 'openteam/capistrano/deploy'
+
+set :slackistrano, channel: '#your-channel',
+                   webhook: 'your-incoming-webhook-url'

data/lib/generators/openteam/capistrano/templates/config/unicorn.rb

@@ -14,7 +14,7 @@ timeout 360
 working_directory app_dir
 
 # Set up socket location
-listen "#{app_dir}/tmp/sockets/unicorn.sock", :backlog => 64
+listen "#{app_dir}/tmp/sockets/unicorn.sock", backlog: 64
 
 # Loging
 stderr_path "#{app_dir}/log/unicorn.stderr.log"
@@ -24,9 +24,9 @@ stdout_path "#{app_dir}/log/unicorn.stdout.log"
 pid "#{app_dir}/tmp/pids/unicorn.pid"
 
 before_fork do |server, worker|
-  defined?(ActiveRecord::Base) and ActiveRecord::Base.connection.disconnect!
+  defined?(ActiveRecord::Base) && ActiveRecord::Base.connection.disconnect!
   old_pid = "#{server.config[:pid]}.oldbin"
-  if File.exists?(old_pid) && server.pid != old_pid
+  if File.exist?(old_pid) && server.pid != old_pid
     begin
       sig = (worker.nr + 1) >= server.worker_processes ? :QUIT : :TTOU
       Process.kill(sig, File.read(old_pid).to_i)
@@ -36,10 +36,10 @@ before_fork do |server, worker|
   end
 end
 
-after_fork do |server, worker|
-  defined?(ActiveRecord::Base) and ActiveRecord::Base.establish_connection
+after_fork do |_server, _worker|
+  defined?(ActiveRecord::Base) && ActiveRecord::Base.establish_connection
 end
 
-before_exec do |server|
+before_exec do |_server|
   ENV['BUNDLE_GEMFILE'] = "#{app_dir}/Gemfile"
 end

data/lib/openteam/capistrano/deploy.rb

@@ -5,10 +5,15 @@ if fetch(:stage) && !fetch(:stage).empty?
   require 'openteam/capistrano/app_config'
   require 'openteam/capistrano/git'
   require 'openteam/capistrano/hooks'
-  require 'openteam/capistrano/sidekiq'           if used_sidekiq?
+  require 'openteam/capistrano/sidekiq' if used_sidekiq?
   require 'openteam/capistrano/shared'
   require 'openteam/capistrano/ssh'
   require 'openteam/capistrano/tagging'
   require 'openteam/capistrano/unicorn'           if used_unicorn?
   require 'openteam/capistrano/whenever'          if used_whenever?
+
+  if used_settings?
+    require 'configliere'
+    Settings.read('config/settings.yml')
+  end
 end

data/lib/openteam/capistrano/deploy_config.rb

@@ -1,5 +1,5 @@
 if used_deploy_config?
-  YAML::load(File.open('config/deploy.yml'))[fetch(:stage).to_s].each do |k, v|
+  YAML.load(File.open('config/deploy.yml'))[fetch(:stage).to_s].each do |k, v|
     set k.to_sym, v
   end if fetch(:stage)
 else

data/lib/openteam/capistrano/git.rb

@@ -1,3 +1,3 @@
-set :repo_url, %x( git config --get remote.origin.url ).chomp
+set :repo_url, `git config --get remote.origin.url`.chomp
 set :branch,   fetch(:stage)
-set :user,     %x( git config --get user.name ).chomp
+set :user,     `git config --get user.name`.chomp

data/lib/openteam/capistrano/helpers.rb

@@ -34,7 +34,6 @@ begin
 rescue LoadError
 end
 
-
 def used_db?
   !@used_db.nil?
 end
@@ -44,7 +43,7 @@ def used_delayed_job?
 end
 
 def used_deploy_config?
-  @used_deploy_config ||= File.exists?('config/deploy.yml')
+  @used_deploy_config ||= File.exist?('config/deploy.yml')
 end
 
 def used_sidekiq?
@@ -52,7 +51,7 @@ def used_sidekiq?
 end
 
 def used_rails?
-  @used_rails ||= File.exists?('config/application.rb') && File.exists?('config/environment.rb')
+  @used_rails ||= File.exist?('config/application.rb') && File.exist?('config/environment.rb')
 end
 
 def used_rmq?
@@ -68,5 +67,9 @@ def used_unicorn?
 end
 
 def used_whenever?
-  @used_whenever ||= File.exists?('config/schedule.rb')
+  @used_whenever ||= File.exist?('config/schedule.rb')
+end
+
+def used_settings?
+  @used_settings ||= File.exist?('config/settings.yml')
 end

data/lib/openteam/capistrano/hooks.rb

@@ -1,6 +1,5 @@
 after  'deploy',            'deploy:tagging:create'
 after  'deploy:publishing', 'unicorn:restart'
-after  'unicorn:restart',   'airbrake:deploy'
 before 'deploy:cleanup',    'deploy:tagging:clean'
 after  'sunspot:pull',      'sunspot:reload' if used_solr?
 after  'sunspot:clear',     'sunspot:reload' if used_solr?

data/lib/openteam/capistrano/shared.rb

@@ -1,4 +1,4 @@
-set :linked_dirs,  %w{ bin bundle log public/system tmp/cache tmp/pids tmp/sockets }
-set :linked_files, %w{ config/settings.yml }
+set :linked_dirs,  %w(bin bundle log public/system tmp/cache tmp/pids tmp/sockets)
+set :linked_files, %w(config/settings.yml)
 
-set :linked_files, fetch(:linked_files) + %w{ config/database.yml } if used_db?
+set :linked_files, fetch(:linked_files) + %w(config/database.yml) if used_db?

data/lib/openteam/capistrano/solr/solr.rb

@@ -21,9 +21,10 @@ class Solr
     end
 
     private
+
     def really_replicate
       print 'Wait while solr replicated '
-      local.send_replication_command :fetchindex, :masterUrl => "#{remote.url}"
+      local.send_replication_command :fetchindex, masterUrl: remote.url.to_s
       while base_local_index_version == local.index_version
         print '.'
         sleep 0.5
@@ -48,28 +49,28 @@ class Solr
   end
 
   def send_version_command
-    send_command 'replication',         :params => { :command => :indexversion}
+    send_command 'replication',         params: { command: :indexversion }
   end
 
-  def send_replication_command(command, extra={})
-    send_command 'replication',         :params => { :command => command }.merge(extra)
-    puts "Index has been successfully received"
+  def send_replication_command(command, extra = {})
+    send_command 'replication',         params: { command: command }.merge(extra)
+    puts 'Index has been successfully received'
   end
 
   def send_reload_core_command(core)
-    send_command '/cores/admin/cores',  :params => { :action => 'RELOAD', :core => core }
+    send_command '/cores/admin/cores', params: { action: 'RELOAD', core: core }
     puts "The '#{core}' core has been successfully reloaded"
   end
 
   def send_clear_command(core)
-    send_command 'update',              :params => { :commit => true, 'stream.body' => '<delete><query>*:*</query></delete>' }
+    send_command 'update', params: { :commit => true, 'stream.body' => '<delete><query>*:*</query></delete>' }
     puts "The '#{core}' core has been successfully cleared"
   end
 
   private
 
   def solr
-    @solr ||= RSolr.connect :url => url
+    @solr ||= RSolr.connect url: url
   end
 
   def send_command(href, params)
@@ -78,10 +79,9 @@ class Solr
     STDERR.puts "!!! ensure solr started on '#{url}' !!!"
     puts "Couldn't connect to '#{url}'"
     exit
-  rescue RSolr::Error::Http  #=> e
-    STDERR.puts "!!! RSolr error !!!"
+  rescue RSolr::Error::Http #=> e
+    STDERR.puts '!!! RSolr error !!!'
     puts "Could not perform action '#{href}'"
     exit
   end
-
 end

data/lib/openteam/capistrano/ssh.rb

@@ -1,6 +1,6 @@
 require 'net/ssh/proxy/command'
 
 server fetch(:domain),
-  ssh_options: {
-    proxy: Net::SSH::Proxy::Command.new("ssh #{fetch(:gateway)} -W %h:%p")
-  } if fetch(:gateway)
+       ssh_options: {
+         proxy: Net::SSH::Proxy::Command.new("ssh #{fetch(:gateway)} -W %h:%p")
+       } if fetch(:gateway)

data/lib/openteam/capistrano/tagging.rb

@@ -4,15 +4,15 @@ module Openteam
   module Capistrano
     class Tag
       def create
-        %x( git tag -a '#{tag_name}' -m 'Deployed by #{fetch(:user)}' origin/#{fetch(:branch)} )
-        %x( git push origin '#{tag_name}' )
+        `git tag -a '#{tag_name}' -m 'Deployed by #{fetch(:user)}' origin/#{fetch(:branch)}`
+        `git push origin '#{tag_name}'`
       end
 
       def clean
         get_tags
         return if rotten_tags.empty?
-        %x( git tag -d #{rotten_tags.join(' ')} )
-        %x( git push origin #{rotten_tags.map{|t| ":refs/tags/#{t}"}.join(' ')} )
+        `git tag -d #{rotten_tags.join(' ')}`
+        `git push origin #{rotten_tags.map { |t| ":refs/tags/#{t}" }.join(' ')}`
       end
 
       private
@@ -22,19 +22,19 @@ module Openteam
       end
 
       def formatted_local_time
-        Time.now.strftime("%Y.%m.%d-%H%M")
+        Time.now.strftime('%Y.%m.%d-%H%M')
       end
 
       def get_tags
-        %x( git fetch --tags )
+        `git fetch --tags`
       end
 
       def stage_tags
-        @stage_tags ||= %x( git tag -l #{fetch(:branch)}* ).chomp.split("\n").grep(/^#{fetch(:stage)}-/)
+        @stage_tags ||= `git tag -l #{fetch(:branch)}*`.chomp.split("\n").grep(/^#{fetch(:stage)}-/)
       end
 
       def rotten_tags
-        stage_tags[0..-fetch(:keep_releases)-1]
+        stage_tags[0..-fetch(:keep_releases) - 1]
       end
     end
   end

data/lib/openteam/capistrano/tasks/sunspot.rake

@@ -18,7 +18,7 @@ begin
   end
 
   namespace :sunspot do
-    desc "Synchronize your local solr using remote solr data"
+    desc 'Synchronize your local solr using remote solr data'
     task :pull do
       puts
       remote_solr_url = ''
@@ -28,7 +28,7 @@ begin
         remote_solr_url = capture(:ruby, " -ryaml -e \"#{ruby_expression}\"")
       end
 
-      Solr::Replicator.new(:remote => remote_solr_url, :local => development_solr_url).replicate
+      Solr::Replicator.new(remote: remote_solr_url, local: development_solr_url).replicate
     end
 
     desc 'Reload development core'

data/lib/openteam/capistrano/tasks/tagging.rake

@@ -1,14 +1,13 @@
 namespace :deploy do
   namespace :tagging do
-    desc "Create release tag in local and origin repo"
+    desc 'Create release tag in local and origin repo'
     task :create do
       Openteam::Capistrano::Tag.new.create
     end
 
-    desc "Remove release tag from local and origin repo"
+    desc 'Remove release tag from local and origin repo'
     task :clean do
       Openteam::Capistrano::Tag.new.clean
     end
   end
 end
-

data/lib/openteam/capistrano/tasks.rb

@@ -1,2 +1,2 @@
-tasks_dir = File.expand_path("../tasks", __FILE__)
+tasks_dir = File.expand_path('../tasks', __FILE__)
 Dir.glob("#{tasks_dir}/*.rake").each { |r| load r }

data/lib/openteam/capistrano/unicorn.rb

@@ -1,2 +1,2 @@
 set   :rails_env,           :production
-set   :unicorn_config_path, File.join(current_path, "config/unicorn.rb")
+set   :unicorn_config_path, File.join(current_path, 'config/unicorn.rb')

data/openteam-capistrano.gemspec

@@ -4,25 +4,26 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = 'openteam-capistrano'
-  gem.version       = '1.0.12'
-  gem.authors       = ["OpenTeam developers"]
-  gem.email         = ["developers@openteam.ru"]
-  gem.description   = %q{OpenTeam common capistrano3 recipe}
-  gem.summary       = %q{Adds common use case tasks (import db, reload unicorn, send airbrake notice, tag deploy)}
-  gem.homepage      = ""
+  gem.version       = '1.0.15'
+  gem.authors       = ['OpenTeam developers']
+  gem.email         = ['developers@openteam.ru']
+  gem.description   = 'OpenTeam common capistrano3 recipe'
+  gem.summary       = 'Adds common use case tasks (import db, reload unicorn, send airbrake notice, tag deploy)'
+  gem.homepage      = ''
 
-  gem.files         = `git ls-files`.split($/)
-  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
+  gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = ['lib']
 
-  gem.add_dependency 'airbrake',            '~> 3.1.16'
-  gem.add_dependency 'capistrano',          '~> 3.1'
-  gem.add_dependency 'capistrano-db-tasks', '~> 0.3'
-  gem.add_dependency 'capistrano-rails',    '~> 1.1'
+  gem.add_dependency 'airbrake' # ,            '~> 3.1.16'
+  gem.add_dependency 'capistrano', '~> 3.5.0'
+  gem.add_dependency 'capistrano-db-tasks' # , '~> 0.3'
+  gem.add_dependency 'capistrano-rails' # ,    '~> 1.1'
   gem.add_dependency 'capistrano-rvm'
   gem.add_dependency 'capistrano-sidekiq'
   gem.add_dependency 'capistrano3-unicorn'
+  gem.add_dependency 'slackistrano', '3.1.0.beta'
 
   gem.add_development_dependency 'rake'
 end

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: openteam-capistrano
 version: !ruby/object:Gem::Version
-  version: 1.0.12
+  version: 1.0.15
 platform: ruby
 authors:
 - OpenTeam developers
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-20 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: airbrake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.16
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 3.1.16
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capistrano
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.5.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: 3.5.0
 - !ruby/object:Gem::Dependency
   name: capistrano-db-tasks
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capistrano-rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: capistrano-rvm
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +108,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: slackistrano
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.0.beta
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 3.1.0.beta
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -177,7 +191,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Adds common use case tasks (import db, reload unicorn, send airbrake notice,