rubber 2.16.0 → 3.0.0

data/.travis.yml

@@ -2,53 +2,19 @@ language: ruby
 sudo: false
 cache: bundler
 
-gemfile:
-  - Gemfile
-  - Gemfile.1.8.7
-
 rvm:
-  - 1.8.7
-  - 1.9.2
   - 1.9.3
   - 2.0.0
   - 2.1
   - 2.2
   - ruby-head
-  - jruby-18mode
   - jruby-19mode
   - jruby-head
   - rbx-2
 
 matrix:
-  exclude:
-    - rvm: 1.8.7
-      gemfile: Gemfile
-    - rvm: 1.9.2
-      gemfile: Gemfile.1.8.7
-    - rvm: 1.9.3
-      gemfile: Gemfile.1.8.7
-    - rvm: 2.0.0
-      gemfile: Gemfile.1.8.7
-    - rvm: 2.1
-      gemfile: Gemfile.1.8.7
-    - rvm: 2.2
-      gemfile: Gemfile.1.8.7
-    - rvm: ruby-head
-      gemfile: Gemfile.1.8.7
-    - rvm: jruby-18mode
-      gemfile: Gemfile
-    - rvm: jruby-19mode
-      gemfile: Gemfile.1.8.7
-    - rvm: jruby-head
-      gemfile: Gemfile.1.8.7
-    - rvm: rbx-2
-      gemfile: Gemfile.1.8.7
-
   allow_failures:
     - rvm: rbx-2
-    - rvm: 1.8.7
-    - rvm: 1.9.2
-    - rvm: jruby-18mode
     - rvm: ruby-head
 
 # script: bundle exec rspec spec

data/CHANGELOG

@@ -1,3 +1,36 @@
+3.0.0 (04/24/2015)
+
+This is a major Rubber release in 3 years.  Most of the Rubber internals haven't changed from the 2.x series.  However,
+we have removed support for Ruby versions < 1.9.3 and Rails < 3.  Dropping older versions of Ruby meant we were able
+to also drop the open4 dependency -- if you relied on that, you'll need to add it to your Gemfile.  We also dropped
+support for Ubuntu 10.04.  While it's tied to this major version release, dropping Ubuntu 10.04 is a consequence of
+it no longer being supported by Canonical.
+
+Breaking Changes:
+================
+
+[core] Force Ruby 1.9.3+ for Rubber 3.0. <a5f4259>
+[core] Removed open4 dependency in favor of standard lib open3. <e7f6d8e>
+[core] Dropped support for Rails 2.3. <cf8d6c2>
+[core] Dropped support for Ubuntu 10.04. <8e0753e>
+
+Improvements:
+============
+
+[base] Bump ruby-build from 20150116 to 20150413 and default Ruby from 2.2.0 to 2.2.2. <48357a3, 2854426>
+[base] Removed obsoleted gems from default install list. <cfe3433>
+[core] Improved SSH key validation. <000c309>
+[core] Worked around DigitalOcean's eventual consistencyness with regards to creating SSH keys. <b6dc6c5>
+[core] Don't modify the Gemfile when vulcanizing 'base'. <422feda>
+[passenger] Upgraded from Passenger from 4.0.57 to 5.0.6. <ca8a7d1>
+[passenger_nginx] Upgraded from Passenger from 4.0.57 to 5.0.6. <ca8a7d1>
+
+Bug Fixes:
+=========
+
+[base] Fixed bad default DigitalOcean image. <000c309>
+
+
 2.16.0 (02/23/2015)
 
 New Features:

data/lib/rubber/cloud/digital_ocean.rb

@@ -58,7 +58,17 @@ module Rubber
         ssh_key = compute_provider.list_ssh_keys.body['ssh_keys'].find { |key| key['name'] == env.key_name }
         if ssh_key.nil?
           if env.key_file
-            ssh_key = compute_provider.create_ssh_key(env.key_name, File.read("#{env.key_file}.pub"))
+            compute_provider.create_ssh_key(env.key_name, File.read("#{env.key_file}.pub"))
+
+            # Although not documented, DigitalOcean is eventually consistent.  Receiving a 200 response with the key
+            # body does not mean the key has propagated through their systems yet.  Thus we need to query to see if
+            # the key is yet available.  Otherwise our request will end up creating a droplet without an attached key.
+
+            begin
+              sleep(0.5)
+              ssh_key = compute_provider.list_ssh_keys.body['ssh_keys'].find { |key| key['name'] == env.key_name }
+            end while ssh_key.nil?
+
           else
             raise 'Missing key_file for DigitalOcean'
           end

data/lib/rubber/commands/cron.rb

@@ -1,4 +1,4 @@
-require 'open4'
+require 'open3'
 require 'fileutils'
 
 module Rubber
@@ -93,26 +93,24 @@ module Rubber
         # set current directory to rootdir
         Dir.chdir(rootdir)
 
-        # Open4 forks, which JRuby doesn't support.  But JRuby added a popen4-compatible method on the IO class,
-        # so we can use that instead.
-        status = (defined?(JRUBY_VERSION) ? IO : Open4).popen4(*cmd) do |pid, stdin, stdout, stderr|
+        status = Open3.popen3(*cmd) do |stdin, stdout, stderr, wait_thread|
           File.open(log, "a") do | fh |
             fh.puts "\nrubber:cron running #{cmd.inspect} at #{Time.now}\n"
             threads = []
+
             threads <<  Thread.new(stdout) do |stdout|
-               stdout.each { |line| $stdout.puts line if echoout?; fh.print line; fh.flush }
+              stdout.each { |line| $stdout.puts line if echoout?; fh.print line; fh.flush }
             end
+
             threads <<  Thread.new(stderr) do |stderr|
-               stderr.each { |line| $stderr.puts line if echoerr?; fh.print line; fh.flush }
+              stderr.each { |line| $stderr.puts line if echoerr?; fh.print line; fh.flush }
             end
+
             threads.each { |t| t.join }
           end
-        end
 
-        # JRuby's open4 doesn't return a Process::Status object when invoked with a block, but rather returns the
-        # block expression's value.  The Process::Status is stored as $?, so we need to normalize the status
-        # object if on JRuby.
-        status = $? if defined?(JRUBY_VERSION)
+          wait_thread.value
+        end
 
         result = status.exitstatus
         if result != 0

data/lib/rubber/instance.rb

@@ -293,20 +293,12 @@ module Rubber
         end
       end
 
-      if RUBY_VERSION < '1.9'
-        def to_yaml_properties
-          vars = instance_variables.map { |x| x.to_s }
-          vars - VARIABLES_TO_OMIT_IN_SERIALIZATION
-        end
-
-      else
-        def encode_with(coder)
-          vars = instance_variables.map { |x| x.to_s }
-          vars = vars - VARIABLES_TO_OMIT_IN_SERIALIZATION
+      def encode_with(coder)
+        vars = instance_variables.map { |x| x.to_s }
+        vars = vars - VARIABLES_TO_OMIT_IN_SERIALIZATION
 
-          vars.each do |var|
-            coder[var.gsub('@', '')] = eval(var)
-          end
+        vars.each do |var|
+          coder[var.gsub('@', '')] = eval(var)
         end
       end
     end

data/lib/rubber/recipes/rubber.rb

@@ -92,6 +92,8 @@ namespace :rubber do
     else
       if cloud.env.key_file.nil?
         fatal "Missing required cloud provider configuration item 'key_file'."
+      elsif cloud.env.key_file.strip.empty?
+        fatal "Empty path supplied for required cloud provider configuration item 'key_file'."
       else
         cloud.env.key_file
       end

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = '2.16.0'.freeze
+  VERSION = '3.0.0'.freeze
 end

data/rubber.gemspec

@@ -8,6 +8,7 @@ Gem::Specification.new do |s|
   s.name = "rubber"
   s.version     = Rubber::VERSION.dup
   s.platform    = Gem::Platform::RUBY
+  s.required_ruby_version = '>= 1.9.3'
   s.authors = ["Matt Conway", "Kevin Menard"]
   s.email       = ["matt@conwaysplace.com", "nirvdrum@gmail.com"]
   s.homepage = "https://github.com/rubber/rubber"
@@ -21,8 +22,6 @@ Gem::Specification.new do |s|
     deployment, e.g. adding in instances that serve only as an 'app' role to handle increased app server load.
   DESC
 
-  s.rubyforge_project = 'rubber'
-
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
@@ -32,7 +31,6 @@ Gem::Specification.new do |s|
   s.add_dependency 'net-ssh', '~> 2.6'
   s.add_dependency 'thor'
   s.add_dependency 'clamp'
-  s.add_dependency 'open4'
   s.add_dependency 'fog', '~> 1.6'
   s.add_dependency 'json'
   

data/templates/apache/config/rubber/role/web_tools/tools-apache-vhost.conf

@@ -1,5 +1,5 @@
 <%
-  is_old_ubuntu = %w[10.04 12.04].include?(rubber_instance.os_version)
+  is_old_ubuntu = rubber_instance.os_version == '12.04'
 
   # Apache 2.2 requires no extension while Apache 2.4 requires the '.conf' extension.
   @path = "/etc/apache2/sites-available/#{rubber_env.app_name}-tools"

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

@@ -12,12 +12,12 @@ packages: [autoconf, bison, build-essential, libssl-dev, libyaml-dev, libreadlin
 
 # REQUIRED: The version of ruby-build to use for building ruby.
 # It must be one of the versions from https://github.com/sstephenson/ruby-build/releases.
-ruby_build_version: 20150116
+ruby_build_version: 20150413
 
 # REQUIRED: Set to the version string for the ruby version you wish to use
 # Run "ruby-build --definitions" to see the list of possible options or look through the list of
 # recipes online at https://github.com/sstephenson/ruby-build/tree/master/share/ruby-build
-ruby_version: 2.2.0
+ruby_version: 2.2.2
 
 # REQUIRED: Installation path for ruby.
 ruby_path: "/usr/local/rubies/#{ruby_version}"

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

@@ -129,7 +129,7 @@ cloud_providers:
     region: New York 2
 
     # REQUIRED: The image name and type for creating instances.
-    image_id: Ubuntu 14.04 x64
+    image_id: 14.04 x64
     image_type: 512MB
 
     # Optionally enable private networking for your instances.
@@ -286,8 +286,8 @@ os_version_cmd: 'lsb_release -sr'
 
 # OPTIONAL: The gems to install on all instances
 # You can install a specific version of a gem by using a sub-array of gem, version
-# For example, gem: [[rails, 2.2.2], open4, aws-s3]
-gems: [open4, aws-s3, bundler, [rubber, "#{Rubber.version}"]]
+# For example, gem: [[rails, 4.2.1], bundler]
+gems: [bundler, [rubber, "#{Rubber.version}"]]
 
 # OPTIONAL: A string prepended to shell command strings that cause multi
 # statement shell commands to fail fast.  You may need to comment this out

data/templates/cassandra/config/rubber/deploy-cassandra.rb

@@ -35,16 +35,6 @@ namespace :rubber do
 
     end
 
-    task :oldjdk_install, :roles => [:cassandra, :opscenter] do
-      rubber.sudo_script 'install_cassandra', <<-ENDSCRIPT
-        mkdir /tmp/jdk
-        wget -qNP /tmp/jdk http://archive.canonical.com/pool/partner/s/sun-java6/sun-java6-jre_6.22-0ubuntu1~10.04_all.deb
-        wget -qNP /tmp/jdk http://archive.canonical.com/pool/partner/s/sun-java6/sun-java6-bin_6.22-0ubuntu1~10.04_amd64.deb
-        wget -qNP /tmp/jdk http://archive.canonical.com/pool/partner/s/sun-java6/sun-java6-jdk_6.22-0ubuntu1~10.04_amd64.deb
-        dpkg -i /tmp/jdk/*.deb
-      ENDSCRIPT
-    end
-
     after "rubber:bootstrap", "rubber:cassandra:bootstrap"
 
     task :bootstrap, :roles => :cassandra do

data/templates/graphite/config/rubber/deploy-graphite.rb

@@ -284,7 +284,7 @@ EOF
     end
 
     def old_ubuntu?
-      %w[10.04 12.04].include?(rubber_instance.os_version)
+      is_old_ubuntu = rubber_instance.os_version == '12.04'
     end
 
   end

data/templates/graphite/config/rubber/role/graphite_server/carbon.conf

@@ -1,5 +1,5 @@
 <%
-  is_old_ubuntu = %w[10.04 12.04].include?(rubber_instance.os_version)
+  is_old_ubuntu = rubber_instance.os_version == '12.04'
 
   @path = is_old_ubuntu ? "#{rubber_env.graphite_dir}/conf/carbon.conf" : '/etc/carbon/carbon.conf'
 %>

data/templates/graphite/config/rubber/role/graphite_server/graphite-carbon-default.conf

@@ -1,5 +1,5 @@
 <%
-  is_old_ubuntu = %w[10.04 12.04].include?(rubber_instance.os_version)
+  is_old_ubuntu = rubber_instance.os_version == '12.04'
 
   @path = '/etc/default/graphite-carbon'
   @skip = is_old_ubuntu

data/templates/graphite/config/rubber/role/graphite_server/graphite_server-upstart.conf

@@ -2,7 +2,7 @@
   @path = "/etc/init/graphite-server.conf"
   @backup = false
 
-  is_old_ubuntu = %w[10.04 12.04].include?(rubber_instance.os_version)
+  is_old_ubuntu = rubber_instance.os_version == '12.04'
   @skip = ! is_old_ubuntu
 %>
 description "graphite server"

data/templates/graphite/config/rubber/role/graphite_server/storage-schemas.conf

@@ -1,5 +1,5 @@
 <%
-  is_old_ubuntu = %w[10.04 12.04].include?(rubber_instance.os_version)
+  is_old_ubuntu = rubber_instance.os_version == '12.04'
   @path = is_old_ubuntu ? "#{rubber_env.graphite_dir}/conf/storage-schemas.conf" : '/etc/carbon/storage-schemas.conf'
 %>
 

data/templates/graphite/config/rubber/role/graphite_web/graphite.wsgi

@@ -1,5 +1,5 @@
 <%
-  is_old_ubuntu = %w[10.04 12.04].include?(rubber_instance.os_version)
+  is_old_ubuntu = rubber_instance.os_version == '12.04'
 
   @path = "#{rubber_env.graphite_dir}/conf/graphite.wsgi"
   @skip = ! is_old_ubuntu

data/templates/graphite/config/rubber/role/graphite_web/local_settings.py

@@ -1,5 +1,5 @@
 <%
-  is_old_ubuntu = %w[10.04 12.04].include?(rubber_instance.os_version)
+  is_old_ubuntu = rubber_instance.os_version == '12.04'
 
   @path = is_old_ubuntu ? "#{rubber_env.graphite_dir}/webapp/graphite/local_settings.py" : '/etc/graphite/local_settings.py'
 %>

data/templates/graphite/config/rubber/role/graphite_web/uwsgi.ini

@@ -1,7 +1,7 @@
 <%
   @path = "#{rubber_env.graphite_dir}/conf/uwsgi.ini"
 
-  is_old_ubuntu = %w[10.04 12.04].include?(rubber_instance.os_version)
+  is_old_ubuntu = rubber_instance.os_version == '12.04'
   log_dir = is_old_ubuntu ? "#{rubber_env.graphite_storage_dir}/log/webapp" : '/var/log/graphite'
 %>
 

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

@@ -21,7 +21,6 @@ web_tools_proxies:
 roles:
   graphite_web:
     os_packages:
-      '10.04': [python-django, python-django-tagging, python-cairo, python-memcache, memcached, uwsgi, uwsgi-plugin-python, uwsgi-plugin-http, sqlite3, bzr, zip]
       '12.04': [python-django, python-django-tagging, python-cairo, python-memcache, memcached, uwsgi, uwsgi-plugin-python, uwsgi-plugin-http, sqlite3, bzr, zip]
       '14.04': [uwsgi, uwsgi-plugin-python, graphite-web]
   graphite_server:

data/templates/jenkins/config/rubber/role/jenkins/jenkins-apache-vhost.conf

@@ -1,5 +1,5 @@
 <%
-  is_old_ubuntu = %w[10.04 12.04].include?(rubber_instance.os_version)
+  is_old_ubuntu = rubber_instance.os_version == '12.04'
 
   # Apache 2.2 requires no extension while Apache 2.4 requires the '.conf' extension.
   @path = "/etc/apache2/sites-available/#{rubber_env.app_name}-jenkins"

data/templates/passenger/config/rubber/role/passenger/passenger-apache-vhost.conf

@@ -1,5 +1,5 @@
 <%
-  is_old_ubuntu = %w[10.04 12.04].include?(rubber_instance.os_version)
+  is_old_ubuntu = rubber_instance.os_version == '12.04'
 
   # Apache 2.2 requires no extension while Apache 2.4 requires the '.conf' extension.
   @path = "/etc/apache2/sites-available/#{rubber_env.app_name}-passenger"

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

@@ -1,4 +1,4 @@
-passenger_version: '1:4.0.57-1~`lsb_release -sc`1'
+passenger_version: '1:5.0.6-1~`lsb_release -sc`1'
 passenger_ruby: "#{ruby_path}/bin/ruby"
 passenger_listen_port: 7000
 passenger_listen_ssl_port: 7001

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

@@ -1,4 +1,4 @@
-passenger_version: '1:4.0.57-1~`lsb_release -sc`1'
+passenger_version: '1:5.0.6-1~`lsb_release -sc`1'
 passenger_ruby: "#{ruby_path}/bin/ruby"
 nginx_log_dir: /mnt/nginx/logs
 passenger_listen_port: 7000

data/templates/torquebox/config/rubber/role/app/torquebox-apache-vhost.conf

@@ -1,5 +1,5 @@
 <%
-  is_old_ubuntu = %w[10.04 12.04].include?(rubber_instance.os_version)
+  is_old_ubuntu = rubber_instance.os_version == '12.04'
 
   # Apache 2.2 requires no extension while Apache 2.4 requires the '.conf' extension.
   @path = "/etc/apache2/sites-available/#{rubber_env.app_name}-torquebox"

data/test/test-rails-template.rb

@@ -53,7 +53,7 @@ run "cp -f #{secret} config/rubber/rubber-secret.yml"
 chmod 'config/rubber/rubber-secret.yml', 0644
 gsub_file 'config/rubber/rubber-secret.yml', /dns_provider: .*/, ''
 
-run "vagrant init precise32 http://files.vagrantup.com/precise32.box"
+run "vagrant init ubuntu/trusty64"
 vagrantfile = <<-EOS
   config.vm.define :vagrant do |vagrant|
     vagrant.vm.network :private_network, ip: "192.168.70.10"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.16.0
+  version: 3.0.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-24 00:00:00.000000000 Z
+date: 2015-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -76,22 +76,6 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: open4
-  requirement: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -283,7 +267,6 @@ files:
 - lib/rubber/vagrant/plugin.rb
 - lib/rubber/vagrant/provisioner.rb
 - lib/rubber/version.rb
-- rails/init.rb
 - rubber.gemspec
 - templates/apache/config/rubber/deploy-apache.rb
 - templates/apache/config/rubber/role/apache/deflate.conf
@@ -312,7 +295,6 @@ files:
 - templates/base/config/rubber/rubber-vagrant-env.yml
 - templates/base/config/rubber/rubber.yml
 - templates/base/script/rubber
-- templates/base/templates.rb
 - templates/base/templates.yml
 - templates/browsermob_proxy/config/rubber/deploy-browsermob_proxy.rb
 - templates/browsermob_proxy/config/rubber/role/browsermob_proxy/crontab
@@ -729,10 +711,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 3842651331565498107
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -741,9 +720,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3842651331565498107
+      hash: -1209637678339755634
 requirements: []
-rubyforge_project: rubber
+rubyforge_project: 
 rubygems_version: 1.8.23.2
 signing_key: 
 specification_version: 3

data/rails/init.rb

@@ -1,6 +0,0 @@
-# this file just makes it easy to refer to rubber config
-# variables in your apps's config'
-#
-
-require "rubber"
-Rubber::initialize(Rails.root, Rails.env)

data/templates/base/templates.rb

@@ -1,11 +0,0 @@
-if Rubber::Util::is_bundler?
-  append_to_file "Gemfile", "gem 'rubber'\n"
-  
-  # for cron-sh
-  append_to_file 'Gemfile', "gem 'open4'\n"
-  
-  # TODO: remove this once 12.04 is fixed
-  # temp workaround for https://github.com/rubygems/rubygems/issues/319
-  gsub_file 'Gemfile', /source (["'])https/, 'source \1http'
-  
-end