kitchen-openstack 1.5.0 → 1.5.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd777017fb7da7ae301b48183ac23a1a1b2b7e48
-  data.tar.gz: 599ddad461ccb284570401d3f5561874c15ac2be
+  metadata.gz: dabecabfd7d572a681fb2a9ea51dcf01c3da1113
+  data.tar.gz: 50c2d3cce5b1ec2ce75e15c798fc97e9dabef0d3
 SHA512:
-  metadata.gz: f1d10cb0dc35c7c85bfa03942d0e2b0b84713e0655889c0ad41419d6cb1b84f31a104d3eb4dbfb769875bf0c601dd26828688b9f178bc390d2d836e3939bc7d7
-  data.tar.gz: 7dba80c14cbc214df24fec6043465a1bd53f171580e5031d814b43d18c452643ac1636f61836ee724ca0aefcf3d94e6c89ddda6461307b782834f0eb066a4c16
+  metadata.gz: cfc8a647b20323221b6f6fb583f3d1b14a807fe8c2c0463e49b96046f97f43422f35204ba97146f5a4eacbd2935a284c9aa2b3f370c74f6c75d823f92e198478
+  data.tar.gz: fc1505ee21df47332240e176753c66bde27628af421c598fefdee31f0a56c6f5af1eaa381fbcde465866d243219547310e88bc6a53c0b25282ba3069e604eace

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# 1.5.2 / 2014-05-31
+
+### Bug Fixes
+
+* PR [#50][] - Fix possible infinite loop when generating server names
+* PR [#49][] - Limit server names to 63 characters to get around OpenSSH bug
+[2239](https://bugzilla.mindrot.org/show_bug.cgi?id=2239); via [@dschlenk][]
+
 # 1.5.0 / 2014-05-22
 
 ### New Features
@@ -93,6 +101,8 @@ certain specified NICs; via [@monsterzz][]
 
 * Initial release! Woo!
 
+[#50]: https://github.com/test-kitchen/kitchen-openstack/pull/50
+[#49]: https://github.com/test-kitchen/kitchen-openstack/pull/49
 [#48]: https://github.com/test-kitchen/kitchen-openstack/pull/48
 [#46]: https://github.com/test-kitchen/kitchen-openstack/pull/46
 [#41]: https://github.com/test-kitchen/kitchen-openstack/pull/41

data/Gemfile

@@ -1,6 +1,6 @@
+# Encoding: UTF-8
+
 source 'https://rubygems.org'
 
 # Specify your gem's dependencies in kitchen-openstack.gemspec
 gemspec
-
-# vim: ai et ts=2 sts=2 sw=2 ft=ruby

data/Rakefile

@@ -1,12 +1,12 @@
-require 'bundler/gem_tasks'
+# Encoding: UTF-8
+
+require 'bundler/setup'
 require 'tailor/rake_task'
 require 'cane/rake_task'
 require 'rspec/core/rake_task'
 
-desc 'Run Cane to check quality metrics'
 Cane::RakeTask.new
 
-desc 'Run Tailor to lint check code'
 Tailor::RakeTask.new do |task|
   task.file_set '**/*.rb'
 end
@@ -17,9 +17,6 @@ task :loc do
   sh 'countloc -r lib/kitchen'
 end
 
-desc 'Run RSpec unit tests'
 RSpec::Core::RakeTask.new(:spec)
 
 task :default => [ :cane, :tailor, :loc, :spec ]
-
-# vim: ai et ts=2 sts=2 sw=2 ft=ruby fdm=marker

data/kitchen-openstack.gemspec

@@ -1,4 +1,5 @@
-# coding: utf-8
+# Encoding: UTF-8
+
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'kitchen/driver/openstack_version'
@@ -34,5 +35,3 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov-console'
   spec.add_development_dependency 'coveralls'
 end
-
-# vim: ai et ts=2 sts=2 sw=2 ft=ruby

data/lib/kitchen/driver/openstack.rb

@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# Encoding: UTF-8
 #
 # Author:: Jonathan Hartman (<j@p4nt5.com>)
 #
@@ -191,20 +191,27 @@ module Kitchen
       end
 
       def generate_name(base)
-        # Generate what should be a unique server name
+        # 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
         sep = '-'
         pieces = [
           base,
           Etc.getlogin,
           Socket.gethostname,
-          Array.new(8) { rand(36).to_s(36) }.join
+          Array.new(7) { rand(36).to_s(36) }.join
         ]
-        until pieces.join(sep).length <= 64 do
-          if pieces[2].length > 24
+        until pieces.join(sep).length <= 63 do
+          if pieces[2].length > 23
             pieces[2] = pieces[2][0..-2]
-          elsif pieces[1].length > 16
+          elsif pieces[1].length > 15
             pieces[1] = pieces[1][0..-2]
-          elsif pieces[0].length > 16
+          elsif pieces[0].length > 15
             pieces[0] = pieces[0][0..-2]
           end
         end
@@ -312,5 +319,3 @@ module Kitchen
     end
   end
 end
-
-# vim: ai et ts=2 sts=2 sw=2 ft=ruby

data/lib/kitchen/driver/openstack_version.rb

@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# Encoding: UTF-8
 #
 # Author:: Jonathan Hartman (<j@p4nt5.com>)
 #
@@ -19,8 +19,6 @@
 module Kitchen
   module Driver
     # Version string for OpenStack Kitchen driver
-    OPENSTACK_VERSION = '1.5.0'
+    OPENSTACK_VERSION = '1.5.2'
   end
 end
-
-# vim: ai et ts=2 sts=2 sw=2 ft=ruby

data/spec/kitchen/driver/openstack_spec.rb

@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# Encoding: UTF-8
 #
 # Author:: Jonathan Hartman (<j@p4nt5.com>)
 #
@@ -619,8 +619,22 @@ describe Kitchen::Driver::Openstack do
         Socket.stub(:gethostname).and_return('ab.c' * 20)
       end
 
-      it 'limits the generated name to 64-characters' do
-        expect(driver.send(:generate_name, 'long').length).to eq(64)
+      it 'limits the generated name to 63 characters' do
+        expect(driver.send(:generate_name, 'long').length).to eq(63)
+      end
+    end
+
+    context 'node with a long hostname, username, and base name' do
+      before(:each) do
+        Socket.unstub(:gethostname)
+        Socket.stub(:gethostname).and_return('ab.c' * 20)
+
+        Etc.unstub(:getlogin)
+        Etc.stub(:getlogin).and_return('user' * 20)
+      end
+
+      it 'limits the generated name to 63 characters' do
+        expect(driver.send(:generate_name, 'long' * 20).length).to eq(63)
       end
     end
   end
@@ -918,5 +932,3 @@ describe Kitchen::Driver::Openstack do
     end
   end
 end
-
-# vim: ai et ts=2 sts=2 sw=2 ft=ruby

data/spec/spec_helper.rb

@@ -1,4 +1,4 @@
-# -*- encoding: utf-8 -*-
+# Encoding: UTF-8
 #
 # Author:: Jonathan Hartman (<j@p4nt5.com>)
 #
@@ -31,5 +31,3 @@ SimpleCov.minimum_coverage 90
 SimpleCov.start
 
 require_relative '../lib/kitchen/driver/openstack'
-
-# vim: ai et ts=2 sts=2 sw=2 ft=ruby

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-openstack
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.5.2
 platform: ruby
 authors:
 - Jonathan Hartman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-23 00:00:00.000000000 Z
+date: 2014-05-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen