nice-chef-formatter 0.0.2 → 0.0.3

data/lib/nice-chef-formatter.rb

@@ -1,5 +1,4 @@
 require 'chef/formatters/minimal'
-require 'chef/formatters/coloredputter'
 
 class Chef
   module Formatters
@@ -10,7 +9,6 @@ class Chef
       # Override parent class
       def initialize(out, err)
         super
-        @output = Coloredputter.new(out, err)
         livedrive_title = "
 =====================================================================
 =====================================================================
@@ -95,21 +93,21 @@ class Chef
       def resource_skipped(resource, action, conditional)
         # Output should be blue (Skipped)
         resource_exec_time = Time.now.to_f - @resource_start_time
-        puts("  * #{resource} action #{action} (#{resource_exec_time.round(3)} secs)", 'blue')
+        puts("  * #{resource} action #{action} (#{resource_exec_time.round(3)} secs)", :blue)
       end
 
       # Called when a resource has no converge actions, e.g., it was already correct.
       def resource_up_to_date(resource, action)
         # Output should be green
         resource_exec_time = Time.now.to_f - @resource_start_time
-        puts("  * #{resource} action #{action} (#{resource_exec_time.round(3)} secs)", 'green')
+        puts("  * #{resource} action #{action} (#{resource_exec_time.round(3)} secs)", :green)
       end
 
       # Called after a resource has been completely converged.
       def resource_updated(resource, action)
         # Output should be yellow (changes are applied)
         resource_exec_time = Time.now.to_f - @resource_start_time
-        puts("  * #{resource} action #{action} (#{resource_exec_time.round(3)} secs)", 'yellow')
+        puts("  * #{resource} action #{action} (#{resource_exec_time.round(3)} secs)", :yellow)
       end
     end
   end

data/nice-chef-formatter.gemspec

@@ -2,7 +2,7 @@ $:.push File.expand_path("../lib", __FILE__)
 
 Gem::Specification.new do |s|
   s.name        = "nice-chef-formatter"
-  s.version     = "0.0.2"
+  s.version     = "0.0.3"
   s.authors     = ["Nadir Lloret"]
   s.email       = ["nadir.lloret@livedrive.com"]
   s.homepage    = "https://github.com/nadirollo/nice-chef-formatter"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nice-chef-formatter
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rainbow
@@ -36,7 +36,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - README.md
-- lib/chef/formatters/coloredputter.rb
 - lib/nice-chef-formatter.rb
 - nice-chef-formatter.gemspec
 homepage: https://github.com/nadirollo/nice-chef-formatter

data/lib/chef/formatters/coloredputter.rb

@@ -1,76 +0,0 @@
-require 'chef/formatters/base'
-
-
-class Chef
-  module Formatters
-    class Coloredputter < Outputter
-      def initialize(out, err)
-        super(out, err)
-        if OS.windows?
-          require 'Win32API'
-          get_std_handle = Win32API.new("kernel32", "GetStdHandle", ['L'], 'L')
-          @stdout = get_std_handle.call(-11)
-          @set_console_txt_attrb = Win32API.new("kernel32", "SetConsoleTextAttribute", ['L','N'], 'I')
-        elsif OS.linux?
-          require 'rainbow'
-        end
-      end
-
-      def puts(string, *color)
-        if OS.linux?
-            case color[0]
-              when 'green'
-                @out.puts Rainbow(string).color(:green)
-              when 'yellow'
-                @out.puts Rainbow(string).color(:yellow)
-              when 'red'
-                @out.puts Rainbow(string).color(:red)
-              when 'blue'
-                @out.puts Rainbow(string).color(:blue)
-              else
-                @out.puts string
-            end
-        elsif OS.windows?
-          case color[0]
-            when 'green'
-              @set_console_txt_attrb.call(@stdout, 90)
-              @out.puts string
-            when 'yellow'
-              @set_console_txt_attrb.call(@stdout, 94)
-              @out.puts string
-            when 'red'
-              @set_console_txt_attrb.call(@stdout, 92)
-              @out.puts string
-            when 'blue'
-              @set_console_txt_attrb.call(@stdout, 91)
-              @out.puts string
-            else
-              @set_console_txt_attrb.call(@stdout, 95)
-              @out.puts string
-          end
-          @set_console_txt_attrb.call(@stdout, 95)
-        else
-          @out.puts string
-        end
-      end
-    end
-  end
-
-  module OS
-    def OS.windows?
-      (/cygwin|mswin|mingw|bccwin|wince|emx/ =~ RUBY_PLATFORM) != nil
-    end
-
-    def OS.mac?
-      (/darwin/ =~ RUBY_PLATFORM) != nil
-    end
-
-    def OS.unix?
-      !OS.windows?
-    end
-
-    def OS.linux?
-      OS.unix? and not OS.mac?
-    end
-  end
-end