update_repo 0.3.3 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e41be9a5f9b005aa6f666a9e439174d4d4e357c7
-  data.tar.gz: 1a4c8277bde888f513eee2e0bbcbf03fe853fb6b
+  metadata.gz: 73a676a06bff85ea1bee76cbd0fd2233c02d97fc
+  data.tar.gz: 3ef767efdc89c3ae2ce51de70d6467e4a5d2c6e4
 SHA512:
-  metadata.gz: a8dc6f49e949d835af736370847162ca7b93c8d26bd2ea25f17e55ca2909415127e70952ccf305a9b4162a73c9bdeaff478f7da21b52d9447fbc9ab00fac7e40
-  data.tar.gz: a0e769b2ec965e02f426b339f925f8a8ab42dab80f24c9e442c3817bd6ae76adc0890870538df1786892706ea064d0d373a29fa24e4b00b0b74c5a6a4d2cd6c0
+  metadata.gz: 13c1225abb3a6ad9b74a172330b0f5757a3556228d67d9e78e0a4b030e841e5aafdeca26a13182e7f5f553d13c6087ac5938b0dfd2b66afc85a92cd689e397ea
+  data.tar.gz: a5d487d0c3cdb9b08205e84f535a3569565843317607993844716e1bd1463b934d0d5fac73215917c7ed2995416defc526a9e0295f82b5adeaf5794b66b641d5

data/README.md

@@ -20,7 +20,7 @@ It goes without saying that at the very least a working copy of both [`Git`][git
 [ruby]: http://www.ruby-lang.org
 
 #### Quick start
-Create a [YAML](http://yaml.org/)-formatted configuration file `.updatereporc` **in your home directory** that contains at least a 'location' tag pointing to the directory containing the git repositories you wish to have updated :
+Create a [YAML](http://yaml.org/)-formatted configuration file `.updaterepo` **in your home directory** that contains at least a 'location' tag pointing to the directory containing the git repositories you wish to have updated :
 ```yaml
 ---
 location:
@@ -29,7 +29,7 @@ location:
 ```
 This is the most basic example of a configuration file and there are other options that can be added to fine-tune the operation - see the description of configuration options below.
 
-This file should be located in the users home directory (`~/.updatereporc`).
+This file should be located in the users home directory (`~/.updaterepo`).
 
 Run the script :
 ```

data/exe/update_repo

@@ -3,7 +3,7 @@ require 'update_repo'
 
 # Catch ctrl-c and abort gracefully without Ruby back trace...
 Signal.trap('INT') {
-  print "\r  -> ".red, "Aborting on user request.\n"
+  print "\r  -> ".red, "Aborting on user request.\n\n"
   exit
 }
 

data/lib/update_repo/version.rb

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

data/lib/update_repo.rb

@@ -8,7 +8,7 @@ require 'trollop'
 # Contains Class UpdateRepo::WalkRepo
 module UpdateRepo
   # This constant holds the name to the config file, located in ~/
-  CONFIG_FILE = '.updatereporc'.freeze
+  CONFIG_FILE = '.updaterepo'.freeze
 
   # An encapsulated class to walk the repo directories and update all Git
   # repositories found therein.
@@ -22,15 +22,19 @@ module UpdateRepo
       @skip_count = 0
       # @ start_time - will be used to get elapsed time
       @start_time = 0
+      # read the options from Trollop and store in temp variable.
+      # we do it this way around otherwise if configuration file is missing it
+      # gives the error messages even on '--help' and '--version'
+      temp_opt = set_options
       # @config - Class. Reads the configuration from a file in YAML format and
       # allows easy access to the configuration data
-      @config = Confoog::Settings.new(filename: '.updatereporc',
+      @config = Confoog::Settings.new(filename: CONFIG_FILE,
                                       prefix: 'update_repo',
                                       autoload: true,
                                       autosave: false)
-      exit 1 unless @config.status[:errors] == Status::INFO_FILE_LOADED
       # store the command line variables in a configuration variable
-      @config['cmd'] = set_options
+      @config['cmd'] = temp_opt
+      config_error unless @config.status[:errors] == Status::INFO_FILE_LOADED
     end
 
     # This function will perform the required actions to traverse the Repo.
@@ -48,6 +52,14 @@ module UpdateRepo
 
     private
 
+    def config_error
+      if @config.status[:errors] == Status::ERR_CANT_LOAD
+        print 'Note that the the default configuration file was '.red,
+              "changed to ~/#{CONFIG_FILE} from v0.4.0 onwards\n\n".red
+      end
+      exit 1
+    end
+
     # rubocop:disable Metrics//MethodLength
     def set_options
       Trollop.options do
@@ -59,7 +71,7 @@ Usage:
       update_repo [options]
 
 Options are not required. If none are specified then the program will read from
-the standard configuration file (~/.updatereporc) and automatically update the
+the standard configuration file (~/#{CONFIG_FILE}) and automatically update the
 specified Repositories.
 
 Options:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: update_repo
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.4.1
 platform: ruby
 authors:
 - Grant Ramsay