cli-mastermind 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10729271d3db58b9b063db4da11c4e96c96e59b5ffa53b5088b54f63c46ddaf2
-  data.tar.gz: aa7e9c1600070cbb7f154e389a23bfacf6176324e8882acb6107c9a2cb3164d5
+  metadata.gz: 6659e4a6c35a1db85c6986830f3d8e50f4d518f47ff5b728e7a6157fc6f62aee
+  data.tar.gz: d19164e648e37ff2d9c590bb6e9e3409a29e8aba8f6965b34040886f95efb809
 SHA512:
-  metadata.gz: 9cecf65b1e9ab90abe21027ed98fd0fe2bdf14dae7c2439deb9c67dcb873c266c2b3d2496f6c823455b013a78ea3a23978b2caba211aad2da2653a7aa3409fdf
-  data.tar.gz: de633722765fd552f8b861ac62d89308c41d7d984aa6bbc8589a1fce466b2ceb878081a901bde9b7b88248f4bd23ddc698451085f930944817676999778b3169
+  metadata.gz: 216edd2e84edbc21e343d73e60c39000a3c2eb05b1d6b0c8c2059e9cd5a2d4d7102cf537c627c53bcac4fb9c57368d4301cff230171649a1141b06851621e8de
+  data.tar.gz: 9692824218b446a096f44baae35ca0ce482b0fb4138ec7e04d20018effa68d4a27931defa3ddeb6b97ee5b9327e04bd9277236dc70447bce9c34b88afd23cf00

data/lib/cli/mastermind.rb

@@ -224,13 +224,14 @@ module CLI
           plan_name = @arguments.get_next_plan_name
 
           @selected_plan = @selected_plan[plan_name]
-          @plan_stack << titleize(plan_name)
 
           if @selected_plan.nil?
-            puts "No plan found at #{@plan_stack.join('/')}"
+            puts "No plan found at #{(@plan_stack + [titleize(plan_name)]).join('/')}"
             puts @arguments.parser
             exit 1
           end
+
+          @plan_stack << titleize(@selected_plan.name)
         end
       end
 

data/lib/cli/mastermind/loader.rb

@@ -30,7 +30,7 @@ module CLI::Mastermind
 
       # Loads a particular plan from the filesystem.
       def load_all(files)
-        temp_plan = ParentPlan.new('temporary plan')
+        temp_plan = ParentPlan.new('INTERNAL PLAN HOLDER')
 
         plans = files.map do |file|
           ext = File.extname(file)
@@ -38,7 +38,7 @@ module CLI::Mastermind
           temp_plan.add_children loader.load(file)
         end
 
-        temp_plan.children
+        temp_plan
       end
     end
   end

data/lib/cli/mastermind/parent_plan.rb

@@ -14,7 +14,8 @@ module CLI
 
       # Get the child plan with the specified +name+
       def get_child(name)
-        @children[name]
+        return @children[name] if @children.has_key? name
+        @children.each_value.find { |child| child.aliases.include? name }
       end
       alias_method :[], :get_child
       alias_method :dig, :get_child
@@ -32,10 +33,6 @@ module CLI
 
       def incorporate_plan(plan)
         @children[plan.name] = resolve_conflicts(plan.name, plan)
-
-        plan.aliases.each do |a|
-          @children[a] = resolve_conflicts(a, plan)
-        end
       end
 
       def resolve_conflicts(key, plan)

data/lib/cli/mastermind/plan.rb

@@ -51,8 +51,7 @@ module CLI
       alias_method :execute, :call
 
       def add_alias(alias_to)
-        config.define_alias(alias_to.to_s, name)
-        @aliases.add alias_to
+        @aliases.add alias_to.to_s
       end
 
       # Delegate configuration to the top-level configuration object

data/lib/cli/mastermind/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cli-mastermind
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Chris Hall
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-06 00:00:00.000000000 Z
+date: 2019-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cli-ui