rubber 2.3.1 → 2.4.0

data/templates/postgresql/config/rubber/role/postgresql/pg_hba.conf

@@ -94,5 +94,7 @@ local   all             postgres                                ident
 local   all         <%= rubber_env.db_user %>                 <%= scheme %>
 host    all         all                         127.0.0.1/32  <%= scheme %>
 host    all         all                         ::1/128       <%= scheme %>
-host    replication <%= rubber_env.db_replication_user %> 10.0.0.1/8    <%= scheme %>
-host    all         <%= rubber_env.db_user %>   10.0.0.1/8    <%= scheme %>
+
+host    replication <%= rubber_env.db_replication_user %>   10.0.0.1/8    <%= scheme %>
+host    all         <%= rubber_env.db_user %>               10.0.0.1/8    <%= scheme %>
+host    all         <%= rubber_env.db_user %>               <%= rubber_instances[rubber_env.host].internal_ip %>/32    <%= scheme %>

data/test/cloud/aws_test.rb

@@ -26,7 +26,7 @@ class AwsTest < Test::Unit::TestCase
     end
 
     should "create instance" do
-      assert @cloud.create_instance('', '', '', '')
+      assert @cloud.create_instance('', '', '', '', '')
     end
 
   end

data/test/cloud/digital_ocean_test.rb

@@ -0,0 +1,70 @@
+require File.expand_path(File.join(__FILE__, '../..', 'test_helper'))
+require 'rubber/cloud/digital_ocean'
+require 'ostruct'
+
+class DigitalOceanTest < Test::Unit::TestCase
+
+  context 'digital_ocean' do
+
+    setup do
+      env = {'client_key' => "XXX", 'api_key' => "YYY", 'region' => 'New York 1', 'key_file' => "#{File.dirname(__FILE__)}/../fixtures/basic/test.pem"}
+      env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil, nil)
+      @cloud = Rubber::Cloud::DigitalOcean.new(env, nil)
+    end
+
+    should 'instantiate' do
+      assert @cloud.compute_provider
+      assert_nil @cloud.storage_provider
+    end
+
+    context '#create_instance' do
+      should 'create instance' do
+        assert @cloud.create_instance('my-instance', 'Ubuntu 12.04 x64 Server', '512MB', [], 'New York 1')
+      end
+
+      should 'raise error if invalid region' do
+        begin
+          @cloud.create_instance('my-instance', 'Ubuntu 12.04 x64 Server', '512MB', [], 'Mars 1')
+        rescue => e
+          assert_equal 'Invalid region for DigitalOcean: Mars 1', e.message
+        else
+          fail 'Did not raise exception for invalid region'
+        end
+      end
+
+      should 'raise an error if invalid image type' do
+        begin
+          @cloud.create_instance('my-instance', 'Ubuntu 12.04 x64 Server', 'm1.small', [], 'New York 1')
+        rescue => e
+          assert_equal 'Invalid image type for DigitalOcean: m1.small', e.message
+        else
+          fail 'Did not raise exception for invalid image type'
+        end
+      end
+
+      should 'raise an error if invalid image name' do
+        begin
+          @cloud.create_instance('my-instance', 'Windows Server 2003', '512MB', [], 'New York 1')
+        rescue => e
+          assert_equal 'Invalid image name for DigitalOcean: Windows Server 2003', e.message
+        else
+          fail 'Did not raise exception for invalid image name'
+        end
+      end
+
+      should 'raise an error if no remote SSH key and local key_file is bad' do
+        begin
+          env = {'client_key' => "XXX", 'api_key' => "YYY", 'region' => 'New York 1'}
+          env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil, nil)
+          cloud = Rubber::Cloud::DigitalOcean.new(env, nil)
+
+          cloud.create_instance('my-instance', 'Ubuntu 12.04 x64 Server', '512MB', [], 'New York 1')
+        rescue => e
+          assert_equal 'Missing key_file for DigitalOcean', e.message
+        else
+          fail 'Did not raise exception for missing key_file'
+        end
+      end
+    end
+  end
+end

data/test/cloud/fog_test.rb

@@ -7,7 +7,9 @@ class FogTest < Test::Unit::TestCase
   context "fog" do
 
     setup do
-      env = {'credentials' =>
+      env = {'compute_credentials' =>
+                 {'rackspace_api_key' => "XXX", 'rackspace_username' => "YYY", 'provider' => "rackspace"},
+             'storage_credentials' =>
                  {'rackspace_api_key' => "XXX", 'rackspace_username' => "YYY", 'provider' => "rackspace"}}
       env = Rubber::Configuration::Environment::BoundEnv.new(env, nil, nil, nil)
       @cloud = Rubber::Cloud::Fog.new(env, nil)
@@ -27,7 +29,7 @@ class FogTest < Test::Unit::TestCase
     end
 
     should "create instance" do
-      assert @cloud.create_instance('', '', '', '')
+      assert @cloud.create_instance('', '', '', '', '')
     end
 
   end

data/test/fixtures/basic/test.pem.pub

@@ -0,0 +1 @@
+ssh-dss AAAAB3NzaC1kc3MAAACBAJKDT7tweR6kJbNcarF4YUET4rXRfORYy1g2iVgi5EhegJQ2VnNYG71zWp2oL9+ZRwP3B2UQByS8/cQr6xNPtGLd8+VsFsWtl/sTYC/VytMnkTVu/SR0uwlHMwpgW1yutouwAqWvvS2B194tcfgX0ZFOuLUEnMCnAQ+sp4aJ2ItdAAAAFQDB1OMVVSjq1vqc9XcNbqNKzYRWVwAAAIEAkaGlXGvxJvThtjsRjqWg5uLk1PSP91tQwx78Cf+bErbYUynGvVeLk6M0OIed2ZCaGm9T9tzRSnLveJPV07a56O1iyZFdbQBnzjAQaSiFk6xs/glmjjRpe4Tmf5Y28L1gJYLwgGIN85KbyfqyTCAjJnPmlxEtKk35irocuZwRSggAAACAT8BsrVlVenuKfZQrXCwDl2PSaha55iyAJz7NxLM1I6URiX6TzUwkvCqzGOZwzpRGCB5fB/LpiUImeAre8WpfTBZr7cKffyljOTjZbHK2z10Po8Y5CJIvPLRpNzFRcnfKSbcX0l1pm3B11mC0WVJEaLx2LlKzioEuNxy0euooRZU= nirvdrum@rubber

data/test/util_test.rb

@@ -75,5 +75,13 @@ class UtilTest < Test::Unit::TestCase
   
   end
   
+  context 'camelcase' do
+    should 'handle single words' do
+      assert_equal 'Aws', camelcase('aws')
+    end
 
+    should 'handle multiple words' do
+      assert_equal 'DigitalOcean', camelcase('digital_ocean')
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rubber
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Matt Conway
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-12 00:00:00.000000000 Z
+date: 2013-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: capistrano
@@ -211,8 +211,10 @@ files:
 - lib/rubber/cloud/aws.rb
 - lib/rubber/cloud/aws_table_store.rb
 - lib/rubber/cloud/base.rb
+- lib/rubber/cloud/digital_ocean.rb
 - lib/rubber/cloud/fog.rb
 - lib/rubber/cloud/fog_storage.rb
+- lib/rubber/cloud/generic.rb
 - lib/rubber/commands/config.rb
 - lib/rubber/commands/cron.rb
 - lib/rubber/commands/util.rb
@@ -605,6 +607,7 @@ files:
 - templates/zookeeper/templates.yml
 - test/cloud/aws_table_store_test.rb
 - test/cloud/aws_test.rb
+- test/cloud/digital_ocean_test.rb
 - test/cloud/fog_storage_test.rb
 - test/cloud/fog_test.rb
 - test/command_test.rb
@@ -622,6 +625,7 @@ files:
 - test/fixtures/basic/role/role2/foo.conf
 - test/fixtures/basic/rubber-extra.yml
 - test/fixtures/basic/rubber.yml
+- test/fixtures/basic/test.pem.pub
 - test/fixtures/expansion/rubber.yml
 - test/fixtures/generator_order/common/a_first.conf
 - test/fixtures/generator_order/common/z_last.conf
@@ -662,7 +666,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: rubber
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: A capistrano plugin for managing multi-instance deployments to the cloud