RubyGems - cfndk - Versions diffs - 0.0.5 → 0.0.6 - Mend

cfndk 0.0.5 → 0.0.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (8) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f083e8a85ab15d77d5de878cfdbe04449b5e4c63
-  data.tar.gz: 5baddc25f36a208cc9040fcf40f0d9fc314da6ae
+  metadata.gz: 19325cb7304add2725fc19d27eaf72dbd4c4576c
+  data.tar.gz: 7f237af4102d774bf24ea009cfb3a77428271e0c
 SHA512:
-  metadata.gz: 25585042c39f20242014e99ea37bff5e9638621aca5d730d8328c2a09d287a9f70b5dd77795a62e3a1cf80301ca75ff964c3a9c6712e07a6fe829f1f54031e43
-  data.tar.gz: 46872932ad3ca28c12ec6238514f0eb068529a682338796fad391b9b6000c2e9d5278b1eb764e2b85f9fd1b73005c29d701ce9c8a296ba266c769a4bd5fc6f6b
+  metadata.gz: ec6bbe3c622e319a5f9d06527bc0117908db0803f966ac7c657b2f101484e7d39c953f0ed9ff561903908d375b7227e96d0990fc529da00eeb27f2c78351eaf6
+  data.tar.gz: 71e19e30a2342f2c9aa4ebeaee61e8d16d96a3993ed7e5f16e963427dc2cd26e648ad770e9cb5cea8f9fa0c296cd640b57f8940b0957bf591dc9a79456c68b21

data/bin/cfndk CHANGED Viewed

@@ -16,136 +16,7 @@ require 'logger'
 require 'cfndk.rb'
-def do_destroy(option)
-  return true if option[:force]
-  loop do
-    print 'destroy? [yes|no]:'
-    res = STDIN.gets
-    case res
-    when /^yes/
-      return true
-    when /^no/, /^$/
-      return false
-    end
-  end
-end
 $LOAD_PATH.unshift File.dirname(__FILE__) + '/../lib'
-cur_dir = Dir.getwd
-option = {
-  config_path: "#{cur_dir}/cfndk.yml",
-  uuid: ENV['CFNDK_UUID'] || nil,
-  properties: {},
-  stack_names: nil,
-  force: false,
-}
-opt = OptionParser.new do |o|
-  o.version = CFnDK::VERSION
-  o.summary_indent = ' ' * 4
-  o.banner = "Version: #{CFnDK::VERSION} \nUsage: cfndk [cmd] [options]"
-  o.on_head('[cmd]',
-            '    init                  create config YAML file',
-            '    create                create stacks',
-            '    update                update stacks',
-            '    create-or-changeset   create stacks or create changeset',
-            '    destroy               destroy stacks',
-            '    generate-uuid         generate UUID',
-            '    report-event          report stack event',
-            '    report-stack          report stack',
-            '    report-stack-resource report stack resource',
-            '[enviroment variables]',
-            "    AWS_PROFILE: #{ENV['AWS_PROFILE']}",
-            "    AWS_DEFAULT_REGION: #{ENV['AWS_DEFAULT_REGION']}",
-            "    AWS_REGION: #{ENV['AWS_REGION']}",
-            "    AWS_ACCESS_KEY_ID: #{ENV['AWS_ACCESS_KEY_ID']}",
-            "    AWS_SECRET_ACCESS_KEY: #{ENV['AWS_SECRET_ACCESS_KEY']}",
-            "    AWS_SESSION_TOKEN: #{ENV['AWS_SECRET_ACCESS_KEY']}",
-            "    AWS_CONTAINER_CREDENTIALS_RELATIVE_URI: #{ENV['AWS_CONTAINER_CREDENTIALS_RELATIVE_URI']}",
-            '[options]')
-  o.on('-v', '--verbose', 'verbose mode') { |v| option[:v] = v }
-  o.on('-c', '--config_path cfndi.yml', "config path (default: #{option[:config_path]})") { |v| option[:config_path] = v }
-  o.on('-p', '--properties name=value', 'properties') do |v|
-    md = v.match(/^([a-zA-Z_]+[a-zA-Z0-9_]*)=(.*)$/)
-    if md
-      option[:properties][md[0]] = md[1]
-    else
-      raise "invalid properties: '#{v}'" unless md
-    end
-  end
-  o.on('-a', '--auto-uuid') { option[:uuid] = SecureRandom.uuid }
-  o.on('-u', '--uuid uuid') { |v| option[:uuid] = v }
-  o.on('-n', '--stack-names name1,name2') { |v| option[:stack_names] = v.split(/\s*,\s*/) }
-  o.on('--no-color') { |b| Rainbow.enabled = false }
-  o.on('-f', '--force') { |b| option[:force] = true }
-  o.permute!(ARGV)
-end
-logger = CFnDK::Logger.new(option)
-if ARGV.length != 1
-  puts opt.help
-  exit 1
-elsif ARGV[0] == 'generate-uuid'
-  puts SecureRandom.uuid
-  exit 0
-elsif ARGV[0] == 'init'
-  if File.file?(option[:config_path])
-    logger.error "File exist. #{option[:config_path]}".color(:red)
-    exit 1
-  end
-  logger.info 'init...'.color(:green)
-  FileUtils.cp_r(Dir.glob(File.dirname(__FILE__) + '/../skel/*'), './')
-  logger.info "create #{option[:config_path]}".color(:green)
-  exit 0
-end
-unless File.file?(option[:config_path])
-  logger.error "File does not exist. #{option[:config_path]}".color(:red)
-  exit 1
-end
-data = open(option[:config_path], 'r') { |f| YAML.load(f) } if File.file?(option[:config_path])
-credentials = CFnDK::CredentialProviderChain.new.resolve
-stacks = CFnDK::Stacks.new(data, option, credentials)
-keypairs = CFnDK::KeyPairs.new(data, option, credentials)
-if ARGV[0] == 'create'
-  logger.info 'create...'.color(:green)
-  stacks.validate
-  keypairs.create
-  stacks.create
-elsif ARGV[0] == 'update'
-  logger.info 'update...'.color(:green)
-  stacks.validate
-  stacks.update
-elsif ARGV[0] == 'create-or-changeset'
-  logger.info 'create or changeset...'.color(:green)
-  stacks.validate
-  stacks.create_or_changeset
-elsif ARGV[0] == 'destroy'
-  logger.info 'destroy...'.color(:green)
-  if do_destroy(option)
-    stacks.destroy
-    keypairs.destroy
-  end
-elsif ARGV[0] == 'validate'
-  logger.info 'validate...'.color(:green)
-  stacks.validate
-elsif ARGV[0] == 'report-event'
-  logger.info 'report event...'.color(:green)
-  stacks.report_event
-elsif ARGV[0] == 'report-stack'
-  logger.info 'report stack...'.color(:green)
-  stacks.report_stack
-elsif ARGV[0] == 'report-stack-resource'
-  logger.info 'report stack resource...'.color(:green)
-  stacks.report_stack_resource
-else
-  puts opt.help
-  exit 1
-end
-exit 0
+c = CFnDK::Command.new
+exit c.execute

data/cfndk.gemspec CHANGED Viewed

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.7'
   spec.add_development_dependency 'rake', '~> 11.1.2'
-  spec.add_dependency 'rainbow', '~> 2.1.0'
+  spec.add_dependency 'rainbow', '~> 3.0.0'
   spec.add_dependency 'aws-sdk', '~> 3'
   spec.add_dependency 'camelizable', '~> 0.0.3'
   spec.add_dependency 'terminal-table', '~> 1'

data/lib/cfndk.rb CHANGED Viewed

@@ -6,6 +6,7 @@ require 'cfndk/key_pairs'
 require 'cfndk/erb_string'
 require 'cfndk/logger'
 require 'cfndk/credential_provider_chain'
+require 'cfndk/command'
 module CFnDK
 end

data/lib/cfndk/command.rb ADDED Viewed

@@ -0,0 +1,136 @@
+module CFnDK
+  class Command
+    def initialize
+      @cur_dir = Dir.getwd
+      @option = {
+        config_path: "#{@cur_dir}/cfndk.yml",
+        uuid: ENV['CFNDK_UUID'] || nil,
+        properties: {},
+        stack_names: nil,
+        force: false,
+      }
+      @opt = OptionParser.new do |o|
+        o.version = CFnDK::VERSION
+        o.summary_indent = ' ' * 4
+        o.banner = "Version: #{CFnDK::VERSION} \nUsage: cfndk [cmd] [options]"
+        o.on_head('[cmd]',
+                  '    init                  create config YAML file',
+                  '    create                create stacks',
+                  '    update                update stacks',
+                  '    create-or-changeset   create stacks or create changeset',
+                  '    destroy               destroy stacks',
+                  '    generate-uuid         generate UUID',
+                  '    report-event          report stack event',
+                  '    report-stack          report stack',
+                  '    report-stack-resource report stack resource',
+                  '[enviroment variables]',
+                  "    AWS_PROFILE: #{ENV['AWS_PROFILE']}",
+                  "    AWS_DEFAULT_REGION: #{ENV['AWS_DEFAULT_REGION']}",
+                  "    AWS_REGION: #{ENV['AWS_REGION']}",
+                  "    AWS_ACCESS_KEY_ID: #{ENV['AWS_ACCESS_KEY_ID']}",
+                  "    AWS_SECRET_ACCESS_KEY: #{ENV['AWS_SECRET_ACCESS_KEY']}",
+                  "    AWS_SESSION_TOKEN: #{ENV['AWS_SECRET_ACCESS_KEY']}",
+                  "    AWS_CONTAINER_CREDENTIALS_RELATIVE_URI: #{ENV['AWS_CONTAINER_CREDENTIALS_RELATIVE_URI']}",
+                  '[options]')
+        o.on('-v', '--verbose', 'verbose mode') { |v| @option[:v] = v }
+        o.on('-c', '--config_path cfndi.yml', "config path (default: #{@option[:config_path]})") { |v| @option[:config_path] = v }
+        o.on('-p', '--properties name=value', 'properties') do |v|
+          md = v.match(/^([a-zA-Z_]+[a-zA-Z0-9_]*)=(.*)$/)
+          if md
+            @option[:properties][md[0]] = md[1]
+          else
+            raise "invalid properties: '#{v}'" unless md
+          end
+        end
+        o.on('-a', '--auto-uuid') { @option[:uuid] = SecureRandom.uuid }
+        o.on('-u', '--uuid uuid') { |v| @option[:uuid] = v }
+        o.on('-n', '--stack-names name1,name2') { |v| @option[:stack_names] = v.split(/\s*,\s*/) }
+        o.on('--no-color') { |b| Rainbow.enabled = false }
+        o.on('-f', '--force') { |b| @option[:force] = true }
+        o.permute!(ARGV)
+      end
+      @logger = CFnDK::Logger.new(@option)
+    end
+    def execute
+      if ARGV.length != 1
+        puts @opt.help
+        return 2
+      elsif ARGV[0] == 'generate-uuid'
+        puts SecureRandom.uuid
+        return 0
+      elsif ARGV[0] == 'init'
+        if File.file?(@option[:config_path])
+          @logger.error "File exist. #{@option[:config_path]}".color(:red)
+          return 1
+        end
+        @logger.info 'init...'.color(:green)
+        FileUtils.cp_r(Dir.glob(File.dirname(__FILE__) + '/../skel/*'), './')
+        @logger.info "create #{@option[:config_path]}".color(:green)
+        return 0
+      end
+      unless File.file?(@option[:config_path])
+        @logger.error "File does not exist. #{@option[:config_path]}".color(:red)
+        return 1
+      end
+      data = open(@option[:config_path], 'r') { |f| YAML.load(f) } if File.file?(@option[:config_path])
+      credentials = CFnDK::CredentialProviderChain.new.resolve
+      stacks = CFnDK::Stacks.new(data, @option, credentials)
+      keypairs = CFnDK::KeyPairs.new(data, @option, credentials)
+      if ARGV[0] == 'create'
+        @logger.info 'create...'.color(:green)
+        stacks.validate
+        keypairs.create
+        stacks.create
+      elsif ARGV[0] == 'update'
+        @logger.info 'update...'.color(:green)
+        stacks.validate
+        stacks.update
+      elsif ARGV[0] == 'create-or-changeset'
+        @logger.info 'create or changeset...'.color(:green)
+        stacks.validate
+        stacks.create_or_changeset
+      elsif ARGV[0] == 'destroy'
+        @logger.info 'destroy...'.color(:green)
+        if destroy?
+          stacks.destroy
+          keypairs.destroy
+        end
+      elsif ARGV[0] == 'validate'
+        @logger.info 'validate...'.color(:green)
+        stacks.validate
+      elsif ARGV[0] == 'report-event'
+        @logger.info 'report event...'.color(:green)
+        stacks.report_event
+      elsif ARGV[0] == 'report-stack'
+        @logger.info 'report stack...'.color(:green)
+        stacks.report_stack
+      elsif ARGV[0] == 'report-stack-resource'
+        @logger.info 'report stack resource...'.color(:green)
+        stacks.report_stack_resource
+      else
+        puts @opt.help
+        return 2
+      end
+      0
+    end
+    def destroy?
+      return true if @option[:force]
+      loop do
+        print 'destroy? [yes|no]:'
+        res = STDIN.gets
+        case res
+        when /^yes/
+          return true
+        when /^no/, /^$/
+          return false
+        end
+      end
+    end
+  end
+end

data/lib/cfndk/stack.rb CHANGED Viewed

@@ -167,7 +167,7 @@ module CFnDK
             item.stack_name,
             item.creation_time,
             item.deletion_time,
-            coloerd_status(item.stack_status),
+            colored_status(item.stack_status),
             item.stack_status_reason]
         end
         table = Terminal::Table.new headings: %w(Name Creation Deletion Status Reason), rows: rows
@@ -188,7 +188,7 @@ module CFnDK
           [
             item.resource_type,
             item.timestamp,
-            coloerd_status(item.resource_status),
+            colored_status(item.resource_status),
             item.resource_status_reason]
         end
         table = Terminal::Table.new headings: %w(Type Time Status Reason), rows: rows
@@ -211,7 +211,7 @@ module CFnDK
             item.physical_resource_id,
             item.resource_type,
             item.timestamp,
-            coloerd_status(item.resource_status),
+            colored_status(item.resource_status),
             item.resource_status_reason,
             item.description,
           ]
@@ -244,20 +244,20 @@ module CFnDK
     private
-    def coloerd_status(str)
+    def colored_status(str)
       case str
       when 'CREATE_FAILED' then
-        item.resource_status.color :red
+        str.color :red
       when 'ROLLBACK_IN_PROGRESS' then
-        item.resource_status.color :red
+        str.color :red
       when 'ROLLBACK_COMPLETE' then
-        item.resource_status.color :red
+        str.color :red
       when 'CREATE_COMPLETE' then
-        item.resource_status.color :green
+        str.color :green
       when 'DELETE_COMPLETE' then
-        item.resource_status.color :gray
+        str.color :gray
       else
-        item.resource_status.color :orange
+        str.color :orange
       end
     end

data/lib/cfndk/version.rb CHANGED Viewed

@@ -1,3 +1,3 @@
 module CFnDK
-  VERSION = '0.0.5'.freeze
+  VERSION = '0.0.6'.freeze
 end

metadata CHANGED Viewed

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cfndk
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Yoshihisa AMAKATA
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-02-18 00:00:00.000000000 Z
+date: 2019-02-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: 3.0.0
 - !ruby/object:Gem::Dependency
   name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
@@ -111,6 +111,7 @@ files:
 - bin/cfndk
 - cfndk.gemspec
 - lib/cfndk.rb
+- lib/cfndk/command.rb
 - lib/cfndk/credential_provider_chain.rb
 - lib/cfndk/erb_string.rb
 - lib/cfndk/key_pair.rb