blazing 0.2.3 → 0.2.4

data/CHANGELOG.md

@@ -1,5 +1,10 @@
 ## master
 
+## 0.2.4 - November 9, 2011
+
+* Fix logger, so the formatting does not get carried over to apps using
+  blazing. (#55)
+
 ## 0.2.3 - November 1, 2011
 
 * Don't run in -w (warnings) mode, as warnings scare people when they

data/lib/blazing/logger.rb

@@ -1,26 +1,38 @@
 require 'logging'
 
-include Logging.globally
+module Blazing
+  module Logger
 
-# here we setup a color scheme called 'bright'
-Logging.color_scheme( 'bright',
-  :levels => {
-    :debug => :green,
-    :info  => :green,
-    :warn  => :yellow,
-    :error => [:white, :on_red],
-    :fatal => [:white, :on_red]
-  }
-)
+    # include Logging.globally
 
-Logging.appenders.stdout(
-  'stdout',
-  :layout => Logging.layouts.pattern(
-    :pattern => ' ------> [blazing] %-5l: %m\n',
-    :color_scheme => 'bright'
-  )
-)
+    # here we setup a color scheme called 'bright'
+    Logging.color_scheme( 'bright',
+      :levels => {
+        :debug => :green,
+        :info  => :green,
+        :warn  => :yellow,
+        :error => [:white, :on_red],
+        :fatal => [:white, :on_red]
+      }
+    )
 
-Logging.logger.root.appenders = 'stdout'
-Logging.logger.root.level = :info
-Logging.consolidate :root
+    Logging.appenders.stdout(
+      'stdout',
+      :layout => Logging.layouts.pattern(
+        :pattern => ' ------> [blazing] %-5l: %m\n',
+        :color_scheme => 'bright'
+      )
+    )
+
+    Logging.logger.root.appenders = 'stdout'
+    Logging.logger.root.level = :info
+    Logging.consolidate :root
+
+    %w[debug info warn error fatal].each do |level|
+      define_method level do |message|
+        Logging.logger[self].send(level, message)
+      end
+    end
+
+  end
+end

data/lib/blazing/runner.rb

@@ -3,6 +3,8 @@ require 'grit'
 
 class Blazing::Runner
 
+  include Blazing::Logger
+
   def initialize(config = nil, target = nil)
     if config
       @config = config
@@ -17,8 +19,8 @@ class Blazing::Runner
   end
 
   def init_command
-    logger.info "Creating an example config file in #{Blazing::DEFAULT_CONFIG_LOCATION}"
-    logger.info "Customize it to your needs"
+    info "Creating an example config file in #{Blazing::DEFAULT_CONFIG_LOCATION}"
+    info "Customize it to your needs"
 
     Dir.mkdir 'config' unless File.exists? 'config'
     configuration_file = ERB.new(File.read("#{Blazing::TEMPLATE_ROOT}/config.erb")).result
@@ -31,7 +33,7 @@ class Blazing::Runner
   def setup_git_remotes
     repository = Grit::Repo.new(Dir.pwd)
     @config.targets.each do |target|
-      logger.info "Adding new remote #{target.name} pointing to #{target.location}"
+      info "Adding new remote #{target.name} pointing to #{target.location}"
       repository.config["remote.#{target.name}.url"] = target.location
     end
   end

data/lib/blazing/target.rb

@@ -2,6 +2,8 @@ require 'blazing/shell'
 
 class Blazing::Target
 
+  include Blazing::Logger
+
   attr_accessor :name, :location, :options
 
   def initialize(name, location, config, options = {})
@@ -13,19 +15,19 @@ class Blazing::Target
   end
 
   def setup
-    logger.info "Setting up repository for #{name} in #{location}"
+    info "Setting up repository for #{name} in #{location}"
     @shell.run "ssh #{user}@#{host} '#{init_repository} && #{setup_repository}'"
   end
 
   def apply_hook
-    logger.info "Generating and uploading post-receive hook for #{name}"
+    info "Generating and uploading post-receive hook for #{name}"
     hook = ERB.new(File.read("#{Blazing::TEMPLATE_ROOT}/hook.erb")).result(binding)
 
     File.open(Blazing::TMP_HOOK, "wb") do |f|
       f.puts hook
     end
 
-    logger.debug "Copying hook for #{name} to #{location}"
+    debug "Copying hook for #{name} to #{location}"
     copy_hook
     @shell.run "ssh #{user}@#{host} #{make_hook_executable}"
   end
@@ -54,7 +56,7 @@ class Blazing::Target
   end
 
   def copy_hook
-    logger.debug "Making hook executable"
+    debug "Making hook executable"
     @shell.run "scp #{Blazing::TMP_HOOK} #{user}@#{host}:#{path}/.git/hooks/post-receive"
   end
 

data/lib/blazing/version.rb

@@ -1,3 +1,3 @@
 module Blazing
-  VERSION = "0.2.3"
+  VERSION = "0.2.4"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blazing
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-01 00:00:00.000000000Z
+date: 2011-11-09 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70256165498500 !ruby/object:Gem::Requirement
+  requirement: &70336821944020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70256165498500
+  version_requirements: *70336821944020
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70256165496760 !ruby/object:Gem::Requirement
+  requirement: &70336821943420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70256165496760
+  version_requirements: *70336821943420
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70256165496320 !ruby/object:Gem::Requirement
+  requirement: &70336821942940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70256165496320
+  version_requirements: *70336821942940
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70256165495860 !ruby/object:Gem::Requirement
+  requirement: &70336821942360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70256165495860
+  version_requirements: *70336821942360
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70256165495100 !ruby/object:Gem::Requirement
+  requirement: &70336821941820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70256165495100
+  version_requirements: *70336821941820
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70256165493860 !ruby/object:Gem::Requirement
+  requirement: &70336821919000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70256165493860
+  version_requirements: *70336821919000
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70256165482380 !ruby/object:Gem::Requirement
+  requirement: &70336821918460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70256165482380
+  version_requirements: *70336821918460
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70256165481920 !ruby/object:Gem::Requirement
+  requirement: &70336821917920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70256165481920
+  version_requirements: *70336821917920
 - !ruby/object:Gem::Dependency
   name: logging
-  requirement: &70256165481480 !ruby/object:Gem::Requirement
+  requirement: &70336821917440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70256165481480
+  version_requirements: *70336821917440
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70256165481060 !ruby/object:Gem::Requirement
+  requirement: &70336821916960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70256165481060
+  version_requirements: *70336821916960
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70256165480640 !ruby/object:Gem::Requirement
+  requirement: &70336821916480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70256165480640
+  version_requirements: *70336821916480
 description: painless git push deployments for everyone
 email:
 - felipekaufmann@gmail.com