itamae 1.1.7 → 1.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 46e8d6ca2f0b4e05123719182e0244d54455a866
-  data.tar.gz: e35404ee8a2abcdfcd55849c69a9166fdde7ef64
+  metadata.gz: d44fdcac91acf929fbf94754542e1521a8528b67
+  data.tar.gz: 17770615b03da709e699397bddffe2556f01a9c3
 SHA512:
-  metadata.gz: 25fce8fab5558c1fd3240610ff2c52aea30f6427343051e3b5d50950e0814bbe738ad7788159bae53a20385cceb3d6d5108216af6e6c11bbdd55c35ac8195aea
-  data.tar.gz: 93cf42c6d44dfb803de6cb82967e57b9cadc4799233f24dabf3b1da863ec2897e8581dd3ed6774dbaf6857c627653edb7bb4cff45d57e518ce1a6dbb29666ecb
+  metadata.gz: 20e405c5105a2b00d04e20669c4304a73ad21ea6490876dcc4321eb8ef5f837f0f488cb2b2aaef8b36cf5d13b2551920d5b0da88750299cec071ded07a18e4a6
+  data.tar.gz: 0e0761e611fda6e8fef0ddbbfa23b1f3a13bb9a2a02d0cf13e91b0f372545dbc812ac6af7b8e0484723946ef54cae57678d871a34883aa7c58b4c167643e925a

data/README.md

@@ -1,4 +1,4 @@
-# Itamae [![Gem Version](https://badge.fury.io/rb/itamae.svg)](http://badge.fury.io/rb/itamae) [![Code Climate](https://codeclimate.com/github/ryotarai/itamae/badges/gpa.svg)](https://codeclimate.com/github/ryotarai/itamae) [![wercker status](https://app.wercker.com/status/d44df82d2f4529ff664f32fa54ce12f5/s/master "wercker status")](https://app.wercker.com/project/bykey/d44df82d2f4529ff664f32fa54ce12f5) [![Gitter](https://badges.gitter.im/Join Chat.svg)](https://gitter.im/ryotarai/itamae?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge)
+# Itamae [![Gem Version](https://badge.fury.io/rb/itamae.svg)](http://badge.fury.io/rb/itamae) [![Code Climate](https://codeclimate.com/github/ryotarai/itamae/badges/gpa.svg)](https://codeclimate.com/github/ryotarai/itamae) [![wercker status](https://app.wercker.com/status/3e7be3b982d3671940a07e3ef45d9f5f/s "wercker status")](https://app.wercker.com/project/bykey/3e7be3b982d3671940a07e3ef45d9f5f) [![Gitter](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/itamae-kitchen/itamae?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 Simple and lightweight configuration management tool inspired by Chef.
 

data/Rakefile

@@ -46,6 +46,7 @@ namespace :spec do
             cmd << " -j spec/integration/recipes/node.json"
             cmd << " spec/integration/recipes/default.rb"
             cmd << " spec/integration/recipes/default2.rb"
+            cmd << " spec/integration/recipes/redefine.rb"
 
             puts cmd
             system cmd

data/lib/itamae/logger.rb

@@ -7,6 +7,7 @@ module Itamae
     class Formatter
       attr_accessor :colored
       attr_accessor :depth
+      attr_accessor :color
 
       INDENT_LENGTH = 3
 
@@ -19,7 +20,7 @@ module Itamae
       def call(severity, datetime, progname, msg)
         log = "%s : %s%s\n" % ["%5s" % severity, ' ' * INDENT_LENGTH * depth , msg2str(msg)]
         if colored
-          color(log, severity)
+          colorize(log, severity)
         else
           log
         end
@@ -32,6 +33,14 @@ module Itamae
         @depth -= 1
       end
 
+      def color(code)
+        @prev_color = @color
+        @color = code
+        yield
+      ensure
+        @color = @prev_color
+      end
+
       private
       def msg2str(msg)
         case msg
@@ -45,17 +54,21 @@ module Itamae
         end
       end
 
-      def color(str, severity)
-        color_code = case severity
-                     when "INFO"
-                       :green
-                     when "WARN"
-                       :magenta
-                     when "ERROR"
-                       :red
-                     else
-                       :clear
-                     end
+      def colorize(str, severity)
+        if @color
+          color_code = @color
+        else
+          color_code = case severity
+                       when "INFO"
+                         :clear
+                       when "WARN"
+                         :magenta
+                       when "ERROR"
+                         :red
+                       else
+                         :clear
+                       end
+        end
         ANSI.public_send(color_code) { str }
       end
     end
@@ -73,7 +86,7 @@ module Itamae
         @log_device = value
         @logger = create_logger
       end
-      
+
       private
 
       def create_logger

data/lib/itamae/recipe.rb

@@ -80,6 +80,12 @@ module Itamae
       end
 
       def define(name, params = {}, &block)
+        class_name = Resource.get_resource_class_name(name)
+        if Resource.const_defined?(class_name)
+          Logger.warn "Redefine class. (#{class_name})"
+          return
+        end
+
         Resource.const_set(
           Resource.get_resource_class_name(name),
           Definition.create_class(name, params, &block)

data/lib/itamae/resource/base.rb

@@ -205,11 +205,15 @@ module Itamae
           if current_value.nil? && value.nil?
             # ignore
           elsif current_value.nil? && !value.nil?
-            Logger.info "#{key} will be '#{value}'"
+            Logger.formatter.color :green do
+              Logger.info "#{key} will be '#{value}'"
+            end
           elsif current_value == value || value.nil?
             Logger.debug "#{key} will not change (current value is '#{current_value}')"
           else
-            Logger.info "#{key} will change from '#{current_value}' to '#{value}'"
+            Logger.formatter.color :green do
+              Logger.info "#{key} will change from '#{current_value}' to '#{value}'"
+            end
           end
         end
       end
@@ -310,9 +314,7 @@ module Itamae
       end
 
       def updated!
-        unless @updated
-          Logger.debug "This resource is updated."
-        end
+        Logger.debug "This resource is updated."
         @updated = true
       end
 

data/lib/itamae/version.txt

@@ -1 +1 @@
-1.1.7
+1.1.8

data/spec/integration/default_spec.rb

@@ -108,3 +108,7 @@ describe file('/tmp/never_exist4') do
   it { should_not be_file }
 end
 
+describe file('/tmp/created_in_redefine') do
+  it { should be_file }
+  its(:content) { should match(/first/) }
+end

data/spec/integration/recipes/redefine.rb

@@ -0,0 +1,20 @@
+# spec/integration/recipes/redefine.rb
+define :echo_hello, version: nil do
+  file "put file in redefine.rb" do
+    action :create
+    path "/tmp/created_in_redefine"
+    content 'first'
+  end
+end
+
+# Duplicated definitions
+define :echo_hello, version: nil do
+  file "put file in redefine.rb" do
+    action :create
+    path "/tmp/created_in_redefine"
+    content 'second'
+  end
+end
+
+# Execute
+echo_hello "execute echo_hello!"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: itamae
 version: !ruby/object:Gem::Version
-  version: 1.1.7
+  version: 1.1.8
 platform: ruby
 authors:
 - Ryota Arai
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -190,6 +190,7 @@ files:
 - spec/integration/recipes/hello.txt
 - spec/integration/recipes/included.rb
 - spec/integration/recipes/node.json
+- spec/integration/recipes/redefine.rb
 - spec/integration/spec_helper.rb
 - spec/unit/lib/itamae/config_spec.rb
 - spec/unit/lib/itamae/logger_spec.rb
@@ -233,6 +234,7 @@ test_files:
 - spec/integration/recipes/hello.txt
 - spec/integration/recipes/included.rb
 - spec/integration/recipes/node.json
+- spec/integration/recipes/redefine.rb
 - spec/integration/spec_helper.rb
 - spec/unit/lib/itamae/config_spec.rb
 - spec/unit/lib/itamae/logger_spec.rb