rubber 2.10.0 → 2.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8744439407fab692486f20a294c52a5c9205497e
-  data.tar.gz: 0786a0389c092de1defec7d51955e33e70380d9f
+  metadata.gz: d510dffc3ce1ebe0da4418be8388b37cee5e560c
+  data.tar.gz: b3f19bd63f32e4b18011ecb461c30be71db8f736
 SHA512:
-  metadata.gz: fdde13fda5fd4795b06f60941e5e4bef3177d21c171a0d1158c70743c47da90f3c368584bf87cf37f2ed511962671cc95a488cc6f9ee6ee0cd0d9113c70d096a
-  data.tar.gz: 7f6c872ddaf88857d52e543ae6b90972dc6027201e24111d7e46f84d98374e0d26234481ece2a903b3023037446412f3c23533244f26928a8252f51530b9fe6b
+  metadata.gz: b407b7a98d1ef7160a4fd23d343f581e920c0846ca6a55fc72d3f09c77250135115b1b0b47257791b41a3260e710760cc16d80e0bdb857da7c2bd6f7a27642c3
+  data.tar.gz: d3c39792abf3a2e8f23decb42017fdcabdec80bb1d499d77684eeadfb33121f158a8fc96fbdcb81fa2bb9877b2ee3392c3808e40412a81aa33fa9d04f77c30e9

data/.travis.yml

@@ -44,6 +44,7 @@ matrix:
     - rvm: 1.8.7
     - rvm: jruby-18mode
     - rvm: jruby-head
+    - rvm: ruby-head
 
 # script: bundle exec rspec spec
 env:

data/CHANGELOG

@@ -1,4 +1,19 @@
-2.10.0 (06/17/2014)
+2 2.10.1 (07/01/2014)
+
+Improvements:
+============
+
+[core] Validate the SSH key configuration. <c6bb4af>
+
+Bug Fixes:
+=========
+
+[core] Fixed syncing security group rules with default VPC. <f4f073a, 1a527bf, 60ff192>
+[core] Fixed a compatibility problem with Ubuntu 10.04 due to an incompatible core package. <ba6e656>
+[passenger_nginx] Fixed a problem with a template due to random characters at the end of a line. <fa480ca>
+
+
+2.10.0 (06/20/2014)
 
 Improvements:
 ============
@@ -23,7 +38,7 @@ Bug Fixes:
 =========
 
 [core] Fixed template calls to rubber.run_config (a regression introduced in 2.9.0). <66310a5>
-[graylog]  	Prevent creating the same graylog inputs twice. <ad8a177>
+[graylog] Prevent creating the same graylog inputs twice. <ad8a177>
 [unicorn] Fixed unicorn init script. <4c616ba>
 
 

data/lib/rubber/cloud/aws.rb

@@ -284,7 +284,24 @@ module Rubber
               rule[:source_groups] ||= []
               source_group = {}
               source_group[:account] = rule_group["userId"]
-              source_group[:name] = rule_group["groupName"]
+
+              # Amazon doesn't appear to be returning the groupName value when running in a default VPC.  It's possible
+              # it's only returned for EC2 Classic.  This is distinctly in conflict with the API documents and thus
+              # appears to be a bug on Amazon's end.  Nonetheless, we need to handle it because otherwise our security
+              # group rule matching logic will fail and it messes up our users.
+              #
+              # Since every top-level item has both an ID and a name, if we're lacking the groupName we can search
+              # through the items for the one matching the groupId we have and then use its name value.  This should
+              # represent precisely the same data.
+              source_group[:name] = if rule_group["groupName"]
+                                      rule_group["groupName"]
+                                    elsif rule_group["groupId"]
+                                      matching_security_group = response.find { |item| item.group_id == rule_group["groupId"] }
+                                      matching_security_group ? matching_security_group.name : nil
+                                    else
+                                      nil
+                                    end
+
               rule[:source_groups] << source_group
             end if ip_item["groups"]
 

data/lib/rubber/recipes/rubber.rb

@@ -88,10 +88,29 @@ namespace :rubber do
     ssh_keys = if ENV['RUBBER_SSH_KEY']
       ENV['RUBBER_SSH_KEY'].split(',')
     else
-      cloud.env.key_file
+      if cloud.env.key_file.nil?
+        fatal "Missing required cloud provider configuration item 'key_file'."
+      else
+        cloud.env.key_file
+      end
+    end
+
+    normalized_ssh_keys = [ssh_keys].flatten.compact
+
+    # Fail-safe check.  While we do some validation earlier in the cycle, on the off-chance after all
+    # that, we still have no configured keys, we need to catch it.
+    if normalized_ssh_keys.empty?
+      fatal "No configured SSH keys. Please set the 'key_file' parameter for your cloud provider."
+    end
+
+    # Check that the configuration not only exists, but is also valid.
+    normalized_ssh_keys.each do |key|
+      unless File.exists?(key)
+        fatal "Invalid SSH key path '#{key}': File does not exist.\nPlease check your cloud provider's 'key_file' setting for correctness."
+      end
     end
 
-    ssh_options[:keys] = [ssh_keys].flatten.compact
+    ssh_options[:keys] = normalized_ssh_keys
     ssh_options[:timeout] = fetch(:ssh_timeout, 5)
   end
 

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

@@ -438,8 +438,17 @@ namespace :rubber do
         'scsitools'                   # Needed to rescan SCSI channels for any added devices.
     ]
 
-    rsudo "apt-get -q update"
-    rsudo "export DEBIAN_FRONTEND=noninteractive; apt-get -q -o Dpkg::Options::=--force-confold -y --force-yes install #{core_packages.join(' ')}"
+    install_commands = core_packages.collect do |package|
+      "apt-get -q -o Dpkg::Options::=--force-confold -y --force-yes install #{package} || true"
+    end
+
+    sudo_script 'install_core_packages', <<-ENDSCRIPT
+      export DEBIAN_FRONTEND=noninteractive
+
+      apt-get -q update
+
+      #{install_commands.join("\n")}
+    ENDSCRIPT
   end
 
   desc <<-DESC

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = '2.10.0'.freeze
+  VERSION = '2.10.1'.freeze
 end

data/templates/passenger_nginx/config/rubber/role/web_tools/nginx-tools.conf

@@ -19,7 +19,7 @@ server
     proxy_host = rubber_instances.for_role(settings.role).first.full_name rescue nil
     next unless proxy_host
 
-    host = "#{name.gsub('_', '-')}-#{rubber_env.full_host}"oc
+    host = "#{name.gsub('_', '-')}-#{rubber_env.full_host}"
     host_and_port = "#{host}:#{rubber_env.web_tools_ssl_port}"
 
     # don't use settings.path here - mapping the host/port is sufficient,

data/test/commands/cron_test.rb

@@ -19,7 +19,7 @@ class CronTest < Test::Unit::TestCase
     date = Time.now.tv_sec.to_s
     out = `#{@rubber} cron echo #{date}`
 
-    assert_equal 0, $?
+    assert_equal 0, $?.exitstatus
     assert_equal "", out
 
     logs = Dir["#{@rubber_root}/log/*.log"]
@@ -33,11 +33,11 @@ class CronTest < Test::Unit::TestCase
     date = Time.now.tv_sec.to_s
 
     out = `#{@rubber} cron echo #{date}`
-    assert_equal 0, $?
+    assert_equal 0, $?.exitstatus
     assert_equal "", out
 
     out = `#{@rubber} cron echo #{date}`
-    assert_equal 0, $?
+    assert_equal 0, $?.exitstatus
     assert_equal "", out
 
     logs = Dir["#{@rubber_root}/log/*.log"]
@@ -80,7 +80,7 @@ class CronTest < Test::Unit::TestCase
   
   def test_rubber_cron_output_on_error
     out = `#{@rubber} cron -- ls -la jkbhbj`
-    assert_not_equal 0, $?
+    assert_not_equal 0, $?.exitstatus
     assert_not_equal "", out, "Unexpected output:\n#{out}"
   end
   

data/test/commands/util_test.rb

@@ -13,7 +13,7 @@ class UtilTest < Test::Unit::TestCase
 
     should "generate a key" do
       out = `#{@rubber} util:obfuscation -g`
-      assert_equal 0, $?, "Process failed, output: #{out}"
+      assert_equal 0, $?.exitstatus, "Process failed, output: #{out}"
       assert_match /Obfuscation key: [^\n\s]+/, out
     end
     
@@ -22,7 +22,7 @@ class UtilTest < Test::Unit::TestCase
 
       fixture_dir = File.expand_path("#{File.dirname(__FILE__)}/../fixtures/secret")
       out = `#{@rubber} util:obfuscation -f '#{fixture_dir}/secret.yml' -k '#{@key}'`
-      assert_equal 0, $?, "Process failed, output: #{out}"
+      assert_equal 0, $?.exitstatus, "Process failed, output: #{out}"
       assert out.size > 0
       assert_no_match /secret_key: secret_val/, out
       
@@ -30,7 +30,7 @@ class UtilTest < Test::Unit::TestCase
       open(tempfile.path, "w") {|f| f.write(out) }
       
       out2 = `#{@rubber} util:obfuscation -f '#{tempfile.path}' -k '#{@key}' -d`
-      assert_equal 0, $?, "Process failed, output: #{out2}"
+      assert_equal 0, $?.exitstatus, "Process failed, output: #{out2}"
       assert out2.size > 0
       assert_match /secret_key: secret_val/, out2
     end

metadata

@@ -1,184 +1,184 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.10.0
+  version: 2.10.1
 platform: ruby
 authors:
 - Matt Conway
 - Kevin Menard
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-20 00:00:00.000000000 Z
+date: 2014-07-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.12'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.12'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: net-ssh
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.6'
+        version: '2.12'
+- !ruby/object:Gem::Dependency
+  name: net-ssh
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '2.6'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: thor
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: clamp
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: clamp
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: open4
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: open4
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: fog
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: fog
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '1.6'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: json
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.6'
+- !ruby/object:Gem::Dependency
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :runtime
-- !ruby/object:Gem::Dependency
-  name: rake
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: test-unit
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: test-unit
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: shoulda-context
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: shoulda-context
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: mocha
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: awesome_print
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: awesome_print
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-  prerelease: false
   type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: |2
       The rubber plugin enables relatively complex multi-instance deployments of RubyOnRails applications to
       Amazon's Elastic Compute Cloud (EC2).  Like capistrano, rubber is role based, so you can define a set
@@ -194,8 +194,8 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - CHANGELOG
 - Gemfile
 - Gemfile.1.8.7
@@ -694,24 +694,25 @@ files:
 homepage: https://github.com/rubber/rubber
 licenses: []
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: rubber
-rubygems_version: 2.1.9
-signing_key:
+rubygems_version: 2.2.2
+signing_key: 
 specification_version: 4
-summary: A capistrano plugin for managing multi-instance deployments to the cloud (ec2)
+summary: A capistrano plugin for managing multi-instance deployments to the cloud
+  (ec2)
 test_files: []