rubber 2.11.0 → 2.12.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: cb719c42daba4da22b9c9566bb445e3077b198b0
-  data.tar.gz: 7fb644c6a3d571ee6019ac55fc2afae3aa0766f0
+  metadata.gz: e0c241edcf70cad1688c5546d8aa21d2afa70c11
+  data.tar.gz: aacfc3fdd0c3d1611f26dc338fecb1c80549ef3d
 SHA512:
-  metadata.gz: bfcc3023241d63d494a98f1e441fc048e98800db6c2c390ee8c700c2572d551167a72de4e9e138dbbff121e0deaf6a164ac0c464a8900bfe5bd8d714c6bc6bdf
-  data.tar.gz: e753355f2ea865547888732ccc864e0480a294a9f4094c126f768b4dcf17e0ece7f0350ce18bba47f735192ce370f452db2be938c5d5d2c6c7410075af244983
+  metadata.gz: 9c9ec2602ebe633357cbadce74ebf93466bc53bb3bf0574bc551ea73fd9b90a501bcfe684a4fa20d23d1d99fc89ac8775cb28b76aa20ddb9243549242149085e
+  data.tar.gz: 885ea154a928f2438c8ed5b2ea86e85a80b24286f36097670cb9205822f259fc934dcc73267321e53a9f473f809997158394944c65d7a37348c4bea9d129edd8

data/CHANGELOG

@@ -1,3 +1,21 @@
+2.12.0 (08/19/2014)
+
+New Features:
+============
+
+[base] Added a task for cleaning up old kernels. <653bd0c>
+
+Improvements:
+============
+
+[core] Implemented a check that will only repeat 'apt-get update' calls if there's a change to the sources list. <adafdc0>
+
+Bug Fixes:
+=========
+
+[passenger_nginx] Fixed a typo in the template preventing vulcanization. <cdc3ad8>
+
+
 2.11.0 (08/07/2014)
 
 New Features:
@@ -364,7 +382,7 @@ Bug Fixes:
 
 [core] Fixed a problem with tasks using the `:only` option being overwritten by rubber internally (#397) <d3ae2fa>
 [core] Don't install fog 1.16.0 until we're able to sort out API compatiblities with it <346c99b>
-[core] Presen the $REBOOT value across multiple calls to `maybe_reboot` <f03dc22>
+[core] Present the $REBOOT value across multiple calls to `maybe_reboot` <f03dc22>
 [web_tools] Proxied service hostnames should not have underscores since that would be an invalid hostname <055919f>
 
 

data/lib/rubber/recipes/rubber/setup.rb

@@ -445,7 +445,7 @@ namespace :rubber do
     sudo_script 'install_core_packages', <<-ENDSCRIPT
       export DEBIAN_FRONTEND=noninteractive
 
-      apt-get -q update
+      #{apt_get_update_script}
 
       #{install_commands.join("\n")}
     ENDSCRIPT
@@ -598,6 +598,7 @@ namespace :rubber do
     end
   end
 
+
   def destroy_dyndns(instance_item)
     env = rubber_cfg.environment.bind(instance_item.role_names, instance_item.name)
     if env.dns_provider
@@ -630,15 +631,34 @@ namespace :rubber do
       expanded_pkg_list.join(' ')
     end
 
-    rsudo "apt-get -q update"
     if upgrade
       if ENV['NO_DIST_UPGRADE']
-        rsudo "export DEBIAN_FRONTEND=noninteractive; apt-get -q -o Dpkg::Options::=--force-confold -y --force-yes upgrade"
+        sudo_script 'upgrade_packages', <<-ENDSCRIPT
+          export DEBIAN_FRONTEND=noninteractive
+
+          #{apt_get_update_script}
+
+          apt-get -q -o Dpkg::Options::=--force-confold -y --force-yes upgrade
+        ENDSCRIPT
       else
-        rsudo "export DEBIAN_FRONTEND=noninteractive; apt-get -q -o Dpkg::Options::=--force-confold -y --force-yes dist-upgrade"
+        sudo_script 'dist_upgrade_packages', <<-ENDSCRIPT
+          export DEBIAN_FRONTEND=noninteractive
+
+          #{apt_get_update_script}
+
+          apt-get -q -o Dpkg::Options::=--force-confold -y --force-yes dist-upgrade
+        ENDSCRIPT
       end
     else
-      rsudo "export DEBIAN_FRONTEND=noninteractive; apt-get -q -o Dpkg::Options::=--force-confold -y --force-yes install $CAPISTRANO:VAR$", opts
+      install_packages_script = <<-ENDSCRIPT
+        export DEBIAN_FRONTEND=noninteractive
+
+        #{apt_get_update_script}
+
+        apt-get -q -o Dpkg::Options::=--force-confold -y --force-yes install $@
+      ENDSCRIPT
+
+      sudo_script 'install_packages', install_packages_script, opts.merge(:script_args => '$CAPISTRANO:VAR$')
     end
 
     maybe_reboot
@@ -812,4 +832,25 @@ namespace :rubber do
     end
   end
 
+  # Helper script that only issues an apt-get update command if the apt sources list has changed.
+  def apt_get_update_script
+    <<-ENDSCRIPT
+      if [[ ! -f /tmp/apt_sources.md5 ]]; then
+        apt-get -q update
+
+        md5sum /etc/apt/sources.list > /tmp/apt_sources.md5
+        md5sum /etc/apt/sources.list.d/*.list >> /tmp/apt_sources.md5
+      else
+        md5sum /etc/apt/sources.list > /tmp/apt_sources_compare.md5
+        md5sum /etc/apt/sources.list.d/*.list >> /tmp/apt_sources_compare.md5
+
+        if [[ `diff /tmp/apt_sources.md5 /tmp/apt_sources_compare.md5` ]]; then
+          apt-get -q update
+        fi
+
+        mv /tmp/apt_sources_compare.md5 /tmp/apt_sources.md5
+      fi
+    ENDSCRIPT
+  end
+
 end

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = '2.11.0'.freeze
+  VERSION = '2.12.0'.freeze
 end

data/templates/base/config/rubber/deploy-setup.rb

@@ -104,5 +104,11 @@ namespace :rubber do
     task :reinstall_virtualbox_additions, :only => { :provider => 'vagrant' } do
       rsudo "service vboxadd setup"
     end
+
+    task :cleanup_old_kernels do
+      rubber.sudo_script 'cleanup_old_kernels', <<-ENDSCRIPT
+        dpkg -l 'linux-*' | sed '/^ii/!d;/'"$(uname -r | sed "s/\\(.*\\)-\\([^0-9]\\+\\)/\\1/")"'/d;s/^[^ ]* [^ ]* \\([^ ]*\\).*/\\1/;/[0-9]/!d' | xargs dpkg --purge
+      ENDSCRIPT
+    end
   end
 end

data/templates/passenger_nginx/config/rubber/rubber-passenger_nginx.yml

@@ -14,4 +14,4 @@ use_ssl_key: false
 
 roles:
   passenger_nginx:
-    packages: [libcurl4-openssl-dev, libpcre3-dev, nginx-extras, [passenger, "#{passenger_version}"]
+    packages: [libcurl4-openssl-dev, libpcre3-dev, nginx-extras, [passenger, "#{passenger_version}"]]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.11.0
+  version: 2.12.0
 platform: ruby
 authors:
 - Matt Conway
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement