ec2ctl 0.7.9 → 0.8.0

data/lib/ec2ctl/logger.rb

@@ -0,0 +1,179 @@
+require "logger"
+require "forwardable"
+
+module EC2Ctl
+  class Logger
+    extend Forwardable
+
+    InvalidOutputFormat = Class.new RuntimeError
+
+    VALID_FORMATS = %w(json yaml table markdown backlog)
+
+    def initialize(
+      output_format: :json,
+      null_output:   false,
+      pretty:        false,
+      verbose:       false,
+      std_io:        STDOUT,
+      err_io:        STDERR
+    )
+      @output_format = output_format
+      @null_output   = null_output
+      @std_logger    = ::Logger.new std_io
+      @err_logger    = ::Logger.new err_io
+
+      @std_logger.level = verbose ? ::Logger::DEBUG : ::Logger::INFO
+      @err_logger.level = verbose ? ::Logger::DEBUG : ::Logger::INFO
+
+      @std_logger.formatter = formatter(std_io, pretty)
+      @err_logger.formatter = formatter(err_io, pretty)
+
+      self
+    end
+
+    %i(debug info warn).each do |m|
+      define_method m do |args|
+        @std_logger.send m, to_hash(args)
+      end
+    end
+
+    %i(error fatal).each do |m|
+      define_method m do |args|
+        @err_logger.send m, to_hash(args)
+      end
+    end
+
+    def_delegators :@std_logger, :debug?, :info?, :warn?, :error?, :fatal?
+
+    private
+
+    def to_hash(object)
+      case object
+      when Struct
+        object.each_pair.to_a.map {|a|
+          [a.first, to_hash(a.last)]
+        }.to_h
+      when Hash
+        object.to_a.map {|a|
+          [a.first, to_hash(a.last)]
+        }.to_h
+      when Array, Aws::Resources::Collection
+        object.map {|o| to_hash(o)}
+      when Aws::Resources::Resource
+        to_hash object.data
+      else
+        object
+      end
+    end
+
+    def formatter(io, pretty)
+      -> (severity, time, progname, message) {
+        return "" if @null_output
+
+        data = {
+          time:     time,
+          severity: severity,
+        }.merge(
+          if message.is_a? Hash
+            message
+          else
+            {message: message}
+          end
+        )
+
+        case @output_format
+        when /\Ajson\z/i
+          require "json"
+
+          json = JSON.send((pretty ? :pretty_generate : :generate), data) + "\n"
+
+          if io.tty?
+            require "coderay"
+            CodeRay.scan(json, :json).terminal
+          else
+            json
+          end
+        when /\Ayaml\z/i
+          require "yaml"
+
+          # korehahidoi
+          require "json"
+          yaml = YAML.dump(JSON.load(JSON.generate(data)))
+
+          if io.tty?
+            require "coderay"
+            CodeRay.scan(yaml, :yaml).terminal
+          else
+            yaml
+          end
+        when /\Atable|markdown|backlog\z/i
+          require "terminal-table"
+          require "json"
+
+          title, content = data.find {|k, v| !%i(time severity).include?(k)}
+
+          headings, rows = begin
+            case content
+            when Hash
+              row = content.values.map do |value|
+                case value
+                when Hash, Array
+                  JSON.generate value
+                else
+                  value.to_s
+                end
+              end
+
+              [content.keys.map(&:to_s), [row]]
+            when Array
+              if content.first.is_a? Hash
+                rows = content.map do |item|
+                  item.values.map do |value|
+                    case value
+                    when Hash, Array
+                      JSON.generate value
+                    else
+                      value.to_s
+                    end
+                  end
+                end
+
+                [content.first.keys, rows]
+              else
+                [["items"], [content]]
+              end
+            else
+              fail
+            end
+          rescue
+            [["data"], [[content.to_json]]]
+          end
+
+          table = Terminal::Table.new(
+            title:    (@output_format == :table ? title : nil),
+            headings: headings,
+            rows:     rows,
+          ).to_s
+
+          output = case @output_format
+          when /\Atable\z/i
+            table + "\n"
+          when /\Amarkdown\z/i
+            lines = table.lines[1..-2]
+            lines[1].gsub!("+", "|")
+            lines.join
+          when /\Abacklog\z/i
+            lines = table.lines[1..-2]
+            lines[0].sub!("\n", "h\n")
+            lines[1] = nil
+            lines.compact.join
+          end
+
+          output + "\n"
+        else
+          fail InvalidOutputFormat, "Valid output formats are #{VALID_FORMATS}"
+        end
+      }
+    end
+  end
+end

data/lib/ec2ctl/version.rb

@@ -1,3 +1,3 @@
 module EC2Ctl
-  VERSION = "0.7.9"
+  VERSION = "0.8.0"
 end

metadata

@@ -1,114 +1,114 @@
 --- !ruby/object:Gem::Specification
 name: ec2ctl
 version: !ruby/object:Gem::Version
-  version: 0.7.9
+  version: 0.8.0
 platform: ruby
 authors:
-- y13i
+- Yoriki Yamaguchi
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-06-07 00:00:00.000000000 Z
+date: 2016-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: commander
+  name: aws-sdk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.3'
 - !ruby/object:Gem::Dependency
-  name: aws-sdk
+  name: commander
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.4'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '4.4'
 - !ruby/object:Gem::Dependency
-  name: terminal-table
+  name: coderay
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: terminal-table
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
+        version: '1.6'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.6'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.12'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.12'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '0.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: A minimum tool for EC2 instances.
+        version: '0.10'
+description: A small command line tool for managing EC2/ELB.
 email:
 - email@y13i.com
 executables:
@@ -117,7 +117,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
+- CODE_OF_CONDUCT.md
 - Gemfile
+- LICENSE
 - README.md
 - Rakefile
 - bin/console
@@ -127,9 +130,11 @@ files:
 - lib/ec2ctl.rb
 - lib/ec2ctl/cli.rb
 - lib/ec2ctl/client.rb
+- lib/ec2ctl/logger.rb
 - lib/ec2ctl/version.rb
 homepage: https://github.com/y13i/ec2ctl
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -139,7 +144,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 2.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -150,5 +155,5 @@ rubyforge_project:
 rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
-summary: A minimum tool for EC2 instances.
+summary: A small command line tool for managing EC2/ELB.
 test_files: []