deb_deploy 1.1.5 → 1.2.0

data/README.md

@@ -12,9 +12,13 @@ or with Bundler
 
 ### Tasks
 
+    cap deb:bootstrap
+
+This sets up the environment for dpkg or apt deployment, depending on your configuration.
+
     cap deb:deploy
 
-This deploys the debian packages and does a simple apt-get install of on the target servers.
+This deploys the debian packages on the target servers.
 
 ### Configuration
 
@@ -40,3 +44,7 @@ the debian package manager to use (one of [dpkg, apt]).
   	set :debian_stream_log, false
 
 determines whether to stream the command output.
+	
+	set :debian_filter, ['*']
+
+a glob syntax filter to determine which packages to deploy. By default all will be deployed.

data/lib/deb_deploy/rsync.rb

@@ -4,7 +4,8 @@ module DebDeploy
       def command(from, to, options={})
         flags = ['-az']
         flags << '--delete'
-        flags << includes(["*/","*.deb"])
+        flags << '--delete-excluded'
+        flags << includes(options[:filter])
         flags << excludes(["*"])
         flags << ssh_options(options[:ssh]) if options.has_key?(:ssh)
 

data/lib/deb_deploy/util/collection_utils.rb

@@ -0,0 +1,17 @@
+module DebDeploy
+  module LazyEnumerable
+    def each(&block)
+      threads = []
+      super do |item|
+        threads << Thread.new { yield item }
+      end
+      threads.each(&:join)
+    end
+
+    def map(&block)
+      super do |item|
+        Thread.new { Thread.current[:output] = block[item] }
+      end.map(&:join).map { |thread| thread[:output] }
+    end
+  end
+end

data/lib/deb_deploy/util/parallel_enumerable.rb

@@ -0,0 +1,8 @@
+require 'deb_deploy/util/collection_utils'
+
+module Enumerable
+	def async
+		self.clone.extend DebDeploy::LazyEnumerable
+	end
+end
+	

data/lib/deb_deploy.rb

@@ -1,6 +1,7 @@
 require 'deb_deploy/rsync'
 require 'deb_deploy/logger/batch'
 require 'deb_deploy/logger/stream'
+require 'deb_deploy/util/parallel_enumerable'
 
 Capistrano::Configuration.instance.load do
   namespace :deb do
@@ -8,6 +9,7 @@ Capistrano::Configuration.instance.load do
   	set :debian_target, '/tmp/deb_deploy'
   	set :debian_package_manager, 'dpkg'
   	set :debian_stream_log, false
+    set :debian_filter, ['*']
 
     namespace :bootstrap do
       desc "prepares remote hosts for debian deployment based on selected package manager (dpkg or apt)"
@@ -39,21 +41,58 @@ Capistrano::Configuration.instance.load do
 
         logger.debug "Dependencies installed"
 
-        run "echo 'deb file:#{debian_target} ./' > #{debian_target}/deb_deploy.list"
+        put "deb file:#{debian_target} ./", "#{debian_target}/deb_deploy.list"
         sudo "mv #{debian_target}/deb_deploy.list /etc/apt/sources.list.d/deb_deploy.list"
 
+        put "Package: *\nPin: origin\nPin-Priority: 900\n", "#{debian_target}/00debdeploy"
+        sudo "mv #{debian_target}/00debdeploy /etc/apt/preferences.d/00debdeploy"
+
+        run "cd #{debian_target} && apt-ftparchive packages .  | gzip -9c > Packages.gz"
+
         logger.debug "Set up local debian repository"
       end
       
     end
 
+    namespace :teardown do
+      desc "cleans up deb_deploy files from remote hosts based on selected package manager (dpkg or apt)"
+      task :default do
+        case debian_package_manager
+          when "dpkg"
+            dpkg
+          when "apt"
+            apt
+          else
+            raise "#{debian_package_manager} is an unsupported package manager. Only dpkg and apt are supported"
+        end
+      end
+     
+      desc "cleans up deb_deploy directory (#{debian_target})"
+      task :dpkg do
+        run "rm -rf #{debian_target}"
+        logger.debug "Removed deployment directory"
+      end
+
+      desc "cleans up deb_deploy directory (#{debian_target}) and local debian repository from remote hosts"
+      task :apt do
+        run "rm -rf #{debian_target}"
+
+        sudo "rm /etc/apt/sources.list.d/deb_deploy.list"
+
+        sudo "rm /etc/apt/preferences.d/00debdeploy"
+
+        logger.debug "Removed local debian repository and deployment directory"
+      end
+    end
+
   	desc "copies debian packages to the server"
   	task :copy_packages do
   		targets = find_servers_for_task(current_task)
-  		failed_targets = targets.map do |target|
+  		failed_targets = targets.async.map do |target|
   			copy_cmd = DebDeploy::Rsync.command(
   				debian_source,
   				DebDeploy::Rsync.remote_address(target.user || fetch(:user, ENV['USER']), target.host, debian_target),
+          :filter => ['*/'] + debian_filter.map {|x| "#{x}.deb"},
   				:ssh => { 
   					:keys => ssh_options[:keys], 
   					:config => ssh_options[:config], 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deb_deploy
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-08 00:00:00.000000000 Z
+date: 2012-05-09 00:00:00.000000000 Z
 dependencies: []
 description: See http://github.com/jeroenr/deb_deploy
 email:
@@ -22,6 +22,8 @@ files:
 - Rakefile
 - lib/deb_deploy.rb
 - lib/deb_deploy/rsync.rb
+- lib/deb_deploy/util/parallel_enumerable.rb
+- lib/deb_deploy/util/collection_utils.rb
 - lib/deb_deploy/scp.rb
 - lib/deb_deploy/logger/batch.rb
 - lib/deb_deploy/logger/stream.rb