deb_deploy 1.2.1 → 1.3.0

data/README.md

@@ -1,3 +1,5 @@
+[![endorse](http://api.coderwall.com/jeroenr/endorsecount.png)](http://coderwall.com/jeroenr)
+
 # deb_deploy
 
 deb_deploy is a capistrano plugin to facilitate the deployment of debian packages (inspired by supply_drop). It works by simply copying (using rsync, or scp) your debian packages to your servers and installing them through the package manager
@@ -20,6 +22,10 @@ This sets up the environment for dpkg or apt deployment, depending on your confi
 
 This deploys the debian packages on the target servers.
 
+    cap deb:teardown
+
+Cleans up the environment.
+
 ### Configuration
 
 At the top of your deploy.rb
@@ -33,7 +39,7 @@ then optionally set some variables
 
 the directory containing your debian packages that will be rsynced to the servers.
 
-  	set :debian_target, '/tmp/deb_deploy'
+  	set :debian_target, '/tmp'
 
 the temp directory on the target machine to hold the packages before installing.
 
@@ -45,6 +51,6 @@ the debian package manager to use (one of [dpkg, apt]).
 
 determines whether to stream the command output.
 	
-	set :debian_filter, ['*']
+	set :debian_filter, '*'
 
 a glob syntax filter to determine which packages to deploy. By default all will be deployed.

data/lib/deb_deploy/apt_ftp_archive.rb

@@ -0,0 +1,27 @@
+module DebDeploy
+  class AptFtpArchive
+    class << self
+      def command(arguments, options={})
+        "apt-ftparchive " << options.map{|k,v| "-o #{k}='#{v}'"}.join(' ') << " #{arguments}"
+      end
+
+      def create_packages_file(from, options={})
+        command("packages #{from} | gzip -9c > Packages.gz", options)
+      end
+
+      def create_release_file(from, options={})
+        release_file_options = {
+              "Codename" => "deb_deploy", 
+              "Components" => "deb_deploy", 
+              "Origin" => "deb_deploy", 
+              "Label" => "Deployed with deb_deploy", 
+              "Architectures" => "all", 
+              "Suite" => "stable"
+            }
+        command("release #{from} > Release", options.merge(Hash[release_file_options.map {|k,v| ["APT::FTPArchive::Release::#{k}",v]}]))
+      end
+
+
+    end
+  end
+end

data/lib/deb_deploy/apt_get.rb

@@ -0,0 +1,17 @@
+module DebDeploy
+  class AptGet
+    class << self
+      def command(arguments, options={})
+        "apt-get -y --allow-unauthenticated " << options.map{|k,v| "-o #{k}='#{v}'"}.join(' ') << " #{arguments}"
+      end
+
+      def update_cache(options={})
+        command("update", options)
+      end
+
+      def install_packages(packages, options={})
+        command("install #{packages.join(' ')}", options)
+      end
+    end
+  end
+end

data/lib/deb_deploy/rsync.rb

@@ -4,6 +4,7 @@ module DebDeploy
       def command(from, to, options={})
         flags = ['-az']
         flags << '--delete'
+        flags << '--prune-empty-dirs'
         flags << '--delete-excluded'
         flags << includes(options[:filter])
         flags << excludes(["*"])

data/lib/deb_deploy.rb

@@ -1,4 +1,6 @@
 require 'deb_deploy/rsync'
+require 'deb_deploy/apt_get'
+require 'deb_deploy/apt_ftp_archive'
 require 'deb_deploy/logger/batch'
 require 'deb_deploy/logger/stream'
 require 'deb_deploy/util/parallel_enumerable'
@@ -6,11 +8,20 @@ require 'deb_deploy/util/parallel_enumerable'
 Capistrano::Configuration.instance.load do
   namespace :deb do
   	set :debian_source, '.'
-  	set :debian_target, '/tmp/deb_deploy'
+  	set :debian_target, '/tmp'
   	set :debian_package_manager, 'dpkg'
   	set :debian_stream_log, false
     set :debian_filter, '*'
 
+    RELEASE_FILE_OPTIONS = {
+              "Codename" => "deb_deploy", 
+              "Components" => "deb_deploy", 
+              "Origin" => "deb_deploy", 
+              "Label" => "Deployed with deb_deploy", 
+              "Architectures" => "all", 
+              "Suite" => "stable"
+            }
+
     namespace :bootstrap do
       desc "prepares remote hosts for debian deployment based on selected package manager (dpkg or apt)"
       task :default do
@@ -26,28 +37,26 @@ Capistrano::Configuration.instance.load do
      
       desc "creates directories and installs dependencies"
       task :dpkg do
-        run "mkdir -p #{debian_target}"
-        sudo "apt-get update"
-        sudo "apt-get install -y rsync"
+        run "mkdir -p #{debian_target}/deb_deploy"
+        sudo DebDeploy::AptGet.update_cache
+        sudo DebDeploy::AptGet.install_packages(%w(rsync))
         logger.debug "Dependencies installed"
       end
 
       desc "creates local debian repository for apt-get"
       task :apt do
-        run "mkdir -p #{debian_target}"
+        run "mkdir -p #{debian_target}/deb_deploy"
 
-        sudo "apt-get update"
-        sudo "apt-get install -y rsync dpkg-dev gzip"
+        sudo DebDeploy::AptGet.update_cache
+        sudo DebDeploy::AptGet.install_packages(%w(rsync dpkg-dev gzip))
 
         logger.debug "Dependencies installed"
 
-        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 "deb file:#{debian_target}/deb_deploy ./", "#{debian_target}/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"
+        run "cd #{debian_target}/deb_deploy && " << DebDeploy::AptFtpArchive.create_packages_file('.')
 
         logger.debug "Set up local debian repository"
       end
@@ -55,34 +64,16 @@ Capistrano::Configuration.instance.load do
     end
 
     namespace :teardown do
-      desc "cleans up deb_deploy files from remote hosts based on selected package manager (dpkg or apt)"
+      desc "cleans up deb_deploy files"
       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"
+        sudo "rm -rf #{debian_target}/deb_deploy"
+
+        deb_deploy_files = %w(/etc/apt/sources.list.d/deb_deploy.list /etc/apt/preferences.d/00debdeploy) << "#{debian_target}/deb_deploy.list" << "#{debian_target}/00debdeploy"
+        deb_deploy_files.each do |file_name|
+          sudo "rm -f #{file_name}"
         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"
@@ -91,7 +82,7 @@ Capistrano::Configuration.instance.load do
   		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),
+  				DebDeploy::Rsync.remote_address(target.user || fetch(:user, ENV['USER']), target.host, "#{debian_target}/deb_deploy"),
           :filter => ['*/'] + debian_filter.split(',').map {|x| "#{x}.deb"},
   				:ssh => { 
   					:keys => ssh_options[:keys], 
@@ -116,28 +107,23 @@ Capistrano::Configuration.instance.load do
 	    begin
         case debian_package_manager
           when "dpkg"
-    	      sudo "dpkg -R -i #{debian_target}" do |channel, stream, data|
+    	      sudo "dpkg -R -i #{debian_target}/deb_deploy" do |channel, stream, data|
     	        log.collect(channel[:host], data)
     	      end
           when "apt"
-            run "cd #{debian_target} && apt-ftparchive packages .  | gzip -9c > Packages.gz"
-
-            release_file_options = {
-              "Codename" => "deb_deploy", 
-              "Components" => "deb_deploy", 
-              "Origin" => "deb_deploy", 
-              "Label" => "Deployed with deb_deploy", 
-              "Architectures" => "all", 
-              "Suite" => "stable"
+            apt_get_options = {
+              "Dir::Etc::SourceList" => "#{debian_target}/deb_deploy.list",
+              "Dir::Etc::Preferences" => "#{debian_target}/00debdeploy"
             }
 
-            run "cd #{debian_target} && apt-ftparchive " << release_file_options.map{|k,v| "-o APT::FTPArchive::Release::#{k}='#{v}'"}.join(' ') << " release . > Release"
+            list_packages_cmd = "zcat #{debian_target}/deb_deploy/Packages.gz | grep Package | cut -d ' ' -f2 | sed ':a;N;$!ba;s/\n/ /g'"
+
+            run "cd #{debian_target}/deb_deploy && " << DebDeploy::AptFtpArchive.create_packages_file('.')
+            run "cd #{debian_target}/deb_deploy && " << DebDeploy::AptFtpArchive.create_release_file('.', Hash[RELEASE_FILE_OPTIONS.map {|k,v| ["APT::FTPArchive::Release::#{k}",v]}])
 
-            sudo "apt-get update"
+            sudo DebDeploy::AptGet.update_cache(apt_get_options)
 
-            list_packages_cmd = "zcat #{debian_target}/Packages.gz | grep Package | cut -d ' ' -f2 | sed ':a;N;$!ba;s/\n/ /g'"
-            
-            run "#{list_packages_cmd} | xargs #{sudo} apt-get -y --allow-unauthenticated install" do |channel, stream, data|
+            run "#{list_packages_cmd} | xargs #{sudo} #{DebDeploy::AptGet.install_packages([],apt_get_options)}" do |channel, stream, data|
               log.collect(channel[:host], data)
             end
           else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deb_deploy
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-09 00:00:00.000000000 Z
+date: 2012-06-01 00:00:00.000000000 Z
 dependencies: []
 description: See http://github.com/jeroenr/deb_deploy
 email:
@@ -21,7 +21,9 @@ files:
 - README.md
 - Rakefile
 - lib/deb_deploy.rb
+- lib/deb_deploy/apt_get.rb
 - lib/deb_deploy/rsync.rb
+- lib/deb_deploy/apt_ftp_archive.rb
 - lib/deb_deploy/util/parallel_enumerable.rb
 - lib/deb_deploy/util/collection_utils.rb
 - lib/deb_deploy/scp.rb