cli-mastermind 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 661c3f66382c7e6fb62eb1c01c265c93fe2e62b45340307c6912e8618621026f
-  data.tar.gz: 775edbb8a13283c46a91bdbc7698e3e322aa9022b29285ada8e5d56884b855b0
+  metadata.gz: 10729271d3db58b9b063db4da11c4e96c96e59b5ffa53b5088b54f63c46ddaf2
+  data.tar.gz: aa7e9c1600070cbb7f154e389a23bfacf6176324e8882acb6107c9a2cb3164d5
 SHA512:
-  metadata.gz: a8b725781d38d56a9153f1d4bbb4216dffcca02c69a8bb19296218543c1e790bc7f9f11159012bc3a673d75ef8c83b2639536704daee65404c20e9bab04c51bd
-  data.tar.gz: 1a267b4f96d51da4a02ac6044b330fc8b2f97cc8d87066e650e3578b44afd4f1cb2f427b6ab0719c17919507166a28d4cd15abf2679b7f40cebce1d3bd863b3d
+  metadata.gz: 9cecf65b1e9ab90abe21027ed98fd0fe2bdf14dae7c2439deb9c67dcb873c266c2b3d2496f6c823455b013a78ea3a23978b2caba211aad2da2653a7aa3409fdf
+  data.tar.gz: de633722765fd552f8b861ac62d89308c41d7d984aa6bbc8589a1fce466b2ceb878081a901bde9b7b88248f4bd23ddc698451085f930944817676999778b3169

data/lib/cli/mastermind/parent_plan.rb

@@ -31,30 +31,37 @@ module CLI
       private
 
       def incorporate_plan(plan)
-        # If this namespace isn't taken just add the plan
-        if @children.has_key? plan.name
+        @children[plan.name] = resolve_conflicts(plan.name, plan)
 
-          # Otherwise, we need to handle a name collision
-          existing_plan = @children[plan.name]
+        plan.aliases.each do |a|
+          @children[a] = resolve_conflicts(a, plan)
+        end
+      end
 
-          # If both plans have children, we merge them together
-          if existing_plan.has_children? and plan.has_children?
-            existing_plan.add_children plan.children.values
+      def resolve_conflicts(key, plan)
+        # If this namespace isn't taken we're good
+        return plan unless @children.has_key?(key)
 
-            return existing_plan
-          end
+        # Otherwise, we need to handle a name collision
+        existing_plan = @children[key]
 
-          # Otherwise, the plan defined later wins and overwrites the existing plan
+        # If both plans have children, we merge them together
+        if existing_plan.has_children? and plan.has_children?
+          existing_plan.add_children plan.children.values
 
-          # Warn the user that this is happening, unless we're running tests.
-          warn <<~PLAN_COLLISON.strip unless defined? RSpec
-                 Plan name collision encountered when loading plans from "#{plan.filename}" that cannot be merged.
-                 "#{plan.name}" was previously defined in "#{existing_plan.filename}".
-                 Plans from "#{plan.filename}" will be used instead.
-               PLAN_COLLISON
+          return existing_plan
         end
 
-        @children[plan.name] = plan
+        # Otherwise, the plan defined later wins and overwrites the existing plan
+
+        # Warn the user that this is happening, unless we're running tests.
+        warn <<~PLAN_COLLISON.strip unless defined? RSpec
+               Plan name collision encountered when loading plans from "#{plan.filename}" that cannot be merged.
+               "#{key}" was previously defined in "#{existing_plan.filename}".
+               Plan "#{key}" from "#{plan.filename}" will be used instead.
+             PLAN_COLLISON
+
+        plan
       end
     end
   end

data/lib/cli/mastermind/version.rb

@@ -8,7 +8,7 @@ module CLI
     module VERSION
       RELEASE = 1
       MAJOR = 2
-      MINOR = 0
+      MINOR = 1
       PATCH = nil
 
       STRING = [RELEASE, MAJOR, MINOR, PATCH].compact.join('.').freeze

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cli-mastermind
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Chris Hall