logger refactor

Atalanta · Sep 17, 2012 · e9bbfa8 · e9bbfa8
1 parent 7aa11be
commit e9bbfa8
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 99 deletions.
diff --git a/bin/cc-knife b/bin/cc-knife
@@ -1,8 +1,8 @@
 #!/usr/bin/env ruby
 require 'cucumber-chef'
 
-$logger = Cucumber::Chef::Logger.new
-$logger.level = (Cucumber::Chef.is_rc? ? Cucumber::Chef::Logger::DEBUG : Cucumber::Chef::Logger::INFO)
+$logger = ZTK::Logger.new(Cucumber::Chef.log_file)
+Cucumber::Chef.is_rc? and ($logger.level = ZTK::Logger::DEBUG)
 
 # if we have bundler binstubs use that; otherwise attempt to detect
 knife = (Cucumber::Chef.locate(:file, "bin", "knife") rescue nil)

diff --git a/bin/cucumber-chef b/bin/cucumber-chef
@@ -57,8 +57,8 @@ class CucumberChef < Thor
         exit(255)
       end
 
-      $logger = Cucumber::Chef::Logger.new
-      Cucumber::Chef.is_rc? and ($logger.level = Cucumber::Chef::Logger::DEBUG)
+      $logger = ZTK::Logger.new(Cucumber::Chef.log_file)
+      Cucumber::Chef.is_rc? and ($logger.level = ZTK::Logger::DEBUG)
 
       message = "cucumber-chef v#{Cucumber::Chef::VERSION}"
       puts(set_color(message, :green, true))

diff --git a/bin/push-cucumber-chef b/bin/push-cucumber-chef
@@ -6,8 +6,8 @@ def run(command)
   @ssh.exec(command)
 end
 
-$logger = Cucumber::Chef::Logger.new
-$logger.level = (Cucumber::Chef.is_rc? ? Cucumber::Chef::Logger::DEBUG : Cucumber::Chef::Logger::INFO)
+$logger = ZTK::Logger.new(Cucumber::Chef.log_file)
+Cucumber::Chef.is_rc? and ($logger.level = ZTK::Logger::DEBUG)
 
 message = "push-cucumber-chef v#{Cucumber::Chef::VERSION}"
 puts(message)

diff --git a/lib/cucumber/chef/logger.rb b/lib/cucumber/chef/logger.rb
diff --git a/lib/cucumber/chef/templates/cucumber/env.rb b/lib/cucumber/chef/templates/cucumber/env.rb
@@ -14,8 +14,9 @@ class CustomWorld
 
 ################################################################################
 
-$logger = Cucumber::Chef::Logger.new
-Cucumber::Chef.is_rc? and ($logger.level = Cucumber::Chef::Logger::DEBUG)
+# $logger = ZTK::Logger.new(Cucumber::Chef.log_file)
+$logger = ZTK::Logger.new(Cucumber::Chef.log_file)
+Cucumber::Chef.is_rc? and ($logger.level = ZTK::Logger::DEBUG)
 
 message = "cucumber-chef v#{Cucumber::Chef::VERSION}"
 print("  * #{message}")

diff --git a/lib/cucumber/chef/utility.rb b/lib/cucumber/chef/utility.rb
@@ -130,6 +130,12 @@ def external_ip
         %x( wget -q -O - checkip.dyndns.org|sed -e 's/.*Current IP Address: //' -e 's/<.*$//' ).chomp
       end
 
+      def log_file
+        config_path = File.join(Cucumber::Chef.locate_parent(".chef"), ".cucumber-chef")
+        FileUtils.mkdir_p(config_path)
+        File.join(config_path, "cucumber-chef.log")
+      end
+
 ################################################################################
 
     end

diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -22,7 +22,7 @@
 require 'cucumber-chef'
 
 dev_null = File.open("/dev/null", "w")
-$logger = Cucumber::Chef::Logger.new(dev_null)
+$logger = ZTK::Logger.new(dev_null)
 
 require 'simplecov'
 SimpleCov.start do