cli-mastermind 0.4.1 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 889cacb914ffc6a59675412d3d09deba8f531ec23633c4ea1fba1e56bef5fa28
-  data.tar.gz: 8a1319225703fcadb958b83f61b021dbddbdead8285cc8c441e80773ddf6edb2
+  metadata.gz: e40196d83c1db754add3b8e4fbf4f10a26c4f66f1aff199261261bdfda66edc7
+  data.tar.gz: 0de3f8b0fe48d3c2496970380ea5f9ec3d5e73b15258bd3be5dcf7315516edc1
 SHA512:
-  metadata.gz: 6618509b8ac96d95afd1e3b1306814786dcef86919de6332cd4cd0937a7eed88855c46c39d3167835aa1288a3bcbde854183113631dfdd65b216c9401285e6ea
-  data.tar.gz: 95f2c85d604dab702b4dd14e7c08e66b2e963065f510a096cd28485213dbc3de257489ec7802d970bd8e752148d3ebe965f36b3359bd0ebb819bf736067ada58
+  metadata.gz: 034731a236c65aa88e3bd04dae4f41cf6324c128ea2847b5753ab86300f4c31a250ba3224afd8e14f33e746fabc319c7f046e3d3f380294ee7f1154d66fba2fc
+  data.tar.gz: a1b8f76371629f2fd7844cea59fc3e5e753f819a4f567562b0cfb7bcd7da3983149e2906b76efb19c4ebade3adf5188865b52568efb3052f0edb207269e7259f

data/README.md

@@ -71,6 +71,9 @@ parallel, _Mastermind is designed to run only one task at a time_.  Specifying
 multiple plan names on the command line is how you walk down the tree to a
 specific plan.
 
+If you don't provide enough information to Mastermind to walk to an executable
+plan, Mastermind will provide you with a list of available options to choose.
+
 For more information on how to use and configure Mastermind, check out the
 [wiki][wiki].
 

data/lib/cli/mastermind.rb

@@ -18,6 +18,18 @@ module CLI
         @config
       end
 
+      # Allows utilities wrapping Mastermind to specify that only plans under a
+      # particular path should be loaded.
+      def base_path=(base_path)
+        @base_path = base_path
+      end
+
+      # Allows utilities wrapping Mastermind to specify a top level plan without
+      # having to monkey with the incomming arguments.
+      def base_plan=(base_plan)
+        @base_plan = base_plan
+      end
+
       # Process incoming options and take an appropriate action.
       # This is normally called by the mastermind executable.
       def execute(cli_args=ARGV)
@@ -26,7 +38,7 @@ module CLI
         enable_ui if @arguments.display_ui?
 
         frame('Mastermind') do
-          @config = spinner('Loading configuration') { Configuration.new }
+          @config = spinner('Loading configuration') { Configuration.new @base_path }
 
           if @arguments.dump_config?
             do_print_configuration
@@ -81,7 +93,7 @@ module CLI
             suffix = was_callable ? '{{*}}' : ' '
 
             puts stylize("{{yellow:#{name}}}")
-            puts stylize("\t #{suffix} {{blue:#{value}}}")
+            puts stylize("\t #{suffix} {{blue:#{value.inspect}}}")
             print "\n"
           end
         end
@@ -138,9 +150,11 @@ module CLI
       def process_plan_names
         @arguments.do_command_expansion!(@config)
 
+        @arguments.insert_base_plan!(@base_plan) unless @base_plan.nil?
+
         @plan_stack = []
 
-        @selected_plan = @plans
+        @selected_plan = @plans if @arguments.has_additional_plan_names?
 
         while @arguments.has_additional_plan_names?
           plan_name = @arguments.get_next_plan_name
@@ -168,7 +182,7 @@ module CLI
       end
 
       def user_is_sure?
-        !@arguments.ask? or confirm("Execute plan #{@plan_stack.join('/')}?")
+        !@arguments.ask? or !@config.ask? or confirm("Execute plan #{@plan_stack.join('/')}?")
       end
 
       def execute_plan!

data/lib/cli/mastermind/arg_parse.rb

@@ -31,6 +31,13 @@ module CLI::Mastermind
       @plan_arguments = @alias_arguments + @plan_arguments
 
       @mastermind_arguments.flatten!
+      nil # prevent @mastermind_arguments from leaking
+    end
+
+    # Adds the given base plan to the beginning of the arguments array
+    def insert_base_plan!(base_plan)
+      @mastermind_arguments.unshift base_plan
+      nil # prevent @mastermind_arguments from leaking
     end
 
     def display_plans?

data/lib/cli/mastermind/configuration.rb

@@ -47,9 +47,11 @@ module CLI
       # masterplans, so it's important that it be set.
       add_attribute :project_root
 
-      def initialize
+      def initialize(base_path=nil)
+        @base_path = base_path
         @loaded_masterplans = Set.new
         @plan_files = Set.new
+        @ask_for_confirmation = true
 
         # If no alias exists for a particular value, return that value
         @aliases = Hash.new { |_,k| k }
@@ -60,7 +62,13 @@ module CLI
 
       # Adds a set of filenames for plans into the set of +@plan_files+
       def add_plans(planfiles)
-        @plan_files.merge(planfiles)
+        allowed_plans = if @base_path.nil?
+                          planfiles
+                        else
+                          planfiles.select { |file| file.start_with? @base_path }
+                        end
+
+        @plan_files.merge(allowed_plans)
       end
 
       # Loads all plan files added using +add_plans+
@@ -115,6 +123,14 @@ module CLI
         @aliases[input]
       end
 
+      def ask?
+        @ask_for_confirmation
+      end
+
+      def skip_confirmation!
+        @ask_for_confirmation = false
+      end
+
       private
 
       # Walks up the file tree looking for masterplans.
@@ -168,10 +184,18 @@ module CLI
           @config.public_send "#{attribute}=", value, &block
         end
 
+        # Define a user alias.  User aliases are expanded as part of plan selection.
+        # @see ArgParse#do_command_expansion!
         def define_alias(name, arguments)
           @config.define_alias(name, arguments)
         end
 
+        # SKip confirmation before plan execution.
+        # Identical to -A.
+        def skip_confirmation
+          @config.skip_confirmation!
+        end
+
         private
 
         def supported_extensions

data/lib/cli/mastermind/version.rb

@@ -7,8 +7,8 @@ module CLI
 
     module VERSION
       RELEASE = 0
-      MAJOR = 4
-      MINOR = 1
+      MAJOR = 5
+      MINOR = 0
       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: 0.4.1
+  version: 0.5.0
 platform: ruby
 authors:
 - Chris Hall
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-03-01 00:00:00.000000000 Z
+date: 2019-03-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cli-ui