kitchen-rackspace 0.2.0 → 0.3.0

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+# 0.3.0 / 2013-12-07
+
+### Improvements
+
+* Tested against, and working with, Test Kitchen 1.1.0
+
+### Bug Fixes
+
+* PR [#15][] - Update default `image_id` to a current one
+* PR [#15][] - Fix collision with TK 1.x; change `name` option to `server_name`
+
 # 0.2.0 / 2013-05-11
 
 ### New Features
@@ -13,6 +24,7 @@
 
 * Initial release! Woo!
 
+[#15]: https://github.com/RoboticCheese/kitchen-rackspace/pull/15
 [#9]: https://github.com/RoboticCheese/kitchen-rackspace/pull/9
 [#8]: https://github.com/RoboticCheese/kitchen-rackspace/pull/8
 [#7]: https://github.com/RoboticCheese/kitchen-rackspace/pull/7

data/README.md

@@ -1,4 +1,7 @@
-[![Build Status](https://travis-ci.org/RoboticCheese/kitchen-rackspace.png?branch=master)](https://travis-ci.org/RoboticCheese/kitchen-rackspace) [![Code Climate](https://codeclimate.com/github/RoboticCheese/kitchen-rackspace.png)](https://codeclimate.com/github/RoboticCheese/kitchen-rackspace)
+[![Gem Version](https://badge.fury.io/rb/kitchen-rackspace.png)](http://badge.fury.io/rb/kitchen-rackspace)
+[![Build Status](https://travis-ci.org/RoboticCheese/kitchen-rackspace.png?branch=master)](https://travis-ci.org/RoboticCheese/kitchen-rackspace)
+[![Code Climate](https://codeclimate.com/github/RoboticCheese/kitchen-rackspace.png)](https://codeclimate.com/github/RoboticCheese/kitchen-rackspace)
+[![Dependency Status](https://gemnasium.com/RoboticCheese/kitchen-rackspace.png)](https://gemnasium.com/RoboticCheese/kitchen-rackspace)
 
 # Kitchen::Rackspace
 
@@ -25,8 +28,8 @@ Or install it yourself as:
 
 Provide, at a minimum, the required driver options in your `.kitchen.yml` file:
 
-    driver_plugin: rackspace
-    driver_config:
+    driver:
+      name: rackspace
       rackspace_username: [YOUR RACKSPACE CLOUD USERNAME]
       rackspace_api_key: [YOUR RACKSPACE CLOUD API KEY]
       require_chef_omnibus: latest (if you'll be using Chef)
@@ -36,7 +39,7 @@ Rackspace region. Additional, optional settings can be provided:
 
     image_id: [SERVER IMAGE ID]
     flavor_id: [SERVER FLAVOR ID]
-    name: [A UNIQUE SERVER NAME]
+    server_name: [A UNIQUE SERVER NAME]
     public_key_path: [PATH TO YOUR PUBLIC SSH KEY]
     rackspace_region: [A VALID RACKSPACE DC/REGION]
 

data/kitchen-rackspace.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.alpha'
-  spec.add_dependency 'fog', '~> 1.11'
+  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/rackspace.rb

@@ -29,16 +29,16 @@ module Kitchen
     # @author Jonathan Hartman <j@p4nt5.com>
     class Rackspace < Kitchen::Driver::SSHBase
       default_config :version, 'v2'
-      default_config :image_id, '8a3a9f96-b997-46fd-b7a8-a9e740796ffd'
+      default_config :image_id, 'd45ed9c5-d6fc-4c9d-89ea-1b3ae1c83999'
       default_config :flavor_id, '2'
-      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'
       default_config :rackspace_region, nil
 
       def create(state)
-        config[:name] ||= generate_name(instance.name)
+        config[:server_name] ||= generate_name(instance.name)
         server = create_server
         state[:server_id] = server.id
         info("Rackspace instance <#{state[:server_id]}> created.")
@@ -76,7 +76,7 @@ module Kitchen
 
       def create_server
         compute.servers.bootstrap(
-          :name             => config[:name],
+          :name             => config[:server_name],
           :image_id         => config[:image_id],
           :flavor_id        => config[:flavor_id],
           :public_key_path  => config[:public_key_path]

data/lib/kitchen/driver/rackspace_version.rb

@@ -19,7 +19,7 @@
 module Kitchen
   module Driver
     # Version string for Rackspace Kitchen driver
-    RACKSPACE_VERSION = '0.2.0'
+    RACKSPACE_VERSION = '0.3.0'
   end
 end
 

data/spec/kitchen/driver/rackspace_spec.rb

@@ -45,7 +45,7 @@ describe Kitchen::Driver::Rackspace do
       end
 
       it 'defaults to a Ubuntu 12.10 image ID' do
-        expect(driver[:image_id]).to eq('8a3a9f96-b997-46fd-b7a8-a9e740796ffd')
+        expect(driver[:image_id]).to eq('d45ed9c5-d6fc-4c9d-89ea-1b3ae1c83999')
       end
 
       it 'defaults to the smallest flavor size' do
@@ -63,7 +63,7 @@ describe Kitchen::Driver::Rackspace do
       end
 
       it 'defaults to no server name' do
-        expect(driver[:name]).to eq(nil)
+        expect(driver[:server_name]).to eq(nil)
       end
 
       it 'defaults to no region' do
@@ -79,7 +79,7 @@ describe Kitchen::Driver::Rackspace do
           :public_key_path => '/tmp',
           :username => 'admin',
           :port => '2222',
-          :name => 'puppy',
+          :server_name => 'puppy',
           :rackspace_region => 'ord'
         }
       end
@@ -117,7 +117,7 @@ describe Kitchen::Driver::Rackspace 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
@@ -224,13 +224,18 @@ describe Kitchen::Driver::Rackspace do
   describe '#create_server' do
     let(:config) do
       {
-        :name => 'hello',
+        :server_name => 'hello',
         :image_id => 'there',
         :flavor_id => '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
     let(:servers) do
       s = double('servers')
       s.stub(:bootstrap) { |arg| arg }
@@ -245,7 +250,7 @@ describe Kitchen::Driver::Rackspace do
     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
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-rackspace
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-11 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.alpha
+        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.alpha
+        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.11'
+        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.11'
+        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
@@ -186,3 +202,4 @@ summary: A Test Kitchen Rackspace driver
 test_files:
 - spec/kitchen/driver/rackspace_spec.rb
 - spec/spec_helper.rb
+has_rdoc: