kitchen-habitat 0.11.0 → 0.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d2a1fb8ade246aa6d678e6ef4e459204465a1d905933f3497edbf5c4f42f37ce
-  data.tar.gz: 3d4026a94857b3f551ca4a41cea0061796a4149e6ae559187c61c5e7505bac2a
+  metadata.gz: 829dec57fdb189dcd37c2d5ec649ab0d0efed8584f5e2c711f171b21610fc9ec
+  data.tar.gz: ca4c16b4dcd0d6bc49c98dd8f4f0b5d888aafc954cd143e9f9e992b9ed7d4622
 SHA512:
-  metadata.gz: 15d2703d84279215547ca903670e43b8ed31551bf5a3fce94f460743a92cfb603fae10560f0b09c576fca7e571d476558e429853affe2aa09ec58d0b7ff58d0e
-  data.tar.gz: 136cacef506411b56e4e8b9cb97c781f8cb7b9ccee4bb741322b0ce85184e332ec5de66db52f256c4580586967d5ad8a5261a760ee11d50515a4ca9443793c25
+  metadata.gz: a87b899607aa31a5a497b82310de421621f272a1c6e08c40d25afa6fba77cc420671d067024d9545fe6ecab5b469e43a5a72890a1001632a795b9871800ff35d
+  data.tar.gz: 41bbd702a57ee8ec7758f51bed075dd5e5060ff6aae46f9c8da361d77cb9231d92172756752fbd4948f11528839774bb43b7bcd6de44bb0fe9c5ff9160d15e32

data/lib/kitchen-habitat/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Habitat
-    VERSION = "0.11.0".freeze
+    VERSION = "0.11.1".freeze
   end
 end

data/lib/kitchen/provisioner/habitat.rb

@@ -55,7 +55,7 @@ module Kitchen
 
       def finalize_config!(instance)
         # Check to see if a package ident was specified for package name and be helpful
-        unless config[:package_name].nil? || (config[:package_name] =~ /\//).nil?
+        unless config[:package_name].nil? || (config[:package_name] =~ %r{/}).nil?
           config[:package_origin], config[:package_name], config[:package_version], config[:package_release] = config[:package_name].split("/")
         end
 
@@ -99,7 +99,7 @@ module Kitchen
           id -u hab >/dev/null 2>&1 || sudo -E useradd hab >/dev/null 2>&1
           rm -rf /tmp/kitchen
           mkdir -p /tmp/kitchen/results
-          #{'mkdir -p /tmp/kitchen/config' unless config[:override_package_config]}
+          #{"mkdir -p /tmp/kitchen/config" unless config[:override_package_config]}
         EOH
       end
 
@@ -118,7 +118,7 @@ module Kitchen
           #{install_service_package}
           #{remove_previous_user_toml}
           #{copy_user_toml_to_service_directory}
-          EOH
+        EOH
       end
 
       def run_command
@@ -137,6 +137,7 @@ module Kitchen
 
       def clean_up_screen_sessions
         return unless config[:use_screen]
+
         <<-CLEAN
         if sudo -E screen -ls | grep -q #{clean_package_name}
           then
@@ -150,6 +151,7 @@ module Kitchen
 
       def clean_up_previous_supervisor
         return if config[:use_screen]
+
         <<-EOH
         [ -f ./run.pid ] && echo "Removing previous supervisor and unloading package. "
         [ -f ./run.pid ] && sudo -E hab svc unload #{package_ident}
@@ -160,20 +162,20 @@ module Kitchen
       end
 
       def sup_run_script
-        <<-SCRIPT
-cat > /tmp/sup-run.sh <<"END"
-#!/bin/bash
-
-while true
-do
-  COUNT=$(ps aux | grep hab | wc -l)
-  if [[ ${COUNT} -lt 2 ]]
-  then
-    sudo -E hab sup run #{supervisor_options} > ~/nohup.out & echo $! > /tmp/run.pid
-  fi
-done
-END
-SCRIPT
+        <<~SCRIPT
+          cat > /tmp/sup-run.sh <<"END"
+          #!/bin/bash
+
+          while true
+          do
+            COUNT=$(ps aux | grep hab | wc -l)
+            if [[ ${COUNT} -lt 2 ]]
+            then
+              sudo -E hab sup run #{supervisor_options} > ~/nohup.out & echo $! > /tmp/run.pid
+            fi
+          done
+          END
+        SCRIPT
       end
 
       def run_package_in_background
@@ -226,6 +228,7 @@ SCRIPT
       def copy_package_config_from_override_to_sandbox
         return if config[:config_directory].nil?
         return unless config[:override_package_config]
+
         local_config_dir = File.join(config[:kitchen_root], config[:config_directory])
         return unless Dir.exist?(local_config_dir)
 
@@ -235,8 +238,10 @@ SCRIPT
 
       def copy_results_to_sandbox
         return if config[:artifact_name].nil? && !config[:install_latest_artifact]
+
         results_dir = resolve_results_directory
         return if results_dir.nil?
+
         FileUtils.mkdir_p(File.join(sandbox_path, "results"))
         FileUtils.cp(
           File.join(results_dir, config[:install_latest_artifact] ? latest_artifact_name : config[:artifact_name]),
@@ -256,6 +261,7 @@ SCRIPT
       def copy_user_toml_to_sandbox
         return if config[:config_directory].nil?
         return unless File.exist?(full_user_toml_path)
+
         FileUtils.mkdir_p(File.join(sandbox_path, "config"))
         debug("Copying user.toml from #{full_user_toml_path} to #{sandbox_user_toml_path}")
         FileUtils.cp(full_user_toml_path, sandbox_user_toml_path)
@@ -293,9 +299,10 @@ SCRIPT
 
       def copy_user_toml_to_service_directory
         return unless !config[:config_directory].nil? && File.exist?(full_user_toml_path)
+
         <<-EOH
           sudo -E mkdir -p /hab/svc/#{config[:package_name]}
-          sudo -E cp #{File.join(File.join(config[:root_path], 'config'), 'user.toml')} /hab/svc/#{config[:package_name]}/user.toml
+          sudo -E cp #{File.join(File.join(config[:root_path], "config"), "user.toml")} /hab/svc/#{config[:package_name]}/user.toml
         EOH
       end
 
@@ -309,6 +316,7 @@ SCRIPT
 
       def export_hab_bldr_url
         return if config[:depot_url].nil?
+
         "export HAB_BLDR_URL=#{config[:depot_url]}"
       end
 
@@ -348,7 +356,7 @@ SCRIPT
         options = ""
         options += " --listen-ctl #{config[:hab_sup_listen_ctl]}" unless config[:hab_sup_listen_ctl].nil?
         options += " --listen-gossip #{config[:hab_sup_listen_gossip]}" unless config[:hab_sup_listen_gossip].nil?
-        options += " --config-from #{File.join(config[:root_path], 'config/')}" if config[:override_package_config]
+        options += " --config-from #{File.join(config[:root_path], "config/")}" if config[:override_package_config]
         options += config[:hab_sup_bind].map { |b| " --bind #{b}" }.join(" ") if config[:hab_sup_bind].any?
         options += config[:hab_sup_peer].map { |p| " --peer #{p}" }.join(" ") if config[:hab_sup_peer].any?
         options += " --group #{config[:hab_sup_group]}" unless config[:hab_sup_group].nil?

metadata

@@ -1,29 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-habitat
 version: !ruby/object:Gem::Version
-  version: 0.11.0
+  version: 0.11.1
 platform: ruby
 authors:
 - Steven Murawski
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-09-28 00:00:00.000000000 Z
+date: 2019-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.4'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: countloc
   requirement: !ruby/object:Gem::Requirement
@@ -110,12 +116,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- kitchen-habitat.gemspec
 - lib/kitchen-habitat/version.rb
 - lib/kitchen/provisioner/habitat.rb
 homepage: https://github.com/test-kitchen/kitchen-habitat
 licenses:
-- Apache 2
+- Apache-2.0
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -132,8 +137,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: "[none]"
-rubygems_version: 2.7.6
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Habitat provisioner for test-kitchen

data/kitchen-habitat.gemspec

@@ -1,38 +0,0 @@
-$LOAD_PATH.unshift File.expand_path("../lib", __FILE__)
-require "kitchen-habitat/version"
-
-Gem::Specification.new do |s|
-  s.name              = "kitchen-habitat"
-  s.version           = Kitchen::Habitat::VERSION
-  s.authors           = ["Steven Murawski"]
-  s.email             = ["smurawski@chef.io"]
-  s.homepage          = "https://github.com/test-kitchen/kitchen-habitat"
-  s.summary           = "Habitat provisioner for test-kitchen"
-  candidates          = Dir.glob("lib/**/*") + ["README.md", "kitchen-habitat.gemspec"]
-  s.files             = candidates.sort
-  s.platform          = Gem::Platform::RUBY
-  s.require_paths     = ["lib"]
-  s.rubyforge_project = "[none]"
-  s.license           = "Apache 2"
-  s.description       = <<-EOF
-== DESCRIPTION:
-
-Habitat Provisioner for Test Kitchen
-
-== FEATURES:
-
-TBD
-
-EOF
-  s.add_dependency "test-kitchen", "~> 1.4"
-
-  s.add_development_dependency "countloc", "~> 0.4"
-  s.add_development_dependency "rake"
-  s.add_development_dependency "rspec",     "~> 3.2"
-  s.add_development_dependency "simplecov", "~> 0.9"
-
-  # style and complexity libraries are tightly version pinned as newer releases
-  # may introduce new and undesireable style choices which would be immediately
-  # enforced in CI
-  s.add_development_dependency "chefstyle"
-end