cloudit 0.0.7 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ec3176b8b67a1ca01cdbbd9560e98a858967551
-  data.tar.gz: a885cf68772af70428abb0dc6b0a5869cee98662
+  metadata.gz: 3353a5a81bfb22965463099ab58d6b79b01dea27
+  data.tar.gz: 070d25814d452e3afe6bf06b9605ee6f3ef1c01e
 SHA512:
-  metadata.gz: dc824d4b6ee60060baf04435ba136d83cae4448586ea00853e110307de3572799da1460c6dda873ea5c540e042e03b7ee80cd0d1b1e707c27b304a5aa3b300fb
-  data.tar.gz: 12f3ae87ea5820ba36302b6088c1e4a0d9e2fd2fb75e861e63a171e015536bc46188d7c8afe767c8f337418043a86e5b51dbfef7d6bb814af0f69db160d6d71b
+  metadata.gz: 67336ed2b5f9cfb825faa7cba1dc255a3345a21ec988471e20dee86c98dbef1b7ad23d2be0943e6a4e244dd4ea007fcd06333804f595eb7ecfd751b24cf00313
+  data.tar.gz: 007af9ea5ee9583780541f9668eb46351195f2af62a667b14bae7c6f11f75fcc818dba88069fdf9b6ec0113a5dc0c175a54abe4ac1bd0388248d6d5c9445ce04

data/lib/cloudit/command/base.rb

@@ -8,6 +8,7 @@ class Cloudit::Command::Base
 
   VALID_METHODS = []
   OPTION_NAME_OFFSET = 6
+  DEFAULT_DIRECTORY = './'
 
   def initialize(args=[])
     @method = if args[0].is_a?(String) && args[0].include?('-')

data/lib/cloudit/command/generate.rb

@@ -9,7 +9,6 @@ class Cloudit::Command::Generate < Cloudit::Command::Base
   DESCRIPTION = 'Build YAML files into Cloudformation template'
   DEFAULT_OUT_FILE = 'out.json'
   DEFAULT_MAIN_CFN_EXTENSION = 'cfn.yml'
-  DEFAULT_DIRECTORY = './'
 
   def index
     if @opts.help?
@@ -17,6 +16,7 @@ class Cloudit::Command::Generate < Cloudit::Command::Base
     else
       out = @opts[:output]
       dir = normalize_directory @opts[:directory]
+      min = @opts[:minify]
 
       if File.exist? out
         if out.eql? DEFAULT_OUT_FILE
@@ -31,13 +31,14 @@ class Cloudit::Command::Generate < Cloudit::Command::Base
         end
       end
 
-      json = generate_json(dir)
-      $stdout.puts json
+      json = generate_json dir, min
       File.new(out, 'w').write "#{json}\n"
+
+      $stdout.puts "Template generated to #{out}"
     end
   end
 
-  def generate_json(dir='.')
+  def generate_json(dir='./', min=false)
     hash = {}
     hash_sections = {}
 
@@ -68,7 +69,11 @@ class Cloudit::Command::Generate < Cloudit::Command::Base
 
     hash.merge! hash_sections
 
-    hash.to_json
+    if min
+      hash.to_json
+    else
+      JSON.pretty_generate hash
+    end
   end
 
   private
@@ -89,6 +94,7 @@ class Cloudit::Command::Generate < Cloudit::Command::Base
     opts.string '-o', '--output', 'output filename', default: DEFAULT_OUT_FILE
     opts.bool '-h', '--help', 'print options', default: false
     opts.string '-d', '--directory', 'root directory to generate', default: DEFAULT_DIRECTORY
+    opts.bool '-m', '--minify', 'minify JSON output', default: false
 
     self.slop_opts = opts
     self.parser = Slop::Parser.new(opts)

data/lib/cloudit/command/validate.rb

@@ -5,6 +5,7 @@ require 'aws-sdk'
 class Cloudit::Command::Validate < Cloudit::Command::Base
   VALID_METHODS = ['help']
   DESCRIPTION = "Validate CloudFormation template"
+  DEFAULT_REGION = 'us-east-1'
 
   def index
     if @opts.help?
@@ -16,16 +17,16 @@ class Cloudit::Command::Validate < Cloudit::Command::Base
 
   private
 
-  def validate_template(region='us-east-1')
+  def validate_template(region=DEFAULT_REGION)
     cf = Aws::CloudFormation::Client.new(
       region: region,
       access_key_id: Cloudit::Config.access_key_id,
       secret_access_key: Cloudit::Config.secret_access_key
     )
 
-    json = Cloudit::Command::Generate.new.generate_json
+    json = Cloudit::Command::Generate.new.generate_json @opts[:directory]
     resp = cf.validate_template(template_body: json)
-    $stdout.puts resp
+    $stdout.puts "Template is valid"
   rescue Aws::CloudFormation::Errors::ValidationError => e
     $stdout.puts e.message
   end
@@ -35,7 +36,8 @@ class Cloudit::Command::Validate < Cloudit::Command::Base
     opts.banner = 'Usage: cloudit validate'
     opts.separator ''
     opts.separator 'Validate options:'
-    opts.string '-r', '--region', 'region used for validation'
+    opts.string '-r', '--region', 'region used for validation', default: Cloudit::Config.region || DEFAULT_REGION
+    opts.string '-d', '--directory', 'root directory to generate', default: DEFAULT_DIRECTORY
     opts.bool '-h', '--help', 'print usage', default: false
 
     self.slop_opts = opts

data/lib/cloudit/version.rb

@@ -1,3 +1,3 @@
 module Cloudit
-  VERSION = "0.0.7"
+  VERSION = "0.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudit
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.1.0
 platform: ruby
 authors:
 - Zachary Chai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-16 00:00:00.000000000 Z
+date: 2016-06-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop