blazing 0.2.0 → 0.2.1

data/Gemfile.lock

@@ -1,10 +1,11 @@
 PATH
   remote: .
   specs:
-    blazing (0.2.0)
+    blazing (0.2.1)
       activesupport
       grit
       i18n
+      logging
 
 GEM
   remote: http://rubygems.org/
@@ -22,7 +23,10 @@ GEM
       guard (>= 0.8.4)
     i18n (0.6.0)
     json (1.6.1)
-    mime-types (1.16)
+    little-plugger (1.1.2)
+    logging (1.6.1)
+      little-plugger (>= 1.1.2)
+    mime-types (1.17.2)
     multi_json (1.0.3)
     rake (0.9.2)
     rb-fsevent (0.4.0)

data/blazing.gemspec

@@ -28,7 +28,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency('guard-rspec')
   s.add_development_dependency('growl')
   s.add_development_dependency('rb-fsevent')
+
   s.add_dependency('grit')
+  s.add_dependency('logging')
 
   # TODO: Get rid of those, just used for guessing recipe names etc in lib/recipes.rb
   s.add_dependency "activesupport"

data/lib/blazing.rb

@@ -1,4 +1,5 @@
 require "blazing/version"
+require "blazing/logger"
 
 module Blazing
 

data/lib/blazing/logger.rb

@@ -0,0 +1,27 @@
+require 'logging'
+
+include Logging.globally
+
+# 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.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

data/lib/blazing/recipe.rb

@@ -1,10 +1,7 @@
 require 'active_support/inflector'
-require 'blazing/cli_logging'
 
 class Blazing::Recipe
 
-  include Blazing::CLILogging
-
   attr_reader :options
 
   def initialize(options = {})

data/lib/blazing/runner.rb

@@ -1,11 +1,8 @@
 require 'erb'
-require 'blazing/cli_logging'
 require 'grit'
 
 class Blazing::Runner
 
-  include Blazing::CLILogging
-
   def initialize(config = nil, target = nil)
     if config
       @config = config
@@ -20,8 +17,8 @@ class Blazing::Runner
   end
 
   def init_command
-    info("Creating an example config file in #{Blazing::DEFAULT_CONFIG_LOCATION}")
-    info("Customize it to your needs")
+    logger.info "Creating an example config file in #{Blazing::DEFAULT_CONFIG_LOCATION}"
+    logger.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
@@ -34,7 +31,7 @@ class Blazing::Runner
   def setup_git_remotes
     repository = Grit::Repo.new(Dir.pwd)
     @config.targets.each do |target|
-      info("Adding new remote #{target.name} pointing to #{target.location}")
+      logger.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

@@ -13,16 +13,19 @@ class Blazing::Target
   end
 
   def setup
+    logger.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}"
     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}"
     copy_hook
     @shell.run "ssh #{user}@#{host} #{make_hook_executable}"
   end
@@ -46,6 +49,7 @@ class Blazing::Target
   end
 
   def copy_hook
+    logger.debug "Making hook executable"
     @shell.run "scp #{Blazing::TMP_HOOK} #{user}@#{host}:#{path}/.git/hooks/post-receive"
   end
 

data/lib/blazing/templates/hook.erb

@@ -1,6 +1,8 @@
 #!/bin/bash
 
-echo "------> [blazing] Entering post-receive hook for <%= name %>"
+echo "------"
+echo "------  [blazing] ENTERING POST RECEIVE HOOK FOR: <%= name %>"
+echo "------"
 
 cd ..
 GIT_DIR='.git'
@@ -8,6 +10,7 @@ GIT_DIR='.git'
 while read oldrev newrev refname
 do
   # Reset so we dont have unstaged changes... and then checkout the pushed ref
+  echo "------> [blazing] Doing a hard reset and checking out $refname since thats what you pushed"
   git reset --hard HEAD
   git checkout $refname
 done

data/lib/blazing/version.rb

@@ -1,3 +1,3 @@
 module Blazing
-  VERSION = "0.2.0"
+  VERSION = "0.2.1"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: blazing
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2011-10-27 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70202482807140 !ruby/object:Gem::Requirement
+  requirement: &70129527165280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202482807140
+  version_requirements: *70129527165280
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70202482806620 !ruby/object:Gem::Requirement
+  requirement: &70129527164400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.2
   type: :development
   prerelease: false
-  version_requirements: *70202482806620
+  version_requirements: *70129527164400
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70202482806200 !ruby/object:Gem::Requirement
+  requirement: &70129527163660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202482806200
+  version_requirements: *70129527163660
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70202482805740 !ruby/object:Gem::Requirement
+  requirement: &70129527162880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202482805740
+  version_requirements: *70129527162880
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70202482805320 !ruby/object:Gem::Requirement
+  requirement: &70129527162160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202482805320
+  version_requirements: *70129527162160
 - !ruby/object:Gem::Dependency
   name: growl
-  requirement: &70202482804880 !ruby/object:Gem::Requirement
+  requirement: &70129527161380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202482804880
+  version_requirements: *70129527161380
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70202482804460 !ruby/object:Gem::Requirement
+  requirement: &70129527160620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70202482804460
+  version_requirements: *70129527160620
 - !ruby/object:Gem::Dependency
   name: grit
-  requirement: &70202482804040 !ruby/object:Gem::Requirement
+  requirement: &70129527159680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,21 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70202482804040
+  version_requirements: *70129527159680
+- !ruby/object:Gem::Dependency
+  name: logging
+  requirement: &70129527158820 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70129527158820
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70202482803620 !ruby/object:Gem::Requirement
+  requirement: &70129527158020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70202482803620
+  version_requirements: *70129527158020
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70202482803200 !ruby/object:Gem::Requirement
+  requirement: &70129527157080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,7 +131,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70202482803200
+  version_requirements: *70129527157080
 description: painless git push deployments for everyone
 email:
 - felipekaufmann@gmail.com
@@ -141,10 +152,9 @@ files:
 - bin/blazing
 - blazing.gemspec
 - lib/blazing.rb
-- lib/blazing/cli_logger.rb
-- lib/blazing/cli_logging.rb
 - lib/blazing/config.rb
 - lib/blazing/dsl_setter.rb
+- lib/blazing/logger.rb
 - lib/blazing/recipe.rb
 - lib/blazing/runner.rb
 - lib/blazing/shell.rb

data/lib/blazing/cli_logger.rb

@@ -1,114 +0,0 @@
-#
-# Borrowed from: https://raw.github.com/davetron5000/methadone/master/lib/methadone/cli_logging.rb
-#
-
-require 'logger'
-
-module Blazing
-  # A Logger instance that gives better control of messaging the user
-  # and logging app activity.  At it's most basic, you would use
-  # #info as a replacement for +puts+ and #error as a replacement
-  # for <tt>STDERR.puts</tt>.  Since this is a logger, however, you
-  # can also use #debug, #warn, and #fatal, and you can control
-  # the format and "logging level" as such.
-  #
-  # So, by default:
-  # * #debug messages do not appear anywhere
-  # * #info messages appear on the standard output
-  # * #warn, #error, and #fata messagse appear on the standard error
-  # * The default format of messages is simply the message, no logging cruft
-  #
-  # You can customize this in several ways:
-  # 
-  # * You can override the devices used by passing different devices to the constructor
-  # * You can adjust the level of message that goes to the error logger via error_level=
-  # * You can adjust the format for messages to the error logger separately via error_formatter=
-  #
-  # === Example
-  #
-  #     logger = CLILogger.new
-  #     logger.debug("Starting up") # => only the standard output gets this
-  #     logger.warn("careful!") # => only the standard error gets this
-  #     logger.error("Something went wrong!") # => only the standard error gets this
-  #
-  #     logger = CLILogger.new
-  #     logger.error_level = Logger::ERROR
-  #     logger.debug("Starting up") # => only the standard output gets this
-  #     logger.warn("careful!") # => only the standard OUTPUT gets this
-  #     logger.error("Something went wrong!") # => only the standard error gets this
-  #     
-  #     logger = CLILogger.new('logfile.txt')
-  #     logger.debug("Starting up") # => logfile.txt gets this
-  #     logger.error("Something went wrong!") # => BOTH logfile.txt AND the standard error get this
-  class CLILogger < Logger
-    BLANK_FORMAT = proc { |severity,datetime,progname,msg|
-      msg + "\n"
-    }
-
-    # Helper to proxy methods to the super class AND to the internal error logger
-    # 
-    # +symbol+:: Symbol for name of the method to proxy
-    def self.proxy_method(symbol) #:nodoc:
-      old_name = "old_#{symbol}".to_sym
-      alias_method old_name,symbol
-      define_method symbol do |*args,&block|
-        send(old_name,*args,&block)
-        @stderr_logger.send(symbol,*args,&block)
-      end
-    end
-
-    proxy_method :'formatter='
-    proxy_method :'datetime_format='
-
-    def add(severity, message = nil, progname = nil, &block) #:nodoc:
-      if @split_logs 
-        unless severity >= @stderr_logger.level
-          super(severity,message,progname,&block)
-        end
-      else
-        super(severity,message,progname,&block)
-      end
-      @stderr_logger.add(severity,message,progname,&block)
-    end
-    
-
-    # A logger that logs error-type messages to a second device; useful
-    # for ensuring that error messages go to standard error.  This should be
-    # pretty smart about doing the right thing.  If both log devices are
-    # ttys, e.g. one is going to standard error and the other to the standard output,
-    # messages only appear once in the overall output stream.  In other words,
-    # an ERROR logged will show up *only* in the standard error.  If either
-    # log device is NOT a tty, then all messages go to +log_device+ and only
-    # errors go to +error_device+
-    #
-    # +log_device+:: device where all log messages should go, based on level
-    # +error_device+:: device where all error messages should go.  By default, this is Logger::Severity::WARN
-    def initialize(log_device=$stdout,error_device=$stderr)
-      super(log_device)
-      @split_logs = log_device.tty? && error_device.tty?
-      self.level = Logger::Severity::INFO
-      @stderr_logger = Logger.new(error_device)
-      @stderr_logger.level = Logger::Severity::WARN
-      self.formatter = BLANK_FORMAT if log_device.tty?
-      @stderr_logger.formatter = BLANK_FORMAT if error_device.tty?
-    end
-
-    # Set the threshold for what messages go to the error device.  Note that calling
-    # #level= will *not* affect the error logger
-    #
-    # +level+:: a constant from Logger::Severity for the level of messages that should go
-    #           to the error logger
-    def error_level=(level)
-      @stderr_logger.level = level
-    end
-
-    # Overrides the formatter for the error logger.  A future call to #formatter= will
-    # affect both, so the order of the calls matters.
-    #
-    # +formatter+:: Proc that handles the formatting, the same as for #formatter=
-    def error_formatter=(formatter)
-      @stderr_logger.formatter=formatter
-    end
-
-  end
-end

data/lib/blazing/cli_logging.rb

@@ -1,58 +0,0 @@
-#
-# Borrowed from: https://raw.github.com/davetron5000/methadone/master/lib/methadone/cli_logging.rb
-#
-
-require 'blazing/cli_logger'
-
-module Blazing
-  # Provides easier access to a shared Methadone::CLILogger instance.
-  #
-  # Include this module into your class, and #logger provides access to a shared logger.
-  # This is handy if you want all of your clases to have access to the same logger, but 
-  # don't want to (or aren't able to) pass it around to each class.
-  #
-  # This also provides methods for direct logging without going through the #logger
-  #
-  # === Example
-  #
-  #     class MyClass
-  #       include Methadone::CLILogger
-  #       
-  #       def doit
-  #         debug("About to doit!")
-  #         if results
-  #           info("We did it!"
-  #         else
-  #           error("Something went wrong")
-  #         end
-  #         debug("Done doing it")
-  #       end
-  #     end
-  module CLILogging
-    # Access the shared logger.  All classes that include this module
-    # will get the same logger via this method.
-    def logger
-      @@logger ||= Blazing::CLILogger.new
-    end
-
-    # Change the global logger that includers will use.  Useful if you
-    # don't want the default configured logger.
-    #
-    # +new_logger+:: the new logger.  May not be nil and should be a a logger of some kind
-    def logger=(new_logger)
-      raise ArgumentError,"Logger may not be nil" if new_logger.nil?
-      @@logger = new_logger
-    end
-
-    # pass-through to <tt>logger.debug(progname,&block)</tt>
-    def debug(progname = nil, &block); logger.debug(progname,&block); end
-    # pass-through to <tt>logger.info(progname,&block)</tt>
-    def info(progname = nil, &block); logger.info(progname,&block); end
-    # pass-through to <tt>logger.warn(progname,&block)</tt>
-    def warn(progname = nil, &block); logger.warn(progname,&block); end
-    # pass-through to <tt>logger.error(progname,&block)</tt>
-    def error(progname = nil, &block); logger.error(progname,&block); end
-    # pass-through to <tt>logger.fatal(progname,&block)</tt>
-    def fatal(progname = nil, &block); logger.fatal(progname,&block); end
-  end
-end