kitchen-openstack 1.0.0 → 1.1.0

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 1.1.0 / 2013-12-07
+
+### Improvements
+
+* Tested against, and working with, Test Kitchen 1.1.0
+
+### Bug Fixes
+
+* PR [#31][] - Fix collision with TK 1.x; change `name` option to `server_name`
+
 # 1.0.0 / 2013-10-16
 
 ### New Features
@@ -52,6 +62,7 @@
 
 * Initial release! Woo!
 
+[#31]: https://github.com/RoboticCheese/kitchen-openstack/pull/31
 [#27]: https://github.com/RoboticCheese/kitchen-openstack/pull/27
 [#26]: https://github.com/RoboticCheese/kitchen-openstack/pull/26
 [#25]: https://github.com/RoboticCheese/kitchen-openstack/pull/25

data/README.md

@@ -1,4 +1,7 @@
-[![Gem Version](https://badge.fury.io/rb/kitchen-openstack.png)](http://badge.fury.io/rb/kitchen-openstack) [![Dependency Status](https://gemnasium.com/RoboticCheese/kitchen-openstack.png)](https://gemnasium.com/RoboticCheese/kitchen-openstack) [![Build Status](https://travis-ci.org/RoboticCheese/kitchen-openstack.png?branch=master)](https://travis-ci.org/RoboticCheese/kitchen-openstack) [![Code Climate](https://codeclimate.com/github/RoboticCheese/kitchen-openstack.png)](https://codeclimate.com/github/RoboticCheese/kitchen-openstack)
+[![Gem Version](https://badge.fury.io/rb/kitchen-openstack.png)](http://badge.fury.io/rb/kitchen-openstack)
+[![Build Status](https://travis-ci.org/RoboticCheese/kitchen-openstack.png?branch=master)](https://travis-ci.org/RoboticCheese/kitchen-openstack)
+[![Code Climate](https://codeclimate.com/github/RoboticCheese/kitchen-openstack.png)](https://codeclimate.com/github/RoboticCheese/kitchen-openstack)
+[![Dependency Status](https://gemnasium.com/RoboticCheese/kitchen-openstack.png)](https://gemnasium.com/RoboticCheese/kitchen-openstack)
 
 # Kitchen::OpenStack
 
@@ -25,8 +28,8 @@ Or install it yourself as:
 
 Provide, at a minimum, the required driver options in your `.kitchen.yml` file:
 
-    driver_plugin: openstack
-    driver_config:
+    driver:
+      name: openstack
       openstack_username: [YOUR OPENSTACK USERNAME]
       openstack_api_key: [YOUR OPENSTACK API KEY]
       openstack_auth_url: [YOUR OPENSTACK AUTH URL]
@@ -41,7 +44,7 @@ By default, a unique server name will be generated and the current user's SSH
 key will be used (with an RSA key taking precedence over a DSA), though that
 behavior can be overridden with additional options:
 
-    name: [A UNIQUE SERVER NAME]
+    server_name: [A UNIQUE SERVER NAME]
     private_key_path: [PATH TO YOUR PRIVATE SSH KEY]
     public_key_path: [PATH TO YOUR SSH PUBLIC KEY]
     username: [SSH USER]

data/kitchen-openstack.gemspec

@@ -18,8 +18,10 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']
 
-  spec.add_dependency 'test-kitchen', '~> 1.0.0.beta'
-  spec.add_dependency 'fog', '~> 1.15'
+  spec.add_dependency 'test-kitchen', '~> 1.1'
+  spec.add_dependency 'fog', '~> 1.18'
+  # Newer Fogs throw a warning if unf isn't there :(
+  spec.add_dependency 'unf'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/kitchen/driver/openstack.rb

@@ -31,7 +31,7 @@ module Kitchen
     class Openstack < Kitchen::Driver::SSHBase
       @@ip_pool_lock = Mutex.new
 
-      default_config :name, nil
+      default_config :server_name, nil
       default_config :key_name, nil
       default_config :private_key_path do |driver|
         %w{id_rsa id_dsa}.collect do |k|
@@ -53,7 +53,7 @@ module Kitchen
       default_config :floating_ip, nil
 
       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[:server_id] = server.id
@@ -118,7 +118,7 @@ module Kitchen
         debug "Selected flavor: #{flavor.id} #{flavor.name}"
 
         server_def = {
-          :name => config[:name],
+          :name => config[:server_name],
           :image_ref => image.id,
           :flavor_ref => flavor.id
         }

data/lib/kitchen/driver/openstack_version.rb

@@ -19,7 +19,7 @@
 module Kitchen
   module Driver
     # Version string for OpenStack Kitchen driver
-    OPENSTACK_VERSION = '1.0.0'
+    OPENSTACK_VERSION = '1.1.0'
   end
 end
 

data/spec/kitchen/driver/openstack_spec.rb

@@ -31,7 +31,9 @@ describe Kitchen::Driver::Openstack do
   let(:rsa) { File.expand_path('~/.ssh/id_rsa') }
 
   let(:instance) do
-    double(:name => 'potatoes', :logger => logger, :to_str => 'instance')
+    double(
+      :name => 'potatoes', :logger => logger, :to_str => 'instance'
+    )
   end
 
   let(:driver) do
@@ -96,7 +98,7 @@ describe Kitchen::Driver::Openstack do
       end
 
       nils = [
-        :name,
+        :server_name,
         :openstack_tenant,
         :openstack_region,
         :openstack_service_name,
@@ -118,7 +120,7 @@ describe Kitchen::Driver::Openstack do
           :public_key_path => '/tmp',
           :username => 'admin',
           :port => '2222',
-          :name => 'puppy',
+          :server_name => 'puppy',
           :openstack_tenant => 'that_one',
           :openstack_region => 'atlantis',
           :openstack_service_name => 'the_service',
@@ -165,7 +167,7 @@ describe Kitchen::Driver::Openstack do
 
       it 'generates a server name in the absence of one' do
         driver.create(state)
-        expect(driver[:name]).to eq('a_monkey!')
+        expect(driver[:server_name]).to eq('a_monkey!')
       end
 
       it 'gets a proper server ID' do
@@ -303,7 +305,7 @@ describe Kitchen::Driver::Openstack do
   describe '#create_server' do
     let(:config) do
       {
-        :name => 'hello',
+        :server_name => 'hello',
         :image_ref => '111',
         :flavor_ref => '1',
         :public_key_path => 'tarpals'
@@ -330,50 +332,66 @@ describe Kitchen::Driver::Openstack 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
-        expect(driver.send(:create_server)).to eq(@config)
+        expect(driver.send(:create_server)).to eq(@expected)
       end
     end
 
     context 'a provided public key path' do
       let(:config) do
         {
-          :name => 'hello',
+          :server_name => 'hello',
           :image_ref => '111',
           :flavor_ref => '1',
           :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
-        expect(driver.send(:create_server)).to eq(@config)
+        expect(driver.send(:create_server)).to eq(@expected)
       end
     end
 
     context 'a provided key name' do
       let(:config) do
         {
-          :name => 'hello',
+          :server_name => 'hello',
           :image_ref => '111',
           :flavor_ref => '1',
           :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
-        expect(driver.send(:create_server)).to eq(@config)
+        expect(driver.send(:create_server)).to eq(@expected)
       end
     end
 
     context 'image/flavor specifies id' do
       let(:config) do
         {
-          :name => 'hello',
+          :server_name => 'hello',
           :image_ref => '111',
           :flavor_ref => '1',
           :public_key_path => 'tarpals'
@@ -391,7 +409,7 @@ describe Kitchen::Driver::Openstack do
     context 'image/flavor specifies name' do
       let(:config) do
         {
-          :name => 'hello',
+          :server_name => 'hello',
           :image_ref => 'fedora',
           :flavor_ref => 'small',
           :public_key_path => 'tarpals'
@@ -409,7 +427,7 @@ describe Kitchen::Driver::Openstack do
     context 'image/flavor specifies regex' do
       let(:config) do
         {
-          :name => 'hello',
+          :server_name => 'hello',
           # pass regex as string as yml returns string values
           :image_ref => '/edo/',
           :flavor_ref => '/in/',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-openstack
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2013-12-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
@@ -34,7 +34,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -42,7 +42,23 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.15'
+        version: '1.18'
+- !ruby/object:Gem::Dependency
+  name: unf
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement