opzworks 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ceb825f2ff952211a19939007467e3e08b253159
-  data.tar.gz: fdb27f9eec43d7c0c58e54213088c3346368dc69
+  metadata.gz: ab1543fcedf335dd55bf202dcce00c00876ece4d
+  data.tar.gz: 823d039d9ce4c93e9040ce1aadaae9289ccd8e67
 SHA512:
-  metadata.gz: ffea248fe7461455233b525a8b000324714ba69fd69999cc98bec9d451a81c20a0fc4bee98759b07d62ba601c0da2f2ccb004cff97591f76eea5690dcd86cc91
-  data.tar.gz: 88ff9887fd1584d3028c1f4a262120e6e31ab152f930bb4418bd0ce3486c682b219d52e92e9b2f31c3cafe467f64e4e7c57fa2acc82cb0a16f5ad0dd18a26867
+  metadata.gz: f07a659564cf9763deb42b7db455613af2c2419b6a2853ce383fdaa2cd1f0ea720f2fecf54d3d16f154f11ef8e22ab7b4e725632568b01dec582194cffa2ad3a
+  data.tar.gz: 6418a9b09e65017e708dd71271b4d33210556737f66bdb7f1e8ed9f864a333fd96301ded9b043732855c1952cfab02cef5a6e0622807bfcc17785192e408db2c

data/CHANGELOG.md

@@ -1,16 +1,21 @@
 changelog
 =========
 
+0.10.0
+------
+* allow override of default [opzworks] config block via ENV var: `OPZWORKS_PROFILE`
+* better error handling if passed a missing `AWS_PROFILE`
+
 0.9.0
 -----
 * allow updating only specific cookbooks in the berkshelf: when passing the `-u` update flag, you can now also specify a space delimited list of cookbooks following a `-c` switch (`-u` alone will continue to run `berks update` for the entire berksfile):
 
-e.g. `opzworks berks -u -c mapzen_transitland sensu`
+e.g. `opzworks berks transitland::d -u -c mapzen_transitland sensu`
 
 0.8.0
 -----
 * change in behavior: `berks update` is now no longer the default, and will be skipped unless the --update flag is passed explicitly. This is to prevent unwanted updating of unpinned cookbooks. However, you must now be sure to pass --update when the situation requires it.
-* to all the short option of -u for `berks update`, the `update_custom_cookbooks` flag is now -ucc
+* to allow the short option of -u for `berks update`, the `update_custom_cookbooks` flag is now -ucc
 
 0.7.3
 -----

data/lib/opzworks/commands/berks.rb

@@ -28,7 +28,7 @@ module OpzWorks
           EOS
           opt :ucc, 'Trigger update_custom_cookbooks on stack after uploading a new cookbook tarball.', default: true
           opt :update, 'Run berks update before packaging the Berkshelf.', default: false, short: 'u'
-          opt :cookbooks, 'Run berks update only for the specified cookbooks', type: :strings, default: nil, short: 'c'
+          opt :cookbooks, 'Run berks update only for the specified cookbooks (requires -u)', type: :strings, default: nil, short: 'c'
           opt :clone, 'Only clone the management repo, then exit.', default: false
         end
         ARGV.empty? ? Trollop.die('no stacks specified') : false
@@ -84,17 +84,17 @@ module OpzWorks
           end
 
           if options[:update] == true
-            unless options[:cookbooks].nil?
-              puts "\nUpdating the berkshelf for cookbook(s) ".foreground(:blue) + "#{options[:cookbooks].join(', ')}".foreground(:green)
+            if options[:cookbooks].nil?
+              puts "\nUpdating the berkshelf".foreground(:blue)
               run_local <<-BASH
                 cd #{@target_path}
-                berks update #{options[:cookbooks].join(' ')}
+                berks update
               BASH
             else
-              puts "\nUpdating the berkshelf".foreground(:blue)
+              puts "\nUpdating the berkshelf for cookbook(s): ".foreground(:blue) + options[:cookbooks].join(', ').to_s.foreground(:green)
               run_local <<-BASH
                 cd #{@target_path}
-                berks update
+                berks update #{options[:cookbooks].join(' ')}
               BASH
             end
           else

data/lib/opzworks/config.rb

@@ -17,24 +17,26 @@ module OpzWorks
       abort "Config file #{file} not found, exiting!".foreground(:red) unless File.exist? file
       ini = IniFile.load(file)
 
-      abort "Could not find [opzworks] config block in #{file}, exiting!".foreground(:red) if ini['opzworks'].empty?
+      @opzworks_profile = ENV['OPZWORKS_PROFILE'] || 'opzworks'
+      abort "Could not find [#{@opzworks_profile}] config block in #{file}, exiting!".foreground(:red) if ini[@opzworks_profile].empty?
 
       # set the region and the profile we want to pick up from ~/.aws/credentials
       @aws_profile = ENV['AWS_PROFILE'] || 'default'
+      abort "Could not find [#{@aws_profile}] config block in #{file}, exiting!".foreground(:red) if ini[@aws_profile].empty?
       @aws_region  = ENV['AWS_REGION'] || ini[@aws_profile]['region']
 
       @ssh_user_name =
-        ini['opzworks']['ssh-user-name'].strip unless ini['opzworks']['ssh-user-name'].nil?
+        ini[@opzworks_profile]['ssh-user-name'].strip unless ini[@opzworks_profile]['ssh-user-name'].nil?
       @berks_repository_path =
-        ini['opzworks']['berks-repository-path'].strip unless ini['opzworks']['berks-repository-path'].nil?
+        ini[@opzworks_profile]['berks-repository-path'].strip unless ini[@opzworks_profile]['berks-repository-path'].nil?
       @berks_base_path =
-        ini['opzworks']['berks-base-path'].strip unless ini['opzworks']['berks-base-path'].nil?
+        ini[@opzworks_profile]['berks-base-path'].strip unless ini[@opzworks_profile]['berks-base-path'].nil?
       @berks_s3_bucket =
-        ini['opzworks']['berks-s3-bucket'].strip unless ini['opzworks']['berks-s3-bucket'].nil?
+        ini[@opzworks_profile]['berks-s3-bucket'].strip unless ini[@opzworks_profile]['berks-s3-bucket'].nil?
       @berks_tarball_name =
-        ini['opzworks']['berks-tarball-name'].strip unless ini['opzworks']['berks-tarball-name'].nil?
+        ini[@opzworks_profile]['berks-tarball-name'].strip unless ini[@opzworks_profile]['berks-tarball-name'].nil?
       @berks_github_org =
-        ini['opzworks']['berks-github-org'].strip unless ini['opzworks']['berks-github-org'].nil?
+        ini[@opzworks_profile]['berks-github-org'].strip unless ini[@opzworks_profile]['berks-github-org'].nil?
     end
   end
 end

data/lib/opzworks/meta.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 module OpzWorks
-  VERSION     = '0.9.0'.freeze
+  VERSION     = '0.10.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.9.0
+  version: 0.10.0
 platform: ruby
 authors:
 - Grant Heffernan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-22 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk