kitchen-fog 0.6.2 → 0.7.0

data/CHANGELOG.md

@@ -1,53 +1,13 @@
-# 0.2.0 / 2013-10-02
+# 0.7.0 / 2013-10-02
 
 ### New Features
 
-* Generalize kitchen-openstack to work with other providers
-
-### Improvements
-
-* PR [#19][] - Don't assume `public` and `private` network names exist
-* PR [#19][] - Make IPv4 or IPv6 configurable instead of relying on Fog to pick
-
-### Bug Fixes
-
-* PR [#20][] - Limit generated hostnames to 64 characters
+* PR [#2][] - release created floating ips when destroying instance (thanks bkw)
+* PR [#1][] - bump dependency on test-kitchen to release version 1.1.0 (thanks bkw)
 
-# 0.4.0 / 2013-06-06
+# 0.6.2 / 2013-10-02
 
 ### New Features
 
-* PR [#12][] - Support `openstack_network_name` option; via [@saketoba][]
-* PR [#11][] - Support `ssh_key` option; via [@saketoba][]
-
-# 0.2.0 / 2013-05-11
-
-### Bug Fixes
-
-* PR [#7][] - `disable_ssl_validation` wasn't being respected on destroy
-
-### New Features
-
-* PR [#10][] - Support optional `openstack_region` and `openstack_service_name`
-* PR [#2][] - Support `key_name:` option; via [@stevendanna][]
-
-### Improvements
-
-* PR [#7][] - Clean up/refactor to pass style checks
-* PR [#9][] - Add some (probably overkill) RSpec tests
-
-# 0.1.0 / 2013-03-12
-
-* Initial release! Woo!
-
-[#20]: https://github.com/RoboticCheese/kitchen-openstack/pull/20
-[#19]: https://github.com/RoboticCheese/kitchen-openstack/pull/19
-[#12]: https://github.com/RoboticCheese/kitchen-openstack/pull/12
-[#11]: https://github.com/RoboticCheese/kitchen-openstack/pull/11
-[#10]: https://github.com/RoboticCheese/kitchen-openstack/pull/10
-[#9]: https://github.com/RoboticCheese/kitchen-openstack/pull/9
-[#7]: https://github.com/RoboticCheese/kitchen-openstack/pull/7
-[#2]: https://github.com/RoboticCheese/kitchen-openstack/pull/2
+* Generalize kitchen-openstack to work with other providers
 
-[@saketoba]: https://github.com/saketoba
-[@stevendanna]: https://github.com/stevendanna

data/README.md

@@ -25,23 +25,26 @@ Or install it yourself as:
 
 Provide, at a minimum, the required driver options in your `.kitchen.yml` file.  The authentication and server_create sections are specific to the provider:
 
+    ---
     driver_plugin: fog
     driver_config:
       authentication:
-        provider: 'hp'
-        hp_access_key: 'username'
-        hp_secret_key: 'password'
-        hp_auth_uri: 'https://region-a.geo-1.identity.hpcloudsvc.com:35357/v2.0/tokens'
-        hp_tenant_id: 'project/tenant id'
-        hp_avl_zone: 'region-b.geo-1'
-        version: v2
-        hp_use_upass_auth_style: true
+        provider: 'openstack'
+        openstack_username: 'username'
+        openstack_api_key: 'password'
+        openstack_auth_url: 'https://id.example.com:35357/v2.0/tokens'
+        openstack_tenant: 'tenant_name'
+        openstack_region: 'region-b.geo-1'
       server_create:
-        flavor_id: '103'
-        image_id: '8c096c29-a666-4b82-99c4-c77dc70cfb40'
-        networks: [ '76abe0b1-581a-4698-b200-a2e890f4eb8d' ]
-      network_name: '76abe0b1-581a-4698-b200-a2e890f4eb8d'
-      require_chef_omnibus: latest (if you'll be using Chef)
+        flavor_ref: '103'
+        image_ref: '8c096c29-a666-4b82-99c4-c77dc70cfb40'
+        key_name: 'bover'
+        nics: [ 'net_id': '76abe0b1-581a-4698-b200-a2e890f4eb8d' ]
+      floating_ip_create:
+        floating_network_id: '7da74520-9d5e-427b-a508-213c84e69616'
+      require_chef_omnibus: latest
+      public_key_path: /home/terry/.ssh/bover.pub
+      username: ubuntu
 
 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

data/kitchen-fog.gemspec

@@ -18,7 +18,7 @@ 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 'test-kitchen', '~> 1.1.0'
   spec.add_dependency 'fog', '~> 1.15'
 
   spec.add_development_dependency 'bundler'

data/lib/kitchen/driver/fog.rb

@@ -61,6 +61,12 @@ module Kitchen
         server = compute.servers.get(state[:server_id])
         server.destroy unless server.nil?
         info "Fog instance <#{state[:server_id]}> destroyed."
+        unless config[:floating_ip_create].nil?
+          network.floating_ips.destroy(state[:floating_ip_id])
+          info "Fog floating ip #{state[:hostname]} " +
+            "<#{state[:floating_ip_id]}> released."
+          state.delete(:floating_ip_id)
+        end
         state.delete(:server_id)
         state.delete(:hostname)
       end
@@ -104,6 +110,9 @@ module Kitchen
         floater = network.floating_ips.create(hsh)
         floating_id = floater.id
         state[:hostname] = floater.floating_ip_address
+        state[:floating_ip_id] = floating_id
+        info "Fog floating ip #{state[:hostname]} " +
+          "<#{state[:floating_ip_id]}> created."
         port = network.ports(:filters => { :device_id => server.id }).first
         network.associate_floating_ip(floating_id, port.id)
       end

data/lib/kitchen/driver/fog_version.rb

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

data/spec/kitchen/driver/fog_spec.rb

@@ -41,29 +41,29 @@ describe Kitchen::Driver::Fog do
   describe '#initialize'do
     context 'default options' do
       it 'defaults to no name' do
-        expect(driver[:name]).to eq(nil)
+        driver[:name].should eq(nil)
       end
 
       it 'defaults to local user\'s SSH public key' do
-        expect(driver[:public_key_path]).to eq(File.expand_path(
+        driver[:public_key_path].should eq(File.expand_path(
           '~/.ssh/id_dsa.pub'))
       end
 
       it 'defaults to SSH with root user on port 22' do
-        expect(driver[:username]).to eq('root')
-        expect(driver[:port]).to eq('22')
+        driver[:username].should eq('root')
+        driver[:port].should eq('22')
       end
 
       it 'defaults to use ipv4' do
-        expect(driver[:use_ipv6]).to eq(false)
+        driver[:use_ipv6].should eq(false)
       end
 
       it 'defaults to no network name' do
-        expect(driver[:network_name]).to eq(nil)
+        driver[:network_name].should eq(nil)
       end
 
       it 'defaults to no upload_public_ssh_key' do
-        expect(driver[:upload_public_ssh_key]).to eq(false)
+        driver[:upload_public_ssh_key].should eq(false)
       end
     end
 
@@ -90,12 +90,12 @@ describe Kitchen::Driver::Fog do
       it 'uses all the overridden options' do
         drv = driver
         config.each do |k, v|
-          expect(drv[k]).to eq(v)
+          drv[k].should eq(v)
         end
       end
 
       it 'SSH with user-specified private key' do
-        expect(driver[:ssh_key]).to eq('/path/to/id_rsa')
+        driver[:ssh_key].should eq('/path/to/id_rsa')
       end
     end
   end
@@ -134,12 +134,12 @@ describe Kitchen::Driver::Fog do
 
       it 'generates a server name in the absence of one' do
         driver.create(state)
-        expect(driver[:name]).to eq('a_monkey!')
+        driver[:name].should eq('a_monkey!')
       end
 
       it 'gets a proper hostname (IP)' do
         driver.create(state)
-        expect(state[:hostname]).to eq('1.2.3.4')
+        state[:hostname].should eq('1.2.3.4')
       end
 
       it 'does not disable SSL validation' do
@@ -245,7 +245,7 @@ describe Kitchen::Driver::Fog do
       it 'creates a new compute connection' do
         Fog::Compute.stub(:new) { |arg| arg }
         res = config.merge({ :provider => 'fog' })
-        expect(driver.send(:compute)).to eq(res[:authentication])
+        driver.send(:compute).should eq(res[:authentication])
       end
     end
 
@@ -299,8 +299,8 @@ describe Kitchen::Driver::Fog do
 
       it 'creates the server using a compute connection' do
         state = {}
-        expect(driver.send(:create_server, state)).to eq(server)
-        expect(state).to eq({ :server_id => 'test222' })
+        driver.send(:create_server, state).should eq(server)
+        state.should eq({ :server_id => 'test222' })
       end
     end
 
@@ -317,8 +317,8 @@ describe Kitchen::Driver::Fog do
 
       it 'passes that public key path to Fog' do
         state = {}
-        expect(driver.send(:create_server, state)).to eq(server)
-        expect(state).to eq({ :server_id => 'test222' })
+        driver.send(:create_server, state).should eq(server)
+        state.should eq({ :server_id => 'test222' })
       end
     end
 
@@ -336,8 +336,8 @@ describe Kitchen::Driver::Fog do
 
       it 'passes that key name to Fog' do
         state = {}
-        expect(driver.send(:create_server, state)).to eq(server)
-        expect(state).to eq({ :server_id => 'test222' })
+        driver.send(:create_server, state).should eq(server)
+        state.should eq({ :server_id => 'test222' })
       end
     end
   end
@@ -349,7 +349,7 @@ describe Kitchen::Driver::Fog do
     end
 
     it 'generates a name' do
-      expect(driver.send(:generate_name, 'monkey')).to match(
+      driver.send(:generate_name, 'monkey').should match(
         /^monkey-user-host-/)
     end
 
@@ -360,7 +360,7 @@ describe Kitchen::Driver::Fog do
       end
 
       it 'limits the generated name to 64-characters' do
-        expect(driver.send(:generate_name, 'long').length).to eq(64)
+        driver.send(:generate_name, 'long').length.should eq(64)
       end
     end
   end
@@ -388,7 +388,7 @@ describe Kitchen::Driver::Fog do
       let(:parsed_ips) { [%w{1.2.3.4}, %w{5.5.5.5}] }
 
       it 'returns a public IPv4 address' do
-        expect(driver.send(:get_ip, server)).to eq('1.2.3.4')
+        driver.send(:get_ip, server).should eq('1.2.3.4')
       end
     end
 
@@ -397,7 +397,7 @@ describe Kitchen::Driver::Fog do
       let(:parsed_ips) { [%w{4.3.2.1}, []] }
 
       it 'returns a public IPv4 address' do
-        expect(driver.send(:get_ip, server)).to eq('4.3.2.1')
+        driver.send(:get_ip, server).should eq('4.3.2.1')
       end
     end
 
@@ -406,7 +406,7 @@ describe Kitchen::Driver::Fog do
       let(:parsed_ips) { [[], %w{5.5.5.5}] }
 
       it 'returns a private IPv4 address' do
-        expect(driver.send(:get_ip, server)).to eq('5.5.5.5')
+        driver.send(:get_ip, server).should eq('5.5.5.5')
       end
     end
 
@@ -422,7 +422,7 @@ describe Kitchen::Driver::Fog do
       end
 
       it 'returns a IPv4 address in user-defined network group' do
-        expect(driver.send(:get_ip, server)).to eq('7.7.7.7')
+        driver.send(:get_ip, server).should eq('7.7.7.7')
       end
     end
 
@@ -447,7 +447,7 @@ describe Kitchen::Driver::Fog do
         let(:parsed_ips) { [%w{6.6.6.6 7.7.7.7}, %w{8.8.8.8 9.9.9.9}] }
 
         it 'selects the first public IP' do
-          expect(driver.send(:get_ip, server)).to eq('6.6.6.6')
+          driver.send(:get_ip, server).should eq('6.6.6.6')
         end
       end
 
@@ -458,7 +458,7 @@ describe Kitchen::Driver::Fog do
         let(:parsed_ips) { [%w{6.6.6.6 7.7.7.7}, []] }
 
         it 'selects the first public IP' do
-          expect(driver.send(:get_ip, server)).to eq('6.6.6.6')
+          driver.send(:get_ip, server).should eq('6.6.6.6')
         end
       end
 
@@ -469,7 +469,7 @@ describe Kitchen::Driver::Fog do
         let(:parsed_ips) { [[], %w{8.8.8.8 9.9.9.9}] }
 
         it 'selects the first private IP' do
-          expect(driver.send(:get_ip, server)).to eq('8.8.8.8')
+          driver.send(:get_ip, server).should eq('8.8.8.8')
         end
       end
     end
@@ -492,7 +492,7 @@ describe Kitchen::Driver::Fog do
     context 'both public and private IPs' do
       context 'IPv4 (default)' do
         it 'returns only the v4 IPs' do
-          expect(driver.send(:parse_ips, pub, priv)).to eq([pub_v4, priv_v4])
+          driver.send(:parse_ips, pub, priv).should eq([pub_v4, priv_v4])
         end
       end
 
@@ -500,7 +500,7 @@ describe Kitchen::Driver::Fog do
         let(:config) { { :use_ipv6 => true } }
 
         it 'returns only the v6 IPs' do
-          expect(driver.send(:parse_ips, pub, priv)).to eq([pub_v6, priv_v6])
+          driver.send(:parse_ips, pub, priv).should eq([pub_v6, priv_v6])
         end
       end
     end
@@ -510,7 +510,7 @@ describe Kitchen::Driver::Fog do
 
       context 'IPv4 (default)' do
         it 'returns only the v4 IPs' do
-          expect(driver.send(:parse_ips, pub, priv)).to eq([pub_v4, []])
+          driver.send(:parse_ips, pub, priv).should eq([pub_v4, []])
         end
       end
 
@@ -518,7 +518,7 @@ describe Kitchen::Driver::Fog do
         let(:config) { { :use_ipv6 => true } }
 
         it 'returns only the v6 IPs' do
-          expect(driver.send(:parse_ips, pub, priv)).to eq([pub_v6, []])
+          driver.send(:parse_ips, pub, priv).should eq([pub_v6, []])
         end
       end
     end
@@ -528,7 +528,7 @@ describe Kitchen::Driver::Fog do
 
       context 'IPv4 (default)' do
         it 'returns only the v4 IPs' do
-          expect(driver.send(:parse_ips, pub, priv)).to eq([[], priv_v4])
+          driver.send(:parse_ips, pub, priv).should eq([[], priv_v4])
         end
       end
 
@@ -536,7 +536,7 @@ describe Kitchen::Driver::Fog do
         let(:config) { { :use_ipv6 => true } }
 
         it 'returns only the v6 IPs' do
-          expect(driver.send(:parse_ips, pub, priv)).to eq([[], priv_v6])
+          driver.send(:parse_ips, pub, priv).should eq([[], priv_v6])
         end
       end
     end
@@ -547,7 +547,7 @@ describe Kitchen::Driver::Fog do
 
       context 'IPv4 (default)' do
         it 'returns empty lists' do
-          expect(driver.send(:parse_ips, pub, priv)).to eq([[], []])
+          driver.send(:parse_ips, pub, priv).should eq([[], []])
         end
       end
 
@@ -555,7 +555,7 @@ describe Kitchen::Driver::Fog do
         let(:config) { { :use_ipv6 => true } }
 
         it 'returns empty lists' do
-          expect(driver.send(:parse_ips, nil, nil)).to eq([[], []])
+          driver.send(:parse_ips, nil, nil).should eq([[], []])
         end
       end
     end
@@ -583,13 +583,13 @@ describe Kitchen::Driver::Fog do
         'echo "a_key" >> ~/.ssh/authorized_keys',
         'passwd -l root'
       ]
-      expect(res).to eq(expected)
+      res.should eq(expected)
     end
   end
 
   describe '#disable_ssl_validation' do
     it 'turns off Excon SSL cert validation' do
-      expect(driver.send(:disable_ssl_validation)).to eq(false)
+      driver.send(:disable_ssl_validation).should eq(false)
     end
   end
 end

metadata

@@ -1,32 +1,36 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-fog
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.7.0
+  prerelease: 
 platform: ruby
 authors:
 - Jonathan Hartman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-09 00:00:00.000000000 Z
+date: 2013-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta
+        version: 1.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0.beta
+        version: 1.1.0
 - !ruby/object:Gem::Dependency
   name: fog
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -34,6 +38,7 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -41,6 +46,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -48,6 +54,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -55,6 +62,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -62,6 +70,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -69,6 +78,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: tailor
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -76,6 +86,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -83,6 +94,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -90,6 +102,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -97,6 +110,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: countloc
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -104,6 +118,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -111,6 +126,7 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -118,6 +134,7 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
@@ -144,26 +161,27 @@ files:
 homepage: https://github.com/TerryHowe/kitchen-fog
 licenses:
 - Apache
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.1.5
+rubygems_version: 1.8.25
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: A Test Kitchen Fog Nova driver
 test_files:
 - spec/kitchen/driver/fog_spec.rb

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: e2e1b0a298df449a085cbdbb1efb97fd4ae9d808
-  data.tar.gz: 7151432803cbdec21ee8c0cd4460ccf72fd373cb
-SHA512:
-  metadata.gz: 1b67603813c60c4c1102f9674a11a7ff95cf163e2c2726493f2f82973e2962e4043bbf54430bf98e9af92b827319579deb39a81e1d7e75ef48256dcd3eebffa2
-  data.tar.gz: c730813645e6ad9c3a1776bde72da9af4a508dd893ed3ccd9150424b51373dd857c14f2a5080c048887b3f5bf7c431cfad887a75bf9be1621919ece8fb59cf1b