kitchen-fog 0.7.0 → 0.7.1

data/README.md

@@ -50,7 +50,7 @@ By default, a unique server name will be generated and the current user's SSH
 key will be used, though that behavior can be overridden with additional
 options:
 
-    name: [A UNIQUE SERVER NAME]
+    server_name: [A UNIQUE SERVER NAME]
     ssh_key: [PATH TO YOUR PRIVATE SSH KEY]
     upload_public_ssh_key: [TRUE UPLOADS PUBLIC KEY TO SERVER]
     public_key_path: [PATH TO YOUR SSH PUBLIC KEY]

data/lib/kitchen/driver/fog.rb

@@ -29,7 +29,7 @@ module Kitchen
     #
     # @author Jonathan Hartman <j@p4nt5.com>
     class Fog < Kitchen::Driver::SSHBase
-      default_config :name, nil
+      default_config :server_name, nil
       default_config :public_key_path, File.expand_path('~/.ssh/id_dsa.pub')
       default_config :username, 'root'
       default_config :port, '22'
@@ -38,7 +38,7 @@ module Kitchen
       default_config :upload_public_ssh_key, false
 
       def create(state)
-        config[:name] ||= generate_name(instance.name)
+        config[:server_name] ||= generate_name(instance.name)
         config[:disable_ssl_validation] and disable_ssl_validation
         server = create_server(state)
         unless config[:floating_ip_create].nil?
@@ -96,7 +96,7 @@ module Kitchen
       def create_server(state)
         server_configed = config[:server_create] || {}
         server_configed = server_configed.dup
-        server_configed[:name] = config[:name]
+        server_configed[:name] = config[:server_name]
         server_configed = convert_to_strings(server_configed)
         server = compute.servers.create(server_configed)
         state[:server_id] = server.id

data/lib/kitchen/driver/fog_version.rb

@@ -19,7 +19,7 @@
 module Kitchen
   module Driver
     # Version string for Fog Kitchen driver
-    FOG_VERSION = '0.7.0'
+    FOG_VERSION = '0.7.1'
   end
 end
 

data/spec/kitchen/driver/fog_spec.rb

@@ -29,7 +29,9 @@ describe Kitchen::Driver::Fog do
   let(:state) { Hash.new }
 
   let(:instance) do
-    double(:name => 'potatoes', :logger => logger, :to_str => 'instance')
+    double(
+      :name => 'potatoes', :logger => logger, :to_str => 'instance'
+    )
   end
 
   let(:driver) do
@@ -40,8 +42,8 @@ describe Kitchen::Driver::Fog do
 
   describe '#initialize'do
     context 'default options' do
-      it 'defaults to no name' do
-        driver[:name].should eq(nil)
+      it 'defaults to no server name' do
+        driver[:server_name].should eq(nil)
       end
 
       it 'defaults to local user\'s SSH public key' do
@@ -82,7 +84,7 @@ describe Kitchen::Driver::Fog do
           :public_key_path => '/tmp',
           :username => 'admin',
           :port => '2222',
-          :name => 'puppy',
+          :server_name => 'puppy',
           :ssh_key => '/path/to/id_rsa'
         }
       end
@@ -134,7 +136,7 @@ describe Kitchen::Driver::Fog do
 
       it 'generates a server name in the absence of one' do
         driver.create(state)
-        driver[:name].should eq('a_monkey!')
+        driver[:server_name].should eq('a_monkey!')
       end
 
       it 'gets a proper hostname (IP)' do
@@ -271,7 +273,7 @@ describe Kitchen::Driver::Fog do
   describe '#create_server' do
     let(:config) do
       {
-        :name => 'hello',
+        :server_name => 'hello',
         :image_ref => 'there',
         :flavor_ref => 'captain',
         :public_key_path => 'tarpals'
@@ -295,7 +297,12 @@ describe Kitchen::Driver::Fog do
     end
 
     context 'a default config' do
-      before(:each) { @config = config.dup }
+      before(:each) do
+        @expected = config.merge(:name => config[:server_name])
+        @expected.delete_if do |k, v|
+          k == :server_name
+        end
+      end
 
       it 'creates the server using a compute connection' do
         state = {}
@@ -307,13 +314,18 @@ describe Kitchen::Driver::Fog do
     context 'a provided public key path' do
       let(:config) do
         {
-          :name => 'hello',
+          :server_name => 'hello',
           :image_ref => 'there',
           :flavor_ref => 'captain',
           :public_key_path => 'tarpals'
         }
       end
-      before(:each) { @config = config.dup }
+      before(:each) do
+        @expected = config.merge(:name => config[:server_name])
+        @expected.delete_if do |k, v|
+          k == :server_name
+        end
+      end
 
       it 'passes that public key path to Fog' do
         state = {}
@@ -325,14 +337,20 @@ describe Kitchen::Driver::Fog do
     context 'a provided key name' do
       let(:config) do
         {
-          :name => 'hello',
+          :server_name => 'hello',
           :image_ref => 'there',
           :flavor_ref => 'captain',
           :public_key_path => 'montgomery',
           :key_name => 'tarpals'
         }
       end
-      before(:each) { @config = config.dup }
+
+      before(:each) do
+        @expected = config.merge(:name => config[:server_name])
+        @expected.delete_if do |k, v|
+          k == :server_name
+        end
+      end
 
       it 'passes that key name to Fog' do
         state = {}

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-fog
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-05 00:00:00.000000000 Z
+date: 2013-12-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -186,3 +186,4 @@ summary: A Test Kitchen Fog Nova driver
 test_files:
 - spec/kitchen/driver/fog_spec.rb
 - spec/spec_helper.rb
+has_rdoc: