update_repo 0.7.3 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d492231d540c9292da5e531ca9b8996b68b8b3cb
-  data.tar.gz: beaeeb3862f562398e8f93da7092aedc791e4e42
+  metadata.gz: fe97d312b2d580418707a7a5e139b9ce446e2564
+  data.tar.gz: ea880a88cc78769ae33ab2f9cd13f88800243ff3
 SHA512:
-  metadata.gz: 144c0bc9cc6b33131cdd46b0db1b8b2a3a9c42a03e0ba11d2303966510d449046fe6726ea3eabf4cb8eabadc76625cf83facf6b826cd834042fba5d9f302ac8e
-  data.tar.gz: 961c1c5fc1cfca3db813f44ebc464911ea7d2fd4cf5a30ddc77380638da74ce2bcd565eb74841b45f9d00a9fda46cbcd63661bf0bacaae94299e1c195c4b259d
+  metadata.gz: bc289788fbb7460a45a18154ea271e5c1f24b71a17f533f26ebfc93a66f8c2c021fdb580fe165df8f17466bb2043a5a2e5a981f5ee08eeaf162a8a95148caf49
+  data.tar.gz: ebf55d5a2f734362bce499c0f87f7697f50fd98564f5ebdf0bfde257bdd6e12b82a23ce357ed1e1c8d0dbbb414a896fdef07baf827376f135f2ed414bced3335

data/README.md

@@ -89,6 +89,8 @@ Options:
                              Any older logs will be overwritten.
   -t, --timestamp            Timestamp the logfile instead of overwriting. Does nothing unless the
                              --log option is also specified.
+  -r, --dump-remote          Create a dump to screen or log listing all the git remote URLS found in
+                             the specified directories.
   -v, --version              Print version and exit
   -h, --help                 Show this message
 ```
@@ -100,27 +102,25 @@ Add functionality, not in any specific order :
 - Improve the stats / info at end-of-job :
   * errors or connection problems `[IN PROGRESS]`
   * _more..._
-- Add command line options to override configuration, and even specify an alternate config file. Any options so specified will have precedence over settings specified in the configuration file.
+- Add command line options to override configuration, and even specify an alternate config file. Any options so specified will have precedence over settings specified in the configuration file. `[IN PROGRESS]`
 - Add command line options for verbose or quiet, with same options in config file.
 - Add ability to specify a new directory (containing Git repos) to search from the command line, and optionally save this to the standard configuration.
 - Add new repo from the command line that will be cloned to the default repo directory and then updated as usual. Extra flag added for "add only, clone later" for offline use.
 - Add flag for 'default' repo directory (or another specific directory - if it does not already exist it will be created and added to the standard list) which will be used for new additions.
-- Add option to only display a (text) tree of the discovered git repositories, not updating them; Similar option to just dump a list of the remote git locations.
+- Add option to only display a (text) tree of the discovered git repositories, not updating them.
 - Add Import & Export functionality :
-  * ability to export a text dump of each repo location `[DONE]`
+  * ability to export a text dump of each repo location and remote as a CSV file. `[DONE]`
   * re-import the above dump on a different machine or after reinstall
 - Add option to use alternative git command if required, either globally or on a case-by-case basis (see also comments on 'variants' above). Currently the script just uses a blanket `git pull` command on all repositories.
-- Document configuration file format and options.
+- Document configuration file format and options. `[IN PROGRESS]`
 
 Internal Changes and refactoring :
 - Add testing!
-- Refactor all command-line handling into a separate class and file
 - Error checking and reporting for the git processes `[IN PROGRESS]`
 - Improve error-checking and recovery while parsing the configuration file
   * Ignore and report invalid or missing directories
   * Add more failure cases, not all git errors fail with "fatal:"
 - Retry for connection issues etc (config setting).
-- Fix functionality so that command line options will override those in the config file
 
 [confoog]: http://confoog.seapagan.net
 

data/lib/update_repo/cmd_config.rb

@@ -21,6 +21,7 @@ module UpdateRepo
                                     prefix: 'update_repo',
                                     autoload: true, autosave: false)
       @conf['cmd'] = temp_opt
+      check_params
       config_error unless @conf.status[:errors] == Status::INFO_FILE_LOADED
     end
 
@@ -51,7 +52,10 @@ module UpdateRepo
     # make sure the parameter combinations are valid
     def check_params
       if true_cmd(:dump) && true_cmd(:import)
-        Trollop.die 'Sorry, you cannot specify both --dump and --import '.red
+        Trollop.die 'Sorry, you cannot specify --dump AND --import'.red
+      end
+      if true_cmd(:dump) && true_cmd(:dump_remote)
+        Trollop.die 'Sorry, you cannot specify --dump AND --dump-remote'.red
       end
     end
 
@@ -89,6 +93,7 @@ EOS
         # opt :import, "Import a previous dump of directories and Git repository URL's,\n(created using --dump) then proceed to clone them locally.", default: false
         opt :log, "Create a logfile of all program output to './update_repo.log'. Any older logs will be overwritten.", default: false
         opt :timestamp, 'Timestamp the logfile instead of overwriting. Does nothing unless the --log option is also specified.', default: false
+        opt :dump_remote, 'Create a dump to screen or log listing all the git remote URLS found in the specified directories.', default: false, short: 'r'
         # opt :quiet, 'Only minimal output to the terminal', default: false
         # opt :silent, 'Completely silent, no output to terminal at all.', default: false
       end

data/lib/update_repo/version.rb

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

data/lib/update_repo.rb

@@ -40,7 +40,7 @@ module UpdateRepo
       # make sure we dont have bad cmd-line parameter combinations ...
       @cmd.check_params
       # print out our header unless we are dumping / importing ...
-      no_header = cmd(:dump) || cmd(:import)
+      no_header = cmd(:dump) || cmd(:import) || cmd(:dump_remote)
       show_header unless no_header
       config['location'].each do |loc|
         recurse_dir(loc)
@@ -77,7 +77,7 @@ module UpdateRepo
       Dir.chdir(dirname) do
         Dir['**/'].each do |dir|
           next unless gitdir?(dir)
-          if cmd(:dump)
+          if cmd(:dump) || cmd(:dump_remote)
             dump_repo(File.join(dirname, dir))
           else
             notexception?(dir) ? update_repo(dir) : skip_repo(dir)
@@ -187,10 +187,13 @@ module UpdateRepo
       end
     end
 
+    # this function will either dump out a CSV with the directory and remote,
+    # or just the remote depending if we called --dump or --dump-remote
     def dump_repo(dir)
       Dir.chdir(dir.chomp!('/')) do
         repo_url = `git config remote.origin.url`.chomp
-        print_log "#{trunc_dir(dir, config['cmd'][:prune])},#{repo_url}\n"
+        print_log "#{trunc_dir(dir, config['cmd'][:prune])}," if cmd(:dump)
+        print_log "#{repo_url}\n"
       end
     end
   end

metadata

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