j-cap-recipes 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b96c02150dff5033f67954c8625e207f08050d9
-  data.tar.gz: a9cd1381347921f258d6987953a3155127b1b725
+  metadata.gz: 5196ab571ff7a96196e7a0e7e7a1a740e05e2663
+  data.tar.gz: 51f805237ce8285ebf7f1e4cd3be1d9b6affd735
 SHA512:
-  metadata.gz: 1ffd8d989dcf6292e96a6a04d2d1bb02d7981a3421836af6e6c68bb3be648ca6d3eef9b03e6790a8cdd5daaa6313d6b6798adbc2fdf8d23f7ffa70ad39d026ef
-  data.tar.gz: a1ddaafa9ec4178cb3cd63990eacbadf87aa8e8101f5bbaad55eef9627decfa21625715a904255f611c969faf8939bafefa3c6afdb1b02d3ae18dfdced5dd97c
+  metadata.gz: b8ac7e2590969083d4a2db7712e174f9a155659b25f354a81d814def2e96d78184b35e47b0f4601ba1224bf3477361b2ebae49d80407f5c48c1e180118d860af
+  data.tar.gz: f212f9d82f1006094fc70379a52bbefcbccf521da8224f8a914fa7b2ab339666b4664615638ae4ebd2d7b78deddd3553c9233318e5fe65ca403ec3d7941efba0

data/CHANGELOG.md

@@ -1,9 +1,15 @@
 ## Changelog
 
+## 0.0.16
+
+* Added handy task to remote edit settings file.
+* Renamed handy to settings recipes
+* Updated settings to run default editor instead of only `vi`
+
 ## 0.0.15
 
 * Added new SSHKit backend called SshCommand. It adds support to run interactive commands, example like `rails console`.
-* Added rails rake task to create datbase backup and restore. You can check `rake -T`
+* Added rails rake task to create database backup and restore. You can check `rake -T`
 * Optimized to run rails console task via SshCommand backend
 * Added a new task `rails:less_log` to show the current log file via `less`
 * Update Handy with a new task `config:settings:get` to download remote stage config to local folder.
@@ -18,8 +24,8 @@
 
 * Updated recipe git to update remote with new tags.
 * Remove the old settings before upload a new one.
-* Added files recipes to dowload remote files. Use `current` folder to search settings.
-* Use capistrano method to get revison timestamp for git tagging.
+* Added files recipes to download remote files. Use `current` folder to search settings.
+* Use capistrano method to get revision timestamp for git tagging.
 
 
 ## 0.0.11
@@ -39,7 +45,7 @@
 
 ## 0.0.6
 
-* Added deploy notifiction of the Honeybadger service.
+* Added deploy notification of the Honeybadger service.
 
 ## 0.0.5
 

data/Gemfile.lock

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

data/README.md

@@ -45,6 +45,16 @@ Also you need to include rake tasks in your `Rakefile`:
 ### Setup
 ### Check
 ### Monit
+
+### Database recipes
+
+ `cap production db:create`
+ `cap production db:backup`
+ `cap production db:dump_download`
+ `cap production db:dump_upload`
+ `cap production db:restore`
+
+
 ### Rails
 
 To run remote rails console you should update to the latest gems `capistrano-rbenv` and `capistrano-bundler`
@@ -86,16 +96,16 @@ test:
 
 `honeybadger:deploy` - notify the service about deploy and it would be invoked after `deploy:migrate`
 
-### Handy
-
-Support to manage https://github.com/bigbinary/handy config files. First should add `require 'j-cap-recipes/handy'` to `Capfile`.
-There are three tasks available:
+### Settings
 
+Support to manage https://github.com/bigbinary/handy config files. First should add `require 'j-cap-recipes/settings'` to `Capfile`.
+There are tasks available:
 
 - `cap staging config:settings` Show the current staging config files;
 - `cap staging config:settings:delete` Remove the custom env settings file;
 - `cap staging config:settings:upload` Update the remote config file with local one;
-- `cap staging config:settings:get` Download the rmote config file to local one
+- `cap staging config:settings:get` Download the remote config file to local one
+- `cap staging config:settings:edit` Direct editing of the settings file
 
 ### Git
 
@@ -140,7 +150,7 @@ Added utility rake task to create database backup for postgresql and rails.
 
 ### SSHKit addon
 
-`SSHKit::Backend::SshCommand` a new backend to invoke the ssh command using sytem command `ssh`.
+`SSHKit::Backend::SshCommand` a new backend to invoke the ssh command using system command `ssh`.
 Now you can easy to execute interactive applications with similar changes. Example:
 
 ```ruby

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

@@ -1 +1,4 @@
-load File.expand_path('../tasks/handy.rake', __FILE__)
+require 'sshkit/backends/ssh_command'
+require_relative 'sshkit_runner_patch'
+
+load File.expand_path('../tasks/settings.rake', __FILE__)

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

@@ -1,45 +1,4 @@
 require 'sshkit/backends/ssh_command'
-require 'sshkit/runners/abstract'
-
-#Patch to support backend option
-# Sent PR https://github.com/capistrano/sshkit/pull/117, except constantinize
-module SSHKit
-
-  module Runner
-
-    class Abstract
-
-      attr_reader :hosts, :options, :block
-
-      def initialize(hosts, options = nil, &block)
-        @hosts   = Array(hosts)
-        @options = options || {}
-        @block   = block
-      end
-
-      private
-
-      def backend(host, &block)
-        backend_factory.new(host, &block)
-      end
-
-      def backend_factory
-        case @options[:backend]
-        when Symbol
-          SSHKit::Backend.const_get(@options[:backend].to_s.split('_').collect(&:capitalize).join)
-        when String
-          Kernel.const_get(@options[:backend])
-        when nil
-          SSHKit.config.backend
-        else
-          @options[:backend]
-        end
-
-      end
-    end
-
-  end
-
-end
+require_relative 'sshkit_runner_patch'
 
 load File.expand_path('../tasks/rails.rake', __FILE__)

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

@@ -0,0 +1,4 @@
+require 'sshkit/backends/ssh_command'
+require_relative 'sshkit_runner_patch'
+
+load File.expand_path('../tasks/settings.rake', __FILE__)

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

@@ -0,0 +1,42 @@
+require 'sshkit/runners/abstract'
+
+#Patch to support backend option
+# Sent PR https://github.com/capistrano/sshkit/pull/117, except constantinize
+module SSHKit
+
+  module Runner
+
+    class Abstract
+
+      attr_reader :hosts, :options, :block
+
+      def initialize(hosts, options = nil, &block)
+        @hosts   = Array(hosts)
+        @options = options || {}
+        @block   = block
+      end
+
+      private
+
+      def backend(host, &block)
+        backend_factory.new(host, &block)
+      end
+
+      def backend_factory
+        case @options[:backend]
+        when Symbol
+          SSHKit::Backend.const_get(@options[:backend].to_s.split('_').collect(&:capitalize).join)
+        when String
+          Kernel.const_get(@options[:backend])
+        when nil
+          SSHKit.config.backend
+        else
+          @options[:backend]
+        end
+
+      end
+    end
+
+  end
+
+end

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

@@ -46,11 +46,23 @@ namespace :db do
       within release_path do
         FileUtils.mkdir_p 'db/backups'
         bakup_file = "db/backups/#{fetch(:application)}_#{fetch(:rails_env).to_s}_latest.dump"
-        download! "#{shared_path}/#{bakup_file}", bakup_file
+        download! "#{release_path}/#{bakup_file}", bakup_file
       end
     end
   end
 
+  desc 'Downlaod to local machine the latest backup'
+  task :dump_upload do
+    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}"
+      end
+    end
+  end
+
+
 end
 
 remote_file 'config/database.yml' => '/tmp/database.yml', roles: :app

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

@@ -51,7 +51,7 @@ ps xa \
   | grep #{database_name} \
   | grep -v grep \
   | awk '{print $1}' \
-  | xargs kill
+  | xargs kill || true
 EOF
     sh command
   end
@@ -61,6 +61,7 @@ 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
 end
 

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

@@ -2,28 +2,35 @@ namespace :monit do
   desc 'Restart monit'
   task :restart do
     on roles(:app), in: :sequence, wait: 5 do
-      execute 'sudo', '/etc/init.d/monit restart'
+      execute :sudo, '/etc/init.d/monit restart'
     end
   end
 
   desc 'Stop monit'
   task :stop do
     on roles(:app), in: :sequence, wait: 5 do
-      execute 'sudo', '/etc/init.d/monit stop'
+      execute :sudo, '/etc/init.d/monit stop'
     end
   end
 
   desc 'Start monit'
   task :start do
     on roles(:app), in: :sequence, wait: 5 do
-      execute 'sudo', '/etc/init.d/monit start'
+      execute :sudo, '/etc/init.d/monit start'
     end
   end
 
   desc 'Exec monit command'
   task :exec, :command do |task, args|
     on roles(:app), in: :sequence, wait: 5 do
-      execute 'sudo', 'monit', args[:command]
+      execute :sudo, :monit, args[:command]
+    end
+  end
+
+  desc 'Reload monit configs'
+  task :reload, :command do |task, args|
+    on roles(:app), in: :sequence, wait: 5 do
+      execute :sudo, :monit, :reload
     end
   end
 end

data/lib/j-cap-recipes/tasks/{handy.rake → settings.rake}

@@ -35,6 +35,13 @@ namespace :config do
         download! current_path.join('config', 'settings', "#{fetch(:stage)}.yml"), local_dir
       end
     end
+
+    desc 'Edit remote settings'
+    task :edit do
+      on roles(:app), backend: :ssh_command do |*args|
+        execute('\"\${EDITOR:-vi}\"', current_path.join('config', 'settings', "#{fetch(:stage)}.yml"))
+      end
+    end
   end
 
 end

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

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

data/lib/sshkit/backends/ssh_command.rb

@@ -16,7 +16,9 @@ module SSHKit
       end
 
       def execute(*args, &block)
-        result = 'ssh %s@%s -t "%s"' % [host.username, String(host.hostname), command(*args).to_command]
+        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)
         system(result)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: j-cap-recipes
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - Michael Nikitochkin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-24 00:00:00.000000000 Z
+date: 2014-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -84,7 +84,9 @@ files:
 - lib/j-cap-recipes/rails.rb
 - lib/j-cap-recipes/railtie.rb
 - lib/j-cap-recipes/rake.rb
+- lib/j-cap-recipes/settings.rb
 - lib/j-cap-recipes/setup.rb
+- lib/j-cap-recipes/sshkit_runner_patch.rb
 - lib/j-cap-recipes/tasks/airbrake.rake
 - lib/j-cap-recipes/tasks/check.rake
 - lib/j-cap-recipes/tasks/database.rake
@@ -93,7 +95,6 @@ files:
 - lib/j-cap-recipes/tasks/deploy.rake
 - lib/j-cap-recipes/tasks/files.rake
 - lib/j-cap-recipes/tasks/git.rake
-- lib/j-cap-recipes/tasks/handy.rake
 - lib/j-cap-recipes/tasks/honeybadger.rake
 - lib/j-cap-recipes/tasks/hpusher.rake
 - lib/j-cap-recipes/tasks/log.rake
@@ -101,6 +102,7 @@ files:
 - lib/j-cap-recipes/tasks/nginx.rake
 - lib/j-cap-recipes/tasks/rails.rake
 - lib/j-cap-recipes/tasks/rake.rake
+- lib/j-cap-recipes/tasks/settings.rake
 - lib/j-cap-recipes/tasks/setup.rake
 - lib/j-cap-recipes/tasks/templates/database.yml.erb
 - lib/j-cap-recipes/tasks/unicorn.rake