update_repo 0.9.8 → 0.9.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ea51a325f2034931394847abe9affebe15c9f749
-  data.tar.gz: 423151a48e8c9181257407aa22d875cab4793177
+SHA256:
+  metadata.gz: 5904ff9e75b0a3f8ca385929e367660c8b036fa7ef64751910fd64d28b1e0822
+  data.tar.gz: a6ac76df0c1dc18a11b82c69835f75f2b884f7a2a871603ef551bc491f5960a2
 SHA512:
-  metadata.gz: b42b27c64c860d0981951fe331d8acebd943917da21cf781f08c2d336b7826d276086ecb87ad1cbdcdd3f4af91a6be04c638372326de0df60c239a0ddc671d75
-  data.tar.gz: 5a66f4057f27b77e49c25a8720944a64f801e2d7ff1fe219afe2d2b4bba6b267931cbae5ba88682a2afc203cc3223fcd74e9e8eedee79b0868c33a35c390ec38
+  metadata.gz: e123ca8994c046b218c3379749fdf5946a384b01f2df16f5dac7b376e1aaa67b06c804c869e4cfdb6090bbecb491299fd75afddb335dde5504971ef2993a8f46
+  data.tar.gz: ddb71d1eecc47173aec36f1a4a95824a638586a537099362ef4cf9442c4ed4bbee699962e3e6cae8ebb876a4847104a197fd669518e1be7331e0ce7d4e1d44a5

data/.travis.yml

@@ -1,13 +1,10 @@
 language: ruby
 
 rvm:
-  - 1.9.3-p551
-  - 2.0.0-p648
-  - 2.1.10
-  - 2.2.7
-  - 2.3.4
-  - 2.4.1
+  - 2.3.8
+  - 2.4.5
+  - 2.5.3
 
 before_install:
   - gem update --system
-  - gem install bundler -v 1.15.1
+  - gem install bundler -v 1.17.1

data/lib/update_repo/cmd_config.rb

@@ -1,7 +1,7 @@
 require 'update_repo/version'
 require 'update_repo/helpers'
 require 'confoog'
-require 'trollop'
+require 'optimist'
 require 'yaml'
 
 # this class will encapsulate the command line fucntionality and processing
@@ -76,8 +76,9 @@ module UpdateRepo
     # @return [void]
     def check_params
       return unless true_cmd(:dump)
-      Trollop.die 'You cannot use --dump AND --import'.red if true_cmd(:import)
-      Trollop.die 'You cannot use --dump AND --dump-remote'.red if true_cmd(:dump_remote)
+
+      Optimist.die 'You cannot use --dump AND --import'.red if true_cmd(:import)
+      Optimist.die 'You cannot use --dump AND --dump-remote'.red if true_cmd(:dump_remote)
     end
     # rubocop:enable  Metrics/LineLength
 
@@ -100,9 +101,9 @@ module UpdateRepo
     # rubocop:disable Metrics/MethodLength
     # rubocop:disable Metrics/LineLength
     def set_options
-      Trollop.options do
+      Optimist.options do
         version "update_repo version #{VERSION} (C)2017 G. Ramsay\n"
-        banner <<-EOS
+        banner <<-OPTION_TEXT
 
   Keep multiple local Git-Cloned Repositories up to date with one command.
 
@@ -115,7 +116,7 @@ module UpdateRepo
 
   Options:
 
-        EOS
+        OPTION_TEXT
         opt :color, 'Use colored output', default: true
         opt :dump, 'Dump a list of Directories and Git URL\'s to STDOUT in CSV format', default: false
         opt :prune, "Number of directory levels to remove from the --dump output.\nOnly valid when --dump or -d specified", default: 0

data/lib/update_repo/console_output.rb

@@ -101,6 +101,7 @@ module UpdateRepo
     def list_exceptions
       exceptions = @cmd['exceptions']
       return unless exceptions
+
       print_log "\nExclusions:".underline, ' ',
                 exceptions.join(', ').yellow, "\n"
     end
@@ -119,6 +120,7 @@ module UpdateRepo
     # @return [void]
     def show_logfile
       return unless @cmd[:log]
+
       print_log "\nLogging to file:".underline, " #{@log.logfile}\n".cyan
     end
   end

data/lib/update_repo/helpers.rb

@@ -7,6 +7,7 @@ module Helpers
   def trunc_dir(dir, how_many)
     # make sure we don't lose any root slash if '--prune' is NOT specified
     return dir if how_many.zero?
+
     # convert to array then lose the first 'how_many' parts
     path_array = Pathname(dir).each_filename.to_a
     path_array = path_array.drop(how_many)

data/lib/update_repo/logger.rb

@@ -20,6 +20,7 @@ module UpdateRepo
                   skipped: { char: 's', color: 'yellow' } }
       # don't prepare a logfile unless it's been requested.
       return unless @cmd[:log]
+
       # generate a filename depending on 'timestamp' setting.
       filename = generate_filename
       # open the logfile and set sync mode.
@@ -32,11 +33,11 @@ module UpdateRepo
     # @return [string] Filename for the logfile.
     def generate_filename
       # add a timestamp if requested
-      if @cmd[:timestamp]
-        name = 'updaterepo-' + Time.new.strftime('%y%m%d-%H%M%S') + '.log'
-      else
-        name = 'updaterepo.log'
-      end
+      name = if @cmd[:timestamp]
+               'updaterepo-' + Time.new.strftime('%y%m%d-%H%M%S') + '.log'
+             else
+               'updaterepo.log'
+             end
       # log to local directory instead of home directory if requested
       if @cmd[:log_local]
         File.expand_path(File.join('./', name))
@@ -57,6 +58,7 @@ module UpdateRepo
       end
       # log to file if that has been enabled
       return unless @cmd[:log]
+
       @logfile.write(string.join('').gsub(/\e\[(\d+)(;\d+)*m/, ''))
     end
 
@@ -67,6 +69,7 @@ module UpdateRepo
     def repostat(status)
       # only print if not quiet and not verbose!
       return if @cmd[:quiet] || @cmd[:verbose]
+
       @legend.each do |key, value|
         print value[:char].send(value[:color].to_sym) if status[key]
       end
@@ -85,7 +88,7 @@ module UpdateRepo
     def repo_text?
       # get calling function - need to skip first 2, also remove 'block in '
       # prefix if exists
-      calling_fn = caller_locations[2].label.gsub(/block in /, '')
+      calling_fn = caller_locations(3..3).first.label.gsub(/block in /, '')
       # array with the functions we want to skip
       repo_output = %w[do_update print_line handle_output skip_repo update]
       # return TRUE if DOES match, FALSE otherwise.

data/lib/update_repo/version.rb

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

data/lib/update_repo.rb

@@ -8,7 +8,7 @@ require 'update_repo/git_control'
 require 'yaml'
 require 'colorize'
 require 'confoog'
-require 'trollop'
+require 'optimist'
 require 'versionomy'
 require 'pp'
 
@@ -59,6 +59,7 @@ module UpdateRepo
       end
       gitver = `git --version`.gsub(/git version /, '').chomp
       return if Versionomy.parse(gitver) >= '1.8.5'
+
       print 'Git version 1.8.5 or greater must be installed, you have '.red,
             "version #{gitver}!\n".red
       exit 1
@@ -99,6 +100,7 @@ module UpdateRepo
       Dir.chdir(dirname) do
         Dir['**/'].each do |dir|
           next unless gitdir?(dir)
+
           repo_list.push(path: File.join(dirname, dir), name: dir)
         end
       end
@@ -111,6 +113,7 @@ module UpdateRepo
     # ignore the :reek:NilCheck for this function, may refactor later
     def notexception?(dir)
       return true if @cmd.true_cmd(:exceptions).nil?
+
       !config['exceptions'].include?(File.basename(dir))
     end