opzworks 0.12.5 → 0.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 003d9821f85b0ffdb6c5966e4460b0c3306da1eb
-  data.tar.gz: b34db8b47959c76f0ae2f75c96baefd9a3c02f32
+  metadata.gz: 8f978b2b5bbdeaf105c5ced5f34baa49b5b06964
+  data.tar.gz: 74b811d8bf781ad43111ed3f19da65fd769a432e
 SHA512:
-  metadata.gz: 469280ca906bb174e609e97f3cf0f230740ea697124ae1cd7337df4ccfb5730886acfd467daf43ea56301e5fa8b13aeaaf0844a56558c6703fdd7f89fddecd0b
-  data.tar.gz: d4c3b36fa39e18665d789e9c49c46597b947edf82174f33ac3a1524b8d8d3f37ab698032131b08b670702a17ca40ea53ee153115b849acae54f59fb4adf4364b
+  metadata.gz: a351a593d1db06e7941b38a94d79cc0f260761bf41943eba864b985f4b1554123134377e6e80cdf2e064538d637fb62343f2332aa7d8ca970d7644ae55e4f830
+  data.tar.gz: 676c50919362cbff6043e38e343bbe588626de4d9f37ba93ec5091c16a2c84cd9001d275d1f8fa543185387dc81d27419cd1b9a2845a217037955b1beb38e127

data/CHANGELOG.md

@@ -1,6 +1,10 @@
 changelog
 =========
 
+0.12.6
+------
+* validate stack json before commit
+
 0.12.4
 ------
 * large lint for rubocop 2.3 syntax

data/README.md

@@ -3,14 +3,15 @@
 Command line interface for managing AWS OpsWorks chef cookbooks and stack json, as well
 as other OpsWorks centric tasks such as generating ssh configs for OpsWorks instances.
 
-## Wiki
-
-#### See the [wiki](https://github.com/mapzen/opzworks/wiki) for more detailed information on getting started, walkthroughs, etc.
-
 ## Build Status
 
 [![Circle CI](https://circleci.com/gh/mapzen/opzworks.svg?style=svg)](https://circleci.com/gh/mapzen/opzworks)
 
+
+## Wiki
+
+**See the [wiki](https://github.com/mapzen/opzworks/wiki) for more detailed information on getting started, walkthroughs, etc.**
+
 ## Third party requirements:
 
 Ruby 2.3+, and...
@@ -18,7 +19,7 @@ Ruby 2.3+, and...
 * git
 * [ChefDK](https://downloads.chef.io/chef-dk/)
 
-#### Again, please see the [wiki](https://github.com/mapzen/opzworks/wiki) for details!
+**Again, please see the [wiki](https://github.com/mapzen/opzworks/wiki) for details!**
 
 ## Installation
 
@@ -45,14 +46,43 @@ systems via private IP and assumes port 9200 is open and available.
 
 This is a very rough implementation!
 
+Usage: `opzworks elastic [stack1] [stack2] ... [options]`
+
+Options:
+* `-s, --start`               Start Elastic
+* `-t, --stop`                Stop Elastic
+* `-b, --bounce`              Bounce (stop/start) Elastic
+* `-r, --rolling`             Perform a rolling restart of Elastic
+* `-o, --old-service-name`    Use 'elasticsearch' as the service name, otherwise use the layer shortname
+* `-h, --help`                Show this message
+
 #### json
 
 Update stack custom JSON.
 
+Usage: `opzworks json [stack1] [stack2] ... [options]`
+
+Options:
+* `-q, --quiet`          Update the stack json without confirmation
+* `-o, --context=<i>`    Change the number lines of diff context to show (default: 5)
+* `-c, --clone`          Just clone the management repo then exit
+* `-h, --help`           Show this message
+
+
 #### berks
 
 Build the berkshelf for a stack, or only upload the Berksfile to allow remote berkshelf management on the host, upload the tarball to S3, trigger `update_custom_cookbooks` on the stack.
 
+Usage: `opzworks berks [stack1] [stack2] ... [options]`
+
+Options:
+* `--ucc, --no-ucc`         Trigger update_custom_cookbooks on stack after uploading a new cookbook
+                          tarball. (Default: true)
+* `-u, --update`            Run berks update before packaging the Berkshelf.
+* `-c, --cookbooks=<s+>`    Run berks update only for the specified cookbooks (requires -u)
+* `-l, --clone`             Only clone the management repo, then exit.
+* `-h, --help`              Show this message
+
 ## Contributing
 
 1. Fork it

data/lib/opzworks/cli.rb

@@ -16,7 +16,7 @@ module OpzWorks
           Commands
             ssh  #{OpzWorks::Commands::SSH.banner}
             cmd  #{OpzWorks::Commands::CMD.banner}
-            json #{OpzWorks::Commands::JSON.banner}
+            json #{OpzWorks::Commands::STACKJSON.banner}
             berks #{OpzWorks::Commands::BERKS.banner}
             elastic #{OpzWorks::Commands::ELASTIC.banner}
 
@@ -33,7 +33,7 @@ module OpzWorks
       when 'ssh'
         OpzWorks::Commands::SSH.run
       when 'json'
-        OpzWorks::Commands::JSON.run
+        OpzWorks::Commands::STACKJSON.run
       when 'berks'
         OpzWorks::Commands::BERKS.run
       when 'elastic'

data/lib/opzworks/commands/json.rb

@@ -12,7 +12,7 @@ require_relative 'include/manage_berks_repos'
 
 module OpzWorks
   class Commands
-    class JSON
+    class STACKJSON
       def self.banner
         'Update stack json'
       end
@@ -20,7 +20,7 @@ module OpzWorks
       def self.run
         options = Trollop.options do
           banner <<-EOS.unindent
-            #{JSON.banner}
+            #{STACKJSON.banner}
 
               opzworks json stack1 stack2 ...
 
@@ -62,6 +62,16 @@ module OpzWorks
           next if options[:clone] == true
 
           json = File.read("#{@target_path}/stack.json")
+          print "\nValidating json before continuing... ".foreground(:blue)
+          begin
+            JSON.load(json)
+            print 'PASSED!'.foreground(:green)
+          rescue JSON::ParserError => e
+            print 'FAILED!'.foreground(:red)
+            puts "\n" + e.to_s.lines.first
+            abort
+          end
+
           diff = Diffy::Diff.new(@stack_json + "\n", json, context: options[:context])
           diff_str = diff.to_s(:color).chomp
 

data/lib/opzworks/meta.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: opzworks
 version: !ruby/object:Gem::Version
-  version: 0.12.5
+  version: 0.12.6
 platform: ruby
 authors:
 - Grant Heffernan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-23 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk