opzworks 0.6.4 → 0.7.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1111296f3cd018dd32d24abc4c0c98c8946460df
-  data.tar.gz: 44c0079506ae6ef1a6715632e57db8e51d9215c6
+  metadata.gz: 6bdef3feb5b4be06d5c793abfd6dc87c50b3a3db
+  data.tar.gz: 8380aa94b7ef8f1f754c6f50f6d07444afef10f4
 SHA512:
-  metadata.gz: 4131004755aa53588f044d1333ac3b919a9789ea511739ba60a4c0768408db22ba88ff580084a88ccbe2b002e53502fe6b45a5606c35efbc192973bea780f943
-  data.tar.gz: e37092652e873004a49dae217bdb1cbf652bab1b5689302abb5c0fdf145a6cfab6b701752356b06da430a74afb67eb9f3e248a5d88312c67f7b677620c5186e6
+  metadata.gz: fd04bb03e9460c266a2107a167d0827e4eced5375393ef7cfb72c420779434089f1f1af4f39349535d9300716ccd6b4a2db900929fcd50c404205cbe0173b57d
+  data.tar.gz: 5f0bcea7dda3cc0240c3a523c3ab39a1bc139cd97071e40d6b1b834532999f39afd5de967060c06260a2807304a77be8d96e3f00bafe746a114fd803e9f6f999

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 changelog
 =========
 
+0.7.0
+-----
+* use `berks package` rather than vendor and archive
+* dump overrides support
+
 0.6.3
 -----
 * support for missing Berksfile.lock, such as when starting a new project

data/lib/opzworks/commands/berks.rb

@@ -64,16 +64,16 @@ module OpzWorks
 
           berks_cook_path  = config.berks_base_path || '/tmp'
           cook_path        = "#{berks_cook_path}/#{@project}-#{@branch}"
-          install_path     = cook_path + '/' + "cookbooks-#{@project}-#{@branch}"
           cookbook_tarball = config.berks_tarball_name || 'cookbooks.tgz'
           cookbook_upload  = cook_path + '/' "#{cookbook_tarball}"
           s3_bucket        = config.berks_s3_bucket || 'opzworks'
-          overrides        = 'overrides'
+
+          FileUtils.mkdir_p(cook_path) unless File.exist?(cook_path)
 
           # berks
           #
           unless File.exist?("#{@target_path}/Berksfile.lock")
-            puts "\nNo Berksfile.lock, running berks install before vendoring".foreground(:blue)
+            puts "\nNo Berksfile.lock, running berks install before packaging".foreground(:blue)
             run_local <<-BASH
               cd #{@target_path}
               berks install
@@ -87,40 +87,18 @@ module OpzWorks
             berks update
           BASH
 
-          puts "\nVendoring the berkshelf".foreground(:blue)
+          puts "\nPackaging the berkshelf".foreground(:blue)
           run_local <<-BASH
             cd #{@target_path}
-            berks vendor #{install_path}
+            berks package #{cook_path}/#{cookbook_tarball}
           BASH
 
-          # if there's an overrides file, just pull it and stuff the contents into the
-          #   upload repo; the line is assumed to be a git repo. This is done to override
-          #   opsworks templates without destroying the upstream cookbook.
-          #
-          #   For example, to override the default nginx cookbook's nginx.conf, create a git
-          #     repo with the directory structure nginx/templates/default and place your
-          #     custom nginx.conf.erb in it.
-          #
-          if File.file?("#{@target_path}/#{overrides}")
-            FileUtils.mkdir_p(install_path) unless File.directory?(install_path)
-            File.open("#{@target_path}/#{overrides}") do |f|
-              f.each_line do |line|
-                puts "Copying override #{line}".foreground(:blue)
-                `cd #{install_path} && git clone #{line}`
-              end
-            end
-          end
-
-          puts 'Committing changes and pushing'.foreground(:blue)
+          puts "\nCommitting changes and pushing".foreground(:blue)
           system "cd #{@target_path} && git commit -am 'berks update'; git push origin #{@branch}"
 
-          puts 'Creating tarball of cookbooks'.foreground(:blue)
-          FileUtils.mkdir_p(cook_path)
-          run_local "tar czf #{cookbook_upload} -C #{install_path} ."
-
           # upload
           #
-          puts 'Uploading to S3'.foreground(:blue)
+          puts "\nUploading to S3".foreground(:blue)
 
           begin
             obj = s3.bucket(s3_bucket).object("#{@s3_path}/#{cookbook_tarball}")
@@ -129,7 +107,7 @@ module OpzWorks
             puts "Caught exception while uploading to S3 bucket #{s3_bucket}: #{e}".foreground(:red)
             puts 'Cleaning up before exiting'.foreground(:blue)
             FileUtils.rm(cookbook_upload)
-            FileUtils.rm_rf(install_path)
+            FileUtils.rm_rf(cook_path)
             abort
           else
             puts "Completed successful upload of #{@s3_path}/#{cookbook_tarball} to #{s3_bucket}!".foreground(:green)
@@ -139,7 +117,7 @@ module OpzWorks
           #
           puts 'Cleaning up'.foreground(:blue)
           FileUtils.rm(cookbook_upload)
-          FileUtils.rm_rf(install_path)
+          FileUtils.rm_rf(cook_path)
           puts 'Done!'.foreground(:green)
 
           # update remote cookbooks

data/lib/opzworks/meta.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module OpzWorks
-  VERSION     = '0.6.4'.freeze
+  VERSION     = '0.7.0'.freeze
   AUTHORS     = ['Grant Heffernan', 'Mapzen'].freeze
   EMAIL       = ['grant@mapzen.com'].freeze
   DESCRIPTION = 'OpzWorks Utilities'.freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opzworks
 version: !ruby/object:Gem::Version
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors:
 - Grant Heffernan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-30 00:00:00.000000000 Z
+date: 2016-02-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk