appbundle-updater 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5890c1c5cd9b4cec6094ab1bd3ecaf17e9c5d8e4
-  data.tar.gz: 99409df42e6b1967180fcefa47c377485cc64826
+  metadata.gz: dfcacfbb727241b71f679cd6d73822845d46678a
+  data.tar.gz: 2e73c75ef74df6d2ce735199ec6069eb97421362
 SHA512:
-  metadata.gz: 75fddef196538706740fe4a70851dd6acbe71d12201e0047d487c492ad4eefa13c975a4c62ad7969e4862885aef1c78f363c81dda374f16fba25c4fd837a5958
-  data.tar.gz: 682e150d1d33c6a9973bab2f6e253b63fb6fce498f9a0d90ee36835f62f22f5bd33dc1fa7e03065672ba5bc3db07ebe8975619c1fa09b941c2ae7b7d560beada
+  metadata.gz: b35f3f5574fd2e4db0b4298fd4e2380eec65098107f9922c96bbe09fced2bafaf5a56fb564180e9f118bc0f0ff12384e562ebb67ee4da2ada39d4c83d9cec4aa
+  data.tar.gz: c9ccff22e84a8e3f6704d576234f60b29f9c997a0044c3cfe37de2f281124d3920e30ca70d3bae94f142dbe4d3aa96f279fc898dd886750f7d201b1d3013cafe

data/CHANGELOG.md

@@ -1,5 +1,20 @@
 # Change Log
 
+## [Unreleased](https://github.com/chef/appbundle-updater/tree/HEAD)
+
+[Full Changelog](https://github.com/chef/appbundle-updater/compare/v0.2.2...HEAD)
+
+**Merged pull requests:**
+
+- fix windows via using tar.exe [\#8](https://github.com/chef/appbundle-updater/pull/8) ([lamont-granquist](https://github.com/lamont-granquist))
+
+## [v0.2.2](https://github.com/chef/appbundle-updater/tree/v0.2.2) (2015-09-25)
+[Full Changelog](https://github.com/chef/appbundle-updater/compare/v0.2.1...v0.2.2)
+
+**Merged pull requests:**
+
+- fixing syntax error \(derp\) [\#7](https://github.com/chef/appbundle-updater/pull/7) ([lamont-granquist](https://github.com/lamont-granquist))
+
 ## [v0.2.1](https://github.com/chef/appbundle-updater/tree/v0.2.1) (2015-09-25)
 [Full Changelog](https://github.com/chef/appbundle-updater/compare/v0.2.0...v0.2.1)
 

data/bin/appbundle-updater

@@ -43,11 +43,41 @@ def bin_dir
   chefdk.join("embedded/bin")
 end
 
+ENV_KEYS = %w[
+    BUNDLE_BIN_PATH BUNDLE_GEMFILE GEM_HOME GEM_PATH GEM_ROOT IRBRC MY_RUBY_HOME RUBYLIB RUBYOPT RUBY_ENGINE RUBY_ROOT RUBY_VERSION _ORIGINAL_GEM_PATH PATH
+].freeze
+
+def run(cmd)
+  ENV_KEYS.each { |key| ENV["_YOLO_#{key}"] = ENV[key]; ENV.delete(key) }
+  ENV['PATH'] = bin_dir.to_s + File::PATH_SEPARATOR + ENV['_YOLO_PATH']
+  puts "    running: #{cmd}"
+  output = `#{cmd} 2>&1`   #FIXME: bash/zsh-ism, will not work on csh
+  unless $?.exited? && $?.exitstatus == 0
+    raise("Command [#{cmd}] failed!\n\n---BEGIN OUTPUT--\n#{output}\n---END OUTPUT--\n")
+  end
+  ENV_KEYS.each { |key| ENV[key] = ENV.delete("_YOLO_#{key}") }
+end
+
 TAR_LONGLINK = '././@LongLink'
 
+def extract_tgz(file, destination = '.')
+  if windows?
+    extract_tgz_windows(file, destination)
+  else
+    extract_tgz_unix(file, destination)
+  end
+end
+
+# our windows omnibus packages all are guaranteed to have tar
+def extract_tgz_windows(file, destination = '.')
+  Dir.chdir(app_dir) do
+    run("tar xf #{file} --directory #{destination}")
+  end
+end
+
 # pure ruby `tar xzf`, handles longlinks and directories ending in '/'
 # (http://stackoverflow.com/a/31310593/506908)
-def extract_tgz(file, destination = '.')
+def extract_tgz_unix(file, destination = '.')
   # NOTE: THIS IS DELIBERATELY PURE RUBY USING NO NATIVE GEMS AND ONLY
   # THE RUBY STDLIB BY DESIGN
   Gem::Package::TarReader.new( Zlib::GzipReader.open file ) do |tar|
@@ -194,9 +224,6 @@ class Updater
   end
 
   private
-  ENV_KEYS = %w[
-    BUNDLE_BIN_PATH BUNDLE_GEMFILE GEM_HOME GEM_PATH GEM_ROOT IRBRC MY_RUBY_HOME RUBYLIB RUBYOPT RUBY_ENGINE RUBY_ROOT RUBY_VERSION _ORIGINAL_GEM_PATH PATH
-  ].freeze
 
   def app_dir
     chefdk.join("embedded/apps/#{app}")
@@ -212,17 +239,6 @@ class Updater
     run([ruby, script].join(" "))
   end
 
-  def run(cmd)
-    ENV_KEYS.each { |key| ENV["_YOLO_#{key}"] = ENV[key]; ENV.delete(key) }
-    ENV['PATH'] = bin_dir.to_s + File::PATH_SEPARATOR + ENV['_YOLO_PATH']
-    puts "    running: #{cmd}"
-    output = `#{cmd} 2>&1`   #FIXME: bash/zsh-ism, will not work on csh
-    unless $?.exited? && $?.exitstatus == 0
-      raise("Command [#{cmd}] failed!\n\n---BEGIN OUTPUT--\n#{output}\n---END OUTPUT--\n")
-    end
-    ENV_KEYS.each { |key| ENV[key] = ENV.delete("_YOLO_#{key}") }
-  end
-
 end
 
 class CLI

data/lib/appbundle_updater/version.rb

@@ -1,3 +1,3 @@
 module AppbundleUpdater
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: appbundle-updater
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - lamont-granquist
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-25 00:00:00.000000000 Z
+date: 2015-09-29 00:00:00.000000000 Z
 dependencies: []
 description: Updates appbundled apps in Chef's omnibus packages
 email: