inprovise 0.2.12 → 0.2.13

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MmU0MTAwMDZmYzQzNTQxYzA2ZGU5MTNmNzA4ZDJkNDg2ZTU0ZTRjOQ==
+    NDM3NDQyMTI2YjQ3MTdmY2QzNzBiM2U4ZDY3ZGIyYmI0MDNkYTUyNg==
   data.tar.gz: !binary |-
-    MzAzNWE4NTY0ZmMwNDgzZDRkMTY3MTJkNDBhOTM2N2FmOGY0YzIzYQ==
+    NTViNDMwM2JmNDI4YWE4MmU3YmQ0OTlhYjQ0YWI2MGQ5YjFmZDVhMQ==
 SHA512:
   metadata.gz: !binary |-
-    ZDMwYzRiZGU2YzE2ZTZiZGYwYjRkMjJkMzExMGE0MDdkMTI1NTllMjQxNzY0
-    MTRhYjBjZmYyNDk0ODAzZDAzNDIwNWU3YThjYWFmYWYzY2EzZDQyZjliNWY3
-    ZWVhYzgxZDEyZWEzMWU5YTgzZjkxOGU2YTc4MThiOTdiNDk0MzI=
+    ZGRlY2FhYTA5ZmE1NWIwNzI2NzMyMDdhZjE1NWJlZmZmM2NkZGYyNzhmYWRi
+    YzExMTYwZmE2NTcwOGRlYjk1YWU5NGIzZTYxZWEwMTgxMmQyZTI0MDQxMDhm
+    Y2U4MDExNDZkYjZkNzYzZDRjMzIwZDMxODc3OTlmZTlmZThlZjg=
   data.tar.gz: !binary |-
-    NWM0ZmUxMzZlYzllYTM3NjY3MjNhNWY5YjZjMTdlNWM5M2Y4YjFmZGY2NGI3
-    MTAyODMxMjVlMTA3NDdjZDFiYmE3MjJkMGQ0ZWFmZjc2YzIwM2JiM2RjZDI1
-    NjI1YWFjMDNkNmFiMDg4MjM4ZDM5OWNlY2M1MzE5Y2FlNWVlMzg=
+    OTc5ZTUwNmRhN2UxYzIyZWFmOGM0NTEyNmMxYjQxNWVmNzE3OTE4YmQ2NDk0
+    Y2YyNzgyYjIzMDg0MjE2M2Q5MzdlYzVmMTAwZTIwZjYxZGNiNjQwOTNjODJk
+    MWM3OGM3N2FmODQ0ZTdjMjYzMjQ3NWJlZjc3MTc3N2NmMjVkYjM=

data/lib/inprovise/control.rb

@@ -168,7 +168,7 @@ class Inprovise::Controller
       @targets << tgt
       [
         if command == :trigger
-          Inprovise::TriggerRunner.new(tgt, cmdtgt)
+          Inprovise::TriggerRunner.new(tgt, cmdtgt, Inprovise.skip_dependencies)
         else
           Inprovise::ScriptRunner.new(tgt, Inprovise::ScriptIndex.default.get(cmdtgt), Inprovise.skip_dependencies)
         end,

data/lib/inprovise/execution_context.rb

@@ -217,15 +217,15 @@ class Inprovise::ExecutionContext
 
   def resolve_action_ref(action_ref)
     action_name, scr_name = *action_ref.split(':', 2).reverse
-    scr = @script
-    scr = @index.get(scr_name) if scr_name
-    action = scr ? scr.actions[action_name] : nil
-    raise Inprovise::MissingActionError.new(action_ref) unless action
-    [scr, action]
+    scr = scr_name ? @index.get(scr_name) : nil
+    [scr, action_name]
   end
 
-  def trigger(scr, action, *args)
-    curtask = @node.log.set_task(action_ref)
+  def trigger(scr, action_name, *args)
+    scr ||= @script
+    action = scr ? scr.actions[action_name] : nil
+    raise Inprovise::MissingActionError.new("#{scr ? scr.name+':' : ''}#{action_name}") unless action
+    curtask = @node.log.set_task("#{scr.name}:#{action_name}")
     curscript = @script
     @script = scr
     begin

data/lib/inprovise/trigger_runner.rb

@@ -4,10 +4,11 @@
 # License::   Distributes under the same license as Ruby
 
 class Inprovise::TriggerRunner
-  def initialize(node, action_ref_with_args)
+  def initialize(node, action_ref_with_args, skip_dependencies=false)
     @node = node
     @action_ref, @args = *parse_action_ref(action_ref_with_args)
     @log = Inprovise::Logger.new(@node, @action_ref)
+    @skip_dependencies = skip_dependencies
     @index = Inprovise::ScriptIndex.default
   end
 
@@ -19,7 +20,7 @@ class Inprovise::TriggerRunner
     Inprovise.log.local("Triggering #{@action_ref} for #{@node.to_s}")
     context = Inprovise::ExecutionContext.new(@node, @log, @index, config)
     scr, action = context.resolve_action_ref(@action_ref)
-    setup_configuration(scr, context)
+    setup_configuration(scr, context) if scr
     context.trigger(scr, action, *@args)
   end
 
@@ -27,18 +28,28 @@ class Inprovise::TriggerRunner
     Inprovise.log.local("Demonstrating trigger #{@action_ref} for #{@node.to_s}")
     context = Inprovise::MockExecutionContext.new(@node, @log, @index, config)
     scr, action = context.resolve_action_ref(@action_ref)
-    setup_configuration(scr, context)
+    setup_configuration(scr, context) if scr
     context.trigger(scr, action, *@args)
   end
 
   private
 
+  def scripts(script)
+    return [script] if @skip_dependencies
+    resolver = Inprovise::Resolver.new(script, @index)
+    resolver.resolve
+    resolver.scripts
+  end
+
   def setup_configuration(script, context)
-    script.update_configuration(context)
-    context.log.set_task(script)
-    context.log.command(:configure)
-    context.script = script
-    script.command(:configure).each {|cmd| context.exec_config(cmd) }
+    script_list = scripts(script)
+    script_list.each { |scr| scr.update_configuration(context) }
+    script_list.each do |scr|
+      context.log.set_task(scr)
+      context.log.command(:configure)
+      context.script = scr
+      scr.command(:configure).each {|cmd| context.exec_config(cmd) }
+    end
   end
 
   def parse_action_ref(action_ref_with_args)

data/lib/inprovise/version.rb

@@ -5,6 +5,6 @@
 
 module Inprovise
 
-  VERSION = '0.2.12'
+  VERSION = '0.2.13'
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inprovise
 version: !ruby/object:Gem::Version
-  version: 0.2.12
+  version: 0.2.13
 platform: ruby
 authors:
 - Martin Corino