rezept 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5c8f3eb27e65563acbbbc617cbc141b5a19de137
-  data.tar.gz: e3c70945a590294ec954ea1f9eb4bea2246ee404
+  metadata.gz: e5f610649539bdf53d08d1d230922672609cdfc5
+  data.tar.gz: 266c8aae2d4d9ee13c9c121f155d3608042cb8b3
 SHA512:
-  metadata.gz: 7f47d7fc0f2ddee9603e8e109b5a6aaf742efbb50a0419ca03409f3559d6095f2ecf3f6937931d2fb2c446b59ff6a03f3c38577080718f0468ae8b46f23c66cf
-  data.tar.gz: dc976d2d4c1403574e6b534fd452aa6e72a1ce83255d3f6479032d3b491d36649ab1341f4f1eee7272da8ff06f8cac307b3865d82772c8eb8287bfa0efbae4c1
+  metadata.gz: 608bfaac7e2e6a5b95d95e4f9b5ab56c3e1bd747797dcb83a7cc40b164d74aa77b3707ee46a29824fa44bf27423fc77f998d2f20a4673f4aebebff3037ab4275
+  data.tar.gz: fb4ec8a3fabc40ddf7f781a74c3c73f212ffff410640a452908a96e71d10938a71fd5c0952f65d1f894e955d008c5ebce34a51da0178fcc8b8e7f8c46320e091

data/CHANGELOG.md

@@ -1,3 +1,6 @@
+## 0.4.1
+- Bugfix: `color` option is not working
+
 ## 0.4.0
 - Add `prefix` option to `apply` [#4][]
 

data/Docfile

@@ -17,9 +17,9 @@ template "runShellScriptTemplate" do
   end
 end
 
-Command "My-RunShellScript" do
+Command "Test-Example-RunShellScript" do
   account_ids []
-  include_template "runShellScriptTemplate", commands: "echo 1 >> /tmp/result.txt"
+  include_template "runShellScriptTemplate", commands: "echo 123 >> /tmp/result.txt"
 end
 
 Command "My-RunShellScript-2" do

data/lib/rezept/actions.rb

@@ -13,6 +13,7 @@ module Rezept
     def export(options)
       @converter.set_options(options)
       @client.set_options(options)
+      Rezept::TermColor.color = options['color']
       docs = @client.get_documents
 
       if options['write']
@@ -35,6 +36,7 @@ module Rezept
     def apply(options)
       @converter.set_options(options)
       @client.set_options(options)
+      Rezept::TermColor.color = options['color']
       dry_run = options['dry_run'] ? '[Dry run] ' : ''
       local = @converter.dslfile_to_h(options['file'])
       remote = @client.get_documents
@@ -45,10 +47,10 @@ module Rezept
         remote.reject!{|d| not d['name'] =~ prefix }
       end
 
-      _apply_docs(local, remote, dry_run)
+      _apply_docs(local, remote, dry_run, options)
     end
 
-    def _apply_docs(local, remote, dry_run)
+    def _apply_docs(local, remote, dry_run, options)
       local.each do |l|
         l_ids = l.delete('account_ids')
         r_ids = []
@@ -59,7 +61,7 @@ module Rezept
           @client.create_document(l) if dry_run.empty?
         else
           r_ids = r.delete('account_ids')
-          diff = Rezept::Utils.diff(@converter, r, l)
+          diff = Rezept::Utils.diff(@converter, r, l, options['color'])
 
           if diff == "\n"
             info("#{dry_run}No changes '#{l['name']}'")
@@ -87,6 +89,7 @@ module Rezept
 
     def convert(options)
       @converter.set_options(options)
+      Rezept::TermColor.color = options['color']
 
       fmt = 'unknown'
 
@@ -121,6 +124,7 @@ module Rezept
     def run_command(options)
       dry_run = options['dry_run'] ? '[Dry run] ' : ''
       @client.set_options(options)
+      Rezept::TermColor.color = options['color']
 
       if options['instance_ids'].nil? and options['tags'].nil? and (options['inventory'].nil? or options['conditions'].nil?)
         raise "Please specify the targets (--instance-ids/-i' or '--target-tags/-t' or '--inventroty/-I and --conditions/-C')"

data/lib/rezept/logger.rb

@@ -4,6 +4,11 @@ require 'singleton'
 module Rezept
   class TermColor
     class << self
+      @@color = true
+
+      def color=(color)
+        @@color = color
+      end
 
       def green(msg)
         colorize 32, msg
@@ -18,7 +23,7 @@ module Rezept
       end
 
       def colorize(num, msg)
-        "\e[#{num}m#{msg}\e[0m"
+        @@color ? "\e[#{num}m#{msg}\e[0m" : msg
       end
 
     end

data/lib/rezept/utils.rb

@@ -5,12 +5,13 @@ require 'coderay'
 module Rezept
   class Utils
 
-    def self.diff(converter, hash1, hash2)
-      Diffy::Diff.new(
+    def self.diff(converter, hash1, hash2, color=false)
+      diff = Diffy::Diff.new(
         converter.to_dsl(hash1),
         converter.to_dsl(hash2),
         :diff => '-u'
-      ).to_s(:color)
+      )
+      color ? diff.to_s(:color) : diff.to_s
     end
 
     def self.print_ruby(ruby, color=false)

data/lib/rezept/version.rb

@@ -1,3 +1,3 @@
 module Rezept
-  VERSION = "0.4.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rezept
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Serverworks Co.,Ltd.
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-09 00:00:00.000000000 Z
+date: 2017-03-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk