kitchen-salt 0.0.26 → 0.0.27

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce9c5030ee4a7c45966026996ae30d05e56e7094
-  data.tar.gz: 306ce8731374489fbdaf79aa84d3bd1487432f82
+  metadata.gz: 88b37d106829f94550c409e6eebb9c1d745bf7ed
+  data.tar.gz: d305501da8d91fee412673540ee66f90f995c18e
 SHA512:
-  metadata.gz: ce2f252ce956de0bf21ac1c916ae4e81d14996ed493a95fa9e9717ee286ff7d8edd661d361864e111171ce1af54a8a3dd7ed1f70f3b8cadce660cfa068168e08
-  data.tar.gz: db028180b932531c74322228103a3bb92933629c67031a179a92114cb23550074d3eb03580f796ca4dda8138bbaa3bda0b0b003ba9e359ecdd4477d13cfb4793
+  metadata.gz: 7c68cbaf25d24cd854d022b68cade1cef34dd4d41d7fcd54df36dce4cacb076a168fdc5168259e50267095b3fd39aec56c8d8c426c444bebdfd64a5dec400285
+  data.tar.gz: a0f348d5b3343bf85d83a1989e08f9b422e5af006d00038bfd942a121603b4d2b8ae4a6ff300c7c6589d1db6e41c180202bae41508a5ac0fc97ee4f411a7f3a7

data/lib/kitchen/provisioner/formula-fetch.sh

@@ -64,13 +64,23 @@ function linkFormulas() {
   SALT_ROOT=$1
   SALT_ENV=${2:-/usr/share/salt-formulas/env}
 
-  # form git, development versions
-  find "$SALT_ENV"/_formulas -maxdepth 1 -mindepth 1 -type d -print0| xargs -0 -n1 basename | xargs -I{} \
-    ln -fs "$SALT_ENV"/_formulas/{}/{} "$SALT_ROOT"/{};
+  if [[ -e "$SALT_ENV" ]]; then
+    # form git, development versions
+    if [[ -e "$SALT_ENV/_formulas" ]]; then
+      GIT_FORMULA_LIST=$(find "$SALT_ENV"/_formulas -maxdepth 1 -mindepth 1 -type d)
+      for formula in $GIT_FORMULA_LIST
+      do
+        name=$(basename "$formula")
+        ln -fs "$formula/$name" "$SALT_ROOT/$name"
+        find "$formula" -maxdepth 1 -mindepth 1 -type d |grep -E "_(modules|states|grains|renderers|returners)" | xargs -I{} \
+          basename {}| xargs -I{} cp -rs "$formula"/{} "$SALT_ROOT"/
+      done
+    fi
 
-  # form pkgs
-  find "$SALT_ENV" -path "*_formulas*" -prune -o -name "*" -maxdepth 1 -mindepth 1 -type d -print0| xargs -0 -n1 basename | xargs -I{} \
-    ln -fs "$SALT_ENV"/{} "$SALT_ROOT"/{};
+    # form pkgs
+    find "$SALT_ENV" -maxdepth 1 -mindepth 1 -path "*_formulas*" -prune -o -name "*" -type d -print0| xargs -I{} -0 -n1 basename --no-run-if-empty {} | xargs -I{} --no-run-if-empty \
+      ln -fs "$SALT_ENV"/{} "$SALT_ROOT"/{};
+  fi
 
 }
 

data/lib/kitchen/provisioner/salt_solo.rb

@@ -38,7 +38,7 @@ module Kitchen
         dry_run: false,
         salt_version: 'latest',
         salt_install: 'bootstrap',
-        salt_bootstrap_url: 'https://bootstrap.saltstack.org',
+        salt_bootstrap_url: 'https://bootstrap.saltstack.com',
         salt_bootstrap_options: '',
         salt_apt_repo: 'https://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest',
         salt_apt_repo_key: 'https://repo.saltstack.com/apt/ubuntu/16.04/amd64/latest/SALTSTACK-GPG-KEY.pub',
@@ -128,9 +128,11 @@ module Kitchen
                 echo "Failed install ruby(-dev) using assets.sh from kitchen-salt"
                 echo "-----> Fallback to Chef Bootstrap script (for busser/serverspec ruby support)"
                 mkdir -p "#{omnibus_download_dir}"
-                if [ ! -x #{omnibus_download_dir}/install.sh ] ; then
+                if [ ! -x #{omnibus_download_dir}/install.sh ]
+                then
                     #{sudo('sh')} #{omnibus_download_dir}/install.sh -d #{omnibus_download_dir}
                 fi;
+              fi
           INSTALL
         end
       end

data/lib/kitchen-salt/version.rb

@@ -1,5 +1,5 @@
 module Kitchen
   module Salt
-    VERSION = '0.0.26'.freeze
+    VERSION = '0.0.27'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-salt
 version: !ruby/object:Gem::Version
-  version: 0.0.26
+  version: 0.0.27
 platform: ruby
 authors:
 - Simon McCartney
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-24 00:00:00.000000000 Z
+date: 2017-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-kitchen
@@ -104,7 +104,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: "[none]"
-rubygems_version: 2.6.12
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: salt provisioner for test-kitchen