rubber 2.1.0 → 2.1.1

data/templates/torquebox/config/rubber/role/torquebox/standalone.conf

@@ -55,6 +55,7 @@ if [ "x$JAVA_OPTS" = "x" ]; then
    JAVA_OPTS="$JAVA_OPTS -Djboss.modules.system.pkgs=$JBOSS_MODULES_SYSTEM_PKGS -Djava.awt.headless=true"
    JAVA_OPTS="$JAVA_OPTS -Djboss.bind.address=<%= rubber_env.full_host %>"
    JAVA_OPTS="$JAVA_OPTS -Djboss.mod_cluster.proxyList=<%= rubber_instances.for_role('web').collect { |host| "#{host.full_name}:80" }.join(',') %>"
+   JAVA_OPTS="$JAVA_OPTS -Djruby.home=<%= rubber_env.ruby_path %>"
    JAVA_OPTS="$JAVA_OPTS -Djboss.server.default.config=standalone-ha.xml"
 else
    echo "JAVA_OPTS already set in environment; overriding default settings with values: $JAVA_OPTS"

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

@@ -1,16 +1,18 @@
-torquebox_version: 2.0.3
+torquebox_version: 2.1.0
 torquebox_prefix: /opt
 torquebox_dir: "#{torquebox_prefix}/torquebox"
+torquebox_log_dir: /var/log/torquebox
 torquebox_pid_file: "#{torquebox_dir}/jboss/standalone/torquebox.pid"
 torquebox_http_port: 9090
 torquebox_https_port: 9443
 torquebox_ajp_port: 8009
 
-backstage_user: rubber
-backstage_password: rubber
+backstage_user: nirvdrum
+backstage_password: negativetwenty
 
 mod_cluster_version: 1.2.0
 
 roles:
   torquebox:
-    packages: [openjdk-7-jdk, libaio1, unzip]
+    packages: [openjdk-7-jdk libaio1, unzip]
+    gems: [[torquebox, "#{torquebox_version}"]]

data/test/cloud/aws_test.rb

@@ -8,7 +8,7 @@ class AwsTest < Test::Unit::TestCase
 
     setup do
       env = {'access_key' => "XXX", 'secret_access_key' => "YYY", 'region' => "us-east-1"}
-      env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil)
+      env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil, nil)
       @cloud = Rubber::Cloud::Aws.new(env, nil)
     end
 

data/test/cloud/fog_test.rb

@@ -9,7 +9,7 @@ class FogTest < Test::Unit::TestCase
     setup do
       env = {'credentials' =>
                  {'rackspace_api_key' => "XXX", 'rackspace_username' => "YYY", 'provider' => "rackspace"}}
-      env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil)
+      env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil, nil)
       @cloud = Rubber::Cloud::Fog.new(env, nil)
     end
 

data/test/dns/aws_test.rb

@@ -10,7 +10,7 @@ class AwsTest < Test::Unit::TestCase
       setup do
         env = {'access_key' => get_secret('cloud_providers.aws.access_key') || 'xxx',
                'access_secret' => get_secret('cloud_providers.aws.secret_access_key') || 'yyy'}
-        @env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil)
+        @env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil, nil)
 
         @dns = Rubber::Dns::Aws.new(@env)
         destroy_test_domains(@dns)
@@ -18,8 +18,7 @@ class AwsTest < Test::Unit::TestCase
       
       context "compatibility" do
         should "create using old credential style" do
-          env = {'dns_provider' => 'fog',
-                 'dns_providers' => {
+          env = {'dns_providers' => {
                      'fog' => {
                          'credentials' => {
                             'provider' => 'aws', 'aws_access_key_id' => 'xxx', 'aws_secret_access_key' => 'yyy'
@@ -27,7 +26,7 @@ class AwsTest < Test::Unit::TestCase
                      }
                  }
           }
-          @env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil)
+          @env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil, nil)
           
           provider = Rubber::Dns::get_provider(@env.dns_provider, @env)
           assert provider
@@ -189,6 +188,31 @@ class AwsTest < Test::Unit::TestCase
           assert_equal "host#{max - 1}", records.first[:host]
         end
       
+        should "use defaults not supplied by record" do
+          env = {'access_key' => get_secret('cloud_providers.aws.access_key') || 'xxx',
+                 'access_secret' => get_secret('cloud_providers.aws.secret_access_key') || 'yyy',
+                 'domain' => "#{TEST_DOMAIN}5.com",
+                 'type' => 'A',
+                 'ttl' => 345}
+          @env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil, nil)
+  
+          @dns = Rubber::Dns::Aws.new(@env)
+
+          @dns.create_host_record({:host => 'newhost', :data => ['1.1.1.1']})
+
+          @zone = @dns.find_or_create_zone(env['domain'])
+          assert_equal @zone.records.all.size, 1
+          record = @zone.records.first
+          attributes = @dns.host_to_opts(record)
+        
+          assert_equal 'newhost',             attributes[:host]
+          assert_equal ['1.1.1.1'],             attributes[:data]
+          assert_equal env['domain'],               attributes[:domain]
+          assert_equal env['type'],                   attributes[:type]
+          assert_equal env['ttl'],                   attributes[:ttl]
+          
+        end
+        
       end
 
    end

data/test/dns/zerigo_test.rb

@@ -8,7 +8,7 @@ class ZerigoTest < Test::Unit::TestCase
       setup do
         env = {'email' => get_secret('dns_providers.zerigo.email') || 'xxx',
                'token' => get_secret('dns_providers.zerigo.token') || 'yyy'}
-        @env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil)
+        @env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil, nil)
 
         @dns = Rubber::Dns::Zerigo.new(@env)
         destroy_test_domains(@dns)
@@ -25,7 +25,7 @@ class ZerigoTest < Test::Unit::TestCase
                      }
                  }
           }
-          @env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil)
+          @env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil, nil)
           
           provider = Rubber::Dns::get_provider(@env.dns_provider, @env)
           assert provider

data/test/environment_test.rb

@@ -4,12 +4,12 @@ class EnvironmentTest < Test::Unit::TestCase
   include Rubber::Configuration
 
   def test_known_roles
-    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/basic")
+    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/basic", 'test')
     assert_equal ['role1', 'role2', 'role3', 'role4', 'role5'], env.known_roles, "list of known roles not correct"
   end
 
   def test_env
-    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/basic")
+    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/basic", 'test')
     e = env.bind()
     assert_equal 'val1', e['var1'], 'env not retrieving right val'
     assert_equal 'val2', e['var2'], 'env not retrieving right val'
@@ -37,8 +37,28 @@ class EnvironmentTest < Test::Unit::TestCase
     assert_equal 'host1val2', e.var2, 'env not retrieving right val for method missing'
   end
 
+  def test_env_override
+    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/basic", 'test')
+    e = env.bind()
+    assert_equal 'val1', e['var1'], 'should be global val with no overrides'
+    assert_equal 'val2', e['var2'], 'should be global val with no overrides'
+    
+    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/basic", 'env1')
+    e = env.bind(nil, nil)
+    assert_equal 'env1val1', e['var1'], 'should be val from env override'
+    assert_equal 'env1val2', e['var2'], 'should be val from env override'
+    
+    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/basic", 'env1')
+    e = env.bind('role1', nil)
+    assert_equal 'env1val2', e['var2'], 'env override should win against role'
+    
+    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/basic", 'env1')
+    e = env.bind(nil, 'host1')
+    assert_equal 'host1val2', e['var2'], 'host override should win against env'    
+  end
+  
   def test_host_override
-    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/basic")
+    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/basic", 'test')
     e = env.bind('norole', 'host2')
     assert_equal 'host2val3', e['var3'], 'env not retrieving right val'
     assert_equal %w[host2val4a host2val4b], e['var4'], 'env not retrieving right val'
@@ -56,7 +76,7 @@ class EnvironmentTest < Test::Unit::TestCase
   end
 
   def test_expansion
-    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/expansion")
+    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/expansion", 'test')
     e = env.bind()
     assert_equal 'val1', e['var1']
     assert_equal 'val2', e['var2']
@@ -89,7 +109,7 @@ class EnvironmentTest < Test::Unit::TestCase
   end
 
   def test_bool_expansion
-    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/expansion")
+    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/expansion", 'test')
     e = env.bind()
     assert_equal true, e['truevar']
     assert_equal false, e['falsevar']
@@ -101,19 +121,19 @@ class EnvironmentTest < Test::Unit::TestCase
   end
 
   def test_secret_env
-    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/basic")
+    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/basic", 'test')
     e = env.bind()
     assert_nil e['rubber_secret'], 'env should not have secret set'
     
     fixture_dir = File.expand_path("#{File.dirname(__FILE__)}/fixtures/secret")
-    env = Rubber::Configuration::Environment.new(fixture_dir)
+    env = Rubber::Configuration::Environment.new(fixture_dir, 'test')
     e = env.bind()
     assert_equal "#{fixture_dir}/secret.yml", e['rubber_secret'], 'env should have secret set'
     assert_equal "secret_val", e['secret_key'], 'env should have gotten setting from secret file'    
   end
 
   def test_nested_ref
-    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/nested")
+    env = Rubber::Configuration::Environment.new("#{File.dirname(__FILE__)}/fixtures/nested", 'test')
     e = env.bind()
     assert_equal 'val1', e.var1, 'env not retrieving right val'
     assert_equal 'val3', e.var2.var3, 'env not retrieving right val'

data/test/fixtures/basic/rubber.yml

@@ -21,6 +21,11 @@ hosts:
       -
         var54: val54
 
+environments:
+  env1:
+    var1: env1val1
+    var2: env1val2
+
 role_dependencies:
   role3: [role4, role5]
   

data/test/instance_test.rb

@@ -198,7 +198,7 @@ class InstanceTest < Test::Unit::TestCase
       
       setup do
         env = {'access_key' => "XXX", 'secret_access_key' => "YYY", 'region' => "us-east-1"}
-        env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil)
+        env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil, nil)
         @cloud = Rubber::Cloud::Aws.new(env, nil)
         @cloud.storage_provider.put_bucket('bucket')
         Rubber.stubs(:cloud).returns(@cloud)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-20 00:00:00.000000000 Z
+date: 2012-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -99,7 +99,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -107,7 +107,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -351,6 +351,11 @@ files:
 - templates/complete_unicorn_nginx/templates.yml
 - templates/complete_unicorn_nginx_mysql/templates.yml
 - templates/complete_unicorn_nginx_postgresql/templates.yml
+- templates/couchbase/config/rubber/deploy-couchbase.rb
+- templates/couchbase/config/rubber/role/couchbase/crontab
+- templates/couchbase/config/rubber/rubber-couchbase.yml
+- templates/couchbase/templates.rb
+- templates/couchbase/templates.yml
 - templates/cruise/config/rubber/deploy-cruise.rb
 - templates/cruise/config/rubber/role/cruise/cruise
 - templates/cruise/config/rubber/role/cruise/my.cnf
@@ -402,6 +407,7 @@ files:
 - templates/haproxy/templates.yml
 - templates/jenkins/config/environments/jenkins.rb
 - templates/jenkins/config/rubber/deploy-jenkins.rb
+- templates/jenkins/config/rubber/role/jenkins/crontab
 - templates/jenkins/config/rubber/role/jenkins/github-deploy-key.pem
 - templates/jenkins/config/rubber/role/jenkins/github-deploy-key.pem.pub
 - templates/jenkins/config/rubber/role/jenkins/jenkins-apache-vhost.conf
@@ -435,6 +441,7 @@ files:
 - templates/monit/config/rubber/deploy-monit.rb
 - templates/monit/config/rubber/role/apache/monit-apache.conf
 - templates/monit/config/rubber/role/cassandra/monit-cassandra.conf
+- templates/monit/config/rubber/role/couchbase/monit-couchbase.conf
 - templates/monit/config/rubber/role/elasticsearch/monit-elasticsearch.conf
 - templates/monit/config/rubber/role/graphite_server/monit-graphite_server.conf
 - templates/monit/config/rubber/role/graylog_server/monit-graylog_server.conf
@@ -453,6 +460,7 @@ files:
 - templates/monit/config/rubber/role/passenger_nginx/monit-nginx.conf
 - templates/monit/config/rubber/role/postgresql/monit-postgresql.conf
 - templates/monit/config/rubber/role/redis/monit-redis.conf
+- templates/monit/config/rubber/role/resque_scheduler/monit-resque_scheduler.conf
 - templates/monit/config/rubber/role/resque_web/monit-resque_web.conf
 - templates/monit/config/rubber/role/resque_worker/monit-resque_pool.conf
 - templates/monit/config/rubber/role/sphinx/monit-sphinx.conf
@@ -656,7 +664,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -230817372791926441
+      hash: 3394204759182119607
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -665,7 +673,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -230817372791926441
+      hash: 3394204759182119607
 requirements: []
 rubyforge_project: rubber
 rubygems_version: 1.8.24