rubber 2.8.0 → 2.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b790684866800f608ac2a7e8c46be7b69eaff208
-  data.tar.gz: 5eeebc027c8b19071df95dd125bdeda47ee2a124
+  metadata.gz: 74952b3078921c178e794dd97dbfde331e459626
+  data.tar.gz: 64a2230b873c17bf2d296267f04b4ede7df42cc3
 SHA512:
-  metadata.gz: 1a460123e60720d4e04cc9c1d1868e594c9a231cfc0f5ba51b6e1f4793586d283626f3b57685df992505a346d6dd54e9c756897bdbd6a8d41f00d2c96de8872c
-  data.tar.gz: 6ad1acc813073a33f9547dd8aa25927046645f9e1f8b74e6d13c5f439fbe9b2672b8c35758699cb185fe8fa661fd07fb31115d4287c70ac74fdedf06bc9f074f
+  metadata.gz: cadef25f61d49602b586cedfe50f20a7c67ec83ac5f6d6b7a21ea63e58eb27edb9a5d45d4e8a483eab874589c8c7391898361a41d7196912ec3a8801e29eceda
+  data.tar.gz: fce48417a6a09e1e12ede3487f24cf70f3b5e6feb0a3da2c33d5a152390f9a2aa2915956bae282d754e9de2b0e84be34eaeefbf29b55876215457b9ae4d51856

data/CHANGELOG

@@ -1,3 +1,16 @@
+2.8.1 (05/01/2014)
+
+Bug Fixes:
+=========
+
+[core] Detect alternate location of secret file when it is moved into the /config/rubber dir on remote servers. <9bd12ad>
+[core] Make sure add-apt-repository is available on Ubuntu > 12.04. <36c423d>
+[core] Fixed compatibility with Vagrant 1.5.x. <55416f8>
+[selenium_grid_hub] Replaced hard-coded app user with app_user variable. <afc7e9c>
+[selenium_grid_hub] Fixed dynamic MaxPermSize. <abd46cd>
+[web_tools] Underscores aren't valid in hostname, so convert to hyphens like we do everywhere else. <bbe0b81>
+
+
 2.8.0 (03/30/2014)
 
 New Features:

data/lib/rubber/environment.rb

@@ -52,6 +52,14 @@ module Rubber
         bound = bind()
         @config_secret = bound.rubber_secret
         if @config_secret
+
+          # The config_secret value should point to a file outside of the project directory. When run locally, rubber
+          # will be able to read this file directly. In order to support deploys without having to commit this file,
+          # rubber will SCP the file up as part of the deploy. In that case, the file can be found in config_root and
+          # will have the same base name. If the file doesn't exist locally, we'll assume it's a deployed location
+          # and read the file from config_root.
+          @config_secret = "#{@config_root}/#{File.basename(@config_secret)}" unless File.exist?(@config_secret)
+
           obfuscation_key = bound.rubber_secret_key
           if obfuscation_key
             require 'rubber/encryption'

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

@@ -396,7 +396,8 @@ namespace :rubber do
   DESC
   task :install_core_packages do
     core_packages = [
-        'python-software-properties', # Needed for add-apt-repository, which we use for adding PPAs.
+        'python-software-properties', # Needed for add-apt-repository (<= Ubuntu 12.04), which we use for adding PPAs.
+        'software-properties-common', # Needed for add-apt-repository (> Ubuntu 12.04), which we use for adding PPAs.
         'bc',                         # Needed for comparing version numbers in bash, which we do for various setup functions.
         'update-notifier-common',     # Needed for notifying us when a package upgrade requires a reboot.
         'scsitools'                   # Needed to rescan SCSI channels for any added devices.

data/lib/rubber/vagrant/provisioner.rb

@@ -39,9 +39,9 @@ module VagrantPlugins
           script = "RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} ALIAS=#{machine.name} ROLES='#{config.roles}' EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} RUBBER_SSH_KEY=#{rubber_ssh_keys} #{internal_cap_command} rubber:create -S initial_ssh_user=#{ssh_info[:username]}"
         else
           script = <<-ENDSCRIPT
-            unset GEM_HOME;
-            unset GEM_PATH;
-            PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} ALIAS=#{machine.name} ROLES='#{config.roles}' EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} RUBBER_SSH_KEY=#{rubber_ssh_keys} bash -c '#{rvm_prefix} bundle exec cap rubber:create -S initial_ssh_user=#{ssh_info[:username]}'
+            #{clear_vagrant_environment}
+
+            RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} ALIAS=#{machine.name} ROLES='#{config.roles}' EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} RUBBER_SSH_KEY=#{rubber_ssh_keys} bash -c '#{rvm_prefix} bundle exec cap rubber:create -S initial_ssh_user=#{ssh_info[:username]}'
           ENDSCRIPT
         end
 
@@ -53,9 +53,9 @@ module VagrantPlugins
           script = "RUN_FROM_VAGRANT=true FORCE=true RUBBER_ENV=#{config.rubber_env} ALIAS=#{machine.name} #{internal_cap_command} rubber:destroy"
         else
           script = <<-ENDSCRIPT
-            unset GEM_HOME;
-            unset GEM_PATH;
-            PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true FORCE=true RUBBER_ENV=#{config.rubber_env} ALIAS=#{machine.name} bash -c '#{rvm_prefix} bundle exec cap rubber:destroy'
+            #{clear_vagrant_environment}
+
+            RUN_FROM_VAGRANT=true FORCE=true RUBBER_ENV=#{config.rubber_env} ALIAS=#{machine.name} bash -c '#{rvm_prefix} bundle exec cap rubber:destroy'
           ENDSCRIPT
         end
 
@@ -67,9 +67,9 @@ module VagrantPlugins
           script = "RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{rubber_ssh_keys} ALIAS=#{machine.name} EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} #{internal_cap_command} rubber:refresh -S initial_ssh_user=#{ssh_info[:username]}"
         else
           script = <<-ENDSCRIPT
-            unset GEM_HOME;
-            unset GEM_PATH;
-            PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{rubber_ssh_keys} ALIAS=#{machine.name} EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} bash -c '#{rvm_prefix} bundle exec cap rubber:refresh -S initial_ssh_user=#{ssh_info[:username]}'
+            #{clear_vagrant_environment}
+
+            RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{rubber_ssh_keys} ALIAS=#{machine.name} EXTERNAL_IP=#{private_ip} INTERNAL_IP=#{private_ip} bash -c '#{rvm_prefix} bundle exec cap rubber:refresh -S initial_ssh_user=#{ssh_info[:username]}'
           ENDSCRIPT
         end
 
@@ -81,9 +81,9 @@ module VagrantPlugins
           script = "RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{rubber_ssh_keys} FILTER=#{machine.name} #{internal_cap_command} rubber:bootstrap"
         else
           script = <<-ENDSCRIPT
-            unset GEM_HOME;
-            unset GEM_PATH;
-            PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{rubber_ssh_keys} FILTER=#{machine.name} bash -c '#{rvm_prefix} bundle exec cap rubber:bootstrap'
+            #{clear_vagrant_environment}
+
+            RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{rubber_ssh_keys} FILTER=#{machine.name} bash -c '#{rvm_prefix} bundle exec cap rubber:bootstrap'
           ENDSCRIPT
         end
 
@@ -95,9 +95,9 @@ module VagrantPlugins
           script = "RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{rubber_ssh_keys} FILTER=#{machine.name} #{internal_cap_command} deploy:migrations"
         else
           script = <<-ENDSCRIPT
-            unset GEM_HOME;
-            unset GEM_PATH;
-            PATH=#{ENV['PATH'].split(':')[1..-1].join(':')} RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{rubber_ssh_keys} FILTER=#{machine.name} bash -c '#{rvm_prefix} bundle exec cap deploy:migrations'
+          #{clear_vagrant_environment}
+
+          RUN_FROM_VAGRANT=true RUBBER_ENV=#{config.rubber_env} RUBBER_SSH_KEY=#{rubber_ssh_keys} FILTER=#{machine.name} bash -c '#{rvm_prefix} bundle exec cap deploy:migrations'
           ENDSCRIPT
         end
 
@@ -111,6 +111,21 @@ module VagrantPlugins
       def rvm_prefix
         config.rvm_ruby_version ? "rvm #{config.rvm_ruby_version} do" : ''
       end
+
+      def clear_vagrant_environment
+        <<-ENDSCRIPT
+          unset GEM_HOME;
+          unset GEM_PATH;
+          unset RUBYOPT;
+          unset GEMRC;
+          unset BUNDLE_GEMFILE;
+          unset BUNDLE_BIN_PATH;
+          unset RUBYLIB;
+          unset BUNDLE_APP_CONFIG;
+
+          export PATH=#{ENV['PATH'].split(':').reject { |entry| entry =~ /vagrant/i }.join(':')};
+        ENDSCRIPT
+      end
     end
   end
 end

data/lib/rubber/version.rb

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

data/templates/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}-#{rubber_env.full_host}"
+    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/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}-#{rubber_env.full_host}"
+    host = "#{name.gsub('_', '-')}-#{rubber_env.full_host}"oc
     host_and_port = "#{host}:#{rubber_env.web_tools_ssl_port}"
 
     # don't use settings.path here - mapping the host/port is sufficient,

data/templates/selenium_grid_hub/config/rubber/deploy-selenium-grid-hub.rb

@@ -14,12 +14,12 @@ namespace :rubber do
         # Create the log directory if necessary.
         if [[ ! -d #{rubber_env.selenium_grid_hub_log_dir} ]]; then
           mkdir -p #{rubber_env.selenium_grid_hub_log_dir}
-          chown app:app #{rubber_env.selenium_grid_hub_log_dir}
+          chown #{rubber_env.app_user}:#{rubber_env.app_user} #{rubber_env.selenium_grid_hub_log_dir}
         fi
 
         if [[ ! -d #{rubber_env.selenium_grid_hub_dir} ]]; then
           mkdir -p #{rubber_env.selenium_grid_hub_dir}
-          chown app:app #{rubber_env.selenium_grid_hub_dir}
+          chown #{rubber_env.app_user}:#{rubber_env.app_user} #{rubber_env.selenium_grid_hub_dir}
         fi
 
         # Fetch the Selenium Grid 2 JARs.

data/templates/selenium_grid_hub/config/rubber/role/selenium_grid_hub/startup.sh

@@ -5,7 +5,7 @@
   args = []
   args << '-Xms256m'
   args << "-Xmx#{rubber_env.selenium_grid_hub_max_heap_in_mb}m"
-  args << '-XX:MaxPermSize=#{rubber_env.selenium_grid_hub_permgen_in_mb}m'
+  args << "-XX:MaxPermSize=#{rubber_env.selenium_grid_hub_permgen_in_mb}m"
   args << '-server'
   args << '-Xdebug'
   args << '-Xrunjdwp:transport=dt_socket,server=y,suspend=n,address=5005'

metadata

@@ -1,184 +1,184 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.8.0
+  version: 2.8.1
 platform: ruby
 authors:
 - Matt Conway
 - Kevin Menard
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-03-31 00:00:00.000000000 Z
+date: 2014-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.12'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.12'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: !ruby/object:Gem::Requirement
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: thor
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: clamp
   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'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: open4
   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'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: fog
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fog
+        version: '1.6'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.6'
-- !ruby/object:Gem::Dependency
-  name: json
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rake
   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'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: test-unit
   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'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: shoulda-context
   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'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: mocha
   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'
-  type: :development
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: awesome_print
   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'
-  type: :development
   prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+  type: :development
 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
@@ -695,25 +695,24 @@ 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.2.2
-signing_key: 
+rubygems_version: 2.1.9
+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: []