kitchen-digitalocean 0.1.1 → 0.2.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 7d5bd11d573f8cd1d5b9f7d298ce216e501b74dc
-  data.tar.gz: adce4e30accf397ac559e5c31b053cf5f520360d
-SHA512:
-  metadata.gz: ee1cb1862d944b0255822c009723c8c5e706e22ee2232dbe0a4e73bcb2af2a5cf802391bb2ade6c66526803707b46622558ddb4f332514b3eac605c0169cfe70
-  data.tar.gz: 1dcc1561e8b9fd35681b3707c52cab21b6ae5e28844b23e1c5b146c9ef1b9f194c05225261d53e25b557b5e5d0265ea426dc6c033373e0faac7e60a7952cf83c
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    NDdiZTUzMjdkZGE0NjNjY2IwM2Q4M2RhNzhlMjk1YmUyYmJhN2JlZQ==
+  data.tar.gz: !binary |-
+    ODA4ZTE4MzYzYjQxNDM4YTIxM2QxY2YzZjExOGNmNDM4ZTA5YTc4NQ==
+!binary "U0hBNTEy":
+  metadata.gz: !binary |-
+    ZjhkZGM2YTZjODkyN2YzM2MzZDBmNTYwN2JmNWYwNDEzNjAxMDk5MDRhNjI3
+    NzgwMWU4MGIzNjA1ZDgwNTYzYmViMjdjNTc1N2RmYTk1MTMwMjY1MTEzZDAy
+    MWJkOTkzMjgwZGIxODU2ZDFmZGRjZmUzNWFlYzIyMTIzM2I0YjM=
+  data.tar.gz: !binary |-
+    MDUxYTZjYjA2YTkyMDgxNzgyNjc2OWNkYTI5NmMxZTJlOTVhZDAxMjZlOTRl
+    Y2YwZWU1Zjc3NmU0NjgxZmJmNzhjOTVlMDIyMzU4NGM3MmNiOGFkMTNkMzc2
+    MWY2Y2NkZDNhZjU0MmYyNTMyMDFiMzk3NGNkZjkzMTllNjBlYmY=

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+# 0.2.0 / 2013-06-19
+
+* Provide debug output for test-kitchen
+* Visual feedback during server creation
+* Use ruby 1.9 hash syntax
+* Bump fog dependency to 1.12
+
 # 0.1.0 / 2013-05-12
 
 * Initial release

data/README.md

@@ -1,4 +1,4 @@
-[![Build Status](https://travis-ci.org/gregf/kitchen-digitalocean.png?branch=master)](https://travis-ci.org/gregf/kitchen-digitalocean) [![Code Climate](https://codeclimate.com/github/gregf/kitchen-digitalocean.png)](https://codeclimate.com/github/gregf/kitchen-digitalocean) [![Dependency Status](https://gemnasium.com/gregf/kitchen-digitalocean.png)](https://gemnasium.com/gregf/kitchen-digitalocean)
+[![Gem Version](https://badge.fury.io/rb/kitchen-digitalocean.png)](http://badge.fury.io/rb/kitchen-digitalocean) [![Build Status](https://travis-ci.org/gregf/kitchen-digitalocean.png?branch=master)](https://travis-ci.org/gregf/kitchen-digitalocean) [![Code Climate](https://codeclimate.com/github/gregf/kitchen-digitalocean.png)](https://codeclimate.com/github/gregf/kitchen-digitalocean) [![Dependency Status](https://gemnasium.com/gregf/kitchen-digitalocean.png)](https://gemnasium.com/gregf/kitchen-digitalocean)
 
 # Kitchen::Digitalocean
 

data/kitchen-digitalocean.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'test-kitchen', '~> 1.0.0.alpha'
-  spec.add_dependency 'fog', '~> 1.11'
+  spec.add_dependency 'fog', '~> 1.12'
 
   spec.add_development_dependency 'bundler'
   spec.add_development_dependency 'rake'

data/lib/kitchen/driver/digitalocean.rb

@@ -41,10 +41,12 @@ module Kitchen
         config[:name] ||= generate_name(instance.name)
         server = create_server
         state[:server_id] = server.id
+
         info("Digital Ocean instance <#{state[:server_id]}> created.")
-        server.wait_for { ready? } ; puts "(server ready)"
+        server.wait_for { print '.'; ready? } ; print '(server ready)'
         state[:hostname] = server.ip_address
-        wait_for_sshd(state[:hostname]) ; puts "(ssh ready)"
+        wait_for_sshd(state[:hostname]) ; print "(ssh ready)\n"
+        debug("digitalocean:create #{state[:hostname]}")
       rescue Fog::Errors::Error, Excon::Errors::Error => ex
         raise ActionFailed, ex.message
       end
@@ -62,21 +64,25 @@ module Kitchen
       private
 
       def compute
+        debug_compute_config
+
         server_def = {
-          :provider               => "Digitalocean",
-          :digitalocean_api_key   => config[:digitalocean_api_key],
-          :digitalocean_client_id => config[:digitalocean_client_id]
+          provider:               :digitalocean,
+          digitalocean_api_key:   config[:digitalocean_api_key],
+          digitalocean_client_id: config[:digitalocean_client_id]
         }
         Fog::Compute.new(server_def)
       end
 
       def create_server
+        debug_server_config
+
         compute.servers.create(
-          :name         => config[:name],
-          :image_id     => config[:image_id],
-          :flavor_id    => config[:flavor_id],
-          :region_id    => config[:region_id],
-          :ssh_key_ids  => config[:ssh_key_ids]
+          name:         config[:name],
+          image_id:     config[:image_id],
+          flavor_id:    config[:flavor_id],
+          region_id:    config[:region_id],
+          ssh_key_ids:  config[:ssh_key_ids]
         )
       end
 
@@ -85,6 +91,19 @@ module Kitchen
         rand_str = Array.new(8) { rand(36).to_s(36) }.join
         "#{base}-#{Etc.getlogin}-#{Socket.gethostname}-#{rand_str}"
       end
+
+      def debug_server_config
+        debug("digitalocean:name #{config[:name]}")
+        debug("digitalocean:image_id #{config[:image_id]}")
+        debug("digitalocean:flavor_id #{config[:flavor_id]}")
+        debug("digitalocean:region_id #{config[:region_id]}")
+        debug("digitalocean:ssh_key_ids #{config[:ssh_key_ids]}")
+      end
+
+      def debug_compute_config
+        debug("digitalocean_api_key #{config[:digitalocean_api_key]}")
+        debug("digitalocean_client_id #{config[:digitalocean_client_id]}")
+      end
     end
   end
 end

data/lib/kitchen/driver/digitalocean_version.rb

@@ -19,7 +19,7 @@
 module Kitchen
   module Driver
     # Version string for Digital Ocean Kitchen driver
-    DIGITALOCEAN_VERSION = '0.1.1'
+    DIGITALOCEAN_VERSION = '0.2.0'
   end
 end
 

data/spec/kitchen/driver/digitalocean_spec.rb

@@ -29,7 +29,7 @@ describe Kitchen::Driver::Digitalocean do
   let(:state) { Hash.new }
 
   let(:instance) do
-    stub(:name => 'potatoes', :logger => logger, :to_str => 'instance')
+    stub(name: 'potatoes', logger: logger, to_str: 'instance')
   end
 
   let(:driver) do
@@ -69,13 +69,13 @@ describe Kitchen::Driver::Digitalocean do
     context 'overridden options' do
       let(:config) do
         {
-          :image_id => '2676',
-          :flavor_id => '63',
-          :ssh_key_ids => '1234',
-          :username => 'admin',
-          :port => '2222',
-          :name => 'puppy',
-          :region_id => '3'
+          image_id: '2676',
+          flavor_id: '63',
+          ssh_key_ids: '1234',
+          username: 'admin',
+          port: '2222',
+          name: 'puppy',
+          region_id: '3'
         }
       end
 
@@ -90,8 +90,8 @@ describe Kitchen::Driver::Digitalocean do
 
   describe '#create' do
     let(:server) do
-      stub(:id => 'test123', :wait_for => true,
-        :ip_address => '1.2.3.4')
+      stub(id: 'test123', wait_for: true,
+        ip_address: '1.2.3.4')
     end
     let(:driver) do
       d = Kitchen::Driver::Digitalocean.new(config)
@@ -105,8 +105,8 @@ describe Kitchen::Driver::Digitalocean do
     context 'Client ID and API key only provided' do
       let(:config) do
         {
-          :digitalocean_client_id => 'Quei4zaey9nijiexoong',
-          :digitalocean_api_key => 'Eep4eidaiz7chohd4cheyei9peigooyoa9Ek4sua',
+          digitalocean_client_id: 'Quei4zaey9nijiexoong',
+          digitalocean_api_key: 'Eep4eidaiz7chohd4cheyei9peigooyoa9Ek4sua',
         }
       end
 
@@ -130,10 +130,10 @@ describe Kitchen::Driver::Digitalocean do
   describe '#destroy' do
     let(:server_id) { '12345' }
     let(:hostname) { 'example.com' }
-    let(:state) { { :server_id => server_id, :hostname => hostname } }
-    let(:server) { stub(:nil? => false, :destroy => true) }
-    let(:servers) { stub(:get => server) }
-    let(:compute) { stub(:servers => servers) }
+    let(:state) { { server_id: server_id, hostname: hostname } }
+    let(:server) { stub(nil?: false, destroy: true) }
+    let(:servers) { stub(get: server) }
+    let(:compute) { stub(servers: servers) }
 
     let(:driver) do
       d = Kitchen::Driver::Digitalocean.new(config)
@@ -167,7 +167,7 @@ describe Kitchen::Driver::Digitalocean do
         s.stub(:get).with('12345').and_return(nil)
         s
       end
-      let(:compute) { stub(:servers => servers) }
+      let(:compute) { stub(servers: servers) }
       let(:driver) do
         d = Kitchen::Driver::Digitalocean.new(config)
         d.instance = instance
@@ -185,21 +185,21 @@ describe Kitchen::Driver::Digitalocean do
   describe '#compute' do
     let(:config) do
       {
-        :digitalocean_client_id => 'Aife3ahkii4oot9oowai',
-        :digitalocean_api_key => 'yahsh4aesh3oov9daiWach'
+        digitalocean_client_id: 'Aife3ahkii4oot9oowai',
+        digitalocean_api_key: 'yahsh4aesh3oov9daiWach'
       }
     end
 
     context 'all requirements provided' do
       it 'creates a new compute connection' do
         Fog::Compute.stub(:new) { |arg| arg }
-        res = config.merge({ :provider => 'Digitalocean' })
+        res = config.merge({ provider: :digitalocean })
         expect(driver.send(:compute)).to eq(res)
       end
     end
 
     context 'no client id provided' do
-      let(:config) { { :digitalocean_api_key => 'yahsh4aesh3oov9daiWach' } }
+      let(:config) { { digitalocean_api_key: 'yahsh4aesh3oov9daiWach' } }
 
       it 'raises an error' do
         expect { driver.send(:compute) }.to raise_error(ArgumentError)
@@ -207,7 +207,7 @@ describe Kitchen::Driver::Digitalocean do
     end
 
     context 'no API key provided' do
-      let(:config) { { :digitalocean_client_id => 'Aife3ahkii4oot9oowai' } }
+      let(:config) { { digitalocean_client_id: 'Aife3ahkii4oot9oowai' } }
 
       it 'raises an error' do
         expect { driver.send(:compute) }.to raise_error(ArgumentError)
@@ -215,7 +215,7 @@ describe Kitchen::Driver::Digitalocean do
     end
 
     context 'no region id provided' do
-      let(:config) { { :region_id => '1' } }
+      let(:config) { { region_id: '1' } }
 
       it 'raises an error' do
         expect { driver.send(:compute) }.to raise_error(ArgumentError)
@@ -227,11 +227,11 @@ describe Kitchen::Driver::Digitalocean do
   describe '#create_server' do
     let(:config) do
       {
-        :name => 'hello',
-        :image_id => '2047',
-        :flavor_id => '66',
-        :ssh_key_ids => '1234',
-        :region_id => '1'
+        name: 'hello',
+        image_id: '2047',
+        flavor_id: '66',
+        ssh_key_ids: '1234',
+        region_id: '1'
       }
     end
     before(:each) { @config = config.dup }
@@ -240,7 +240,7 @@ describe Kitchen::Driver::Digitalocean do
       s.stub(:create) { |arg| arg }
       s
     end
-    let(:compute) { stub(:servers => servers) }
+    let(:compute) { stub(servers: servers) }
     let(:driver) do
       d = Kitchen::Driver::Digitalocean.new(config)
       d.instance = instance

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
 platform: ruby
 authors:
 - Greg Fitzgerald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-11 00:00:00.000000000 Z
+date: 2013-06-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -30,110 +30,110 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.11'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: tailor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cane
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: countloc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: multi_json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: A Test Kitchen Digital Ocean driver
@@ -165,12 +165,12 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []