capistrano-central_git 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c957726a60a9f32e444eab8158d843829f8c787
-  data.tar.gz: bd2f1fc6ab26dad54e02933e613810992c22e5ad
+  metadata.gz: bf734cc53f51b64f8b70d337651ffea0d68c7398
+  data.tar.gz: dbbbb3d5279b341c0b52081a4dca6d3b461cdfbe
 SHA512:
-  metadata.gz: cdfad88fdf99f6c908a2fcd50c5e562ab9560e57d5bc9ebafe03a4c7cae61da54e6f830703110f19406735ebfe93abcab91bc19f2ee21b8f51e3721b571808f6
-  data.tar.gz: 559793fca2112f3e6e2bfebffdf0eb34d77645874c9be67042ff82eff3a50ebbce6d02b5a70be4951153eb887398f94e6a17abcdac12c8e4a800aa34bf946acd
+  metadata.gz: 59d366e5c420e2e5a67018a4b20ba4462bc09fc5727f9427949fa011d274fb69569e6e733de68f1775c580b25c14180160bd7e3d65cc6d22ca83090e10a391f2
+  data.tar.gz: c4b01e1aaed395ad9f3f39a353d4954ba7ff319746a60bf38eaff23ff48418077795195c25a9db3b7385058847df136690c1a9c4b260ecb8a6168a1f441ff025

data/README.md

@@ -65,7 +65,8 @@ And make sure that:
 | rsync_options | -al | |
 | rsync_rsh | /usr/bin/ssh | |
 | max_parallels | number of hosts | |
-| keep_packages | 5 | |
+| keep_central_packages | 5 | |
+| keep_release_packages | 5 | |
 
 ## Contributing
 

data/lib/capistrano/central_git/config.rb

@@ -52,8 +52,12 @@ module Capistrano::CentralGit
       @max_parallels ||= fetch(:max_parallels, hosts.size).to_i
     end
 
-    def self.keep_packages
-      @keep_packages ||= fetch(:keep_packages, 5).to_i
+    def self.keep_central_packages
+      @keep_central_packages ||= fetch(:keep_central_packages, 5).to_i
+    end
+
+    def self.keep_release_packages
+      @keep_release_packages ||= fetch(:keep_release_packages, 5).to_i
     end
   end
 end

data/lib/capistrano/central_git/scm.rb

@@ -79,15 +79,28 @@ module Capistrano::CentralGit
       execute :tar, "zxf", config.release_package_path, "-C", release_path
     end
 
-    def cleanup_package
-      packages = capture(:ls, '-xtr', config.central_packages_path).split
-      keep_packages = config.keep_packages
+    def cleanup_central_packages
+      cleanup_packages(config.central_packages_path, config.keep_central_packages)
+    end
+
+    def cleanup_release_packages
+      cleanup_packages(config.release_packages_path, config.keep_release_packages)
+    end
+
+    def fetch_revision
+      capture(:git, "rev-list --max-count=1 --abbrev-commit #{fetch(:branch)}").strip
+    end
+
+    private
+
+    def cleanup_packages(packages_path, keep_packages)
+      packages = capture(:ls, '-xtr', packages_path).split
       if packages.count >= keep_packages
         info t(:keeping_packages, host: host.to_s, keep_packages: keep_packages, packages: packages.count)
-        older_packages = (packages - packages.last(:keep_packages))
+        older_packages = (packages - packages.last(keep_packages))
         if older_packages.any?
           older_packages_str = older_packages.map do |package|
-            config.central_packages_path.join(package)
+            packages_path.join(package)
           end.join(" ")
           execute :rm, '-rf', older_packages_str
         else
@@ -95,9 +108,5 @@ module Capistrano::CentralGit
         end
       end
     end
-
-    def fetch_revision
-      capture(:git, "rev-list --max-count=1 --abbrev-commit #{fetch(:branch)}").strip
-    end
   end
 end

data/lib/capistrano/central_git/version.rb

@@ -1,5 +1,5 @@
 module Capistrano
   module CentralGit
-    VERSION = "0.1.2"
+    VERSION = "0.1.3"
   end
 end

data/lib/capistrano/tasks/central_git.rake

@@ -112,13 +112,19 @@ namespace :central_git do
   end
 
   desc "Cleanup packages"
-  task cleanup: :"deploy:cleanup" do
+  task :cleanup do
     run_central do
       within central_packages_path do
-        central_git_scm.cleanup_packages
+        central_git_scm.cleanup_central_packages
+      end
+    end
+    on release_roles :all do |host|
+      within release_packages_path do
+        central_git_scm.cleanup_release_packages
       end
     end
   end
+  after :"deploy:cleanup", :cleanup
 
   desc "Show configurations"
   task :config do
@@ -138,7 +144,7 @@ namespace :central_git do
       rsync_options: config.rsync_options,
       rsync_rsh: config.rsync_rsh,
       max_parallels: config.max_parallels(hosts),
-      keep_packages: config.keep_packages,
+      keep_central_packages: config.keep_central_packages,
     }
 
     max_key_length = pairs.keys.map { |k| k.to_s.length }.max

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: capistrano-central_git
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Masato Ikeda
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-07-15 00:00:00.000000000 Z
+date: 2015-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano