rzo 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 57197ea4ec41e6e0b5ae935a754b415ee3ef7ebc
-  data.tar.gz: ae8140e57a89faf648963cb66f96f45f1fdfa8e5
+  metadata.gz: 70297031778e27174c132a827c094554b20a13f1
+  data.tar.gz: 47971b6987221ea6c623004eddb1736927a4300a
 SHA512:
-  metadata.gz: 627ff40899c739564bd9cd0a5a8bdb0d5995ab76a650e11293a51cf322c456e7310709940b016d539e66c8a23984c17b2ccd67eaef52aadc4a2a8777affde89b
-  data.tar.gz: eaecfbd7e222a971b4c1737b0451b30e24a8dbd0a402ff46ffca2ba0c11895a98914e3618f4b49a21dd6205a166d14d68c9f3e0741eeba900e07c743e0f63eb6
+  metadata.gz: b3d7ac91f360bdd6bcc169699bfc08faeb18343b7b1f3dc7887d87ac82b5a83e51b0f7a7dbec0a3777eac56bbf0c53a2d316170af56f635f62c5a2e5ffe51ade
+  data.tar.gz: b70d5f81eb88e8a4b9950a97b76a1d9a937f33b751d755e3af8116d3e9b689d800d2276074b08f62d79b4632b8a8636bbb10acdc930cc2f31fc766d1d9212571

data/.rubocop.yml

@@ -13,6 +13,12 @@ AllCops:
 Style/RedundantReturn:
   Enabled: false
 
+Style/InverseMethods:
+  Enabled: false
+
+Style/FrozenStringLiteralComment:
+  Enabled: false
+
 Lint/UnneededDisable:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,7 +1,14 @@
 # Change Log
 
-## [v0.4.0](https://github.com/ghoneycutt/rizzo/tree/v0.4.0)
+## [v0.5.0](https://github.com/ghoneycutt/rizzo/tree/v0.5.0)
 
+[Full Changelog](https://github.com/ghoneycutt/rizzo/compare/v0.4.0...v0.5.0)
+
+**Merged pull requests:**
+
+- Prioritize the present working control repository [\#24](https://github.com/ghoneycutt/rizzo/pull/24) ([jeffmccune](https://github.com/jeffmccune))
+
+## [v0.4.0](https://github.com/ghoneycutt/rizzo/tree/v0.4.0) (2017-09-13)
 [Full Changelog](https://github.com/ghoneycutt/rizzo/compare/v0.3.0...v0.4.0)
 
 **Closed issues:**

data/lib/rzo/app/subcommand.rb

@@ -5,6 +5,7 @@ require 'rzo/app/config_validation'
 module Rzo
   class App
     # The base class for subcommands
+    # rubocop:disable Metrics/ClassLength
     class Subcommand
       include ConfigValidation
       include Logging
@@ -15,6 +16,8 @@ module Rzo
       # The Rizzo configuration after loading ~/.rizzo.json (--config).
       # See #load_config!
       attr_reader :config
+      # The present working directory at startup
+      attr_reader :pwd
 
       ##
       # Delegated method to mock with fixture data.
@@ -38,6 +41,7 @@ module Rzo
         @stdout = stdout
         @stderr = stderr
         reset_logging!(opts)
+        @pwd = Dir.pwd
       end
 
       ##
@@ -59,7 +63,8 @@ module Rzo
       def load_config!
         config = load_rizzo_config(opts[:config])
         validate_personal_config!(config)
-        repos = config['control_repos']
+        repos = reorder_repos(config['control_repos'])
+        config['control_repos'] = repos
         @config = load_repo_configs(config, repos)
         debug "Merged configuration: \n#{JSON.pretty_generate(@config)}"
         # TODO: Move these validations to an instance method?
@@ -84,8 +89,8 @@ module Rzo
       def load_repo_configs(config = {}, repos = [])
         repos.each_with_object(config.dup) do |repo, hsh|
           fp = Pathname.new(repo).expand_path + '.rizzo.json'
-          if fp.readable?
-            hsh.deep_merge!(load_rizzo_config(fp))
+          if readable?(fp.to_s)
+            hsh.deep_merge!(load_rizzo_config(fp.to_s))
           else
             log.debug "Skipped #{fp} (it is not readable)"
           end
@@ -161,6 +166,50 @@ module Rzo
         else File.open(filepath, 'w') { |fd| yield fd }
         end
       end
+
+      # helper method to to stub in tests
+      def readable?(path)
+        File.readable?(path)
+      end
+
+      ##
+      # Memoized method to return the fully qualified path to the current rizzo
+      # project directory, based on the pwd.  The project directory is the
+      # dirname of the full path to a `.rizzo.json` config file.  Return false
+      # if not a project directory.  ~/.rizzo.json is considered a personal
+      # configuration and not a project configuration.
+      #
+      # rubocop:disable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+      def project_dir(path)
+        return @project_dir unless @project_dir.nil?
+        rizzo_file = Pathname.new("#{path}/.rizzo.json")
+        personal_config = Pathname.new(File.expand_path('~/.rizzo.json'))
+        iterations = 0
+        while @project_dir.nil? && iterations < 100
+          iterations += 1
+          if readable?(rizzo_file.to_s) && rizzo_file != personal_config
+            @project_dir = rizzo_file.dirname.to_s
+          else
+            rizzo_file = rizzo_file.dirname.dirname + '.rizzo.json'
+            @project_dir = false if rizzo_file.dirname.root?
+          end
+        end
+        @project_dir
+      end
+      # rubocop:enable Metrics/AbcSize, Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+
+      ##
+      # Given a list of control repositories, determine if the user's runtime
+      # pwd is in a control repository.  If it is, move that control repository
+      # to the top level.  If the user is inside a control repository and
+      def reorder_repos(repos = [])
+        if path = project_dir(pwd)
+          new_repos = repos - [path]
+          new_repos.unshift(path)
+        else
+          repos
+        end
+      end
     end
   end
 end

data/lib/rzo/option_parsing.rb

@@ -59,7 +59,7 @@ module Rzo
           'STDOUT, STDERR {RZO_LOGTO}'
         opt :logto, log_msg, default: env['RZO_LOGTO'] || 'STDERR'
         opt :validate, 'Check the configuration for common issues {RZO_VALIDATE="false"}',
-            default: env['RZO_VALIDATE'] == 'false' ? false : true
+            default: !(env['RZO_VALIDATE'] == 'false')
         opt :syslog, 'Log to syslog', default: false, conflicts: :logto
         opt :verbose, 'Set log level to INFO {RZO_VERBOSE="true"}',
             default: env['RZO_VERBOSE'] == 'true'
@@ -119,7 +119,7 @@ module Rzo
     NAME = File.basename($PROGRAM_NAME).freeze
 
     # rubocop:disable Layout/IndentHeredoc
-    BANNER = <<-"EOBANNER".freeze
+    BANNER = <<-BANNERMSG.freeze
 usage: #{NAME} [GLOBAL OPTIONS] SUBCOMMAND [ARGS]
 Sub Commands:
 
@@ -128,6 +128,6 @@ Sub Commands:
   roles        Output all roles defined in the combined config
 
 Global options: (Note, command line arguments supersede ENV vars in {}'s)
-    EOBANNER
+    BANNERMSG
   end
 end

data/lib/rzo/version.rb

@@ -5,7 +5,7 @@ module Rzo
   # The authoritative location of the rzo version.  It should be possible to
   # `require 'rizzo/version'` and access `Rizzo::VERSION` from third party
   # libraries and the gemspec.  The version is defined as a Semantic Version.
-  VERSION = '0.4.0'.freeze
+  VERSION = '0.5.0'.freeze
 
   ##
   # Return the SemVer string, e.g. `"0.1.0"`

data/rzo.gemspec

@@ -1,5 +1,3 @@
-# coding: utf-8
-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'rzo/version'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rzo
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Garrett Honeycutt
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-09-13 00:00:00.000000000 Z
+date: 2017-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake