kitchen-appbundle-updater 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 169dcc72297817ef7f1f8775acd66e65cd66291c
-  data.tar.gz: 3e94b22a7dc3578be8207a02789690a4bdeddedb
+  metadata.gz: 7488673b66cb66cadc310881c0456274b1210085
+  data.tar.gz: 92f3263f36250ece0b18642158b678c88f9eb897
 SHA512:
-  metadata.gz: 0ae9b53d1734d787a48172f1718f6f1bd7bcd15774c0670641b87bd250abf9943825f85adacee583057e0b79053485580cf9a130a079b7e8a59153ccff5cd484
-  data.tar.gz: 8b785ea8891a717f03508823cd684b45ad3b25626de74e4d8dfe6a807e37691beba7457bab7597ab35a7c74fb6665ad1cfc6eee8969bcd480de0dc818ae99e05
+  metadata.gz: 32fed6540a8bbd24dd7f28c3f55d72547029e59a2aa396e27bf59cce4ee52803659fa788db403e388f438ab3da86f384d8fb3054fbb643d87f06226f79474d2a
+  data.tar.gz: a00282633f1960b67dbbe2014f673d22825ecf8811a3c2ccff8330d9f33cd27f21529be260e19d3d7c6daac81d39ef43f248d8b6fc955cab2b9660fc65717fdd

data/lib/kitchen-appbundle-updater/version.rb

@@ -1,3 +1,3 @@
 class KitchenAppbundleUpdater
-  VERSION = '0.0.4'
+  VERSION = '0.1.0'
 end

data/lib/kitchen/provisioner/chef_github.rb

@@ -1,5 +1,4 @@
 require 'kitchen/provisioner/chef_zero'
-require 'kitchen-appbundle-updater/helpers'
 
 module Kitchen
   module Provisioner
@@ -8,50 +7,33 @@ module Kitchen
       default_config :github_owner, "chef"
       default_config :github_repo, "chef"
 
-      def create_sandbox
-        super
-        dna = {
-          chef_appbundle_updater: {
-            github_org: config[:github_owner],
-            github_repo: config[:github_repo],
-            refname: config[:refname]
-          }
-        }
-
-        File.open(File.join(sandbox_path, 'dna_updater.json'), "wb") do |f|
-          f.write(dna.to_json)
-        end
-      end
-
-      def latest_chef_appbundle_updater
-        url = "https://api.github.com/repos/jaym/chef-appbundle-updater/releases/latest"
-        url += "?access_token=#{config[:github_access_token]}" if config[:github_access_token]
-
-        @cookbook_url ||= open(url) do |r|
-          j = JSON.parse(r.read)
-          j["assets"][0]["browser_download_url"]
-        end
-      end
-
       def prepare_command
-        [
-          prepare_command_vars,
-          KitchenAppbundleUpdater::Helpers.load_file("chef_base_updater", powershell_shell?)
-        ].join("\n")
+        gem_bin = remote_path_join(config[:ruby_bindir], "gem").
+          tap { |path| path.concat(".bat") if windows_os? }
+        appbundle_updater_bin = remote_path_join(config[:ruby_bindir], "appbundle-updater").
+          tap { |path| path.concat(".bat") if windows_os? }
+        vars = [
+          shell_var("refname", config[:refname]),
+          shell_var("github_owner", config[:github_owner]),
+          shell_var("github_repo", config[:github_repo]),
+          shell_var("gem", sudo(gem_bin)),
+          shell_var("appbundle_updater", sudo(appbundle_updater_bin)),
+        ].join("\n").concat("\n")
+
+        my_shell_code_from_file(vars, "chef_base_updater")
       end
 
-      def prepare_command_vars
-        vars = [
-          shell_var("cookbook_url", latest_chef_appbundle_updater),
-          shell_var("json", File.join(config[:root_path], 'dna_updater.json')),
-          shell_var("chef_omnibus_root", config[:chef_omnibus_root]),
-        ]
+      private
+
+      # need to override and use __FILE__ relative to this plugin
+      def my_shell_code_from_file(vars, file)
+        src_file = File.join(
+          File.dirname(__FILE__),
+          %w[.. .. .. support],
+          file + (powershell_shell? ? ".ps1" : ".sh")
+        )
 
-        if powershell_shell?
-          vars.join("\n")
-        else
-          vars.join(";\n")
-        end
+        wrap_shell_code([vars, "", IO.read(src_file)].join("\n"))
       end
 
     end

data/support/chef_base_updater.ps1

@@ -1,8 +1,4 @@
 $ErrorActionPreference = "Stop";
 
-Function Log($m) { Write-Host "       $m`n" }
-
-Log "Finding cookbook to update chef"
-$env:Path = $env:Path + ";$chef_omnibus_root\bin\"
-Log "Running chef-client with recipe chef-appbundle-updater::default from $cookbook_url"
-& "$chef_omnibus_root\bin\chef-client.bat" -z --recipe-url "$cookbook_url" -j "$json" -o "recipe[chef-appbundle-updater::default]"
+& "$gem" install appbundle-updater
+& "$appbundle_updater" chef chef "$refname" --tarball --github "$github_owner/$github_repo"

data/support/chef_base_updater.sh

@@ -1,12 +1,4 @@
 set -e
 
-# main
-main() {
-  sudo "$chef_omnibus_root/bin/chef-client" -z --recipe-url "$cookbook_url" -j "$json" -o "recipe[chef-appbundle-updater::default]"
-}
-
-# augment path in an attempt to find a download program
-PATH="${PATH}:/opt/local/bin:/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin:/usr/sfw/bin";
-export PATH;
-
-main
+$gem install appbundle-updater
+$appbundle_updater chef chef $refname --tarball --github $github_owner/$github_repo

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchen-appbundle-updater
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.1.0
 platform: ruby
 authors:
 - Jay Mundrawala
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-25 00:00:00.000000000 Z
+date: 2015-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -98,7 +98,6 @@ files:
 - Rakefile
 - kitchen-appbundle-updater.gemspec
 - lib/kitchen-appbundle-updater.rb
-- lib/kitchen-appbundle-updater/helpers.rb
 - lib/kitchen-appbundle-updater/version.rb
 - lib/kitchen/provisioner/chef_github.rb
 - support/chef_base_updater.ps1
@@ -123,7 +122,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: A Test Kitchen Driver for Appbundle-updater

data/lib/kitchen-appbundle-updater/helpers.rb

@@ -1,12 +0,0 @@
-class KitchenAppbundleUpdater
-  class Helpers
-    def self.load_file(file, is_powershell)
-        src_file = File.join(
-          File.dirname(__FILE__),
-          %w[.. .. support],
-          file + (is_powershell ? ".ps1" : ".sh")
-        )
-        IO.read(src_file)
-      end
-  end
-end