capobvious 0.3.pre20 → 0.3.pre21

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5298c0d742a0213839998e0a4b5b77c1be67ec7e
-  data.tar.gz: b08bed09cccf60623fe104c8ad132f7029511b9a
+  metadata.gz: 0fd6f0aa667d4ad7e2ee910daed6ed5419231151
+  data.tar.gz: c02a245ea666ae07c2203de086366ff907e664aa
 SHA512:
-  metadata.gz: 5349f784aa918732aec4eac7f5e063e8e0b1ac217bfeeaf9f146e7048a3b4384ae1ecca014bd5aab24ed24a958055807544982716bad21aea7457e8c056ce9c2
-  data.tar.gz: 0ae8015b23022ddb9b14ccea0b2a16bc82decbbd30cdc6a91008fec25ac65e1eed527268782efbcad695f3db54032c44841fb149d16d181a2ac1079cf8395efa
+  metadata.gz: 12549997ae8da9f8311f1d8fff00b9a6608354073f1450bed312983c7c10a04ff0390b8d7170ba6ba6add84aaf4ae1607182af70d010127e418f25c97a7b1f46
+  data.tar.gz: 31a52d9636529de7dca814531269bbb3c8416d439f9c496d6173ad58972f5a3fd96ebf8a539387778654b4500e593fad575d7fedb6d3e05e5fda990d6071eff0

data/lib/capobvious/recipes/import.rb

@@ -1,14 +1,16 @@
 Capistrano::Configuration.instance(:must_exist).load do
 
   namespace :import do
-    task :sys do
-      #system "rm -rfv public/system/"
-      if which('rsync') && local_which('rsync')
-        logger.important('Importing with rsync', 'import:sys')
-        system "rsync -avz --rsh='ssh -p#{ssh_port}' #{user}@#{serv}:#{shared_path}/system public/"
-      else
-        backup.sys
-        system "cd public && #{arch_extract} ../#{local_folder_path}/#{sys_file_name}"
+    task :sys, :role => :web do
+      find_servers_for_task(current_task).each do |current_server|
+        if which('rsync') && local_which('rsync')
+          logger.important('Importing with rsync', 'import:sys')
+          system "rsync -avz --rsh='ssh -p#{current_server.port}' #{user}@#{current_server.host}:#{shared_path}/system public/"
+        else
+          backup.sys
+          system "cd public && #{arch_extract} ../#{local_folder_path}/#{sys_file_name}"
+        end
+        break
       end
     end
   end

data/lib/capobvious/recipes/main.rb

@@ -12,7 +12,8 @@ Capistrano::Configuration.instance(:must_exist).load do
   _cset :database_yml_path, 'config/database.yml'
   _cset :auto_migrate, true
   _cset :assets, true
-  _cset(:ssh) {"ssh -p #{fetch(:port, 22)} #{user}@#{serv}"}
+  _cset :port, 22
+  _cset(:ssh) {"ssh -p #{fetch(:port)} #{user}@#{serv}"}
   _cset(:stage){ rails_env }
   _cset(:application_env){ "#{application}_#{rails_env}"}
 
@@ -30,6 +31,10 @@ Capistrano::Configuration.instance(:must_exist).load do
     return (gemfile_lock =~ /^\s*#{name}\s+\(/)? true : false
   end
 
+  def current_host
+    capture("echo $CAPISTRANO:HOST$").strip
+  end
+
   def which(name)
     str = capture("which #{name}").chop
     return false if str == ''
@@ -44,9 +49,7 @@ Capistrano::Configuration.instance(:must_exist).load do
   rescue
     false
   end
-  def ssh_port
-    exists?(:port) ? fetch(:port) : 22
-  end
+
   def local_gem_available?(name)
     Gem::Specification.find_by_name(name)
   rescue Gem::LoadError

data/lib/capobvious/recipes/unicorn.rb

@@ -21,6 +21,7 @@ Capistrano::Configuration.instance(:must_exist).load do
       puts command
 
       run "#{sudo} sed -i 's/exit 0//g' /etc/rc.local"
+      run "echo \"# #{application_env}\" | #{sudo} tee -a /etc/rc.local"
       run "echo \"#{command}\" | #{sudo} tee -a /etc/rc.local"
       run "echo \"exit 0\" | #{sudo} tee -a /etc/rc.local"
     end

data/lib/capobvious/version.rb

@@ -1,3 +1,3 @@
 module Capobvious
-  VERSION = '0.3.pre20'
+  VERSION = '0.3.pre21'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capobvious
 version: !ruby/object:Gem::Version
-  version: 0.3.pre20
+  version: 0.3.pre21
 platform: ruby
 authors:
 - Dmitry Gruzd
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-04 00:00:00.000000000 Z
+date: 2013-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano