inprovise 0.2.11 → 0.2.12

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjkyZDI4ZDcwMWQzZTM3NTJiYzJiYmNjNDI2N2U2NmZkNWI1Y2M3MQ==
+    MmU0MTAwMDZmYzQzNTQxYzA2ZGU5MTNmNzA4ZDJkNDg2ZTU0ZTRjOQ==
   data.tar.gz: !binary |-
-    Zjk2ZmQ3YWFhYjE2ZTk2NzdlOTUyMDkyNDU3MDNiNDgwZTc5MmM3Mg==
+    MzAzNWE4NTY0ZmMwNDgzZDRkMTY3MTJkNDBhOTM2N2FmOGY0YzIzYQ==
 SHA512:
   metadata.gz: !binary |-
-    NzNjNzJhZDgyMjNjMjNiZjYzMjEzZjI0NmU0NTFkYmY4ZmY1MWI0NGY1MWM4
-    NjUwMTNmODA4NjYwNjQ3NzYwYTUyMjQyOWExOTJlM2I0ZjU0ODE1NDc5ODJi
-    OWM5NDIxMDkxYWE4YjAyYmQ5NmZiMDIzMjE1MWI0MTBjMmVjMTE=
+    ZDMwYzRiZGU2YzE2ZTZiZGYwYjRkMjJkMzExMGE0MDdkMTI1NTllMjQxNzY0
+    MTRhYjBjZmYyNDk0ODAzZDAzNDIwNWU3YThjYWFmYWYzY2EzZDQyZjliNWY3
+    ZWVhYzgxZDEyZWEzMWU5YTgzZjkxOGU2YTc4MThiOTdiNDk0MzI=
   data.tar.gz: !binary |-
-    MWY0Y2M5ZWQ0YTQ3ZWNlZTljM2I0NmYwYjBkNDc5OTcwN2YxODcyYWM4YWY1
-    NjliYmZmZmMxYzE3YjJhOGQ1MDBkNTAwMDU0MDMyN2RhYTgxYTBiNWI2YWQw
-    MWE0YjgzZWM5OWVhNzZmYzBlNDY3Y2YwNTc4MzhlZjIxODMzZmM=
+    NWM0ZmUxMzZlYzllYTM3NjY3MjNhNWY5YjZjMTdlNWM5M2Y4YjFmZGY2NGI3
+    MTAyODMxMjVlMTA3NDdjZDFiYmE3MjJkMGQ0ZWFmZjc2YzIwM2JiM2RjZDI1
+    NjI1YWFjMDNkNmFiMDg4MjM4ZDM5OWNlY2M1MzE5Y2FlNWVlMzg=

data/lib/inprovise/execution_context.rb

@@ -7,7 +7,7 @@ require 'open3'
 
 class Inprovise::ExecutionContext
 
-  class DSL
+  class ConfigDSL
     def initialize(context)
       @context = context
     end
@@ -16,13 +16,19 @@ class Inprovise::ExecutionContext
       @context.config.send(meth, *args)
     end
 
-    def node
-      @context.node
+    def script
+      @context.script ? @context.script.name : ''
     end
 
     def config
       @context.config
     end
+  end
+
+  class DSL < ConfigDSL
+    def node
+      @context.node
+    end
 
     def as(user, &blk)
       @context.as(user, &blk)
@@ -81,7 +87,7 @@ class Inprovise::ExecutionContext
     end
 
     def trigger(action_ref, *args)
-      @context.trigger(action_ref, *args)
+      @context.trigger(*@context.resolve_action_ref(action_ref), *args)
     end
 
     def binary_exists?(binary)
@@ -101,6 +107,10 @@ class Inprovise::ExecutionContext
     @script = nil
   end
 
+  def exec_config(blk)
+    ConfigDSL.new(self).instance_eval(&blk)
+  end
+
   def exec(blk, *args)
     if args.empty?
       DSL.new(self).instance_eval(&blk)
@@ -205,16 +215,19 @@ class Inprovise::ExecutionContext
     Inprovise::Template.new(path, self)
   end
 
-  def trigger(action_ref, *args)
-    action_name, pkg_name = *action_ref.split(':', 2).reverse
-    pkg = @script
-    pkg = @index.get(pkg_name) if pkg_name
-    action = pkg.actions[action_name] if pkg
+  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]
+  end
+
+  def trigger(scr, action, *args)
     curtask = @node.log.set_task(action_ref)
     curscript = @script
-    @script = pkg
-    @script.update_configuration(self)
+    @script = scr
     begin
       exec(action, *args)
     ensure

data/lib/inprovise/script.rb

@@ -80,8 +80,8 @@ class Inprovise::Script
   end
 
   def update_configuration(context)
+    context.config[self.name.to_sym] ||= Inprovise::Config.new
     if @configuration
-      context.config[self.name.to_sym] ||= Inprovise::Config.new
       context.config[self.name.to_sym].update!(@configuration)
     end
   end

data/lib/inprovise/script_runner.rb

@@ -35,9 +35,8 @@ class Inprovise::ScriptRunner
     scrs = scripts
     context = @perform ? Inprovise::ExecutionContext.new(@node, @log, @index, config) : Inprovise::MockExecutionContext.new(@node, @log, @index, config)
     context.config.command = command_name.to_sym
-    scrs.each do |script|
-      execute_configuration(script, context)
-    end
+    scrs.each { |script| script.update_configuration(context) }
+    scrs.each { |script| setup_configuration(script, context) }
     scrs.reverse! if command_name.to_sym == :revert
     @log.say(scrs.map(&:name).join(', '), :yellow) if Inprovise.verbosity > 0
     scrs.each do |script|
@@ -51,25 +50,31 @@ class Inprovise::ScriptRunner
     @perform = true
   end
 
-  def execute_configuration(script, context)
-    script.update_configuration(context)
-    exec(script, :configure, context)
+  def setup_configuration(script, context)
+    context.log.set_task(script)
+    context.log.command(:configure)
+    context.script = script
+    script.command(:configure).each {|cmd| context.exec_config(cmd) }
   end
+  private :setup_configuration
 
   def execute_apply(script, context)
     return unless should_run?(script, :apply, context)
     exec(script, :apply, context)
     validate!(script, context)
   end
+  private :execute_apply
 
   def execute_revert(script, context)
     return unless should_run?(script, :revert, context)
     exec(script, :revert, context)
   end
+  private :execute_revert
 
   def execute_validate(script, context)
     validate!(script, context)
   end
+  private :execute_validate
 
   def should_run?(script, command_name, context)
     return false unless script.provides_command?(command_name)
@@ -80,6 +85,7 @@ class Inprovise::ScriptRunner
     return !is_present if command_name == :apply
     is_present
   end
+  private :should_run?
 
   def validate!(script, context)
     return true unless @perform
@@ -87,6 +93,7 @@ class Inprovise::ScriptRunner
     return if is_valid?(script, context)
     raise ValidationFailureError.new(@node, script)
   end
+  private :validate!
 
   def is_valid?(script, context)
     results = exec(script, :validate, context)
@@ -94,6 +101,7 @@ class Inprovise::ScriptRunner
     context.log.command("validate -> #{rc}") if Inprovise.verbosity > 0
     rc
   end
+  private :is_valid?
 
   def exec(script, command_name, context)
     cmds = script.command(command_name)
@@ -103,6 +111,7 @@ class Inprovise::ScriptRunner
     context.script = script
     cmds.map {|cmd| context.exec(cmd) }
   end
+  private :exec
 
   class ValidationFailureError < StandardError
     def initialize(node, script)

data/lib/inprovise/trigger_runner.rb

@@ -17,15 +17,30 @@ class Inprovise::TriggerRunner
 
   def execute(_, config=nil)
     Inprovise.log.local("Triggering #{@action_ref} for #{@node.to_s}")
-    Inprovise::ExecutionContext.new(@node, @log, @index, config).trigger(@action_ref, *@args)
+    context = Inprovise::ExecutionContext.new(@node, @log, @index, config)
+    scr, action = context.resolve_action_ref(@action_ref)
+    setup_configuration(scr, context)
+    context.trigger(scr, action, *@args)
   end
 
   def demonstrate(_, config=nil)
-    Inprovise::MockExecutionContext.new(@node, @log, @index, config).trigger(@action_ref, *@args)
+    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)
+    context.trigger(scr, action, *@args)
   end
 
   private
 
+  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) }
+  end
+
   def parse_action_ref(action_ref_with_args)
     matches = action_ref_with_args.match(/([\w\-\:]+?)(\[([\w\-\,]+?)\])/)
     return [action_ref_with_args,[]] unless matches

data/lib/inprovise/version.rb

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

data/test/script_runner_test.rb

@@ -100,8 +100,8 @@ describe Inprovise::ScriptRunner do
 
       it 'validates before and after applying a script' do
         @runner = Inprovise::ScriptRunner.new(@node, 'validate')
-        @runner.expects(:exec).twice
-               .with() { |script, cmd, context| script.name.must_equal('validate') && Inprovise::ExecutionContext === context && (cmd == :configure || cmd == :apply) }
+        @runner.expects(:exec).once
+               .with() { |script, cmd, context| script.name.must_equal('validate') && Inprovise::ExecutionContext === context && cmd == :apply }
         @runner.expects(:is_valid?).twice
                .with() { |script, context| script.name.must_equal('validate') && Inprovise::ExecutionContext === context }
                .returns(false, true)
@@ -135,8 +135,8 @@ describe Inprovise::ScriptRunner do
 
       it 'validates before reverting a script' do
         @runner = Inprovise::ScriptRunner.new(@node, 'validate')
-        @runner.expects(:exec).twice
-               .with() { |script, cmd, context| script.name.must_equal('validate') && Inprovise::ExecutionContext === context && (cmd == :configure || cmd == :revert) }
+        @runner.expects(:exec).once
+               .with() { |script, cmd, context| script.name.must_equal('validate') && Inprovise::ExecutionContext === context && cmd == :revert }
         @runner.expects(:is_valid?).once
                .with() { |script, context| script.name.must_equal('validate') && Inprovise::ExecutionContext === context }
                .returns(true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inprovise
 version: !ruby/object:Gem::Version
-  version: 0.2.11
+  version: 0.2.12
 platform: ruby
 authors:
 - Martin Corino
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-13 00:00:00.000000000 Z
+date: 2016-09-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored