update_repo 0.8.3 → 0.8.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f3535241ed1c52eb02d217ed8527c1b157b2eef
-  data.tar.gz: 63024bbfebe62bb05f82bb328a1ba6c0e127fda1
+  metadata.gz: 0f4b96ca5d15f8eb980a80f3017430ae9a0baed7
+  data.tar.gz: 34dfed03a84b45affc5736f09e425be50747830b
 SHA512:
-  metadata.gz: 0c29335e5df44c273e7666a36e03a79d4c9b02490f0c3cd715d089a63e9d1a428e53dd88aee4296ae39f379c1f7c81aa24a17884373f2ec5e5539f22eb45ca95
-  data.tar.gz: eed327dfa5518532b4f01c0e757e5570b8584ecbc9377436e128804eec981a73c02f3960a88effbfd55a8c573e7d0be794f2361cf71f4ad30f4d1aecf68fa594
+  metadata.gz: 9a8e063b9a01c9c4ae0dbb68f086ed25fb85c9bb3edc1da8a2fd9e78370b27affd12db1fe86f41f68ee3366e409addfb7fe648e7b78fc375bde081bbd7fb9245
+  data.tar.gz: ed02a5370ada39e6f02d19018db770416f0f4bf85ef386c4c275cd910cb43393eec4d9008a3866cbc8b723fc28fb6117ad2db041c18a2bca7b887c8bc5fd9b16

data/.travis.yml

@@ -4,4 +4,4 @@ rvm:
   - 2.1
   - 2.2.4
   - 2.3.1
-before_install: gem install bundler -v 1.12.5
+before_install: gem install bundler -v 1.13.2

data/lib/update_repo/console_output.rb

@@ -9,7 +9,7 @@ module UpdateRepo
 
     # Constructor for the ConsoleOutput class.
     # @param logger [class] Pointer to the Logger class
-    # @param metrics [hash] Hash of metrics and their values
+    # @param metrics [class] Pointer to the Metrics class
     # @param config [class] Pointer to the Confoog class
     # @return [void]
     # @example

data/lib/update_repo/helpers.rb

@@ -33,4 +33,8 @@ module Helpers
   def print_log(*string)
     @log.output(*string)
   end
+
+  def repo_url
+    `git config remote.origin.url`.chomp
+  end
 end

data/lib/update_repo/metrics.rb

@@ -0,0 +1,53 @@
+require 'update_repo/version'
+require 'update_repo/helpers'
+
+module UpdateRepo
+  # Class : Metrics.
+  # This class takes care of storing the metrics for processed, failures, etc.
+  class Metrics
+    include Helpers
+
+    # Constructor for the Metrics class.
+    # @param logger [instance] Pointer to the Logger class
+    # @return [instance] Instance of the Metrics class
+    def initialize(logger)
+      @log = logger
+      @metrics = { processed: 0, skipped: 0, failed: 0, updated: 0,
+                   start_time: 0, failed_list: [] }
+    end
+
+    # Read the metric 'key'
+    # @param key [symbol] the key to read
+    # @return [various] Return the value for hash key 'key'
+    def [](key)
+      @metrics[key]
+    end
+
+    # Set the metric 'key' to 'value'
+    # @param key [symbol] the key to set
+    # @param value [symbol] set 'key' to this value.
+    # @return [value] Return the value set.
+    def []=(key, value)
+      @metrics[key] = value
+    end
+
+    # output an error line and update the metrics
+    # @param line [string] The string containing the error message
+    # @return [void]
+    def handle_err(line)
+      return unless line =~ /^fatal:|^error:/
+      print_log '   ', line.red
+      @metrics[:failed] += 1
+      err_loc = Dir.pwd + " (#{repo_url})"
+      @metrics[:failed_list].push(loc: err_loc, line: line)
+    end
+
+    # print a git output line and update the metrics if an update has occurred
+    # @param line [string] The string containing the git output line
+    # @return [void]
+    def handle_output(line)
+      print_log '   ', line.cyan
+      @metrics[:updated] += 1 if line =~ %r{^From\s(?:https?|git)://}
+    end
+  end
+end

data/lib/update_repo/version.rb

@@ -1,4 +1,4 @@
 module UpdateRepo
   # constant, current version of this Gem
-  VERSION = '0.8.3'.freeze
+  VERSION = '0.8.4'.freeze
 end

data/lib/update_repo.rb

@@ -3,6 +3,7 @@ require 'update_repo/helpers'
 require 'update_repo/cmd_config'
 require 'update_repo/logger'
 require 'update_repo/console_output'
+require 'update_repo/metrics'
 require 'yaml'
 require 'colorize'
 require 'confoog'
@@ -22,12 +23,12 @@ module UpdateRepo
     # Class constructor. No parameters required.
     # @return [void]
     def initialize
-      @metrics = { processed: 0, skipped: 0, failed: 0, updated: 0,
-                   start_time: 0, failed_list: [] }
       # create a new instance of the CmdConfig class then read the config var
       @cmd = CmdConfig.new
-      # set up the logfile if needed
+      # set up the output and logging class
       @log = Logger.new(cmd(:log), cmd(:timestamp))
+      # create instance of the Metrics class
+      @metrics = Metrics.new(@log)
       # instantiate the console output class for header, footer etc
       @cons = ConsoleOutput.new(@log, @metrics, @cmd)
     end
@@ -127,11 +128,11 @@ module UpdateRepo
     # @param none
     # @return [void]
     def do_update
-      repo_url = `git config remote.origin.url`.chomp
+      # repo_url = `git config remote.origin.url`.chomp
       print_log '* Checking ', Dir.pwd.green, " (#{repo_url})\n"
       Open3.popen3('git pull') do |stdin, stdout, stderr, thread|
         stdin.close
-        do_threads(stdout, stderr, repo_url)
+        do_threads(stdout, stderr)
         thread.join
       end
     end
@@ -142,19 +143,12 @@ module UpdateRepo
     # @param stderr [stream] STDERR Stream from the popen3 call
     # @param repo_url [string] URL of the associated repository
     # @return [void]
-    def do_threads(stdout, stderr, repo_url)
+    def do_threads(stdout, stderr)
       { out: stdout, err: stderr }.each do |key, stream|
         Thread.new do
           while (line = stream.gets)
-            if key == :err && line =~ /^fatal:|^error:/
-              print_log '   ', line.red
-              @metrics[:failed] += 1
-              err_loc = Dir.pwd + " (#{repo_url})"
-              @metrics[:failed_list].push(loc: err_loc, line: line)
-            else
-              print_log '   ', line.cyan
-              @metrics[:updated] += 1 if line =~ %r{^From\s(?:https?|git)://}
-            end
+            @metrics.handle_err(line) if key == :err
+            @metrics.handle_output(line) if key == :out
           end
         end
       end
@@ -166,9 +160,9 @@ module UpdateRepo
     # @return [void]
     def dump_repo(dir)
       Dir.chdir(dir.chomp!('/')) do
-        repo_url = `git config remote.origin.url`.chomp
+        # repo_url = `git config remote.origin.url`.chomp
         print_log "#{trunc_dir(dir, config['cmd'][:prune])}," if cmd(:dump)
-        print_log "#{repo_url}\n"
+        print_log "#{get_repo_url}\n"
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: update_repo
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.4
 platform: ruby
 authors:
 - Grant Ramsay
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-10 00:00:00.000000000 Z
+date: 2016-10-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -289,6 +289,7 @@ files:
 - lib/update_repo/console_output.rb
 - lib/update_repo/helpers.rb
 - lib/update_repo/logger.rb
+- lib/update_repo/metrics.rb
 - lib/update_repo/version.rb
 - update_repo.gemspec
 homepage: http://updaterepo.seapagan.net