kitchen-digitalocean 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a805eadfb3a4bafb3c4bd6b6060d170fc191d507
-  data.tar.gz: c71f2be954f085143a6b0963e851936184f2907a
+  metadata.gz: 2962e0d424072f44969958a36b4b5dd1a447b087
+  data.tar.gz: 83119613368027f4c88802cf2496d4f76be47a87
 SHA512:
-  metadata.gz: e28f7444111dfdda0ff0e43714cd242736b8ec7bda1196d383bc3a92487344ca09c09ef72ab99228def885e40d8f3a368bc28de1acc2f76757ab4ee0d2264ac1
-  data.tar.gz: 3402d1c69e89a43c77006c718fe17ddea073d5e4119f8f1e487c7924443726ddb2de52236387d6ded3ee16caf81ee0158ea09a2934a424b425d9d49ec9e9cbbc
+  metadata.gz: ad93eeb4021fe0a181e5667fbb25932f35e5447a7212cf51c0c5804ef54bf0b7fb22fd339151d83c785607e759449089b017d4e10774711a2227249cc9ba4d51
+  data.tar.gz: 7673f18201fe215ed05d4df71d9ad3e55585e6c7f9558ef1630900a86b9d19a7252e6229c15c17023f5199887574253d33bd22579415cc2f8e48ec42c717843b

data/.travis.yml

@@ -1,10 +1,11 @@
+---
 language: ruby
-
-gemfile:
-  - Gemfile
-
 rvm:
   - 1.9.3
-  - 2.0.0
+  - 2.0
+  - 2.1
+bundler_args: --jobs 7
+gemfile:
+  - Gemfile
 
 # vim: ai et ts=2 sts=2 sw=2 ft=yaml

data/CHANGELOG.md

@@ -1,4 +1,10 @@
-# 0.6.3 / 2014-04-28
+# 0.7.0 / 2014-05-20
+
+* [@zhann](https://github.com/Zhann) [PR #15] Makes hostnames RFC compatible
+* [@coderanger](https://github.com/coderanger) [PR #14] New image ID for centos-6.5
+* [@coderanger](https://github.com/coderanger) [PR #13] Allow using a correctly name-scoped environment variable for ssh_key_ids
+
+# 0.6.4 / 2014-05-02
 
 * Update image list.
 

data/README.md

@@ -43,7 +43,7 @@ You also have the option of providing your credentials from environment variable
 ```bash
 export DIGITALOCEAN_CLIENT_ID="1234"
 export DIGITALOCEAN_API_KEY="5678"
-export SSH_KEY_IDS="1234, 5678"
+export DIGITALOCEAN_SSH_KEY_IDS="1234, 5678"
 ```
 
 Note that your `SSH_KEY_ID` must be the numeric id of your ssh key, not the symbolic name. To get the numeric ID

data/Rakefile

@@ -22,6 +22,6 @@ end
 desc 'Run RSpec unit tests'
 RSpec::Core::RakeTask.new(:spec)
 
-task :default => [ :cane, :rubocop, :loc, :spec ]
+task default: [:cane, :rubocop, :loc, :spec]
 
 # vim: ai et ts=2 sts=2 sw=2 ft=ruby fdm=marker

data/data/digitalocean.json

@@ -6,7 +6,7 @@
     "ubuntu-13.10": "3101918",
     "ubuntu-14.04": "3240036",
     "centos-5.8": "1601",
-    "centos-6.5": "3240850",
+    "centos-6.5": "3448674",
     "centos-6.4": "562354",
     "debian-6.0": "12573",
     "debian-7.0": "3445812",

data/kitchen-digitalocean.gemspec

@@ -13,7 +13,7 @@ Gem::Specification.new do |spec|
   spec.homepage      = 'https://github.com/test-kitchen/kitchen-digitalocean'
   spec.license       = 'Apache 2.0'
 
-  spec.files         = `git ls-files`.split($/)
+  spec.files         = `git ls-files`.split($INPUT_RECORD_SEPARATOR)
   spec.executables   = spec.files.grep(%r{^bin/}) { |f| File.basename(f) }
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ['lib']

data/lib/kitchen/driver/digitalocean.rb

@@ -60,7 +60,7 @@ module Kitchen
       end
 
       default_config :ssh_key_ids do |driver|
-        ENV['SSH_KEY_IDS']
+        ENV['DIGITALOCEAN_SSH_KEY_IDS'] || ENV['SSH_KEY_IDS']
       end
 
       required_config :digitalocean_client_id
@@ -110,7 +110,10 @@ module Kitchen
       def default_name
         # Generate what should be a unique server name
         rand_str = Array.new(8) { rand(36).to_s(36) }.join
-        "#{instance.name}-#{Etc.getlogin}-#{Socket.gethostname}-#{rand_str}"
+        "#{instance.name}-"\
+        "#{Etc.getlogin.gsub('_', '-')}-"\
+        "#{rand_str}-"\
+        "#{Socket.gethostname}"
       end
 
       private

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.6.4'
+    DIGITALOCEAN_VERSION = '0.7.0'
   end
 end
 

data/spec/kitchen/driver/digitalocean_spec.rb

@@ -32,10 +32,10 @@ describe Kitchen::Driver::Digitalocean do
 
   let(:instance) do
     double(
-      :name => 'potatoes',
-      :logger => logger,
-      :to_str => 'instance',
-      :platform => double(:name => platform_name)
+      name: 'potatoes',
+      logger: logger,
+      to_str: 'instance',
+      platform: double(name: platform_name)
     )
   end
 
@@ -101,14 +101,14 @@ describe Kitchen::Driver::Digitalocean do
 
     context 'overridden options' do
       config = {
-        :image_id => '22',
-        :flavor_id => '63',
-        :ssh_key_ids => '5678',
-        :username => 'admin',
-        :port => '2222',
-        :server_name => 'puppy',
-        :region_id => '1',
-        :flavor => '1GB'
+        image_id: '22',
+        flavor_id: '63',
+        ssh_key_ids: '5678',
+        username: 'admin',
+        port: '2222',
+        server_name: 'puppy',
+        region_id: '1',
+        flavor: '1GB'
       }
 
       let(:config) { config }
@@ -123,8 +123,8 @@ describe Kitchen::Driver::Digitalocean do
 
   describe '#create' do
     let(:server) do
-      double(:id => 'test123', :wait_for => true,
-        :public_ip_address => '1.2.3.4')
+      double(id: 'test123', wait_for: true,
+             public_ip_address: '1.2.3.4')
     end
     let(:driver) do
       d = Kitchen::Driver::Digitalocean.new(config)
@@ -138,8 +138,8 @@ describe Kitchen::Driver::Digitalocean do
     context 'username and API key only provided' do
       let(:config) do
         {
-          :digitalocean_client_id => 'hello',
-          :digitalocean_api_key => 'world'
+          digitalocean_client_id: 'hello',
+          digitalocean_api_key: 'world'
         }
       end
 
@@ -163,10 +163,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(:state) { { server_id: server_id, hostname: hostname } }
     let(:server) { double(:nil? => false, :destroy => true) }
-    let(:servers) { double(:get => server) }
-    let(:compute) { double(:servers => servers) }
+    let(:servers) { double(get: server) }
+    let(:compute) { double(servers: servers) }
 
     let(:driver) do
       d = Kitchen::Driver::Digitalocean.new(config)
@@ -200,7 +200,7 @@ describe Kitchen::Driver::Digitalocean do
         s.stub(:get).with('12345').and_return(nil)
         s
       end
-      let(:compute) { double(:servers => servers) }
+      let(:compute) { double(servers: servers) }
       let(:driver) do
         d = Kitchen::Driver::Digitalocean.new(config)
         d.instance = instance
@@ -218,8 +218,8 @@ describe Kitchen::Driver::Digitalocean do
   describe '#compute' do
     let(:config) do
       {
-        :digitalocean_client_id => 'monkey',
-        :digitalocean_api_key => 'potato',
+        digitalocean_client_id: 'monkey',
+        digitalocean_api_key: 'potato',
       }
     end
 
@@ -232,7 +232,7 @@ describe Kitchen::Driver::Digitalocean do
 
     context 'no username provided' do
       let(:config) do
-        { :digitalocean_client_id => nil, :digitalocean_api_key => '1234' }
+        { digitalocean_client_id: nil, digitalocean_api_key: '1234' }
       end
 
       it 'raises an error' do
@@ -242,7 +242,7 @@ describe Kitchen::Driver::Digitalocean do
 
     context 'no API key provided' do
       let(:config) do
-        { :digitalocean_client_id => 'monkey', :digitalocean_api_key => nil }
+        { digitalocean_client_id: 'monkey', digitalocean_api_key: nil }
       end
 
       it 'raises an error' do
@@ -254,16 +254,16 @@ describe Kitchen::Driver::Digitalocean do
   describe '#create_server' do
     let(:config) do
       {
-        :server_name => 'hello',
-        :image_id => 'there',
-        :flavor_id => '68',
-        :region_id => '3',
-        :private_networking => true,
-        :ssh_key_ids => '1234'
+        server_name: 'hello',
+        image_id: 'there',
+        flavor_id: '68',
+        region_id: '3',
+        private_networking: true,
+        ssh_key_ids: '1234'
       }
     end
     before(:each) do
-      @expected = config.merge(:name => config[:server_name])
+      @expected = config.merge(name: config[:server_name])
       @expected.delete_if do |k, v|
         k == :server_name
       end
@@ -273,7 +273,7 @@ describe Kitchen::Driver::Digitalocean do
       s.stub(:create) { |arg| arg }
       s
     end
-    let(:compute) { double(:servers => servers) }
+    let(:compute) { double(servers: servers) }
     let(:driver) do
       d = Kitchen::Driver::Digitalocean.new(config)
       d.instance = instance
@@ -289,11 +289,11 @@ describe Kitchen::Driver::Digitalocean do
   describe 'Region and Flavor names should be converted to IDs' do
     let(:config) do
       {
-        :server_name => 'hello',
-        :image_id => 'there',
-        :flavor => '2gb',
-        :region => 'amsterdam 2',
-        :ssh_key_ids => '1234'
+        server_name: 'hello',
+        image_id: 'there',
+        flavor: '2gb',
+        region: 'amsterdam 2',
+        ssh_key_ids: '1234'
       }
     end
 
@@ -314,7 +314,7 @@ describe Kitchen::Driver::Digitalocean do
 
     it 'generates a name' do
       expect(driver.default_name).to match(
-        /^potatoes-user-host-/)
+        /^potatoes-user-(\S*)-host/)
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Greg Fitzgerald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-02 00:00:00.000000000 Z
+date: 2014-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen