j-cap-recipes 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5196ab571ff7a96196e7a0e7e7a1a740e05e2663
-  data.tar.gz: 51f805237ce8285ebf7f1e4cd3be1d9b6affd735
+  metadata.gz: c956d783e3a5cc9334124c40c98d4b6d6d8f0486
+  data.tar.gz: ff287d34e0858d0d7c4dcbed8fcacb2dc461b763
 SHA512:
-  metadata.gz: b8ac7e2590969083d4a2db7712e174f9a155659b25f354a81d814def2e96d78184b35e47b0f4601ba1224bf3477361b2ebae49d80407f5c48c1e180118d860af
-  data.tar.gz: f212f9d82f1006094fc70379a52bbefcbccf521da8224f8a914fa7b2ab339666b4664615638ae4ebd2d7b78deddd3553c9233318e5fe65ca403ec3d7941efba0
+  metadata.gz: 916166821d2a71988cebb4cd810cc9be36361ffebf238df3f8a0e1bffb3a28e4095ae639f4d78b91de8ada42b9236bb5709480ae1e5b09bd5fed8a6bb2340023
+  data.tar.gz: 05e3a11711e3988095ef5f43a94da4cc3366b414e96f21914b0006b806c3536a0cc7ac1d653d0e4ef58e3f165a9228dba47d9a3f44694799f929c77d8cc7feef

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## Changelog
 
+## 0.0.17
+
+* Added ability to define what the env to download or upload for database backups. If it differs from the rails env.
+* Added task to update the version with current revision and deploy timestamp.
+
 ## 0.0.16
 
 * Added handy task to remote edit settings file.

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    j-cap-recipes (0.0.16)
+    j-cap-recipes (0.0.17)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -51,7 +51,9 @@ Also you need to include rake tasks in your `Rakefile`:
  `cap production db:create`
  `cap production db:backup`
  `cap production db:dump_download`
+ `cap production db:dump_download[rails_env]` - Download the file that located in `<current>/db/backups/<application>_<rails_env>_latest.dump`
  `cap production db:dump_upload`
+ `cap production db:dump_upload[rails_env]` - Upload the file `<current>/db/backups/<application>_<rails_env>_latest.dump` to remote host
  `cap production db:restore`
 
 
@@ -107,6 +109,15 @@ There are tasks available:
 - `cap staging config:settings:get` Download the remote config file to local one
 - `cap staging config:settings:edit` Direct editing of the settings file
 
+### Update VERSION file with build number
+
+Task `deploy:update_version` adds to end of line the `:build_number` string. You may set it to:
+
+```ruby
+set :build_number, proc { [fetch(:current_revision), Time.now.strftime("%Y%m%d"), ].compact.join('-') }
+set :version_filename, 'VERSION'
+```
+
 ### Git
 
 First should add `require 'j-cap-recipes/git'` to `Capfile`.

data/lib/j-cap-recipes/tasks/database.rake

@@ -40,29 +40,34 @@ namespace :db do
     end
   end
 
-  desc 'Downlaod to local machine the latest backup'
-  task :dump_download do
+  desc 'Download to local machine the latest backup'
+  task :dump_download, :env_name do |task, args|
     on primary fetch(:migration_role) do
       within release_path do
         FileUtils.mkdir_p 'db/backups'
-        bakup_file = "db/backups/#{fetch(:application)}_#{fetch(:rails_env).to_s}_latest.dump"
-        download! "#{release_path}/#{bakup_file}", bakup_file
+        env_name = args[:env_name] || fetch(:rails_env).to_s
+        database_config_content = read_remote_database_config
+        database_name = JCap::Recipes::Util.database_name(env_name, database_config_content)
+        backup_file = "db/backups/#{database_name}_latest.dump"
+        download! "#{release_path}/#{backup_file}", backup_file
       end
     end
   end
 
-  desc 'Downlaod to local machine the latest backup'
-  task :dump_upload do
+  desc 'Download to local machine the latest backup'
+  task :dump_upload, :env_name do |task, args|
     on primary fetch(:migration_role) do
       within release_path do
         FileUtils.mkdir_p 'db/backups'
-        bakup_file = "db/backups/#{fetch(:application)}_#{fetch(:rails_env).to_s}_latest.dump"
-        upload! bakup_file, "#{release_path}/#{bakup_file}"
+        env_name = args[:env_name] || fetch(:rails_env).to_s
+        database_config_content = read_remote_database_config
+        database_name = JCap::Recipes::Util.database_name(env_name, database_config_content)
+        backup_file = "db/backups/#{database_name}_latest.dump"
+        upload! backup_file, "#{release_path}/#{backup_file}"
       end
     end
   end
 
-
 end
 
 remote_file 'config/database.yml' => '/tmp/database.yml', roles: :app
@@ -94,3 +99,7 @@ file '/tmp/database.yml' do |t|
     f.puts config.result(binding)
   end
 end
+
+def read_remote_database_config(path = 'config/database.yml')
+  capture :cat, path
+end

data/lib/j-cap-recipes/tasks/db.rake

@@ -13,56 +13,65 @@ namespace :db do
     backup_file   = File.join(backup_dir, "#{database_name}_#{datestamp}.dump")
 
     #dump the backup and zip it up
-    dump_command  = "pg_dump #{database_name} -w -F c"
-    dump_command  += " -h #{config[:hostname]}" if config[:hostname].present?
-    dump_command  += " -U #{config[:username]}" if config[:username].present?
-    dump_command  += " > #{backup_file}"
+    dump_command  = "#{postgres_password(config)} pg_dump #{database_name} -w -F c"
+    dump_command += postgres_auth_options(config)
+    dump_command += " > #{backup_file}"
 
     sh dump_command
 
     safe_ln backup_file, File.join(backup_dir, "#{database_name}_latest.dump")
-
-    #send_to_amazon backup_file
-    #remove the file on completion so we don't clog up our app
-    #File.delete backup_file
   end
 
   desc 'PG restore from the last backup file'
-  task restore: [:environment, :load_config] do
+  task restore: ['db:create', :environment, :load_config] do
     config        = ActiveRecord::Base.connection_config
     database_name = ActiveRecord::Base.connection.current_database
     backup_dir    = ENV['backup-path'] || Rails.root.join('db', 'backups')
     backup_file   = File.join(backup_dir, "#{database_name}_latest.dump")
 
-    Rake::Task['db:kill_postgres_connections'].invoke
-    Rake::Task['db:drop'].invoke
-    Rake::Task['db:create'].invoke
+    execute_task!('db:kill_postgres_connections')
+    execute_task!('db:drop')
+    execute_task!('db:create')
 
-    restore_command = "pg_restore -d #{database_name} -F c -w #{backup_file}"
-    restore_command = postgres_command_options restore_command, config
+    restore_command = "#{postgres_password(config)} pg_restore -d #{database_name} -F c -w #{backup_file}"
+    restore_command += postgres_auth_options(config)
+    restore_command += ' -O -c'
     sh "#{restore_command} || echo 'done'"
   end
 
   task :kill_postgres_connections => :environment do
-    database_name = ActiveRecord::Base.connection.current_database
-    command = <<EOF
-ps xa \
-  | grep postgres: \
-  | grep #{database_name} \
-  | grep -v grep \
-  | awk '{print $1}' \
-  | xargs kill || true
-EOF
-    sh command
+    db_name = ActiveRecord::Base.connection.current_database
+    pid_column_name = if ActiveRecord::Base.connection.send(:postgresql_version) > 90200
+      'pid'
+    else
+      'procpid'
+    end
+
+    kill_query = <<-QUERY
+      SELECT pg_terminate_backend(#{pid_column_name})
+      FROM pg_stat_activity
+      WHERE datname = '#{db_name}';
+    QUERY
+
+    begin
+      ActiveRecord::Base.connection.exec_query(kill_query)
+    rescue ActiveRecord::StatementInvalid => ex
+      puts "All connections to #{db_name} were killed successfully!"
+      puts "Database message: #{ex.message}"
+    end
   end
 
 end
 
-def postgres_command_options(str, config)
-  str += " -h #{config[:hostname]}" if config[:hostname].present?
-  str += " -U #{config[:username]}" if config[:username].present?
-  str += ' -O -c'
-  str
+def postgres_password(config)
+  "PGPASSWORD='#{config[:password]}'" if config[:password].present?
+end
+
+def postgres_auth_options(config)
+  command_options = ''
+  command_options += " -h #{config[:hostname]}" if config[:hostname].present?
+  command_options += " -U #{config[:username]}" if config[:username].present?
+  command_options
 end
 
 #TODO: Use setting to get S3 credentials
@@ -73,3 +82,8 @@ def send_to_amazon(file_path)
   #push the file up
   AWS::S3::S3Object.store(file_name, File.open(file_path), bucket)
 end
+
+def execute_task!(task_name)
+  Rake::Task[task_name].reenable
+  Rake::Task[task_name].invoke
+end

data/lib/j-cap-recipes/tasks/deploy.rake

@@ -5,4 +5,15 @@ namespace :deploy do
       execute :touch, current_path.join('tmp/restart.txt')
     end
   end
+
+  desc 'Store the deploy date and version to project file'
+  task :update_version do
+    on release_roles(:all) do
+      within release_path do
+        build_number = fetch(:build_number, [fetch(:current_revision), release_timestamp].compact.join('-'))
+        version_file_name = fetch(:version_filename, 'VERSION')
+        execute %{sed -i.bak 's/$/@#{build_number}/' #{release_path.join(version_file_name)}}
+      end
+    end
+  end
 end

data/lib/j-cap-recipes/tasks/files.rake

@@ -1,5 +1,5 @@
 namespace :files do
-  desc 'Downlaod remote shared files to local machine.'
+  desc 'Download remote shared files to local machine.'
   task :download, :path do |task, args|
 
     if args[:path].nil?

data/lib/j-cap-recipes/tasks/git.rake

@@ -11,4 +11,15 @@ namespace :git do
           (puts "Created tag `#{tag_name}`")
     end
   end
+
+  desc 'Updates repository url'
+  task :update_repo_url do
+    on release_roles :all do
+      within repo_path  do
+        with fetch(:git_environmental_variables) do
+          execute :git, :remote, 'set-url', 'origin', fetch(:repo_url)
+        end
+      end
+    end
+  end
 end

data/lib/j-cap-recipes/util.rb

@@ -0,0 +1,12 @@
+module JCap
+  module Recipes
+    module Util
+      class << self
+        def database_name(env_name, config_contents)
+          db_config = YAML.load(config_contents)
+          db_config[env_name][:database] || db_config[env_name]['database']
+        end
+      end
+    end
+  end
+end

data/lib/j-cap-recipes/version.rb

@@ -1,5 +1,5 @@
 module JCap
   module Recipes
-    VERSION = '0.0.16'
+    VERSION = '0.0.17'
   end
 end

data/lib/j-cap-recipes.rb

@@ -1,2 +1,3 @@
 require_relative 'j-cap-recipes/version'
+require_relative 'j-cap-recipes/util'
 require_relative 'j-cap-recipes/railtie' if defined?(Rails)

data/lib/sshkit/backends/ssh_command.rb

@@ -19,7 +19,7 @@ module SSHKit
         host_url = String(host.hostname)
         host_url = '%s@%s' % [host.username, host_url] if host.username
         result = 'ssh %s -t "%s"' % [host_url, command(*args).to_command]
-        output << Command.new(result)
+        output << Command.new(result, host: host)
         system(result)
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: j-cap-recipes
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Michael Nikitochkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-05 00:00:00.000000000 Z
+date: 2015-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -107,6 +107,7 @@ files:
 - lib/j-cap-recipes/tasks/templates/database.yml.erb
 - lib/j-cap-recipes/tasks/unicorn.rake
 - lib/j-cap-recipes/unicorn.rb
+- lib/j-cap-recipes/util.rb
 - lib/j-cap-recipes/version.rb
 - lib/sshkit/backends/ssh_command.rb
 homepage: https://github.com/jetthoughts/j-cap-recipes
@@ -129,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Capistrano 3 recipes for nginx, monit, rails log, setup, unicorn