cloudit 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9698e9e003bc1317857063ac382f2e1054ad0fca
-  data.tar.gz: fb1f1b669dac2d26ed3f06a502c3127969c34e37
+  metadata.gz: 58af5bbdd5276b9e5596fad6b504129f8d438612
+  data.tar.gz: a5fa42dd4af059fe179ab29777ae4274d6f97e68
 SHA512:
-  metadata.gz: fafa4668b2e3640249ce14c4f3713f2e2e70f98c87a585f219ffc65449a18b542d63ffe8ceb3d32c542d04a6c7516e924d424a45403c9aabdc5c09e941ffbdb9
-  data.tar.gz: e35911cc498ead53dc55942d98be95e2e62b1690eb9846ce9525753840a0ccf96de1ccd2e23a679dfe72629f1672781175c653aec568af26e14bd28c1833f4ce
+  metadata.gz: 2338ee06ff38001e96bf14c69e6ebaf3cab89440dabf211d8760bdb5d408e57dbbd077a23ce462dc67c2b7ee15ad904174ae27f4d74b21aad27254d2a77f63a3
+  data.tar.gz: 23bfdcbcab880040ac328b2a26a541534a89c81b9d76321fb3d0a2fd7728250f75afd71db7b41b4cc7ba683247de989f4cae8acace27275d072f6563c0d09973

data/lib/cloudit/command/base.rb

@@ -5,19 +5,16 @@ class Cloudit::Command::Base
     attr_accessor :parser, :slop_opts
   end
 
-  attr_accessor :commands
-
   VALID_METHODS = []
   OPTION_NAME_OFFSET = 6
 
-  def initialize(args=[], commands)
+  def initialize(args=[])
     @method = if args[0].is_a?(String) && args[0].include?('-')
       nil
     else
       args.shift.strip rescue nil
     end
     @opts = parser.parse(args)
-    @commands = commands
   end
 
   def execute

data/lib/cloudit/command/generate.rb

@@ -15,30 +15,31 @@ class Cloudit::Command::Generate < Cloudit::Command::Base
     if @opts.help?
       $stdout.puts slop_opts
     else
-      generate_json
+      out = @opts[:output]
+      dir = normalize_directory @opts[:directory]
+
+      if File.exist? out
+        if out.eql? DEFAULT_OUT_FILE
+          i = 1
+          while File.exist? out
+            i += 1
+            out = "out#{i}.json"
+          end
+        else
+          $stdout.puts "cloudit: output file '#{out}' already exists"
+          return
+        end
+      end
+
+      json = generate_json(dir)
+      $stdout.puts json
+      File.new(out, 'w').write "#{json}\n"
     end
   end
 
-  private
-
-  def generate_json
+  def generate_json(dir='.')
     hash = {}
     hash_sections = {}
-    out = @opts[:output]
-    dir = normalize_directory @opts[:directory]
-
-    if File.exist? out
-      if out.eql? DEFAULT_OUT_FILE
-        i = 1
-        while File.exist? out
-          i += 1
-          out = "out#{i}.json"
-        end
-      else
-        $stdout.puts "cloudit: output file '#{out}' already exists"
-        return
-      end
-    end
 
     unless File.directory? dir
       $stdout.puts "cloudit: '#{dir}' must be a directory"
@@ -48,7 +49,7 @@ class Cloudit::Command::Generate < Cloudit::Command::Base
     for file in Dir.glob(Dir["#{dir}**/*.#{DEFAULT_MAIN_CFN_EXTENSION}"]) do
       yml = YAML::load_file(file)
       if yml.is_a?(Hash)
-        hash.merge! YAML::load_file(file)
+        hash.merge! yml
       end
     end
 
@@ -67,10 +68,11 @@ class Cloudit::Command::Generate < Cloudit::Command::Base
 
     hash.merge! hash_sections
 
-    $stdout.puts hash.to_json
-    File.new(out, 'w').write "#{hash.to_json}\n"
+    hash.to_json
   end
 
+  private
+
   def normalize_directory(dir)
     if dir.end_with? '/'
       dir

data/lib/cloudit/version.rb

@@ -1,3 +1,3 @@
 module Cloudit
-  VERSION = "0.0.4"
+  VERSION = "0.0.5"
 end

metadata

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