dtk-action-agent 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ceb9bc809895890686ccd58e4783db04dd98607
-  data.tar.gz: dd303a2fe410acaaa1e1bebb2b5c37d2be231658
+  metadata.gz: 59abb9f8d4c53e5d82e17b93033b27601585ff70
+  data.tar.gz: b3885713293250f5beb51480f31669bfc723054f
 SHA512:
-  metadata.gz: 8b9d0492fbb95fa778718c900bb7accc860b795a2ae53609a6aea453223a5153a7c851f5c0a1775877dc42ad2d2fd9f8d338918df0befd4dd12bd89b69962c49
-  data.tar.gz: 80e42e95161fd18359a5d0988180a6d27e405371d5835de83b2bf7f79a0b5c97c6dee84ecfca4afac784ca6cedd4ded3a3370db5c2c0d5df5d78b059f4fd1a03
+  metadata.gz: ee0795deb8734cac59bfad5fb537602f6947c7c1e9e6dd6f674798950941752fd18f09e5c53e857b8facffcf9ee9c8c9b57c6c003bcc075dfe3ab2234cf4abaf
+  data.tar.gz: 8391a8ebaaf3a2efbc5c14a5b273e7e18977555ad5d036040ae1cf098756a1927111fe68f4527cdc39ca5ab7156346a2d903b8105df5a21cc65373b2b1a3f53a

data/bin/dtk-action-agent

@@ -5,7 +5,6 @@ require 'cgi'
 
 require File.expand_path('../../lib/logger', __FILE__)
 require File.expand_path('../../lib/arbiter', __FILE__)
-require File.expand_path('../../lib/positioner', __FILE__)
 require File.expand_path('../../lib/commander', __FILE__)
 
 unless ARGV[0]

data/lib/arbiter.rb

@@ -18,18 +18,12 @@ module DTK
           return
         end
 
-        # sets enviorment variables
-        Commander.set_environment_variables(@received_message['env_vars'])
-        @positioner     = Positioner.new(@received_message['positioning'])
         @commander = Commander.new(@received_message['execution_list'])
       end
 
       def run
         return { :results => [], :errors => Log.execution_errors } if @execution_list.empty?
 
-        # start positioning files
-        @positioner.run()
-
         # start commander runnes
         @commander.run()
 

data/lib/command.rb

@@ -27,6 +27,9 @@ module DTK
         @if_fail         = value_hash['unless']
         @spawned         = false
         @child_task      = value_hash['child_task'] || false
+        @timeout         = (value_hash['timeout'] || 0).to_i
+
+        @env_vars        = value_hash['env_vars']
 
         if @if_success && @if_fail
           Log.warn "Unexpected case, both if/unless conditions have been set for command #{@command}(#{@command_type})"
@@ -37,11 +40,17 @@ module DTK
       # Creates Posix Spawn of given process
       #
       def start_task
+
         begin
-          @process = POSIX::Spawn::Child.new(formulate_command)
+          Commander.set_environment_variables(@env_vars)
+          @process = POSIX::Spawn::Child.new(formulate_command, :timeout => @timeout)
           Log.debug("Command started: '#{self.to_s}'")
+        rescue POSIX::Spawn::TimeoutExceeded => e
+          @error_message = "Timeout (#{@timeout} sec) for this action has been exceeded"
         rescue Exception => e
           @error_message = e.message
+        ensure
+          Commander.clear_environment_variables(@env_vars)
         end
       end
 
@@ -54,6 +63,10 @@ module DTK
         !!command_to_run
       end
 
+      def is_positioning?
+        'file'.eql?(@command_type)
+      end
+
 
       ##
       # Creates Command object for callback, first check 'if' than 'unless'. There should be no both set so priority is given
@@ -87,6 +100,7 @@ module DTK
       end
 
       def started?
+        return true if @error_message
         !!self.process
       end
 

data/lib/commander.rb

@@ -1,4 +1,5 @@
 require File.expand_path('../command', __FILE__)
+require File.expand_path('../position', __FILE__)
 
 
 module DTK
@@ -8,7 +9,13 @@ module DTK
       PARALLEL_EXECUTION = ENV['DTK_ACTION_AGENT_PARALLEL_EXEC'] || false
 
       def initialize(execution_list)
-        @command_tasks  = execution_list.collect { |command| Command.new(command) }
+        @command_tasks  = execution_list.collect do |command|
+          if (command['type'].eql?('file'))
+            Position.new(command)
+          else
+            Command.new(command)
+          end
+        end
       end
 
       def run
@@ -98,6 +105,14 @@ module DTK
 
     private
 
+      def self.clear_environment_variables(env_vars_hash)
+        return unless env_vars_hash
+        env_vars_hash.keys.each do |k|
+          ENV.delete(k)
+          Log.debug("Environment variable cleared (#{k})")
+        end
+      end
+
       ##
       # Sets environmental variables
       def self.set_environment_variables(env_vars_hash)

data/lib/dtk-action-agent/version.rb

@@ -1,5 +1,5 @@
 module DTK
   module ActionAgent
-    VERSION = "0.0.5"
+    VERSION = "0.0.6"
   end
 end

data/lib/position.rb

@@ -0,0 +1,115 @@
+require 'thread'
+require 'git'
+require 'fileutils'
+
+module DTK
+  module Agent
+    class Position
+
+      attr_accessor :position_file_info, :exitstatus, :started, :out, :err, :child_task
+
+      def initialize(command_hash)
+        source_info, target_info = command_hash['source'], command_hash['target']
+
+        @type    = source_info['type'].to_sym
+        @git_url = source_info['url']
+        @branch  = source_info['ref'] || 'master'
+        @content = source_info['content']
+
+        @env_vars = command_hash['env_vars']
+
+        @target_path = target_info['path']
+
+        @exited     = false
+        @started    = false
+        @exitstatus = 0
+        @child_task = false
+      end
+
+      def start_task()
+        @started = true
+        prepare_path()
+
+        Commander.set_environment_variables(@env_vars)
+
+        begin
+          case @type
+          when :git
+            position_git()
+          when :in_payload
+            position_in_payload()
+          end
+        rescue Exception => e
+          cleanup_path()
+          raise e
+        ensure
+          Commander.clear_environment_variables(@env_vars)
+        end
+
+      end
+
+      def exited?
+        @exited
+      end
+
+      #
+      # This are not standard commands and as such we are ignoring their output
+      #
+      def started?
+        @started
+      end
+
+      def spawn_callback_task
+        raise "Callback task is not supported for positioner"
+      end
+
+      def callback_pending?
+        # not supported at the moment
+        false
+      end
+
+      def to_s
+        :git.eql?(@type) ? "git clone #{@git_url}:#{@branch} > #{@target_path}" : "create #{@target_path} with provided content"
+      end
+
+    private
+
+      def position_git()
+        unless File.directory?(@target_path)
+          begin
+            g_repo = Git.clone("#{@git_url}", '', :path => @target_path, :branch => @branch)
+            Log.info("Positioner successfully cloned git repository '#{@git_url}@#{@branch}' to location '#{@target_path}'")
+          rescue Exception => e
+            cleanup_path()
+            @exitstatus = 1
+            Log.error("Positioner unable to clone #{@git_url}")
+            Log.error(e.message)
+          end
+        else
+          Log.warn("Positioner detected folder '#{@target_path}' skipping git clone")
+        end
+
+        @exited = true
+      end
+
+      def position_in_payload(position_info)
+        # write to file
+        File.open(@target_path, 'w') { |file| file.write(@content) }
+        Log.info("Positioner successfully created 'IN_PAYLOAD' file '#{@target_path}'")
+        @exited = true
+      end
+
+      def prepare_path()
+        # create necessery dir structure
+        FileUtils.mkdir_p(File.dirname(@target_path))
+
+        @target_path
+      end
+
+      def cleanup_path()
+        FileUtils.rm_rf(@target_path)
+      end
+
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-action-agent
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-08 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn
@@ -82,7 +82,7 @@ files:
 - lib/commander.rb
 - lib/dtk-action-agent/version.rb
 - lib/logger.rb
-- lib/positioner.rb
+- lib/position.rb
 homepage: ''
 licenses:
 - GPL-3.0

data/lib/positioner.rb

@@ -1,65 +0,0 @@
-require 'thread'
-require 'git'
-require 'fileutils'
-
-module DTK
-  module Agent
-    class Positioner
-
-      attr_accessor :position_file_info
-
-      def initialize(*position_file_info)
-        @position_file_info = position_file_info.flatten.compact
-      end
-
-      def run()
-        @position_file_info.each do |pfi|
-          case pfi['source']['type'].to_sym
-          when :git
-            position_git(pfi)
-          when :in_payload
-            position_in_payload(pfi)
-          end
-        end
-      end
-
-    private
-
-      def position_git(position_info)
-        folder_path = prepare_path(position_info)
-        git_url     = position_info['source']['url']
-        git_branch  = position_info['source']['ref']
-
-        unless File.directory?(folder_path)
-          begin
-            g_repo = Git.clone("#{git_url}", '', :path => folder_path, :branch => git_branch)
-            Log.info("Positioner successfully cloned git repository '#{git_url}@#{git_branch}' to location '#{folder_path}'")
-          rescue Exception => e
-            Log.error("Positioner unable to clone #{git_url}")
-            Log.error(e.message)
-          end
-        else
-          Log.warn("Positioner detected folder '#{folder_path}' skipping git clone")
-        end
-      end
-
-      def position_in_payload(position_info)
-        file_path    = prepare_path(position_info)
-        file_content = position_info['source']['content']
-        # write to file
-        File.open(file_path, 'w') { |file| file.write(file_content) }
-        Log.info("Positioner successfully created 'IN_PAYLOAD' file '#{file_path}'")
-      end
-
-      def prepare_path(position_info)
-        path = position_info['target']['path']
-
-        # create necessery dir structure
-        FileUtils.mkdir_p(File.dirname(path))
-
-        path
-      end
-
-    end
-  end
-end