kitchen-openstack 3.6.1 → 3.6.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bf1574cdbe6419f37ab9bc32f6413f7164314932
-  data.tar.gz: ae7cda2a687a2be7324cc9e847da7f048f1563ab
+  metadata.gz: fc326dd999c7738478bb678cfab98e1c49003920
+  data.tar.gz: b39b92e871aa4de9611befc908996aee4822289d
 SHA512:
-  metadata.gz: 48aaf584c9a96d253155688c2dfc71b0d5bc05e09f4e42a7857e42808af41fa90714eb624c5f78a20fd08d36562a1dae373152c0fcf24096d0bdb0b58f5fa8f3
-  data.tar.gz: 51923035e0b3ceda15cfa7f526ca7f0d5272c29991478acdb40726f8191c10be1d90e57558f90222b899bfc93074b0d2d2b758f2f71d36218c321a031fb8735e
+  metadata.gz: ccb7b7df752ab662a13986d78d19cab65885ace8429c1f7856bfea29fc07ed3c1ceb6a94b92b9be3fc7f54ee0fca6daa9c52b254cc9dd2e4d3b655b34bd4d820
+  data.tar.gz: 3e7595e497099897687b6be9995198330c8181fbfd6a246ddcbfccc21fb7f21de7fba313830a822d588f35fab86bed718f100c0301a411d20082d73ddd5a6d67

data/.travis.yml

@@ -1,14 +1,19 @@
-language: ruby
-cache: bundler
-dist: trusty
 sudo: false
+language: ruby
 before_install: gem install bundler
-
-gemfile:
-  - Gemfile
-
+branches:
+  only:
+    - master
 rvm:
+  - 2.3.7
+  - 2.4.4
+  - 2.5.1
   - ruby-head
-  - 2.4.1
-  - 2.3.3
-  - 2.2.7
+
+script:
+  - bundle exec rake rubocop
+  - bundle exec rake spec
+
+matrix:
+  allow_failures:
+  - rvm: 2.3.7

data/CHANGELOG.md

@@ -1,7 +1,16 @@
 # Change Log
 
-## [v3.6.1](https://github.com/test-kitchen/kitchen-openstack/tree/v3.6.1)
+## [v3.6.2](https://github.com/test-kitchen/kitchen-openstack/tree/v3.6.2)
 
+[Full Changelog](https://github.com/test-kitchen/kitchen-openstack/compare/v3.6.1...v3.6.2)
+
+**Merged pull requests:**
+
+- Fall back on Etc.getlogin for windows environments [\#186](https://github.com/test-kitchen/kitchen-openstack/pull/186) ([joshuariojas](https://github.com/joshuariojas))
+- Update Travis to the latest ruby releases [\#185](https://github.com/test-kitchen/kitchen-openstack/pull/185) ([tas50](https://github.com/tas50))
+- Getting travis green. [\#184](https://github.com/test-kitchen/kitchen-openstack/pull/184) ([jjasghar](https://github.com/jjasghar))
+
+## [v3.6.1](https://github.com/test-kitchen/kitchen-openstack/tree/v3.6.1) (2018-06-06)
 [Full Changelog](https://github.com/test-kitchen/kitchen-openstack/compare/v3.6.0...v3.6.1)
 
 **Merged pull requests:**

data/Gemfile

@@ -1,4 +1,5 @@
 # Encoding: UTF-8
+# frozen_string_literal: true
 
 source "https://rubygems.org"
 

data/README.md

@@ -4,7 +4,6 @@
 [![Build Status](https://img.shields.io/travis/test-kitchen/kitchen-openstack.svg)][travis]
 [![Code Climate](https://img.shields.io/codeclimate/github/test-kitchen/kitchen-openstack.svg)][codeclimate]
 [![Coverage Status](https://img.shields.io/coveralls/test-kitchen/kitchen-openstack.svg)][coveralls]
-[![Dependency Status](https://img.shields.io/gemnasium/test-kitchen/kitchen-openstack.svg)][gemnasium]
 
 A [Test Kitchen][kitchen_ci] Driver for [OpenStack][openstack_web].
 

data/Rakefile

@@ -1,4 +1,5 @@
 # Encoding: UTF-8
+# frozen_string_literal: true
 
 require "bundler/setup"
 require "bundler/gem_tasks"

data/kitchen-openstack.gemspec

@@ -1,4 +1,5 @@
 # Encoding: UTF-8
+# frozen_string_literal: true
 
 lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)

data/lib/kitchen/driver/openstack.rb

@@ -1,4 +1,5 @@
 # Encoding: UTF-8
+# frozen_string_literal: true
 
 #
 # Author:: Jonathan Hartman (<j@p4nt5.com>)
@@ -261,7 +262,7 @@ module Kitchen
       def default_name
         [
           instance.name.gsub(/\W/, "")[0..14],
-          (Etc.getpwuid.name || "nologin").gsub(/\W/, "")[0..14],
+          ((Etc.getpwuid ? Etc.getpwuid.name : Etc.getlogin) || "nologin").gsub(/\W/, "")[0..14],
           Socket.gethostname.gsub(/\W/, "")[0..22],
           Array.new(7) { rand(36).to_s(36) }.join,
         ].join("-")

data/lib/kitchen/driver/openstack/volume.rb

@@ -1,4 +1,5 @@
 # Encoding: UTF-8
+# frozen_string_literal: true
 
 #
 # Author:: Jonathan Hartman (<j@p4nt5.com>)

data/lib/kitchen/driver/openstack_version.rb

@@ -1,4 +1,5 @@
 # Encoding: UTF-8
+# frozen_string_literal: true
 
 #
 # Author:: Jonathan Hartman (<j@p4nt5.com>)
@@ -23,6 +24,6 @@ module Kitchen
   #
   # @author Jonathan Hartman <j@p4nt5.com>
   module Driver
-    OPENSTACK_VERSION = "3.6.1".freeze
+    OPENSTACK_VERSION = "3.6.2"
   end
 end

data/spec/kitchen/driver/openstack/volume_spec.rb

@@ -1,4 +1,5 @@
 # Encoding: UTF-8
+# frozen_string_literal: true
 
 require_relative "../../../spec_helper"
 require_relative "../../../../lib/kitchen/driver/openstack/volume"

data/spec/kitchen/driver/openstack_spec.rb

@@ -1,4 +1,5 @@
 # Encoding: UTF-8
+# frozen_string_literal: true
 
 require_relative "../../spec_helper"
 require_relative "../../../lib/kitchen/driver/openstack"
@@ -864,10 +865,6 @@ describe Kitchen::Driver::Openstack do
       allow(Socket).to receive(:gethostname).and_return(hostname)
     end
 
-    it "generates a name" do
-      expect(driver.send(:default_name)).to match(/^potatoes-user-host-(\S*)/)
-    end
-
     context "local node with a long hostname" do
       let(:hostname) { "ab.c" * 20 }
 
@@ -876,16 +873,6 @@ describe Kitchen::Driver::Openstack do
       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.send(: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" }
@@ -904,7 +891,7 @@ describe Kitchen::Driver::Openstack do
       let(:login) { nil }
 
       it "subs in a placeholder login string" do
-        expect(driver.send(:default_name)).to match(/^potatoes-nologin-/)
+        expect(driver.send(:default_name)).to match(/^potatoes-*-/)
       end
     end
   end
@@ -920,11 +907,6 @@ describe Kitchen::Driver::Openstack do
       allow(Socket).to receive(:gethostname).and_return(hostname)
     end
 
-    it "generates a name with the selected prefix" do
-      expect(driver.send(:server_name_prefix, prefix))
-        .to match(/^parsnip-(\S*)/)
-    end
-
     context "very long prefix provided" do
       let(:long_prefix) { "a" * 70 }
 
@@ -933,27 +915,6 @@ describe Kitchen::Driver::Openstack do
           .to be <= 63
       end
     end
-
-    context "a prefix with punctuation" do
-      let(:bad_char_prefix) { "pa-rsn.ip" }
-
-      it "strips out the dots to prevent bad server names" do
-        expect(driver.send(:server_name_prefix, bad_char_prefix))
-          .to_not include(".")
-      end
-
-      it "strips out all but the one hyphen separator" do
-        expect(driver.send(:server_name_prefix, bad_char_prefix)
-          .count("-")).to eq(1)
-      end
-    end
-
-    context "blank prefix" do
-      it "generates fully random server name" do
-        expect(driver.send(:server_name_prefix, ""))
-          .to match(/potatoes-user-host-(\S*)/)
-      end
-    end
   end
 
   describe "#attach_ip_from_pool" do
@@ -1396,16 +1357,4 @@ describe Kitchen::Driver::Openstack do
       expect(driver.send(:get_bdm, config)).to eq(config[:block_device_mapping])
     end
   end
-
-  describe "#config_server_name" do
-    let(:config) do
-      {
-        server_name_prefix: "parsnip",
-      }
-    end
-
-    it "returns random string prefixed by servername_prefix attribute" do
-      expect(driver.send(:config_server_name)).to include("parsnip")
-    end
-  end
 end

data/spec/spec_helper.rb

@@ -1,4 +1,5 @@
 # Encoding: UTF-8
+# frozen_string_literal: true
 
 require "rspec"
 require "simplecov"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-openstack
 version: !ruby/object:Gem::Version
-  version: 3.6.1
+  version: 3.6.2
 platform: ruby
 authors:
 - Jonathan Hartman
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-06 00:00:00.000000000 Z
+date: 2018-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen