cloudit 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c668f56969001a73c0ca0df7d5c5d9336b8d3bb2
-  data.tar.gz: b882f0ad4625a9eff7de0b394ad688bf15ca252b
+  metadata.gz: 9698e9e003bc1317857063ac382f2e1054ad0fca
+  data.tar.gz: fb1f1b669dac2d26ed3f06a502c3127969c34e37
 SHA512:
-  metadata.gz: 316d6063727d2cdc87612764a3a6a995f58d7b14592fe9be4a942b4acd78eb9c61cc0321ecdaed3d7881924a4c696a539182fc7996bb3970321031cd46ab1039
-  data.tar.gz: 827c215133829429b81ab3cd49f53e9ef005c3d4f6b627830a8c196dd09b07dd6e7d56b5cf3bf90a0ed47287dfd094038ab17a971e488ad0e82a8d32f3a2fbd8
+  metadata.gz: fafa4668b2e3640249ce14c4f3713f2e2e70f98c87a585f219ffc65449a18b542d63ffe8ceb3d32c542d04a6c7516e924d424a45403c9aabdc5c09e941ffbdb9
+  data.tar.gz: e35911cc498ead53dc55942d98be95e2e62b1690eb9846ce9525753840a0ccf96de1ccd2e23a679dfe72629f1672781175c653aec568af26e14bd28c1833f4ce

data/lib/cloudit/command/base.rb

@@ -1,21 +1,23 @@
 require 'slop'
-require 'byebug'
 
 class Cloudit::Command::Base
   class << self
     attr_accessor :parser, :slop_opts
   end
 
+  attr_accessor :commands
+
   VALID_METHODS = []
   OPTION_NAME_OFFSET = 6
 
-  def initialize(args=[])
+  def initialize(args=[], commands)
     @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

@@ -6,6 +6,7 @@ require 'json'
 class Cloudit::Command::Generate < Cloudit::Command::Base
   VALID_METHODS = ['help']
   SECTIONS = ['Metadata', 'Parameters', 'Mappings', 'Conditions', 'Resources', 'Outputs']
+  DESCRIPTION = 'Build YAML files into Cloudformation template'
   DEFAULT_OUT_FILE = 'out.json'
   DEFAULT_MAIN_CFN_EXTENSION = 'cfn.yml'
   DEFAULT_DIRECTORY = './'

data/lib/cloudit/command/index.rb

@@ -1,16 +1,7 @@
 require 'cloudit/version'
 require 'cloudit/command/base'
 
-require 'byebug'
-
 class Cloudit::Command::Index < Cloudit::Command::Base
-  class << self
-    attr_accessor :usage
-  end
-
-  def usage
-    self.class.usage
-  end
 
   def index
     if @opts.version?
@@ -25,12 +16,14 @@ class Cloudit::Command::Index < Cloudit::Command::Base
 
   private
 
-  def self.build_usage
+  def usage
     str = slop_opts.to_s
-    Cloudit::Command.commands.each do |command|
-      str += command
+    str += "\nCommands:"
+    Cloudit::Command.descriptions.each do |command|
+      str += "\n#{command[:command]}  #{command[:description]}"
     end
-    self.usage = str
+    str += "\n\nRun 'cloudit COMMAND --help' for more information on a command."
+    str
   end
 
   def self.setup_options
@@ -46,5 +39,4 @@ class Cloudit::Command::Index < Cloudit::Command::Base
   end
 
   setup_options
-  build_usage
 end

data/lib/cloudit/command.rb

@@ -1,15 +1,22 @@
 module Cloudit
   module Command
     class << self
-      attr_accessor :commands
+      attr_accessor :commands, :descriptions
     end
 
     @commands = []
+    @descriptions = []
 
     def self.load
       Dir[File.join(File.dirname(__FILE__), "command", "*.rb")].each do |file|
-        self.commands << file.split('/')[-1].chomp('.rb')
         require file
+        com = file.split('/')[-1].chomp('.rb')
+        if com == 'index' || com == 'base'
+          next
+        end
+        desc = Object.const_get("Cloudit::Command::#{com.capitalize}::DESCRIPTION")
+        self.commands << com
+        self.descriptions << {command: com, description: desc}
       end
     end
 
@@ -33,5 +40,9 @@ module Cloudit
       self.class.commands
     end
 
+    def descriptions
+      self.class.descriptions
+    end
+
   end
 end

data/lib/cloudit/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudit
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Zachary Chai