cli-mastermind 0.2.2 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 33bb65a17bf27a8204453ec5aa84042c8ee79d63517660a1dd64f7b9da47fb78
-  data.tar.gz: fc57a1838d2b65d7aff0184ead1bb58646c61fb650f4d4456fd9691c83e901e3
+  metadata.gz: 0ca718b72ecdee995987b9d86bc5f16b968eca9e0d9e255413de7e6801ac0dc5
+  data.tar.gz: a68679268a6c51cbeb4d62976e92095c3534acd1bb4af38ab80fe2184b16579c
 SHA512:
-  metadata.gz: 4a79e90625e8c13b8ed8b8bebee2c3cd4781732f59c739b3189d07fe69074649c2f87de6045f23c3933777746bd54318e75062d76cada487f506203d986bba76
-  data.tar.gz: 1ca37ab292f411ea6a75cdff758046e417b356929e84a7d77a495dbf0fbbb3632e1fe0c41cf4c4a269a6b7134a09b460cc7e93fa851ee96263e841c991fc1b28
+  metadata.gz: a116593dfd1b67d34c8f4e3de01def373adc463ba773c589fac1c8c1585d89097656606fef5a0b9cde8f2cca54a286b0c065c4c4099627dafd63bebd61ba79e3
+  data.tar.gz: b27841d28333c9fc0438ebbfe2e241507196fec5e95f3985f4791f0f46e0e3dead181ac28a132892ced3f4bddce96cb26361472b4f790df73e7d6e69ae6c6ac3

data/lib/cli/mastermind.rb

@@ -129,13 +129,16 @@ module CLI
       end
 
       def process_plan_names
+        @arguments.do_command_expansion!(@config)
+
         @plan_stack = []
 
-        @selected_plan = nil
+        @selected_plan = @plans
 
         while @arguments.has_additional_plan_names?
           plan_name = @arguments.get_next_plan_name
-          @selected_plan = (@selected_plan || @plans)[plan_name]
+
+          @selected_plan = @selected_plan[plan_name]
           @plan_stack << titleize(plan_name)
 
           if @selected_plan.nil?

data/lib/cli/mastermind/arg_parse.rb

@@ -21,6 +21,18 @@ module CLI::Mastermind
       parse_arguments
     end
 
+    def do_command_expansion!(config)
+      @alias_arguments = []
+
+      @mastermind_arguments.map! do |argument|
+        expand_argument(config, argument)
+      end
+
+      @plan_arguments = @alias_arguments + @plan_arguments
+
+      @mastermind_arguments.flatten!
+    end
+
     def display_plans?
       !@pattern.nil?
     end
@@ -79,9 +91,32 @@ module CLI::Mastermind
 
     private
 
+    def expand_argument(config, argument)
+      dealiased = config.map_alias(argument)
+
+      if dealiased.is_a? Array
+        partitioned = dealiased.slice_before('--').to_a
+
+        # Recursively expand plan names
+        # NOTE: This does not defend against circular dependencies!
+        plan_names = partitioned.shift.map { |arg|  expand_argument(config, arg) }.flatten
+
+        plan_arguments = partitioned.shift
+
+        if plan_arguments
+          plan_arguments.shift # removes the --
+          @alias_arguments.concat plan_arguments
+        end
+
+        dealiased = plan_names
+      end
+
+      dealiased
+    end
+
     def parse_arguments
       @mastermind_arguments = @initial_arguments.take_while { |arg| arg != '--' }
-      @plan_arguments = @initial_arguments[(@mastermind_arguments.size + 1)..-1]
+      @plan_arguments = @initial_arguments[(@mastermind_arguments.size + 1)..-1] || []
 
       unless @mastermind_arguments.empty?
         @mastermind_arguments = parser.parse *@mastermind_arguments

data/lib/cli/mastermind/configuration.rb

@@ -51,6 +51,9 @@ module CLI
         @loaded_masterplans = Set.new
         @plan_files = Set.new
 
+        # If no alias exists for a particular value, return that value
+        @aliases = Hash.new { |_,k| k }
+
         lookup_and_load_masterplans
         load_masterplan MASTER_PLAN
       end
@@ -75,6 +78,25 @@ module CLI
         @plans = top_level_plan.children
       end
 
+      def execute_plan(*plan_stack, arguments: nil)
+        if plan_stack.size == 1
+          case plan_stack.first
+          when Array
+            plan_stack = plan_stack.first
+          when String
+            plan_stack = plan_stack.first.split(' ')
+          end
+        end
+
+        plan = @plans
+
+        plan_stack.each do |plan_name|
+          plan = plan[plan_name]
+        end
+
+        plan.call(arguments)
+      end
+
       # Loads a masterplan using the DSL, if it exists and hasn't been loaded already
       def load_masterplan filename
         if File.exists? filename and !@loaded_masterplans.include? filename
@@ -83,6 +105,16 @@ module CLI
         end
       end
 
+      def define_alias(alias_from, alias_to)
+        arguments = alias_to.split(' ') if alias_to.is_a? String
+
+        @aliases[alias_from] = arguments unless @aliases.has_key? alias_from
+      end
+
+      def map_alias(input)
+        @aliases[input]
+      end
+
       private
 
       # Walks up the file tree looking for masterplans.
@@ -136,6 +168,10 @@ module CLI
           @config.public_send "#{attribute}=", value, &block
         end
 
+        def alias(name, arguments)
+          @config.define_alias(name, arguments)
+        end
+
         private
 
         def supported_extensions

data/lib/cli/mastermind/loader/planfile_loader.rb

@@ -46,6 +46,10 @@ module CLI::Mastermind
           @description = nil
         end
         alias_method :task, :plan
+
+        def alias(alias_to)
+          @plans.last.add_alias(alias_to)
+        end
       end
     end
   end

data/lib/cli/mastermind/plan/interface.rb

@@ -26,6 +26,9 @@ module CLI::Mastermind
           # The file this plan was loaded from, if any
           attr_reader :filename
 
+          # Provides shorter names for the plan
+          attr_reader :aliases
+
           include UserInterface
         end
       end
@@ -35,6 +38,7 @@ module CLI::Mastermind
         @description = description.freeze
         @filename = filename
         @block = block
+        @aliases = Set.new
       end
 
       def has_children?
@@ -45,6 +49,11 @@ module CLI::Mastermind
         raise NotImplementedError
       end
 
+      def add_alias(alias_to)
+        config.define_alias(alias_to, name)
+        @aliases.add alias_to
+      end
+
       # Delegate configuration to the top-level configuration object
       def_delegator :'CLI::Mastermind', :configuration
       alias_method :config, :configuration

data/lib/cli/mastermind/version.rb

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

metadata

@@ -1,35 +1,35 @@
 --- !ruby/object:Gem::Specification
 name: cli-mastermind
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.3.0
 platform: ruby
 authors:
 - Chris Hall
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-02-28 00:00:00.000000000 Z
+date: 2019-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cli-ui
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
     - - ">="
       - !ruby/object:Gem::Version
         version: 1.2.0
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -102,8 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.2
 signing_key: 
 specification_version: 4
 summary: Mastermind is a framework for constructing command line toolboxes.