rubber 2.0.0.pre3 → 2.0.0.pre4

data/lib/rubber/instance.rb

@@ -7,7 +7,7 @@ module Rubber
     # Contains the ec2 instance configuration defined in instance.yml
     #
     class Instance
-      attr_reader :file, :artifacts
+      attr_reader :instance_storage, :artifacts
       include Enumerable
       include MonitorMixin
 

data/lib/rubber/recipes/rubber/deploy.rb

@@ -70,7 +70,14 @@ namespace :rubber do
     # Need to do this so we can work with staging instances without having to
     # checkin instance file between create and bootstrap, as well as during a deploy
     if fetch(:push_instance_config, false)
-      push_files = [rubber_instances.file] + rubber_cfg.environment.config_files
+      push_files = rubber_cfg.environment.config_files
+
+      # If we're using a local instance file, push that up.  This isn't necessary when storing in S3 or SimpleDB.
+      if rubber_instances.instance_storage =~ /^file:(.*)/
+        location = $1
+        push_files << location
+      end
+
       push_files.each do |file|
         dest_file = file.sub(/^#{Rubber.root}\/?/, '')
         put(File.read(file), File.join(path, dest_file), :mode => "+r")

data/lib/rubber/version.rb

@@ -1,4 +1,4 @@
 module Rubber
-  VERSION = "2.0.0.pre3"
+  VERSION = "2.0.0.pre4"
 end
 

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

@@ -130,7 +130,7 @@ cloud_provider: aws
 # store, the instance file is typically under version control with
 # your project code, so that provides some safety.
 #
-# instance_storage_backup: "storage:#{cloud_provider.aws.backup_bucket}/RubberInstances_#{app_name}/instance-#{Rubber.env}-#{Time.now.strftime('%Y%m%d-%H%M%S')}.yml"
+# instance_storage_backup: "storage:#{cloud_providers.aws.backup_bucket}/RubberInstances_#{app_name}/instance-#{Rubber.env}-#{Time.now.strftime('%Y%m%d-%H%M%S')}.yml"
 
 # OPTIONAL: Define security groups
 # Each security group is a name associated with a sequence of maps where the

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

@@ -7,9 +7,12 @@
 # installed at /etc/default/monit by maintainer scripts
 # Fredrik Steen <stone@debian.org>
 
-# You must set this variable to for monit to start
+# You must set this variable for monit to start (Ubuntu < 11.10)
 startup=1
 
+# You must set this variable for monit to start (Ubuntu >= 11.10)
+START=yes
+
 # To change the intervals which monit should run uncomment
 # and change this variable.
 # CHECK_INTERVALS=180

data/templates/postgresql/config/rubber/role/postgresql_slave/recovery.conf

@@ -115,7 +115,7 @@ standby_mode = on
 # If set, the PostgreSQL server will try to connect to the primary using this
 # connection string and receive XLOG records continuously.
 #
-primary_conninfo = 'host=<%= rubber_instances.for_role('postgresql_master').first.name %> port=5432 user=<%= rubber_env.db_replication_user %> <%= rubber_env.db_replication_user_pass ? "password=#{rubber_env.db_replication_user}" : "" %> application_name=<%= rubber_env.app_name %>'		# e.g. 'host=localhost port=5432'
+primary_conninfo = 'host=<%= rubber_instances.for_role('postgresql_master').first.name %> port=5432 user=<%= rubber_env.db_replication_user %> <%= rubber_env.db_replication_pass ? "password=#{rubber_env.db_replication_pass}" : "" %> application_name=<%= rubber_env.app_name %>'		# e.g. 'host=localhost port=5432'
 #
 #
 # By default, a standby server keeps restoring XLOG records from the

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre3
+  version: 2.0.0.pre4
   prerelease: 6
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-12 00:00:00.000000000 Z
+date: 2012-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
-  requirement: &22303940 !ruby/object:Gem::Requirement
+  requirement: &27783840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -22,10 +22,10 @@ dependencies:
         version: 2.8.0
   type: :runtime
   prerelease: false
-  version_requirements: *22303940
+  version_requirements: *27783840
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &22301780 !ruby/object:Gem::Requirement
+  requirement: &27783420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22301780
+  version_requirements: *27783420
 - !ruby/object:Gem::Dependency
   name: clamp
-  requirement: &22300360 !ruby/object:Gem::Requirement
+  requirement: &27782960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -44,10 +44,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22300360
+  version_requirements: *27782960
 - !ruby/object:Gem::Dependency
   name: open4
-  requirement: &22299500 !ruby/object:Gem::Requirement
+  requirement: &27782540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22299500
+  version_requirements: *27782540
 - !ruby/object:Gem::Dependency
   name: fog
-  requirement: &26492660 !ruby/object:Gem::Requirement
+  requirement: &27782040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *26492660
+  version_requirements: *27782040
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &26492240 !ruby/object:Gem::Requirement
+  requirement: &27781620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26492240
+  version_requirements: *27781620
 - !ruby/object:Gem::Dependency
   name: test-unit
-  requirement: &26491780 !ruby/object:Gem::Requirement
+  requirement: &27781160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26491780
+  version_requirements: *27781160
 - !ruby/object:Gem::Dependency
   name: shoulda-context
-  requirement: &26491360 !ruby/object:Gem::Requirement
+  requirement: &27780740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26491360
+  version_requirements: *27780740
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &26490940 !ruby/object:Gem::Requirement
+  requirement: &27780320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26490940
+  version_requirements: *27780320
 - !ruby/object:Gem::Dependency
   name: ruby-debug19
-  requirement: &26490520 !ruby/object:Gem::Requirement
+  requirement: &27779900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,7 +121,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *26490520
+  version_requirements: *27779900
 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: 4048110118862946601
+      hash: 1903448208957765126
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: