rubber 2.15.0 → 2.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d4a86ae39c4c054ff5a2ee091be683d011eca4b9
-  data.tar.gz: 2eb0ad4e985ed83c0937a682955e4498d99140c6
+  metadata.gz: 21c5bfb07a7261cb92605b809544a8d9c502aa57
+  data.tar.gz: a697ababec4f8b944685774d919b989ef1d81a67
 SHA512:
-  metadata.gz: ddf6ae11d0479fb544f4e9c093839503ab3ddd1d3f75057e207ab4612cfbe1002c33d354961b6fcddb32689f9c5a3dc2c327cc1ec10e9f85cfa04ddf28f4beb1
-  data.tar.gz: 671bda85dea0936d593772f405ec5536fc841a2cb9fa217f85553ce3221ae3448dd0eb382f96ec66890b7281b14c74e85af30278f90254266ce4e29931464455
+  metadata.gz: 98b33cf60f9828de811891b51fe910be4c7cea0ae3b4b8b20e31a93d25780bc5616f1a61ec7359463c3af7b401d57b19e50242f5a9784e9674389f03677492d1
+  data.tar.gz: 23b7336f0ca80b50e72ce66fb3384b47264dfb7cedb98fbebefbd7f2fd5f403089011c7744b37b9f0e9dddd55ab189a599b3765df75d6ce129826856870ea61e

data/.travis.yml

@@ -1,4 +1,6 @@
 language: ruby
+sudo: false
+cache: bundler
 
 gemfile:
   - Gemfile
@@ -42,6 +44,7 @@ matrix:
   allow_failures:
     - rvm: rbx-2
     - rvm: 1.8.7
+    - rvm: 1.9.2
     - rvm: jruby-18mode
     - rvm: jruby-head
     - rvm: ruby-head

data/CHANGELOG

@@ -1,3 +1,19 @@
+2.15.1 (12/22/2014)
+
+Improvements:
+============
+
+[nginx] Set UTF-8 charset and do not echo server version. <04c03ef>
+
+Bug Fixes:
+=========
+
+[base] Restored comment about EBS volume types in rubber.yml. <73283ff>
+[core] Fixed broken method interface Aws#create_spot_instance_request. <ed95bdb>
+[core] Mostly fixed cronjobs on JRuby 9.0.0.0 (jobs will run, but error cases are incorrectly reported as successful still). <cefbdec>
+[delayed_job] Fixed variable interpolation in monit-delayed_job.conf. <792ba57>
+
+
 2.15.0 (10/24/2014)
 
 New Features:
@@ -15,7 +31,7 @@ Bug Fixes:
 =========
 
 [nginx] Add Nginx parameter required by DigitalOcean droplets. <24ac1aa>
-[postgresql] Surround postgresql database name with quotes to avoid syntax error when using dash. <4017979>
+[postgresql] Surround postgresql database name with quotes to avoid syntax error when using hyphens in the DB name. <4017979>
 
 
 

data/lib/rubber/cloud/aws.rb

@@ -216,13 +216,13 @@ module Rubber
         return zones
       end
 
-      def create_spot_instance_request(spot_price, ami, ami_type, security_groups, availability_zone)
-        response = compute_provider.spot_requests.create(:price => spot_price,
+      def create_spot_instance_request(spot_price, ami, ami_type, security_groups, availability_zone, fog_options={})
+        response = compute_provider.spot_requests.create({:price => spot_price,
                                                           :image_id => ami,
                                                           :flavor_id => ami_type,
                                                           :groups => security_groups,
                                                           :availability_zone => availability_zone,
-                                                          :key_name => env.key_name)
+                                                          :key_name => env.key_name}.merge(Rubber::Util.symbolize_keys(fog_options)))
         request_id = response.id
         return request_id
       end

data/lib/rubber/commands/cron.rb

@@ -95,7 +95,7 @@ module Rubber
 
         # 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 = popen4(*cmd) do |pid, stdin, stdout, stderr|
           File.open(log, "a") do | fh |
             fh.puts "\nrubber:cron running #{cmd.inspect} at #{Time.now}\n"
             threads = []
@@ -125,6 +125,45 @@ module Rubber
         
         exit(result)
       end
+
+      def popen4(*cmd, &blk)
+        if defined?(JRUBY_VERSION)
+          if defined?(IO.popen4)
+            IO.popen4(*cmd, &blk)
+          else
+            opts = {}
+            in_r, in_w = IO.pipe
+            opts[:in] = in_r
+            in_w.sync = true
+
+            out_r, out_w = IO.pipe
+            opts[:out] = out_w
+
+            err_r, err_w = IO.pipe
+            opts[:err] = err_w
+
+            child_io = [in_r, out_w, err_w]
+            parent_io = [in_w, out_r, err_r]
+
+            pid = spawn(*cmd, opts)
+            wait_thr = Process.detach(pid)
+            child_io.each { |io| io.close }
+            result = [pid, *parent_io]
+            if defined? yield
+              begin
+                return yield(*result)
+              ensure
+                parent_io.each { |io| io.close unless io.closed? }
+                wait_thr.join
+              end
+            end
+
+            result
+          end
+        else
+          Open4.popen4(*cmd, &blk)
+        end
+      end
     
     end
     

data/lib/rubber/version.rb

@@ -1,3 +1,3 @@
 module Rubber
-  VERSION = '2.15.0'.freeze
+  VERSION = '2.15.1'.freeze
 end

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

@@ -342,16 +342,16 @@ staging_roles: "#{known_roles.reject {|r| r =~ /slave/ || r =~ /^db$/ }.join(','
 #         # guarantee about how they work (if fog renames an attribute, e.g., your config will break).  Please see the fog
 #         # source code for the option names.
 #         fog_options:
-#           type: standard # type of volume, standard or io1
+#           type: gp2 # type of volume, standard (EBS magnetic), io1 (provisioned IOPS - SSD), or gp2 (general purpose - SSD).
 #           iops: 500 # The number of I/O operations per second (IOPS) that the volume supports.
-#                     # Required when the volume type is io1; not used with standard volumes.
+#                     # Required when the volume type is io1; not used with non-provisioned IOPS volumes.
 #       - size: 10
 #         zone: us-east-1a
 #         device: /dev/sdi
 #         mount: /mnt/logs
 #         filesystem: ext4
 #         fog_options:
-#           type: standard
+#           type: io1
 #           iops: 500
 #
 #       # volumes without mount/filesystem can be used in raid arrays

data/templates/monit/config/rubber/role/delayed_job/monit-delayed_job.conf

@@ -10,14 +10,14 @@
 <% if rubber_env.num_delayed_job_workers == 1 %>
 check process delayed_job
   with pidfile <%= rubber_env.delayed_job_pid_dir %>/delayed_job.pid
-  start program = "/usr/bin/sudo -H -u #{rubber_env.app_user} /bin/bash -l -c 'cd <%= current_path %> && RAILS_ENV=<%= Rubber.env %> bundle exec <%= script_path %> start --pid-dir=<%= rubber_env.delayed_job_pid_dir %>'" with timeout 600 seconds
-  stop program = "/usr/bin/sudo -H -u #{rubber_env.app_user} /bin/bash -l -c 'cd <%= current_path %> && RAILS_ENV=<%= Rubber.env %> bundle exec <%= script_path %> stop --pid-dir=<%= rubber_env.delayed_job_pid_dir %>'" with timeout 600 seconds
+  start program = "/usr/bin/sudo -H -u <%= rubber_env.app_user %> /bin/bash -l -c 'cd <%= current_path %> && RAILS_ENV=<%= Rubber.env %> bundle exec <%= script_path %> start --pid-dir=<%= rubber_env.delayed_job_pid_dir %>'" with timeout 600 seconds
+  stop program = "/usr/bin/sudo -H -u <%= rubber_env.app_user %> /bin/bash -l -c 'cd <%= current_path %> && RAILS_ENV=<%= Rubber.env %> bundle exec <%= script_path %> stop --pid-dir=<%= rubber_env.delayed_job_pid_dir %>'" with timeout 600 seconds
 <% else %>
 <% rubber_env.num_delayed_job_workers.times do |id| %>
 check process delayed_job_<%= id %>
   with pidfile <%= rubber_env.delayed_job_pid_dir %>/delayed_job.<%= id %>.pid
-  start program = "/usr/bin/sudo -H -u #{rubber_env.app_user} /bin/bash -l -c 'cd <%= current_path %> && RAILS_ENV=<%= Rubber.env %> bundle exec <%= script_path %> start -i <%= id %> --pid-dir=<%= rubber_env.delayed_job_pid_dir %>'" with timeout 600 seconds
-  stop program = "/usr/bin/sudo -H -u #{rubber_env.app_user} /bin/bash -l -c 'cd <%= current_path %> && RAILS_ENV=<%= Rubber.env %> bundle exec <%= script_path %> stop -i <%= id %> --pid-dir=<%= rubber_env.delayed_job_pid_dir %>'" with timeout 600 seconds
+  start program = "/usr/bin/sudo -H -u <%= rubber_env.app_user %> /bin/bash -l -c 'cd <%= current_path %> && RAILS_ENV=<%= Rubber.env %> bundle exec <%= script_path %> start -i <%= id %> --pid-dir=<%= rubber_env.delayed_job_pid_dir %>'" with timeout 600 seconds
+  stop program = "/usr/bin/sudo -H -u <%= rubber_env.app_user %> /bin/bash -l -c 'cd <%= current_path %> && RAILS_ENV=<%= Rubber.env %> bundle exec <%= script_path %> stop -i <%= id %> --pid-dir=<%= rubber_env.delayed_job_pid_dir %>'" with timeout 600 seconds
   group delayed_job
 <% end %>
 <% end %>

data/templates/nginx/config/rubber/role/nginx/nginx.conf

@@ -21,6 +21,8 @@ http
   sendfile          on;
   tcp_nopush        on;
   tcp_nodelay       off;
+  server_tokens     off;
+  charset           utf-8;
 
   gzip              on;
   gzip_http_version 1.0;

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.15.0
+  version: 2.15.1
 platform: ruby
 authors:
 - Matt Conway
@@ -9,176 +9,176 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-10-24 00:00:00.000000000 Z
+date: 2014-12-22 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'
-  name: capistrano
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: net-ssh
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.12'
-- !ruby/object:Gem::Dependency
+        version: '2.6'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '2.6'
-  name: net-ssh
   prerelease: false
   type: :runtime
+- !ruby/object:Gem::Dependency
+  name: thor
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '2.6'
-- !ruby/object:Gem::Dependency
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: thor
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: clamp
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: open4
   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
+        version: '1.6'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
-  name: fog
   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
+        version: '0'
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: json
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: rake
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: test-unit
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: shoulda-context
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: mocha
   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
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  name: awesome_print
   prerelease: false
   type: :development
-  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