MuranoCLI 3.2.0.beta.8 → 3.2.0.beta.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8940564247a955849c5a89835b1915f57b3766f28b0fc52cd83e282ec9aef599
-  data.tar.gz: dda30a89bf0f573fd124902dba05fe8c7f21b0b803dd951a6573ccd400a6293f
+  metadata.gz: d280f1504ef238178a4baea98ead2816f1e5e4e171b833c1905f2f9829e5f664
+  data.tar.gz: 57a8ba23b80836607343f7dad576c730747d7ca672b9b2c55318b69a0eb956cf
 SHA512:
-  metadata.gz: e221c40000b55e2c6b18aa2738541ed3c8edbc4bdb61377a2e62342a0ca2f6e261731e455a846eff2a77b18893e1d90fc6c2bd74b9dee4d41ee23bdd8868a4ee
-  data.tar.gz: 6d9076522f2a45cd76a95ffc2f362952e6f2d3978699571efcc93663906b062051e8e883edc58400758112ad7093632f14d087d3218ec87179d9f121473fd01c
+  metadata.gz: 81a67f95d05900d181d9ffd87eea654d0ccf44cb0e9d9dc83d76b8999d203595a8015e4f8a1a9aae83b028c5dd8b343450795bab7e05bf7c194c31a15112c7d3
+  data.tar.gz: 7a27339a72cd15419af5961680e178fb723919082f9a47cf7a9d8fbfd07db9936c3931b16ab665efae073ab58ee719d1f6689123d8babe878c7225d50d9e73dc

data/dockers/README.rst

@@ -65,7 +65,7 @@ Jenkins project configuration: Murano CLI Tests
 
 - General configuration
 
-  - Project name: ``Murano CLI Tests - Ruby 2.3``
+  - Project name: ``Murano_CLI_Tests__Ruby_2_3``
 
   - Discard old builds ``✓``
 

data/lib/MrMurano/Config.rb

@@ -127,6 +127,8 @@ module MrMurano
       @runner = cmd_runner
       @curlfile_f = nil
 
+      @known_keys = {}
+
       @paths = []
       @paths << ConfigFile.new(:internal, nil, self, IniFile.new)
       # :specified --configfile FILE goes here. (see load_specific)
@@ -179,6 +181,7 @@ module MrMurano
       set_defaults_modules
       set_defaults_diff
       set_defaults_postgresql
+      set_defaults_project
     end
 
     def set_defaults_tool
@@ -329,6 +332,14 @@ module MrMurano
       set('postgresql.migrations_dir', 'sql-migrations', :defaults)
     end
 
+    def set_defaults_project
+      # Set these so that @known_keys is updated.
+      set('user.name', nil, :defaults)
+      set('business.id', nil, :defaults)
+      set('application.id', nil, :defaults)
+      set('solution.id', nil, :defaults)
+    end
+
     ## Find the root of this project Directory.
     #
     # The Project dir is the directory between PWD and HOME
@@ -490,15 +501,25 @@ module MrMurano
     def get(key, scope=CFG_SCOPES)
       scope = [scope] unless scope.is_a? Array
       paths = @paths.select { |p| scope.include? p.kind }
-      paths = paths.reject { |p| @exclude_scopes.include? p.kind }
+      paths.reject { |p| @exclude_scopes.include? p.kind }
 
       section, ikey = key.split('.')
       paths.each do |path|
         next if path.data.nil?
         next unless path.data.has_section?(section)
         sec = path.data[section]
-        return sec if ikey.nil?
-        return sec[ikey] if sec.key?(ikey)
+        found = true
+        if ikey.nil?
+          value = sec
+        elsif sec.key?(ikey) && !sec[ikey].nil?
+          value = sec[ikey]
+        else
+          found = false
+        end
+        if found
+          warn_on_unknown_key(key, value)
+          return value
+        end
       end
       nil
     end
@@ -589,6 +610,7 @@ module MrMurano
       tomod = data[section]
       if !value.nil?
         change_value(key, tomod, ikey, value)
+        warn_on_unknown_key(key, value) if scope != :defaults
       else
         tomod.delete(ikey)
       end
@@ -602,6 +624,7 @@ module MrMurano
       data.each_section do |sectn|
         data.delete_section(sectn) if data[sectn].empty?
       end
+      @known_keys[key] = true if scope == :defaults
 
       cfg.write
     end
@@ -617,6 +640,15 @@ module MrMurano
       end
     end
 
+    def known_key?(key)
+      @known_keys.key?(key)
+    end
+
+    def warn_on_unknown_key(key, value)
+      return if known_key?(key)
+      warning %(WARNING: Unknown key #{fancy_ticks(key)} set to #{fancy_ticks(value)})
+    end
+
     def must_be_valid_values!
       return unless @value_errors > 0
       error('You must correct the errors in your config (listed above) to continue.')

data/lib/MrMurano/ReCommander.rb

@@ -370,7 +370,7 @@ module Commander
     def verify_solutions_unmanaged!
       return if $cfg['tool.skip-managed']
       # (lb): All @exosite.com employees are welcome behind the curtain.
-      if $cfg['user.name'].end_with? "@exosite.com"
+      if $cfg['user.name'] && $cfg['user.name'].end_with?("@exosite.com")
         MrMurano::Verbose.verbose(
           "Welcome behind the curtain, #{$cfg['user.name']}!"
         )

data/lib/MrMurano/version.rb

@@ -26,7 +26,7 @@ module MrMurano
   #     '3.0.0-beta.2' is changed to '3.0.0.pre.beta.2'
   #   which breaks our build (which expects the version to match herein).
   #   So stick to using the '.pre.X' syntax, which ruby/gems knows.
-  VERSION = '3.2.0.beta.8'
+  VERSION = '3.2.0.beta.9'
   EXE_NAME = File.basename($PROGRAM_NAME)
   SIGN_UP_URL = 'https://exosite.com/signup/'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: MuranoCLI
 version: !ruby/object:Gem::Version
-  version: 3.2.0.beta.8
+  version: 3.2.0.beta.9
 platform: ruby
 authors:
 - Michael Conrad Tadpol Tilstra
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-14 00:00:00.000000000 Z
+date: 2018-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: certified