capistrano_evrone_recipes 0.1.17 → 0.1.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6fbb96a70ae38e23e257589d0fce134ffd413ce4
-  data.tar.gz: d5f78a522c1653edba10c3208bc53eb4b84d674b
+  metadata.gz: 96ff19ed8c4f61b21d72c6e175830d981bb89759
+  data.tar.gz: 2db18e7a99d6a4d82b7cf0ad1a19ad30f5069695
 SHA512:
-  metadata.gz: 37d8af7ecad59d88b9b2f306479ea9b1d362afcb36b6fcd0719bb7b9b8a7eb798782c5177532d29f4c9a8fbbd07798c03a951f73a9a51a5027abcc455cd3e208
-  data.tar.gz: 15c783746c83a02282bd45898c427347c447e66c335ff7bceb8686e1674f9bc8ff829b1e65186c3f5ecbb340c3783215efd2efb40af4705380ec0a4ac0d2f93a
+  metadata.gz: 6f795161581dc3c16bf3a33fe883fcf87d5131e947edf72baf604a3b6c4a53981e65b0b7e82803b1565bad893b7cbaf2ebe45f3fb279d81dec7cf45eaae838d2
+  data.tar.gz: a61d1381d2f2a5ed6a1ebaf63736d88be192aef331f96026abc7b03657f4c7ce405eaf6e61d98f51f29f8ea7807df632d0482009901db0e1ccaaf7fbe9b1e33d

data/capistrano_evrone_recipes.gemspec

@@ -18,7 +18,6 @@ Gem::Specification.new do |s|
   s.require_paths = ["lib"]
 
   s.add_runtime_dependency("capistrano", ["= 2.15.5"])
-  s.add_runtime_dependency("colored", [">= 0"])
   s.add_runtime_dependency("foreman", [">= 0"])
   s.add_runtime_dependency("foreman_export_runitu", [">= 0"])
   s.add_runtime_dependency("whenever", ["~> 0.8.4"])

data/lib/capistrano_evrone_recipes/capistrano.rb

@@ -1,4 +1,3 @@
-require 'logger'
 require File.dirname(__FILE__) + "/util"
 
 Capistrano::Configuration.instance(:must_exist).load do

data/lib/capistrano_evrone_recipes/recipes/runit.rb

@@ -3,6 +3,7 @@ _cset(:runit_services_path) { "#{deploy_to}/services" }
 _cset(:runit_export_cmd)    { "#{fetch :bundle_cmd} exec foreman export runitu" }
 _cset(:runit_procfile)      { "Procfile" }
 _cset(:foreman_concurency)  { nil }
+_cset(:runit_restart_cmd)   { "sv -v t $(pwd)/*" }
 
 namespace :runit do
 
@@ -11,15 +12,16 @@ namespace :runit do
     if find_servers_for_task(current_task).any?
       cmd = %Q{
         if [ -d #{runit_export_path} ] ; then
-          echo "----> Updating services" ;
+          echo -n "----> Update services" ;
           rm -rf #{runit_services_path}/* ;
           sync ;
           cp -r #{runit_export_path}/* #{runit_services_path}/ ;
           sync ;
           rm -rf #{runit_export_path} ;
         else
-          echo "----> Restart services" ;
-          test $(ls -1 #{runit_services_path} | wc -l) -eq 0 || sv t #{runit_services_path}/* ;
+          echo -n "----> Restart services" ;
+          test $(ls -1 #{runit_services_path} | wc -l) -eq 0 ||
+            (cd #{fetch :runit_services_path} && #{fetch :runit_restart_cmd, "/bin/true"}) ;
         fi
       }.compact
       run cmd
@@ -43,12 +45,16 @@ namespace :runit do
   desc "Export Procfile"
   task :export, :roles => :worker, :on_no_matching_servers => :continue, :except => { :no_release => true } do
     if find_servers_for_task(current_task).any?
-      CapistranoEvroneRecipes::Util.ensure_changed_remote_files(self, fetch(:runit_procfile)) do
-        env = %{ RAILS_ENV=#{rails_env} }.strip + "\n"
-        put(env, "#{latest_release}/.env")
+      env = %{ RAILS_ENV=#{rails_env} }.strip + "\n"
+      put(env, "#{latest_release}/.env")
 
-        c = fetch(:foreman_concurency) ? "-c #{fetch :foreman_concurency}" : ""
-        cmd = %{
+      c = fetch(:foreman_concurency) ? "-c #{fetch :foreman_concurency}" : ""
+      diff = ENV['FORCE'] ?
+        %{ /bin/false } :
+        %{ diff -q #{previous_release}/#{runit_procfile} #{latest_release}/#{runit_procfile} > /dev/null }
+      cmd = %{
+        #{diff} || (
+          echo -n "----> Export #{runit_procfile}" ;
           cd #{latest_release} &&
           #{runit_export_cmd} #{runit_export_path}
             -e #{latest_release}/.env
@@ -56,17 +62,13 @@ namespace :runit do
             -f #{latest_release}/#{runit_procfile}
             --root=#{current_path}
             -a #{application} #{c} > /dev/null &&
-            echo -n "----> Export #{runit_procfile}"
-        }.compact
-        run cmd
 
-        cmd = %{
-          for i in $(ls #{runit_export_path}/); do
-            sed -i 's|#{runit_export_path}|#{runit_services_path}|g' #{runit_export_path}/${i}/run ;
-          done
-        }.compact
-        run cmd
-      end
+            for i in $(ls #{runit_export_path}/); do
+              sed -i 's|#{runit_export_path}|#{runit_services_path}|g' #{runit_export_path}/${i}/run ;
+            done
+         )
+      }.compact
+      run cmd
     end
   end
 end

data/lib/capistrano_evrone_recipes/version.rb

@@ -3,7 +3,7 @@ module CapistranoEvroneRecipes
 
     MAJOR = 0
     MINOR = 1
-    PATCH = 17
+    PATCH = 18
 
     def self.to_s
       "#{MAJOR}.#{MINOR}.#{PATCH}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano_evrone_recipes
 version: !ruby/object:Gem::Version
-  version: 0.1.17
+  version: 0.1.18
 platform: ruby
 authors:
 - Dmitry Galinsky
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-19 00:00:00.000000000 Z
+date: 2013-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -24,20 +24,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 2.15.5
-- !ruby/object:Gem::Dependency
-  name: colored
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: foreman
   requirement: !ruby/object:Gem::Requirement