rubber 2.6.2 → 2.6.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f897442ad924496abcf7f3beeabfb592b0b5c7e9
-  data.tar.gz: e62e8386658cc1a20a8f32e0efa7113813b0166b
+  metadata.gz: ea9c4664c7c0e3bda464394ec4629938c17d3def
+  data.tar.gz: 80eb42ae9aa0625382878b683fc4ec6d1f708236
 SHA512:
-  metadata.gz: d0dc0cd057ce461ee16d32d12c970c756cc9dd343e4f8e2861e08a1657131cba3777fe4449edcb964a5862caa8c445eca7f4e772bed94e3251290c9324fed2d2
-  data.tar.gz: 377e5688e2c403a57aee8c29de42057a679d31771f192bea842e46dd5f0d13f69439a29e478da8daacbd97ed45aaf6027fdb22e5ed85984e1fc64fd8f9a2b9dd
+  metadata.gz: 38f7bb115c0a64ead7ba2a959bdd5c79ce92ae2239546fbd287b08a8eaf18d6bbac483e4d6ce720b0e065731bb4892df37ee49254b25bfd13f9b775787358e21
+  data.tar.gz: 0115c2d6b31efd08592c940265926080231d42d9284efb45e19f57cf09dcf7d8eaa6155f9b222c69c8c47b9e8acc833a1897ca2955cedbacda414784b9f872d9

data/CHANGELOG

@@ -1,3 +1,17 @@
+2.6.3 (11/19/2013)
+
+Improvements:
+============
+
+[core] Drastically improved the speed of repeated configuration lookups.
+[core] Fixed a potential issue uploading backups to S3 if the bucket name contains the '.' character. <7ea9f39>
+
+Bug Fixes:
+=========
+
+[core] Fixed creating EBS volumes (issue #417). <a7d47c5>
+
+
 2.6.2 (11/07/2013)
 
 Improvements:
@@ -19,7 +33,7 @@ Bug Fixes:
 =========
 
 [base] Fixed unknown method 'known_roles' when running create_staging. <44167c4>
-[core] Fixed ip_address deprecation for digital ocean.
+[core] Fixed ip_address deprecation for digital ocean. <62d2e90>
 [core] Fixed a thread safety issue in Capistrano via a monkey-patch. <f3f9086>
 
 

data/lib/rubber.rb

@@ -1,6 +1,9 @@
 $:.unshift(File.dirname(__FILE__))
 
+require 'monitor'
+
 module Rubber
+  extend MonitorMixin
 
   def self.initialize(project_root, project_env)
     return if defined?(RUBBER_ROOT) && defined?(RUBBER_ENV)
@@ -50,11 +53,23 @@ module Rubber
   end
 
   def self.config
-    Rubber::Configuration.rubber_env
+    unless @config
+      synchronize do
+        @config ||= Rubber::Configuration.rubber_env
+      end
+    end
+
+    @config
   end
 
   def self.instances
-    Rubber::Configuration.rubber_instances
+    unless @instances
+      synchronize do
+        @instances ||= Rubber::Configuration.rubber_instances
+      end
+    end
+
+    @instances
   end
   
   def self.cloud(capistrano = nil)

data/lib/rubber/cloud/aws.rb

@@ -16,7 +16,8 @@ module Rubber
         storage_credentials = {
           :provider => 'AWS',
           :aws_access_key_id => env.access_key,
-          :aws_secret_access_key => env.secret_access_key
+          :aws_secret_access_key => env.secret_access_key,
+          :path_style => true
         }
 
         @table_store = ::Fog::AWS::SimpleDB.new(compute_credentials)

data/lib/rubber/cloud/digital_ocean.rb

@@ -16,7 +16,8 @@ module Rubber
           storage_credentials = {
             :provider => 'AWS',
             :aws_access_key_id => env.cloud_providers.aws.access_key,
-            :aws_secret_access_key => env.cloud_providers.aws.secret_access_key
+            :aws_secret_access_key => env.cloud_providers.aws.secret_access_key,
+            :path_style => true
           }
 
           storage_credentials[:region] = env.cloud_providers.aws.region

data/lib/rubber/cloud/generic.rb

@@ -11,7 +11,8 @@ module Rubber
           storage_credentials = {
               :provider => 'AWS',
               :aws_access_key_id => env.cloud_providers.aws.access_key,
-              :aws_secret_access_key => env.cloud_providers.aws.secret_access_key
+              :aws_secret_access_key => env.cloud_providers.aws.secret_access_key,
+              :path_style => true
           }
           storage_credentials[:region] = env.cloud_providers.aws.region
 

data/lib/rubber/cloud/vsphere.rb

@@ -16,7 +16,8 @@ module Rubber
           storage_credentials = {
               :provider => 'AWS',
               :aws_access_key_id => env.cloud_providers.aws.access_key,
-              :aws_secret_access_key => env.cloud_providers.aws.secret_access_key
+              :aws_secret_access_key => env.cloud_providers.aws.secret_access_key,
+              :path_style => true
           }
 
           storage_credentials[:region] = env.cloud_providers.aws.region

data/lib/rubber/configuration.rb

@@ -21,7 +21,7 @@ module Rubber
       raise "This convenience method needs Rubber.env to be set" unless Rubber.env
       cfg = Rubber::Configuration.get_configuration(Rubber.env)
       host = cfg.environment.current_host
-      roles = cfg.instance[host].role_names rescue nil
+      roles = cfg.instance[host] ? cfg.instance[host].role_names : nil
       cfg.environment.bind(roles, host)
     end
 

data/lib/rubber/environment.rb

@@ -1,6 +1,7 @@
 require 'yaml'
 require 'socket'
 require 'delegate'
+require 'monitor'
 require 'rubber/encryption'
 
 
@@ -120,30 +121,40 @@ module Rubber
         else
           value = new
         end
-        return value
+
+        value
       end
 
       class HashValueProxy < Hash
-        attr_reader :global
+        include MonitorMixin
+
+        attr_reader :global, :cache
 
         def initialize(global, receiver)
           @global = global
+          @cache = {}
           super()
           replace(receiver)
         end
 
         def rubber_instances
-          @rubber_instances ||= Rubber::Configuration::rubber_instances
+          Rubber.instances
         end
-        
+
         def known_roles
           Rubber::Configuration.get_configuration(Rubber.env).environment.known_roles
         end
 
         def [](name)
-          value = super(name)
-          value = global[name] if global && !value
-          return expand(value)
+          unless cache.has_key?(name)
+            synchronize do
+              value = super(name)
+              value = global[name] if global && !value
+              cache[name] = expand(value)
+            end
+          end
+
+          cache[name]
         end
 
         def each
@@ -159,17 +170,18 @@ module Rubber
         end
 
         def method_missing(method_id)
-          key = method_id.id2name
-          return self[key]
+          self[method_id.id2name]
         end
 
         def expand_string(val)
           while val =~ /\#\{[^\}]+\}/
             val = eval('%Q{' + val + '}', binding, __FILE__)
           end
+
           val = true if val =="true"
           val = false if val == "false"
-          return val
+
+          val
         end
 
         def expand(value)
@@ -183,7 +195,8 @@ module Rubber
             else
               value
           end
-          return val
+
+          val
         end
 
       end
@@ -211,23 +224,26 @@ module Rubber
           role_overrides = global.delete("roles") || {}
           env_overrides = global.delete("environments") || {}
           host_overrides = global.delete("hosts") || {}
+
           Array(roles).each do |role|
             Array(role_overrides[role]).each do |k, v|
               global[k] = Environment.combine(global[k], v)
             end
           end
+
           Array(env_overrides[env]).each do |k, v|
             global[k] = Environment.combine(global[k], v)
           end
+
           Array(host_overrides[host]).each do |k, v|
             global[k] = Environment.combine(global[k], v)
           end
-          return global
+
+          global
         end
         
         def method_missing(method_id)
-          key = method_id.id2name
-          return self[key]
+          self[method_id.id2name]
         end
 
       end

data/lib/rubber/generator.rb

@@ -224,7 +224,7 @@ module Rubber
       end
 
       def rubber_instances()
-        Rubber::Configuration.rubber_instances
+        Rubber.instances
       end
 
     end

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

@@ -132,7 +132,7 @@ namespace :rubber do
               fi
               mv /etc/fstab /etc/fstab.bak
               cat /etc/fstab.bak | grep -v '#{vol_spec['mount']}' > /etc/fstab
-              if [ #{rubber_env.cloud_provider == 'aws'} && `lsb_release -r -s | sed 's/[.].*//'` -gt "10" ]; then
+              if [[ #{rubber_env.cloud_provider == 'aws'} && `lsb_release -r -s | sed 's/[.].*//'` -gt "10" ]]; then
 		            device=`echo #{vol_spec['device']} | sed 's/sd/xvd/'`
 	            else
 		            device='#{vol_spec['device']}'

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = "2.6.2"
+  VERSION = "2.6.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.6.2
+  version: 2.6.3
 platform: ruby
 authors:
 - Matt Conway
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-08 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano