kumogata 0.2.11 → 0.2.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: acf2fb5a1777c46b50516cf30d4082fd90517625
-  data.tar.gz: 570942ed3c3455c5e3bc34fe1b6f5e57412bab90
+  metadata.gz: 660efba91fef6116d2af9c902ba7d8ef0e11c456
+  data.tar.gz: 7d230216b8843370326fbca927dad8d095ca8ce7
 SHA512:
-  metadata.gz: bd3246d8b6e350335c39ceedae160f47ce4bc0ce05c1d8b17056f647eec9d7f62826f828fc663c41c1631fc1582acc5b7e0b1106a691dbce77f5c193e71fcbe5
-  data.tar.gz: 1fc19204fef197b4a3b535e9fcca171c58eb68dc750e46c1da330e9d36fbe53757cfd16ae4aa7eff6b63196df830d93bbaddfb59536917cd36d39055508e66ad
+  metadata.gz: 6f45ee971165149b7a4a8d0c5745af69e44ab8a35e1fe92c356023c8284da8df08d910da2c70befad9e04728b43887b200d65ebc5655a829b7ee52eed1df876a
+  data.tar.gz: 0f613dbc268a57ecf8945220c171baf8a0aa2d828d202128d43c291f60ed42a757f0c00d368ab28bb9298ae9aa9575c1e5eafea6d4e3e221ac42eb4a075fe176

data/README.md

@@ -5,8 +5,8 @@
 
 Kumogata is a tool for [AWS CloudFormation](https://aws.amazon.com/cloudformation/).
 
-[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403062105)](http://badge.fury.io/rb/kumogata)
-[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403062105)](https://drone.io/github.com/winebarrel/kumogata/latest)
+[![Gem Version](https://badge.fury.io/rb/kumogata.png?201403062244)](http://badge.fury.io/rb/kumogata)
+[![Build Status](https://drone.io/github.com/winebarrel/kumogata/status.png?201403062244)](https://drone.io/github.com/winebarrel/kumogata/latest)
 
 It can define a template in Ruby DSL, such as:
 

data/kumogata.gemspec

@@ -19,12 +19,12 @@ Gem::Specification.new do |spec|
   spec.require_paths = ['lib']
 
   spec.add_dependency 'aws-sdk'
+  spec.add_dependency 'coderay'
   spec.add_dependency 'diffy'
   spec.add_dependency 'dslh', '>= 0.2.4'
   spec.add_dependency 'hashie'
   spec.add_dependency 'highline'
   spec.add_dependency 'json'
-  spec.add_dependency 'json_color'
   spec.add_dependency 'term-ansicolor'
   spec.add_dependency 'uuidtools'
   spec.add_development_dependency 'bundler'

data/lib/kumogata/client.rb

@@ -29,9 +29,9 @@ class Kumogata::Client
     template = open_template(path_or_url)
 
     if ruby_template?(path_or_url)
-      colorize_json(JSON.pretty_generate(template))
+      JSON.pretty_generate(template).colorize_as(:json)
     else
-      devaluate_template(template).chomp
+      devaluate_template(template).chomp.colorize_as(:ruby)
     end
   end
 
@@ -54,27 +54,27 @@ class Kumogata::Client
 
   def list(stack_name = nil)
     stacks = describe_stacks(stack_name)
-    colorize_json(JSON.pretty_generate(stacks))
+    JSON.pretty_generate(stacks).colorize_as(:json)
   end
 
   def export(stack_name)
     template = export_template(stack_name)
-    devaluate_template(template).chomp
+    devaluate_template(template).chomp.colorize_as(:ruby)
   end
 
   def show_events(stack_name)
     events = describe_events(stack_name)
-    colorize_json(JSON.pretty_generate(events))
+    JSON.pretty_generate(events).colorize_as(:json)
   end
 
   def show_outputs(stack_name)
     outputs = describe_outputs(stack_name)
-    colorize_json(JSON.pretty_generate(outputs))
+    JSON.pretty_generate(outputs).colorize_as(:json)
   end
 
   def show_resources(stack_name)
     resources = describe_resources(stack_name)
-    colorize_json(JSON.pretty_generate(resources))
+    JSON.pretty_generate(resources).colorize_as(:json)
   end
 
   def diff(path_or_url1, path_or_url2)
@@ -409,10 +409,10 @@ class Kumogata::Client
     puts <<-EOS
 
 Outputs:
-#{colorize_json(JSON.pretty_generate(outputs))}
+#{JSON.pretty_generate(outputs).colorize_as(:json)}
 
 Stack Resource Summaries:
-#{colorize_json(JSON.pretty_generate(summaries))}
+#{JSON.pretty_generate(summaries).colorize_as(:json)}
 
 (Save to `#{@options.result_log}`)
     EOS
@@ -431,15 +431,4 @@ Stack Resource Summaries:
       i[0, 1].upcase + i[1..-1].downcase
     }.join
   end
-
-  def colorize_json(str)
-    if $stdout.tty? and @options.color?
-      begin
-        return JsonColor.colorize(str)
-      rescue Racc::ParseError
-      end
-    end
-
-    return str
-  end
 end

data/lib/kumogata/ext/string_ext.rb

@@ -25,6 +25,14 @@ class String
     EOS
   end
 
+  def colorize_as(lang)
+    if @@colorize
+      CodeRay.scan(self, lang).terminal
+    else
+      self
+    end
+  end
+
   def encode64
     Base64.encode64(self).delete("\n")
   end

data/lib/kumogata/version.rb

@@ -1,3 +1,3 @@
 module Kumogata
-  VERSION = '0.2.11'
+  VERSION = '0.2.12'
 end

data/lib/kumogata.rb

@@ -3,12 +3,12 @@ require 'kumogata/version'
 
 require 'aws-sdk'
 require 'base64'
+require 'coderay'
 require 'diffy'
 require 'dslh'
 require 'hashie'
 require 'highline/import'
 require 'json'
-require 'json_color'
 require 'logger'
 require 'open-uri'
 require 'optparse'
@@ -21,3 +21,19 @@ require 'kumogata/client'
 require 'kumogata/ext/json_ext'
 require 'kumogata/ext/string_ext'
 require 'kumogata/logger'
+
+CodeRay::Encoders::Terminal::TOKEN_COLORS[:key] = {
+  :self => "\e[1;34m",
+  :char => "\e[1;34m",
+  :delimiter => "\e[1;34m",
+}
+
+CodeRay::Encoders::Terminal::TOKEN_COLORS[:string] = {
+  :self => "\e[32m",
+  :modifier => "\e[1;32m",
+  :char => "\e[1;32m",
+  :delimiter => "\e[1;32m",
+  :escape => "\e[1;32m",
+}
+
+CodeRay::Encoders::Terminal::TOKEN_COLORS[:keyword] = "\e[31m"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kumogata
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Genki Sugawara
@@ -25,7 +25,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: diffy
+  name: coderay
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -39,35 +39,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dslh
+  name: diffy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: 0.2.4
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: hashie
+  name: dslh
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.2.4
 - !ruby/object:Gem::Dependency
-  name: highline
+  name: hashie
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -81,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json
+  name: highline
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='
@@ -95,7 +95,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: json_color
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '>='