appbundle-updater 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 331e2d44703abdf38c526bc815036066fcbc08e9
-  data.tar.gz: 8a9bfc9bb4feaa65e098dc8bb1caab03ebf935f5
+  metadata.gz: ac3bd055342dbbd8af2b4414052f38d1d151f890
+  data.tar.gz: 7f2353ffcb372150135f72a0f25dacc6a49ab7ab
 SHA512:
-  metadata.gz: 49bb29d6a177ee723851a78fb0c0c0b67d9dc29901a576dc7a07f4210d5f1289d32122ba1f55b1e5b1b1ab390145a5b0651b672d71d9176d8b9d0b18f8be74eb
-  data.tar.gz: 5c6c74485430d83b331e83d2df0b02b82fd5e6a69ee8667bc621b75a0a85bee6971d0fdad1591844c65eaf02d950b7425a53efcd201731c8541c6c1dcd94728d
+  metadata.gz: 41bf71dad53439581f2348dbd923f57d761007fb00ec2a5ca6671749536a860aa3cc8db6e0dffaa78563fe9de79fd5a209edbfbf9df5abeab338bbc58863fd46
+  data.tar.gz: c6e1b1e734b322b035ab625e4b228047f6673d13caef25228885aecac13ae8edcce604c2120c5bc970ee97f538c067cd1aa684a9db4b456c832ec6e96387b947

data/.gitignore

@@ -1,7 +1,6 @@
 *.gem
 *.rbc
 .bundle
-Gemfile
 Gemfile.lock
 tmp
 .rvmrc

data/CHANGELOG.md

@@ -0,0 +1,26 @@
+# Change Log
+
+## [Unreleased](https://github.com/chef/appbundle-updater/tree/HEAD)
+
+[Full Changelog](https://github.com/chef/appbundle-updater/compare/v0.1.0...HEAD)
+
+**Merged pull requests:**
+
+- add --github option for pulling forks [\#4](https://github.com/chef/appbundle-updater/pull/4) ([lamont-granquist](https://github.com/lamont-granquist))
+- Suppress command output for successful commands [\#3](https://github.com/chef/appbundle-updater/pull/3) ([lamont-granquist](https://github.com/lamont-granquist))
+- introduce --tarball option, default back to git clone [\#2](https://github.com/chef/appbundle-updater/pull/2) ([lamont-granquist](https://github.com/lamont-granquist))
+
+## [v0.1.0](https://github.com/chef/appbundle-updater/tree/v0.1.0) (2015-09-25)
+[Full Changelog](https://github.com/chef/appbundle-updater/compare/v0.0.2...v0.1.0)
+
+**Merged pull requests:**
+
+- use pure ruby to download tarball and extract [\#1](https://github.com/chef/appbundle-updater/pull/1) ([lamont-granquist](https://github.com/lamont-granquist))
+
+## [v0.0.2](https://github.com/chef/appbundle-updater/tree/v0.0.2) (2015-09-23)
+[Full Changelog](https://github.com/chef/appbundle-updater/compare/v0.0.1...v0.0.2)
+
+## [v0.0.1](https://github.com/chef/appbundle-updater/tree/v0.0.1) (2015-09-23)
+
+
+\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)*

data/Gemfile

@@ -0,0 +1,7 @@
+source 'https://rubygems.org'
+gemspec
+
+group :development do
+  gem "rake"
+  gem "github_changelog_generator"
+end

data/README.md

@@ -54,6 +54,27 @@ Windows users from PowerShell use the bat file:
 
 If you don't want "master" you can use any other git tag/branch/sha/etc that git understands.
 
+## Using a GitHub Fork
+
+By default this gem clones from the official repos from the software. To override and point
+at at fork use the `--github`` option on the command-line:
+
+```ruby
+sudo appbundle-updater chef chef lcg/cool-feature --github lamont-granquist/chef
+```
+
+## Using a GitHub tarball instead of a git clone
+
+Using the `--tarball` method will not use `git clone` and will not require the git binary being
+installed on the system.  By using this command the whole functionality should run in pure ruby,
+be portable across all operating systems that omnibus-chef is ported to, and should only use
+ruby stdlib functions.  The disadvantage is that you do now wind up with a real git checkout
+in the apps directory, just an extracted snapshot.
+
+```ruby
+sudo appbundle-updater chef chef master --tarball
+```
+
 ## Execution and Target rubies
 
 This does not need to be installed into the embedded ruby that you are doing the update on.

data/Rakefile

@@ -1 +1,7 @@
+require "github_changelog_generator/task"
 require "bundler/gem_tasks"
+
+GitHubChangelogGenerator::RakeTask.new :changelog do |config|
+#  config.since_tag = "1.0.1"
+#  config.exclude_labels = %w[duplicate question invalid wontfix changelog_skip]
+end

data/appbundler.gemspec

@@ -19,5 +19,5 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "rake"
+  # This Gem DELIBERATELY has no dependencies other than the ruby stdlib
 end

data/bin/appbundle-updater

@@ -48,6 +48,8 @@ TAR_LONGLINK = '././@LongLink'
 # pure ruby `tar xzf`, handles longlinks and directories ending in '/'
 # (http://stackoverflow.com/a/31310593/506908)
 def extract_tgz(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|
     dest = nil
     tar.each do |entry|
@@ -127,11 +129,13 @@ CHEFDK_APPS = [
 ].freeze
 
 class Updater
-  attr_reader :app, :ref
+  attr_reader :app, :ref, :tarball, :repo
 
   def initialize(options)
     @app = options[:app]
     @ref = options[:ref]
+    @tarball = options[:tarball]
+    @repo = options[:repo] || @app.repo
   end
 
   def start
@@ -139,22 +143,34 @@ class Updater
       abort "#{$0} needs to be run as root user or with sudo"
     end
 
-    ruby("-rpp -e 'pp ENV'")
     banner("Cleaning #{app} checkout")
     app_dir.rmtree if app_dir.directory?
 
-    git_url = "https://github.com/#{app.repo}/archive/#{ref}.tar.gz"
-    banner("Extracting #{app} from #{git_url}")
-    Dir.chdir(chefdk.join("embedded/apps")) do
-      Tempfile.open('appbundle-updater') do |tempfile|
-        open(git_url) do |uri|
-          tempfile.write(uri.read)
+    if ( tarball )
+      # NOTE: THIS IS DELIBERATELY PURE RUBY USING NO NATIVE GEMS AND ONLY
+      # THE RUBY STDLIB BY DESIGN
+      git_url = "https://github.com/#{repo}/archive/#{ref}.tar.gz"
+      banner("Extracting #{app} from #{git_url}")
+      Dir.chdir(chefdk.join("embedded/apps")) do
+        Tempfile.open('appbundle-updater') do |tempfile|
+          open(git_url) do |uri|
+            tempfile.write(uri.read)
+          end
+          tempfile.close
+          extract_tgz(tempfile.path)
         end
-        tempfile.close
-        extract_tgz(tempfile.path)
+        base = File.basename repo
+        FileUtils.mv "#{base}-#{ref}".gsub(/\//, "-"), "#{app.name}"
+      end
+    else
+      git_url = "https://github.com/#{repo}.git"
+      banner("Cloning #{app} from #{git_url}")
+      run("git clone #{git_url} #{app_dir}")
+
+      banner("Checking out #{app} to #{ref}")
+      Dir.chdir(app_dir) do
+        run("git checkout #{ref}")
       end
-      base = File.basename app.repo
-      FileUtils.mv "#{base}-#{ref}", "#{app.name}"
     end
 
     banner("Installing dependencies")
@@ -200,7 +216,10 @@ class Updater
     ENV_KEYS.each { |key| ENV["_YOLO_#{key}"] = ENV[key]; ENV.delete(key) }
     ENV['PATH'] = "#{bin_dir}:#{ENV['_YOLO_PATH']}"
     puts "    running: #{cmd}"
-    system(cmd) or raise("Command [#{cmd}] failed!")
+    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
 
@@ -217,6 +236,12 @@ class CLI
     @options = Hash.new
     @parser = OptionParser.new { |opts|
       opts.banner = "Usage: #{$0} PROJECT APP_NAME GIT_REF"
+      opts.on("-t", "--[no-]tarball", "Do a tarball download instead of git clone") do |t|
+        options[:tarball] = t
+      end
+      opts.on("-g", "--github REPO", "Github repo (e.g. chef/chef) to pull from") do |g|
+        options[:repo] = g
+      end
       opts.on("-h", "--help", "Prints this help") do
         puts opts
         exit

data/lib/appbundle_updater/version.rb

@@ -1,3 +1,3 @@
 module AppbundleUpdater
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: appbundle-updater
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - lamont-granquist
@@ -9,21 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 date: 2015-09-25 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+dependencies: []
 description: Updates appbundled apps in Chef's omnibus packages
 email:
 - lamont@chef.io
@@ -34,6 +20,8 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".kitchen.yml"
+- CHANGELOG.md
+- Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
@@ -69,3 +57,4 @@ summary: Updates appbundled apps in Chef's omnibus packages
 test_files:
 - test/integration/bootstrap.ps1
 - test/integration/bootstrap.sh
+has_rdoc: