kitchen-digitalocean 0.8.0.pre1 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccc0c06837baf2d9f228b5415b1b8d663900b1e6
-  data.tar.gz: 7698c10da2f2b786a3d032273b452d2de1ea83c7
+  metadata.gz: 7162a19c2408c4f1f1f965120d34482a0946a3e4
+  data.tar.gz: 6bc37a3e482c27595ffa155f0dcd5356ac534f27
 SHA512:
-  metadata.gz: 1a3f917e5742397efe95e9fa4c216dac32f4878961f9a43a32dd2fbdcb81003c39b851f8abdf72e5c54dcf793943b932a0511c5be882df855eae44a539504ca0
-  data.tar.gz: e389ffc4079832011843131960d752fa2d1dcebd95f0209f8b27e4465a821e61e77ff39f01953f6f9d631f84efe7ada31d32a22ebc567fb94310bdd9af8a8314
+  metadata.gz: a90f4f5bc4ea67e76f04d4bf116d4a598f30a347339e9d2c063dddcbacc78b6573fec9f72f4c4975a59d8ac78b2ac066d4de3517e3a8741f7ea9ca6983ce6e48
+  data.tar.gz: 51d39d58131da506a022f4106df0fa8d283f48e642f1d0f67df7850bd0803d52c21860573387f94b007fdaddfcc30430ba3ab2d7bde474aa2638665e6ce864b4

data/.travis.yml

@@ -1,8 +1,6 @@
 ---
 language: ruby
 rvm:
-  - 1.9.3
-  - 2.0
   - 2.1
 bundler_args: --jobs 7
 gemfile:

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+# 0.8.0 / 2014-8-21
+
+* [@RoboticCheese](https://github.com/RoboticCheese) [PR #25] Sanitize default names, limit to 63 chars
+
 # 0.8.0.pre1 / 2014-08-21
 
 ***Breaking Changes***

data/README.md

@@ -123,9 +123,9 @@ example:
 
 Created and maintained by [Greg Fitzgerald](https://github.com/gregf/) (<greg@gregf.org>)
 
-Special Thanks
+***Special Thanks:***
 
-[Will Farrington](@https://github.com/wfarr/kitchen-digital_ocean), His fork was a help during the creation of my api v2 driver.
+[Will Farrington](https://github.com/wfarr/kitchen-digital_ocean), His fork was a help during the creation of my api v2 driver.
 
 # License
 

data/lib/kitchen/driver/digitalocean.rb

@@ -83,13 +83,21 @@ module Kitchen
         instance.platform.name
       end
 
+      # Generate what should be a unique server name up to 63 total chars
+      # Base name:    15
+      # Username:     15
+      # Hostname:     23
+      # Random string: 7
+      # Separators:    3
+      # ================
+      # Total:        63
       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.gsub('_', '-')}-"\
-        "#{rand_str}-"\
-        "#{Socket.gethostname}"
+        [
+          instance.name.gsub(/\W/, '')[0..14],
+          Etc.getlogin.gsub(/\W/, '')[0..14],
+          Socket.gethostname.gsub(/\W/, '')[0..22],
+          Array.new(7) { rand(36).to_s(36) }.join
+        ].join('-')
       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.8.0.pre1'
+    DIGITALOCEAN_VERSION = '0.8.0'
   end
 end
 

data/spec/kitchen/driver/digitalocean_spec.rb

@@ -28,11 +28,12 @@ describe Kitchen::Driver::Digitalocean do
   let(:logger) { Logger.new(logged_output) }
   let(:config) { Hash.new }
   let(:state) { Hash.new }
+  let(:instance_name) { 'potatoes' }
   let(:platform_name) { 'ubuntu' }
 
   let(:instance) do
     double(
-      name: 'potatoes',
+      name: instance_name,
       logger: logger,
       to_str: 'instance',
       platform: double(name: platform_name)
@@ -247,14 +248,48 @@ describe Kitchen::Driver::Digitalocean do
   # end
 
   describe '#default_name' do
+    let(:login) { 'user' }
+    let(:hostname) { 'host' }
+
     before(:each) do
-      allow(Etc).to receive(:getlogin).and_return('user')
-      allow(Socket).to receive(:gethostname).and_return('host')
+      allow(Etc).to receive(:getlogin).and_return(login)
+      allow(Socket).to receive(:gethostname).and_return(hostname)
     end
 
     it 'generates a name' do
-      expect(driver.default_name).to match(
-        /^potatoes-user-(\S*)-host/)
+      expect(driver.default_name).to match(/^potatoes-user-host-(\S*)/)
+    end
+
+    context 'local node with a long hostname' do
+      let(:hostname) { 'ab.c' * 20 }
+
+      it 'limits the generated name to 63 characters' do
+        expect(driver.default_name.length).to be <= (63)
+      end
+    end
+
+    context 'node with a long hostname, username, and base name' do
+      let(:login) { 'abcd' * 20 }
+      let(:hostname) { 'efgh' * 20 }
+      let(:instance_name) { 'ijkl' * 20 }
+
+      it 'limits the generated name to 63 characters' do
+        expect(driver.default_name.length).to eq(63)
+      end
+    end
+
+    context 'a login and hostname with punctuation in them' do
+      let(:login) { 'some.u-se-r' }
+      let(:hostname) { 'a.host-name' }
+      let(:instance_name) { 'a.instance-name' }
+
+      it 'strips out the dots to prevent bad server names' do
+        expect(driver.default_name).to_not include('.')
+      end
+
+      it 'strips out all but the three hyphen separators' do
+        expect(driver.default_name.count('-')).to eq(3)
+      end
     end
   end
 end

data/spec/spec_helper.rb

@@ -27,7 +27,6 @@ SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
   SimpleCov::Formatter::HTMLFormatter,
   SimpleCov::Formatter::Console
 ]
-SimpleCov.minimum_coverage 90
 SimpleCov.start
 
 WebMock.disable_net_connect!(allow_localhost: true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-digitalocean
 version: !ruby/object:Gem::Version
-  version: 0.8.0.pre1
+  version: 0.8.0
 platform: ruby
 authors:
 - Greg Fitzgerald
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-22 00:00:00.000000000 Z
+date: 2014-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -216,9 +216,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: 
 rubygems_version: 2.4.1