cli-mastermind 0.0.4 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 665b35d4768aadf8c4f322eefc4724e8baa5ad62efb24e5abd9992d0c6c7e920
-  data.tar.gz: 28526d6c94c5ff46cda54c04fa44009eaeabaa46b5787a5be327f5d0f60fbecd
+  metadata.gz: 4f9d964ad9871b8f4b0b44fce7340487954d1fa00396fafa1c546be54673ced8
+  data.tar.gz: b1ca65e254ac504bdfdc3badde8964dd7f21321b3ef882f6546b7e8c97e94e12
 SHA512:
-  metadata.gz: 22dcafdc16a3c88699b70702319403b3df5b7d9113a993ca9a04bfe354a55094b549fbae02a1b1be22cbc86bc33bf85ef564409405b65231e2cd07cecb008fe1
-  data.tar.gz: f0b19448539416003f3e16fde716bc888ee27c0a70b679c790580e5cae86e6b6a8fcf7280dacf3da35c7c6dec89e5836da96f97a8cd47d2f0e247f2ca746ccb6
+  metadata.gz: ba400135252064d5ae3709c8759ffaac92b19f6c3f3cb55a4db8da99401a0c52becd4507ed075a9ca185bc28b96018eac7763397d8bfd9dd7cc96d4f5cd850d5
+  data.tar.gz: be4dbac7ae0e6d37fa76a55893e9a64c554081fff45bb6f4692e9f5fa22a581f0989ee4e5a0a3661c69f505d020aad0fe62d050187398be4d4fc08b263e03b0d

data/lib/cli/mastermind.rb

@@ -62,12 +62,14 @@ module CLI
           @config.instance_variables.each do |attribute|
             value = @config.instance_variable_get(attribute)
 
+            name = attribute.to_s.sub(/^@/, '')
+
             if value.respond_to? :call
               if @arguments.resolve_callable_attributes?
                 value = begin
-                          value.call
+                          @config.send(name)
                         rescue => e
-                          "UNABLE TO LOAD: #{e.messae}"
+                          "UNABLE TO LOAD: #{e.message}"
                         end
               end
 
@@ -76,8 +78,6 @@ module CLI
               was_callable = false
             end
 
-            name = attribute.to_s.sub(/^@/, '')
-
             suffix = was_callable ? '{{*}}' : ' '
 
             puts stylize("{{yellow:#{name}}}")
@@ -153,7 +153,7 @@ module CLI
       end
 
       def do_interactive_plan_selection
-        options = @selected_plan&.children || @plans
+        options = (@selected_plan&.children || @plans).map { |k,v| [titleize(k.to_s), v] }.to_h
 
         @selected_plan = select("Select a plan under #{@plan_stack.join('/')}", options: options)
         @plan_stack << titleize(@selected_plan.name)

data/lib/cli/mastermind/interface.rb

@@ -14,27 +14,30 @@ module CLI::Mastermind::Interface
   # Display a spinner with a +title+ while data is being loaded
   # @returns the value of the given block
   # @see https://github.com/Shopify/cli-ui#spinner-groups
-  def spinner(title)
+  def spinner(title, &block)
     return yield unless ui_enabled?
 
-    yield_value = nil
+    results = concurrently do |actions|
+      actions.await(title, &block)
+    end
 
-    group = CLI::UI::SpinGroup.new
-    group.add(title) do |spinner|
-      catch(:success) do
-        msg = catch(:fail) do
-          yield_value = yield spinner
-          throw :success
-        end
+    results[title]
+  end
+  alias_method :await, :spinner
 
-        puts msg
-        CLI::UI::Spinner::TASK_FAILED
-      end
-    end
+  # Performs a set of actions concurrently
+  # Yields an +AsyncSpinners+ objects which inherits from +CLI::UI::SpinGroup+.
+  # The only difference between the two is that +AsyncSpinners+ provides a
+  # mechanism for exfiltrating results by using +await+ instead of the usual
+  # +add+.
+  def concurrently
+    group = AsyncSpinners.new
+
+    yield group
 
     group.wait
 
-    yield_value
+    group.results
   end
 
   # Uses +CLI::UI.fmt+ to format a string
@@ -75,23 +78,28 @@ module CLI::Mastermind::Interface
     default_value = nil
     options = case options
               when Array
-                default_value = default
+                default_text = default
 
                 o = options - [default]
                 o.zip(o).to_h
               when Hash
-                # Handle the "default" default.  Otherwise, we expect the
-                # default to be a key in the options hash
-                default = default.first if default.is_a? Array
-                default_value = options[default]
-                options.dup.tap { |o| o.delete(default) }
+                # Handle the "default" default.  Otherwise, we expect the default
+                # is the default value
+                if default.is_a? Array
+                  default_text, default = default
+                else
+                  default_text = options.invert[default]
+                end
+
+                # dup so that we don't change whatever was passed in
+                options.dup.tap { |o| o.delete(default_text) }
               end
 
     CLI::UI::Prompt.ask(question, **opts) do |handler|
-      handler.option(titleize(default.to_s)) { default_value }
+      handler.option(default_text.to_s) { default }
 
       options.each do |(text, value)|
-        handler.option(titleize(text.to_s)) { value }
+        handler.option(text) { value }
       end
     end
   end
@@ -108,4 +116,29 @@ module CLI::Mastermind::Interface
   def titleize(string)
     string.gsub(/[-_-]/, ' ').split(' ').map(&:capitalize).join(' ')
   end
+
+  class AsyncSpinners < CLI::UI::SpinGroup
+    attr_reader :results
+
+    def initialize
+      @results = {}
+      super
+    end
+
+    def await(title)
+      @results[title] = nil
+
+      add(title) do |spinner|
+        catch(:success) do
+          msg = catch(:fail) do
+            @results[title] = yield spinner
+            throw :success
+          end
+
+          puts msg
+          CLI::UI::Spinner::TASK_FAILED
+        end
+      end
+    end
+  end
 end

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

@@ -41,8 +41,8 @@ module CLI::Mastermind
         end
         alias_method :desc, :description
 
-        def plan(name, &block)
-          @plans << Plan.new(name, @description, @filename, &block)
+        def plan(name, plan_class = Plan, &block)
+          @plans << plan_class.new(name, @description, @filename, &block)
           @description = nil
         end
         alias_method :task, :plan

data/lib/cli/mastermind/version.rb

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