kumogata2 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e68a1cac5efe71e08f2d002ac2884c76818bb6fb
-  data.tar.gz: a6373ae6c26e04b76775d44e75d257d2be92e9eb
+  metadata.gz: 2d28ad2995283dcefcf8a822715ba90cdeed0b49
+  data.tar.gz: 2c6d91189979a68e1d967254d95b67363b97f581
 SHA512:
-  metadata.gz: 8851364eb886e8254f807432d5c33c4fe26988473d094b8e8a6b5a320ed27dafdda4d75b87b75be4727f87564a938e647f5a0a9d2f29a3ee3cfabbb15369b216
-  data.tar.gz: 5c1dc3f643cf26808396fc84a7c951e72109ec1e05f0c62773a6d6a84aefb3875d8fe40e2cfba84ee7b27b626786cceb192735c1abda7717fde38015a2b9cd3a
+  metadata.gz: 2a8518aa53c27bd97b4bc237381666cd8791d3b4854d43b40377239816f7db9eb3fea7c41aaad28d582afcda0e8af2b87801b6c122b2becd81ef32c9d9c87cd8
+  data.tar.gz: f9459e808285698de5cac3e90a13c37ea882c069847e325964a79a21f02814315ad40356e6bd7eea35c3ec554a33bcdc07af2e82f52bcaad56529a24e0d51483

data/README.md

@@ -72,6 +72,24 @@ Options:
         --[no-]debug
 ```
 
+### Create resources
+
+    $ kumogata create template.rb
+
+If you want to save the stack, please specify the stack name:
+
+    $ kumogata create template.rb any_stack_name
+
+If you want to pass parameters, please use `-p` option:
+
+    $ kumogata create template.rb -p "InstanceType=m1.large,KeyName=any_other_key"
+
+
+**Notice**
+
+**The stack will be delete if you do not specify the stack name explicitly.**
+(And only the resources will remain)
+
 ## Plugin
 
 Kumogata2 can be extended with plug-ins, such as the following:

data/exe/kumogata2

@@ -22,8 +22,10 @@ def main(argv)
     elsif output_result and out
       puts out
     end
-  rescue => e
-    $stderr.puts("[ERROR] #{e.message}".red)
+  rescue Exception => e
+    if not e.kind_of?(Interrupt) and not e.kind_of?(SystemExit)
+      $stderr.puts("[ERROR] #{e.message}".red)
+    end
 
     if debug
       raise e

data/lib/kumogata2.rb

@@ -1,10 +1,12 @@
 require 'aws-sdk'
 require 'coderay'
 require 'diffy'
+require 'hashie'
 require 'highline/import'
 require 'json'
 require 'logger'
 require 'open-uri'
+require 'optparse'
 require 'securerandom'
 require 'singleton'
 require 'term/ansicolor'

data/lib/kumogata2/cli/option_parser.rb

@@ -1,6 +1,3 @@
-require 'optparse'
-require 'hashie'
-
 module Kumogata2::CLI
   class OptionParser
     DEFAULT_OPTIONS = {
@@ -93,7 +90,8 @@ module Kumogata2::CLI
         options[:aws][:credentials][:path] = v
       end
 
-      opt.on(''  , '--output-format FORMAT', Kumogata2::Plugin.plugin_exts) do |v|
+      plugin_exts = Kumogata2::Plugin.plugins.flat_map(&:ext).uniq
+      opt.on(''  , '--output-format FORMAT', plugin_exts) do |v|
         options[:output_format] = v
       end
 
@@ -183,10 +181,6 @@ module Kumogata2::CLI
       options.output_result = output
 
       [command, arguments, options, output]
-    rescue => e
-      $stderr.puts("[ERROR] #{e.message}")
-      raise e if options[:debug]
-      exit_parse!(1)
     end
 
     private
@@ -220,8 +214,11 @@ module Kumogata2::CLI
       }.join("\n"))
 
       opt.separator ''
-      opt.separator 'Support Format: '
-      opt.separator '  ' + Kumogata2::Plugin.plugin_exts.join(', ')
+      opt.separator 'Plugins: '
+
+      Kumogata2::Plugin.plugins.each do |plugin|
+        opt.separator "  #{plugin.name}: #{plugin.ext.join(', ')}"
+      end
 
       opt.separator ''
       opt.separator 'Options:'

data/lib/kumogata2/client.rb

@@ -354,7 +354,7 @@ class Kumogata2::Client
       return @plugin_by_ext.fetch(ext)
     end
 
-    plugin_class = Kumogata2::Plugin.find(ext)
+    plugin_class = Kumogata2::Plugin.find_by_ext(ext)
     plugin = plugin_class ? plugin_class.new(@options) : nil
     @plugin_by_ext[ext] = plugin
   end

data/lib/kumogata2/plugin.rb

@@ -2,32 +2,33 @@ module Kumogata2::Plugin
   class << self
     def register(name, exts, klass)
       name = name.to_s
-      @plugins ||= {}
+      @plugins ||= Hashie::Mash.new
 
       if @plugins.has_key?(name)
-        raise "Plugin has already been registered: #{name}"
+        Kumogata2::Logger::Helper.log(:warn, "Plugin has already been registered: #{name}", color: :yellow)
       end
 
       @plugins[name] = {
-        class: klass,
+        name: name,
+        type: klass,
         ext: exts.map(&:to_s),
       }
     end
 
-    def find(ext)
-      plgns = @plugins.to_a.reverse
-
-      plugin_name, plugin_attrs = plgns.find do |name, attrs|
-        attrs[:ext].include?(ext)
+    def find_by_ext(ext)
+      plgn = self.plugins.reverse.find do |i|
+        i.ext.include?(ext)
       end
 
-      plugin_attrs ? plugin_attrs[:class] : nil
+      plgn ? plgn.type : nil
+    end
+
+    def plugin_by_name
+      @plugins
     end
 
-    def plugin_exts
-      @plugins.flat_map {|name, attrs|
-        attrs[:ext]
-      }.uniq
+    def plugins
+      @plugins.map {|_, v| v }
     end
 
     def load_plugins
@@ -35,7 +36,7 @@ module Kumogata2::Plugin
 
       plgns.each do |plgns_spec|
         name = plgns_spec.name
-        path = File.join(name.split('-').slice(0, 3))
+        path = File.join(name.split('-', 3))
 
         begin
           require path

data/lib/kumogata2/version.rb

@@ -1,3 +1,3 @@
 module Kumogata2
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kumogata2
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Genki Sugawara
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-30 00:00:00.000000000 Z
+date: 2016-05-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk