builderator 1.3.2 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4695e9899231ab9dd8523045fbcaeb378fc85c7f
-  data.tar.gz: dffbda2a0efc219410b4517d62aab396f06b7d0c
+  metadata.gz: 41c837996139c2caf0e0d243fc3fca3aaee1104f
+  data.tar.gz: '0097d382431ab9d0c461b95cbfee4648b7c8fe98'
 SHA512:
-  metadata.gz: a379d1f004e2542f9271d524015019ddb040f95b979253265b87d77baf3c69c579d84286458a7590084c66e1145fd73b1f84f52e670e49f126296c61ee6c5125
-  data.tar.gz: 523709de7d8b87929cab70358b2bbc133c4f20dce9d8494e8f35df32ed59564d353c46f0940fc2b5a7919298abd149eee0d9af6bb9766252c39f1a238559a636
+  metadata.gz: '083437ac7c570f71e9af19a2d63bed22c39e8d9486c06ca95e3c3924e4772058eded19d5f1585c1bb8e8c7abbc711e161216aa96cca94989aa23ff56830d8c34'
+  data.tar.gz: 8fea96556083b8b4ff137210124031292702c75db1980bfc2c30598b71efc242f66de7547d7b60f9e8eb5fd05d589b9f4a3aab1eb3c81f5ae7c4596a9c1a4745

data/lib/builderator/tasks.rb

@@ -18,21 +18,30 @@ module Builderator
     ##
     class CLI < Thor
       include Thor::Actions
+      VERSION = ['--version', '-v'].freeze
+
+      map VERSION => :print_version
 
       def initialize(*_)
         super
 
+        # Ignore existing config when we don't need it: i.e. `help`
+        ignore_existing_config = ['help'] + VERSION
+        return if ignore_existing_config.any? do |i|
+          ARGV.include?(i) || ARGV.empty?
+        end
+
         Config.argv(options) ## Load command flags
         Config.load(File.join(ENV['HOME'], '.builderator/Buildfile'))
         Config.load(Util.relative_path('Buildfile').to_s)
-
-        # Ignore existing config when we don't need it: i.e. `help`
-        ignore_existing_config = ['help']
-        return if ignore_existing_config.any? { |i| ARGV.include?(i) }
-
         Config.compile
       end
 
+      desc '--version, -v', 'Print Builderator version'
+      def print_version
+        say Gem.loaded_specs['builderator'].version
+      end
+
       def self.exit_on_failure?
         true
       end

data/template/Berksfile.erb

@@ -1,5 +1,3 @@
-require 'builderator/patch/berkshelf'
-
 <% cookbook.sources.each do |s| -%>
 source '<%= s %>'
 <% end -%>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: builderator
 version: !ruby/object:Gem::Version
-  version: 1.3.2
+  version: 2.0.0
 platform: ruby
 authors:
 - John Manero
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-19 00:00:00.000000000 Z
+date: 2017-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '6.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '4.3'
+        version: '6.2'
 - !ruby/object:Gem::Dependency
   name: childprocess
   requirement: !ruby/object:Gem::Requirement
@@ -239,7 +239,6 @@ files:
 - lib/builderator/model/cleaner/scaling_groups.rb
 - lib/builderator/model/cleaner/snapshots.rb
 - lib/builderator/model/cleaner/volumes.rb
-- lib/builderator/patch/berkshelf.rb
 - lib/builderator/patch/thor-actions.rb
 - lib/builderator/tasks.rb
 - lib/builderator/tasks/berkshelf.rb

data/lib/builderator/patch/berkshelf.rb

@@ -1,18 +0,0 @@
-# Monkey patch to handle the case where Content-Type headers returned by servers
-# say "gzip" by the resulting message body isn't in gzip format.
-# TODO Remove this when we upgrade Berkshelf and the gzip response goes away.
-# https://github.com/berkshelf/berkshelf-api-client/blob/v1.3.0/lib/berkshelf/api_client/connection.rb#L37
-require 'faraday_middleware'
-
-module FaradayMiddleware
-  class Gzip
-    alias_method :__uncompress_gzip__, :uncompress_gzip
-    def uncompress_gzip(body)
-      __uncompress_gzip__(body)
-    rescue Zlib::GzipFile::Error
-      StringIO.new(body).read
-    end
-  end
-end
-
-Faraday::Response.register_middleware :gzip => FaradayMiddleware::Gzip