rubber 2.0.0.pre5 → 2.0.0.pre6

data/lib/rubber/generator.rb

@@ -2,6 +2,7 @@ require 'erb'
 require 'find'
 require 'fileutils'
 require 'rubber/util'
+require 'tempfile'
 
 module Rubber
   module Configuration
@@ -118,10 +119,25 @@ module Rubber
           open("#{config_path}.bak", 'w') { |f| f.write(orig) } if config_path && config.backup
 
           # Write out transformed file
-          writer = config_path || "|#{config.write_cmd}"
-          open(writer, 'w') do |pipe|
-            pipe.write(result)
+          if config_path
+            open(config_path, 'w') do |pipe|
+              pipe.write(result)
+            end
+
+          # Handle write_cmd by dumping the body to a file and then piping that into the command.
+          else
+            file = Tempfile.new('rubber_write_cmd')
+
+            begin
+              file.write(result)
+              file.close
+
+              system("cat #{file.path} | #{config.write_cmd}")
+            ensure
+              file.unlink
+            end
           end
+
           if config.write_cmd && ! fake_root && $?.exitstatus != 0
             raise "Config command failed execution:  #{config.write_cmd}"
           end

data/lib/rubber/version.rb

@@ -1,4 +1,4 @@
 module Rubber
-  VERSION = "2.0.0.pre5"
+  VERSION = "2.0.0.pre6"
 end
 

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

@@ -64,6 +64,28 @@ LoadPlugin notify_email
 
 <% end %>
 
+<%
+  ping_hosts = []
+  if rubber_instances[rubber_env.host].role_names.include?('graphite_server')
+    # monitor all servers from graphite_server
+    ping_hosts = rubber_instances.collect {|ic| ic.full_name }.select {|h| h != rubber_env.full_host }
+  elsif rubber_instances[rubber_env.host].role_names.include?('web_tools')
+    # monitor just graphite_server from tools
+    ping_hosts = [rubber_instances.for_role('graphite_server').first.full_name]
+  end
+%>
+
+<% if ping_hosts.size > 0 %>
+
+  LoadPlugin ping
+  <Plugin "ping">
+    <% ping_hosts.each do |h| %>
+    Host "<%= h %>"
+    <% end %>
+  </Plugin>
+  
+<% end %>
+
 Include "/etc/collectd/conf.d/*.conf"
 Include "/etc/collectd/thresholds.d/*.conf"
 Include "/etc/collectd/filters.d/*.conf"

data/templates/collectd/config/rubber/role/collectd/thresholds.conf

@@ -22,6 +22,18 @@
     Hysteresis 0.3
   </Type>
 
+  <Plugin "ping">
+    <Type "ping">
+      Datasource "value"
+      WarningMax 50
+      FailureMax 100
+    </Type>
+    <Type "ping_droprate">
+      Datasource "value"
+      FailureMax 0.05
+    </Type>
+  </Plugin>
+
 </Threshold>
 
 #<Threshold>

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

@@ -52,10 +52,10 @@ namespace :rubber do
             sleep 5
 
             create_user_cmd = "CREATE USER #{env.db_user} WITH NOSUPERUSER CREATEDB NOCREATEROLE"
-            create_user_cmd << "PASSWORD '#{env.db_pass}'" if env.db_pass
+            create_user_cmd << " PASSWORD '#{env.db_pass}'" if env.db_pass
 
             create_replication_user_cmd = "CREATE USER #{env.db_replication_user} WITH NOSUPERUSER NOCREATEROLE REPLICATION"
-            create_replication_user_cmd << "PASSWORD '#{env.db_replication_pass}'" if env.db_replication_pass
+            create_replication_user_cmd << " PASSWORD '#{env.db_replication_pass}'" if env.db_replication_pass
 
             rubber.sudo_script "create_master_db", <<-ENDSCRIPT
               sudo -u postgres psql -c "#{create_user_cmd}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre5
+  version: 2.0.0.pre6
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-24 00:00:00.000000000 Z
+date: 2012-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &8846840 !ruby/object:Gem::Requirement
+  requirement: &11348280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *8846840
+  version_requirements: *11348280
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &8845920 !ruby/object:Gem::Requirement
+  requirement: &11347860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8845920
+  version_requirements: *11347860
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &8844220 !ruby/object:Gem::Requirement
+  requirement: &11347400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8844220
+  version_requirements: *11347400
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &8842980 !ruby/object:Gem::Requirement
+  requirement: &11346980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *8842980
+  version_requirements: *11346980
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &8840680 !ruby/object:Gem::Requirement
+  requirement: &11346480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *8840680
+  version_requirements: *11346480
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &8839740 !ruby/object:Gem::Requirement
+  requirement: &11346060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *8839740
+  version_requirements: *11346060
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &13573900 !ruby/object:Gem::Requirement
+  requirement: &11361900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13573900
+  version_requirements: *11361900
 - !ruby/object:Gem::Dependency
   name: shoulda-context
-  requirement: &13573480 !ruby/object:Gem::Requirement
+  requirement: &11361480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13573480
+  version_requirements: *11361480
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &13573060 !ruby/object:Gem::Requirement
+  requirement: &11361060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13573060
+  version_requirements: *11361060
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &13572640 !ruby/object:Gem::Requirement
+  requirement: &11360640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +121,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *13572640
+  version_requirements: *11360640
 description: ! "    The rubber plugin enables relatively complex multi-instance deployments
   of RubyOnRails applications to\n    Amazon's Elastic Compute Cloud (EC2).  Like
   capistrano, rubber is role based, so you can define a set\n    of configuration
@@ -506,7 +506,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 509756412491793944
+      hash: -3050976247343600522
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -515,7 +515,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: rubber
-rubygems_version: 1.8.15
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: A capistrano plugin for managing multi-instance deployments to the cloud