rubber 2.7.5 → 2.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 12a21d909c8eaa9564ee987b045ab189387d5c46
-  data.tar.gz: 24830a98a3204ebab53f6fd88ec070dd6c487e3f
+  metadata.gz: b790684866800f608ac2a7e8c46be7b69eaff208
+  data.tar.gz: 5eeebc027c8b19071df95dd125bdeda47ee2a124
 SHA512:
-  metadata.gz: f6c6fde0e0c084d19292a0656780ec0f731ac8fb0386e218d52c18e9b66b6204650dee4be70b9e50c3118c2163bbc9cf045da0446b73df35ed78c086fc0f85ec
-  data.tar.gz: 61bbc6df7047f11afeef55b3f6d7c27d379db6712f5e7c3e04a0c749a974caf42d299e3ddb08b2fcb0e5ac5c3aa91f56d8cae57c46fe2b5a3542eeb3ca358a3a
+  metadata.gz: 1a460123e60720d4e04cc9c1d1868e594c9a231cfc0f5ba51b6e1f4793586d283626f3b57685df992505a346d6dd54e9c756897bdbd6a8d41f00d2c96de8872c
+  data.tar.gz: 6ad1acc813073a33f9547dd8aa25927046645f9e1f8b74e6d13c5f439fbe9b2672b8c35758699cb185fe8fa661fd07fb31115d4287c70ac74fdedf06bc9f074f

data/CHANGELOG

@@ -1,3 +1,27 @@
+2.8.0 (03/30/2014)
+
+New Features:
+============
+
+[base, core] Added the ability to specify a package manager mirror for faster package installation. <a127846>
+
+Improvements:
+============
+
+[base] Use binstubs if available in the rubber script since it can be much faster, particularly on JRuby. <eefa30e>
+[core] Suppress dpkg output to cut down on noise in setting up iptables firewall rules. <59997aa>
+[core] Only upload the rubber config once, rather than everytime run_config is called. <1b14e73>
+[core] There's no need to specially upload rubber config files when using a non-SCM deploy strategy. <3227440>
+[core] Prevent tasks from running multiple times if mounting a volume to a location that would blow away the deploy directory. <c222684>
+[core] Sped up config file transformation a bit by cutting down on file system operations. <5623fac>
+[core] Defer loading of rubber encryption code until it's actually needed.
+
+Bug Fixes:
+=========
+
+[core] Fixed a bad env var reference in setting up iptables firewall rules. <1dc844a>
+
+
 2.7.5 (03/28/2014)
 
 Improvements:

data/lib/rubber/cloud/base.rb

@@ -115,7 +115,7 @@ module Rubber
 
         script = <<-ENDSCRIPT
           # Install iptables if it's not already installed.
-          if ! dpkg -l $SOFTWARE; then
+          if ! dpkg -l iptables &> /dev/null; then
             export DEBIAN_FRONTEND=noninteractive; apt-get -q -o Dpkg::Options::=--force-confold -y --force-yes install iptables
           fi
 

data/lib/rubber/commands/util.rb

@@ -338,6 +338,8 @@ module Rubber
              "Generate a key for rubber_secret_key"
 
       def execute
+        require 'rubber/encryption'
+
         if generate?
           puts "Obfuscation key: " + Rubber::Encryption.generate_encrypt_key.inspect
           exit

data/lib/rubber/environment.rb

@@ -2,7 +2,6 @@ require 'yaml'
 require 'socket'
 require 'delegate'
 require 'monitor'
-require 'rubber/encryption'
 
 
 module Rubber
@@ -55,6 +54,8 @@ module Rubber
         if @config_secret
           obfuscation_key = bound.rubber_secret_key
           if obfuscation_key
+            require 'rubber/encryption'
+
             read_config(@config_secret) do |data|
               Rubber::Encryption.decrypt(data, obfuscation_key)
             end

data/lib/rubber/generator.rb

@@ -35,7 +35,7 @@ module Rubber
         config_dirs.each do |dir|
           Dir[dir].sort.each do |f|
             next if f =~ /\/(CVS|\.svn)\//
-            if File.file?(f) && (! pat || pat.match(f))
+            if (! pat || pat.match(f)) && File.file?(f)
               Rubber.logger.info{"Transforming #{f}"}
               begin
                 transform(IO.read(f), @options)

data/lib/rubber/recipes/rubber/deploy.rb

@@ -70,28 +70,37 @@ namespace :rubber do
     opts += " --force" if options[:force]
     opts += " --file=\"#{options[:file]}\"" if options[:file]
 
-    # Need to do this so we can work with staging instances without having to
-    # checkin instance file between create and bootstrap, as well as during a deploy
-    if fetch(:push_instance_config, false)
-      push_files = rubber_cfg.environment.config_files
+    unless fetch(:rubber_config_files_pushed, false)
+      # Need to do this so we can work with staging instances without having to
+      # checkin instance file between create and bootstrap, as well as during a deploy
+      #
+      # If we're not using an SCM to deploy, then the code must've been uploaded via
+      # some strategy that would copy all the files from the local machine, so there's
+      # no need to do a special file upload operation. That's only necessary when using an SCM
+      # and not wanting to commit files in-progress.
+      if fetch(:push_instance_config, false) && (fetch(:scm, nil) != :none)
+        push_files = rubber_cfg.environment.config_files
 
-      # If we're using a local instance file, push that up.  This isn't necessary when storing in S3 or SimpleDB.
-      if rubber_instances.instance_storage =~ /^file:(.*)/
-        location = $1
-        push_files << location
+        # If we're using a local instance file, push that up.  This isn't necessary when storing in S3 or SimpleDB.
+        if rubber_instances.instance_storage =~ /^file:(.*)/
+          location = $1
+          push_files << location
+        end
+
+        push_files.each do |file|
+          dest_file = file.sub(/^#{Rubber.root}\/?/, '')
+          put(File.read(file), File.join(path, dest_file), :mode => "+r")
+        end
       end
 
-      push_files.each do |file|
-        dest_file = file.sub(/^#{Rubber.root}\/?/, '')
-        put(File.read(file), File.join(path, dest_file), :mode => "+r")
+      # if the user has defined a secret config file, then push it into Rubber.root/config/rubber
+      secret = rubber_cfg.environment.config_secret
+      if secret && File.exist?(secret)
+        base = rubber_cfg.environment.config_root.sub(/^#{Rubber.root}\/?/, '')
+        put(File.read(secret), File.join(path, base, File.basename(secret)), :mode => "+r")
       end
-    end
 
-    # if the user has defined a secret config file, then push it into Rubber.root/config/rubber
-    secret = rubber_cfg.environment.config_secret
-    if secret && File.exist?(secret)
-      base = rubber_cfg.environment.config_root.sub(/^#{Rubber.root}\/?/, '')
-      put(File.read(secret), File.join(path, base, File.basename(secret)), :mode => "+r")
+      set :rubber_config_files_pushed, true
     end
     
     rsudo "cd #{path} && RUBBER_ENV=#{Rubber.env} RAILS_ENV=#{Rubber.env} ./script/rubber config #{opts}"

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

@@ -6,9 +6,28 @@ namespace :rubber do
     Bootstraps instances by setting timezone, installing packages and gems
   DESC
   task :bootstrap do
+    # This special piece of Hell is designed to work around callback lifecyle issues and problems associated with
+    # remounting the :deploy_to directory.  The problem is that depending on the filesystem type and whether LLVM is
+    # used, we may need to install packages before we can setup volumes.  However, most end user custom installation
+    # tasks will be configured as "after 'rubber:install_packages'", meaning they'll trigger before the volumes are set
+    # up. While this is safe, it can be very costly.  If :deploy_to is set to '/mnt/myapp-production', for instance,
+    # and we mount a new volume to /mnt, then everything in /mnt will go away and need to be reconstituted.  Rubber
+    # ensures that the correct thing will happen, so there's no correctness issue.  But, if any of those callbacks ran
+    # something like :update_code_for_bootstrap, then several costly operations will be run twice, such as uploading
+    # the code to be deployed and bundle installing gems.  The first time will be in that callback, the second time
+    # will be as part of the normal deploy, after /mnt has been remounted and thus, cleared.
+    #
+    # In order to avoid effectively deploying the app twice in many circumstances, we rebind all
+    # "after 'rubber:install_packages'" callbacks to be "after 'rubber:setup_volumes'".  This allows end-user
+    # configuration to still hook after package installation for normal case operation, while allowing rubber to run
+    # semi-performantly when bootstrapping.
+
+    rebind_after_install_packages_callbacks('rubber:setup_volumes')
+
     link_bash
     set_timezone
     enable_multiverse
+    configure_package_manager_mirror
     install_core_packages
     upgrade_packages
     install_packages
@@ -18,6 +37,15 @@ namespace :rubber do
     deploy.setup
   end
 
+  def rebind_after_install_packages_callbacks(new_after_task)
+    install_package_task = find_task(:install_packages)
+
+    after_install_packages_callbacks = []
+    callbacks[:after].delete_if { |c| after_install_packages_callbacks << c if c.applies_to?(install_package_task) }
+
+    after_install_packages_callbacks.each { |c| after(new_after_task, c.source) }
+  end
+
   # Sets up instance to allow root access (e.g. recent canonical AMIs)
   def enable_root_ssh(ip, initial_ssh_user)
     # Capistrano uses the :password variable for sudo commands.  Since this setting is generally used for the deploy user,
@@ -322,6 +350,16 @@ namespace :rubber do
     end
   end
 
+  desc <<-DESC
+    Updates the mirror used for the primary packages installed by the package manager.
+  DESC
+  task :configure_package_manager_mirror do
+    if rubber_env.package_manager_mirror
+      # This will swap out deb lines that point at a URL while skipping over sources like "deb cdrom".
+      rsudo "sed -i.bak -r \"s/(deb|deb-src) [^ :]+:\\/\\/[^ ]+ (.*)/\\1 #{rubber_env.package_manager_mirror.gsub('/', '\\/')} \\2/g\" /etc/apt/sources.list"
+    end
+  end
+
   desc <<-DESC
     Update to the newest versions of all packages/gems.
   DESC

data/lib/rubber/recipes/rubber/volumes.rb

@@ -48,6 +48,7 @@ namespace :rubber do
 
       if deployed.strip.size == 0
         set :rubber_code_was_updated, false
+        set :rubber_config_files_pushed, false
       end
     end
   end

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = "2.7.5"
+  VERSION = '2.8.0'.freeze
 end

data/templates/base/config/rubber/rubber.yml

@@ -245,6 +245,14 @@ private_networks: [10.0.0.0/8]
 # For example, packages: [[rake, 0.7.1], irb]
 packages: [postfix, build-essential, git-core, libxslt-dev, ntp]
 
+# OPTIONAL: The package manager mirror to use for installation of primary packages (i.e., those not explicitly
+# sourced from a different repository).  If not specified, whatever mirror configured by your server image
+# will be used.
+#
+# Note that Ubuntu has a special URL that can be used to auto-select the mirror based upon geoip.  To use
+# it, specify 'mirror://mirrors.ubuntu.com/mirrors.txt' as the value.
+# package_manager_mirror: 'mirror://mirrors.ubuntu.com/mirrors.txt'
+
 # OPTIONAL: gem sources to setup for rubygems
 # gemsources: ["https://rubygems.org"]
 

data/templates/base/script/rubber

@@ -8,5 +8,10 @@ if type rvm &> /dev/null; then
   # version is set during bootstrap
   rvm default do bundle exec rubber "$@"
 else
-  bundle exec rubber "$@"
+  # Use binstubs if they exist since they're faster.
+  if [[ -f bin/rubber ]]; then
+    ./bin/rubber "$@"
+  else
+    bundle exec rubber "$@"
+  fi
 fi

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.7.5
+  version: 2.8.0
 platform: ruby
 authors:
 - Matt Conway
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-28 00:00:00.000000000 Z
+date: 2014-03-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano