cloudit 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 780b583f7f5295837b2a0e331c77cad8e6cd5a02
-  data.tar.gz: 96559c2b7b70bcb276a180ab5cd5f54b4674802d
+  metadata.gz: c668f56969001a73c0ca0df7d5c5d9336b8d3bb2
+  data.tar.gz: b882f0ad4625a9eff7de0b394ad688bf15ca252b
 SHA512:
-  metadata.gz: a32a506e54fce26769c79634ca4ed16130fc0e5f54f37e281a440d2c084ebbd157bef4818323783bb5a6dadeb5f8f736a132376b300af4307fb7f17f3e2dccef
-  data.tar.gz: 43e17214d3994c56b1581271f92e1ec97422d24e8424097f8929514aebdcf7b995a907796d2fe33a52e58c4dcf91fd2c472520afb89a7e7e2f9ff6b911863c73
+  metadata.gz: 316d6063727d2cdc87612764a3a6a995f58d7b14592fe9be4a942b4acd78eb9c61cc0321ecdaed3d7881924a4c696a539182fc7996bb3970321031cd46ab1039
+  data.tar.gz: 827c215133829429b81ab3cd49f53e9ef005c3d4f6b627830a8c196dd09b07dd6e7d56b5cf3bf90a0ed47287dfd094038ab17a971e488ad0e82a8d32f3a2fbd8

data/cloudit.gemspec

@@ -18,6 +18,8 @@ Gem::Specification.new do |spec|
   spec.executables   = "cloudit"
   spec.require_paths = ["lib"]
 
+  spec.required_ruby_version =  '>= 2.0'
+
   spec.add_dependency "slop"
 
   spec.add_development_dependency "bundler", "~> 1.12"

data/lib/cloudit/command/base.rb

@@ -7,6 +7,7 @@ class Cloudit::Command::Base
   end
 
   VALID_METHODS = []
+  OPTION_NAME_OFFSET = 6
 
   def initialize(args=[])
     @method = if args[0].is_a?(String) && args[0].include?('-')
@@ -29,6 +30,10 @@ class Cloudit::Command::Base
     end
   end
 
+  def invalid_method
+    $stdout.puts "cloudit: '#{@method}' is not a cloudit command\nSee 'cloudit --help'"
+  end
+
   def help
     $stdout.puts slop_opts
   end

data/lib/cloudit/command/generate.rb

@@ -6,6 +6,9 @@ require 'json'
 class Cloudit::Command::Generate < Cloudit::Command::Base
   VALID_METHODS = ['help']
   SECTIONS = ['Metadata', 'Parameters', 'Mappings', 'Conditions', 'Resources', 'Outputs']
+  DEFAULT_OUT_FILE = 'out.json'
+  DEFAULT_MAIN_CFN_EXTENSION = 'cfn.yml'
+  DEFAULT_DIRECTORY = './'
 
   def index
     if @opts.help?
@@ -15,18 +18,33 @@ class Cloudit::Command::Generate < Cloudit::Command::Base
     end
   end
 
-  def invalid_method
-    # TODO write method
-    help
-  end
-
   private
 
   def generate_json
     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
 
-    for file in Dir.glob(Dir['**/*.cfn.yml']) do
+    unless File.directory? dir
+      $stdout.puts "cloudit: '#{dir}' must be a directory"
+      return
+    end
+
+    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)
@@ -37,7 +55,7 @@ class Cloudit::Command::Generate < Cloudit::Command::Base
       section_file = section.downcase
       hash_sections[section] = {}
 
-      for file in Dir.glob(Dir["**/*.#{section_file}.yml"]) do
+      for file in Dir.glob(Dir["#{dir}**/*.#{section_file}.yml"]) do
         yml = YAML::load_file(file)
 
         if yml.is_a?(Hash)
@@ -49,6 +67,15 @@ 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"
+  end
+
+  def normalize_directory(dir)
+    if dir.end_with? '/'
+      dir
+    else
+      dir + '/'
+    end
   end
 
   def self.setup_options
@@ -56,8 +83,9 @@ class Cloudit::Command::Generate < Cloudit::Command::Base
     opts.banner = 'Usage: cloudit generate [options]'
     opts.separator ''
     opts.separator 'Generate options:'
-    opts.string '-o', '--output', 'a filename', default: 'out.json'
+    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
 
     self.slop_opts = opts
     self.parser = Slop::Parser.new(opts)

data/lib/cloudit/version.rb

@@ -1,3 +1,3 @@
 module Cloudit
-  VERSION = "0.0.2"
+  VERSION = "0.0.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudit
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Zachary Chai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-30 00:00:00.000000000 Z
+date: 2016-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slop
@@ -104,7 +104,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="