homeseed 0.0.7 → 0.0.8

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjE5MjNlYzQzOWQyNzM1NmQ5MmM5MjhhMDMyYTM0MTRhZTE3Y2M1NA==
+    NzM0MmJmMDYyOWY2OTlmYjBjMDlkOTIzMDAwZDhiOTA0MzExODg3MQ==
   data.tar.gz: !binary |-
-    NGE2YjFjY2M2NGRmMjg1YzVmOTdkZTQ1ZGRkNjM1MmMxYmIzYTZiOA==
+    MDM4ZmMxMGVmOWRjNmVmYTM0YjEyYTNiMDdmMWExZDk0M2QwMGIxMg==
 SHA512:
   metadata.gz: !binary |-
-    ZTVmNGM5YzZhNjFiMmZjODZhYTgwYzc3YjYxM2FjMTRkM2EwM2FiODUwMTc1
-    NjUzMDA4NDQxMjM2NWQ0NzhhOGJjMmFlOTIyOTk4NGVkZTc0OWYxYjAzYzI1
-    MGNjOWRhNTk2NGM1OGIwYjUyMjU3NTA4ZjQzZWY1NTFhMzZmY2Q=
+    YzJkYWU3ZDNmZTNlNmVlZTA0ZDY4YWUxMjg0MWU5ZWIzYjAxMDU5YjNkMmFm
+    MjgzNTI0MGJiOGNiMDlmNTRjYmEwZDQxODY2NGVhNDkzMzA1YzQzOTVkY2I2
+    Mzc4MWEyOTU0NzQ1NTNjZGI1YmFjOGFiNTFjODkwMzA4ZDVjMjU=
   data.tar.gz: !binary |-
-    N2E1ZjE2OWJjNjliNWU2ODYyOTk3NTRiNmFkZjllMDlhZGJhMjcwODhlZmQ1
-    Y2M3NzcwMzQ1MTY2OTg1ZWZlMDJmOTg1NGE4OTQ0YjcyZDBjZmY4YmFjNTY5
-    ZDVlMTY3YTU5ODI2OTlkMTI0MDk3MzFkM2VhYmVjZjZhOTczNDc=
+    NDU2NmVmNmYxOGYwYjUxOTYyY2NjZDk5NTA0MWI4YzU3M2VmN2VjOWE1MjQ0
+    MmY2MTQ3NDhiNDcxNjg2MzMwZmZlNzAzMTdiZTc0OTdkZTRmMmUxYWQxODE0
+    ZDUxOGJkNjdiM2Q1YTEyYmU3YzMyNmQ3OWM3MTNkYWVkODk2YjU=

data/lib/homeseed/version.rb

@@ -1,3 +1,3 @@
 module Homeseed
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

data/lib/homeseed.rb

@@ -3,27 +3,18 @@ require 'logger'
 require 'net/ssh'
 require 'net/scp'
 require 'yaml'
+require_relative './logging'
 
 module Homeseed
   class Connection
-    def self.logger
-      @logger ||= Logger.new(STDOUT)
-      original_formatter = Logger::Formatter.new
-      @logger.formatter = proc { |severity, datetime, progname, msg|
-        original_formatter.call(severity, datetime, progname, msg.dump)
-      }
-      @logger
-    end
-
-    def logger
-      self.class.logger
-    end
+    include Logging
 
     def initialize(params={})
       raise 'servers and/or user not specified' unless params[:servers] and params[:user]
       @servers = params[:servers].split(',')
       @user = params[:user]
       @password = params[:password] || ''
+      logger.level = params[:logger_level] || Logger::INFO
 
       if params[:command]
         @flat_commands = params[:command]
@@ -77,7 +68,13 @@ module Homeseed
               ch.on_extended_data do |c,type,data|
                 data_lines = data.split(/[\r,\n]/)
                 data_lines.each do |data_line|
-                  logger.error data_line unless data_line == ''
+                  unless data_line == ''
+                    if data_line.match(/error|failed/i)
+                      logger.error data_line
+                    else
+                      logger.info data_line
+                    end
+                  end
                 end
               end
 
@@ -95,9 +92,12 @@ module Homeseed
     def scp_upload
       @servers.each do |server|
         @upload_files.each do |upload_file|
-          logger.info "scp #{upload_file} #{@user}@#{server}:#{@remote_path}"
-          Net::SCP.start(server, @user) do |scp|
-            scp.upload!(upload_file, @remote_path)
+          logger.info "starting scp #{upload_file} #{@user}@#{server}:#{@remote_path}"
+          begin
+            Net::SCP.start(server, @user) { |scp| scp.upload!(upload_file, @remote_path) }
+            logger.info "finished scp #{upload_file} #{@user}@#{server}:#{@remote_path}"
+          rescue => err
+            logger.error "scp FAILED #{err}"
           end
         end
       end

data/lib/logging.rb

@@ -0,0 +1,20 @@
+module Logging
+  def logger
+    @logger ||= Logging.logger_for(self.class.name)
+  end
+
+  # Use a hash class-ivar to cache a unique Logger per class:
+  @loggers = {}
+
+  class << self
+    def logger_for(classname)
+      @loggers[classname] ||= configure_logger_for(classname)
+    end
+
+    def configure_logger_for(classname)
+      logger = Logger.new(STDOUT)
+      logger.progname = classname
+      logger
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: homeseed
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - rbuchss
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-15 00:00:00.000000000 Z
+date: 2014-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -101,6 +101,7 @@ files:
 - homeseed.gemspec
 - lib/homeseed.rb
 - lib/homeseed/version.rb
+- lib/logging.rb
 homepage: http://github.com/rbuchss/homeseed
 licenses:
 - MIT