dtk-action-agent 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 21e7fee109731e73725a259437c2d996742eef6e
-  data.tar.gz: ca71e73fdb44d748c8f4e14ce40bcb45b44b4984
+  metadata.gz: 6d0db3719b17b9856404b7b9e81a1e9f91bc1c04
+  data.tar.gz: 3bcd4713fb782f37a6894f38b99a9cba3b4e7a59
 SHA512:
-  metadata.gz: 433e0f1761c0de50613a8a9f6e543b8857b7c15ec4316fb821eb02546efbf3822b3cf094d966d6f9cc82a656fef60d8e3e4807e362568d38900edbbf2d3ba569
-  data.tar.gz: e9e1eb5dba5b37b41c33736a04a5e8383ef3ce0f15e94cae6dcecf2e8616e9255ec062c8dc5a557fa5ce1eeec406db98b0eaabeb41dbf285630eaa4908765dbc
+  metadata.gz: 8ccabb36b8cdd75c8a28b043255750f165ef03a9257e3f9e6d8ca72aaba4ec45f8b2ee8e2dca10fb1f42abe13e65e638d55c04b6eb119b9f0168c974a88fe0c6
+  data.tar.gz: 628007e0af112995cf08fd4e4bf395d38a213d3af5e44ddf57aa584b6e5c59f3b4f8715cce3795df42bec5a5c64eb8ac5c3cd065591ce7cf009059999ec9b899

data/bin/dtk-action-agent

@@ -1,19 +1,21 @@
 #!/usr/bin/env ruby
 require 'rubygems'
 require 'json'
+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]
   error_msg = {
-    :error => 'You need to provide JSON with argument to method call'
+    :errors => ['You need to provide JSON with argument to method call']
   }
   print error_msg.to_json
 else
   content = JSON.parse(ARGV[0])
   arbiter = DTK::Agent::Arbiter.new(content)
-  arbiter.run()
+  results = arbiter.run()
 
-  results = arbiter.results()
   # we print results in json so that they can be serialized in another
   print results.to_json
 end

data/dtk-action-agent.gemspec

@@ -21,5 +21,5 @@ Gem::Specification.new do |gem|
   gem.add_dependency 'posix-spawn','0.3.8'
   gem.add_dependency 'awesome_print', '1.1.0'
   gem.add_dependency 'json', '1.8.2'
-
+  gem.add_dependency 'git', '1.2.9.1'
 end

data/lib/arbiter.rb

@@ -10,43 +10,31 @@ module DTK
       def initialize(consumer_hash)
         @received_message = consumer_hash
         @process_pool     = []
-      end
+        @execution_list   = @received_message['execution_list']||[]
 
-      def run
-        (@received_message['commands']||[]).each do |message|
-          @process_pool << POSIX::Spawn::Child.new(message)
+        # no need to run other commands if there is no execution list
+        if @execution_list.empty?
+          Log.error "Execution list is not provided or empty, DTK Action Agent has nothing to run"
+          return
         end
 
-        loop do
-          sleep(1)
-          @process_pool.each do |process|
-            unless process.status.exited?
-              next
-            end
-          end
-          break
-        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 results
-        @process_pool.collect do |process|
-          {
-            :status => process.status.exitstatus,
-            :stdout => process.out,
-            :stderr => process.err
-          }
-        end
-      end
+      def run
+        return { :results => [], :errors => Log.execution_errrors } if @execution_list.empty?
 
-      def print_results
-        @process_pool.each do |process|
-          ap process.status
-          ap "STDOUT"
-          print process.out
-          ap "STDERR"
-          print process.err
-          ap "-----------------------------------"
-        end
+        # start positioning files
+        @positioner.run()
+
+        # start commander runnes
+        @commander.run()
+
+        # return results
+        { :results => @commander.results(), :errors => Log.execution_errrors }
       end
 
     end

data/lib/command.rb

@@ -0,0 +1,90 @@
+module DTK
+  module Agent
+
+    ##
+    # This is container for command as received from Node Agent
+
+    class Command
+
+      attr_accessor :command_type, :command, :if_success, :if_fail, :process, :child_task
+
+      ##
+      # command    - string to be run on system, e.g. ifconfig
+      # type       - type of command e.g. syscall, ruby
+      # if         - callback to be run if exit status is  = 0
+      # unless     - callback to be run if exit status is != 0
+      # child_task - if it is spawned by another main task
+      #
+      def initialize(value_hash)
+        @command_type = value_hash['type']
+        @command      = value_hash['command']
+        @if_success   = value_hash['if']
+        @if_fail      = value_hash['unless']
+        @spawned      = false
+        @child_task   = value_hash['child_task'] || false
+
+        if @if_success && @if_fail
+          Log.warn "Unexpected case, both if/unless conditions have been set for command #{@command}(#{@command_type})"
+        end
+      end
+
+      ##
+      # Creates Posix Spawn of given process
+      #
+      def start_task
+        begin
+          @process = POSIX::Spawn::Child.new(@command)
+          Log.debug("Command started: '#{self.to_s}'")
+        rescue Exception => e
+          @error_message = e.message
+        end
+      end
+
+      ##
+      # Checks if there is callaback present, callback beeing if/unless command
+      #
+      def callback_pending?
+        return false if @spawned
+        command_to_run = (self.exitstatus.to_i == 0) ? @if_success : @if_fail
+        !!command_to_run
+      end
+
+
+      ##
+      # Creates Command object for callback, first check 'if' than 'unless'. There should be no both set so priority is given
+      # to 'if' callback in case there are two
+      #
+      def spawn_callback_task
+        callback_command = (self.exitstatus.to_i == 0) ? @if_success : @if_fail
+        new_command = Command.new('type' => @command_type, 'command' => callback_command, 'child_task' => true)
+        @spawned = true
+        new_command
+      end
+
+      def exited?
+        return true if @error_message
+        self.process.status.exited?
+      end
+
+      def exitstatus
+        return 1 if @error_message
+        self.process.status.exitstatus
+      end
+
+      def out
+        return '' if @error_message
+        self.process.out
+      end
+
+      def err
+        return @error_message if @error_message
+        self.process.err
+      end
+
+      def to_s
+        "#{@command} (#{command_type})"
+      end
+
+    end
+  end
+  end

data/lib/commander.rb

@@ -0,0 +1,76 @@
+require File.expand_path('../command', __FILE__)
+
+
+module DTK
+  module Agent
+    class Commander
+
+      def initialize(execution_list)
+        @command_tasks  = execution_list.collect { |command| Command.new(command) }
+      end
+
+      def run
+        @command_tasks.each do |command_task|
+          command_task.start_task
+        end
+
+        loop do
+          all_finished = true
+          sleep(1)
+
+          # we check status of all tasks
+          # (Usually is not good practice to change array/map you are iterating but this seems as cleanest solutions)
+          @command_tasks.each do |command_task|
+
+            # is task finished
+            if command_task.exited?
+              Log.debug("Command '#{command_task}' finished, with status #{command_task.exitstatus}")
+
+              # if there is a callback start it
+              if command_task.callback_pending?
+                new_command_task = command_task.spawn_callback_task
+                new_command_task.start_task
+                @command_tasks << new_command_task
+                Log.debug("Command '#{new_command_task}' spawned as callback")
+                # new task added we need to check again
+                all_finished = false
+              end
+            else
+              # we are not ready yet, some tasks need to finish
+              all_finished = false
+            end
+          end
+
+          break if all_finished
+        end
+      end
+
+      def results
+        @command_tasks.collect do |command_task|
+          process = command_task.process
+          {
+            :status      => command_task.exitstatus,
+            :stdout      => command_task.out,
+            :stderr      => command_task.err,
+            :description => command_task.to_s,
+            :child_task  => command_task.child_task
+          }
+        end
+      end
+
+    private
+
+      ##
+      # Sets environmental variables
+      def self.set_environment_variables(env_vars_hash)
+        return unless env_vars_hash
+        env_vars_hash.each do |k, v|
+          ENV[k] = v.to_s.strip
+          Log.debug("Environment variable set (#{k}: #{v})")
+        end
+      end
+
+    end
+
+  end
+end

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

@@ -1,5 +1,5 @@
 module DTK
   module ActionAgent
-    VERSION="0.0.1"
+    VERSION="0.0.2"
   end
 end

data/lib/logger.rb

@@ -0,0 +1,48 @@
+require 'logger'
+require 'singleton'
+
+module DTK
+  module Agent
+    class Log
+      include Singleton
+
+      attr_accessor :logger, :error_msgs
+
+      LOG_TO_CONSOLE = false
+      LOG_TO_FILE    = '/var/log/action-agent.log'
+      # LOG_TO_FILE    = '/Users/haris/test.log'
+
+      def initialize
+        # @logger = Logger.new(File.new(LOG_TO_FILE,'w'))
+        @error_msgs =[]
+      end
+
+      def self.execution_errrors()
+        self.instance.error_msgs
+      end
+
+      def self.debug(msg)
+        # self.instance.logger.debug(msg)
+        ap "debug: #{msg}" if LOG_TO_CONSOLE
+      end
+
+      def self.info(msg)
+        # self.instance.logger.info(msg)
+        ap "info: #{msg}" if LOG_TO_CONSOLE
+      end
+
+      def self.warn(msg)
+        # self.instance.logger.warn(msg)
+        ap "warn: #{msg}" if LOG_TO_CONSOLE
+        self.instance.error_msgs << msg
+      end
+
+      def self.error(msg)
+        # self.instance.logger.error(msg)
+        ap "error: #{msg}" if LOG_TO_CONSOLE
+        self.instance.error_msgs << msg
+      end
+
+    end
+  end
+end

data/lib/positioner.rb

@@ -0,0 +1,65 @@
+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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dtk-action-agent
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Rich PELAVIN
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-12 00:00:00.000000000 Z
+date: 2015-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: posix-spawn
@@ -52,6 +52,20 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 1.8.2
+- !ruby/object:Gem::Dependency
+  name: git
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.9.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.9.1
 description: The DTK Action Agent is designed to run commands on remote machine.
 email:
 - rich@reactor8.com
@@ -64,7 +78,11 @@ files:
 - bin/dtk-action-agent
 - dtk-action-agent.gemspec
 - lib/arbiter.rb
+- lib/command.rb
+- lib/commander.rb
 - lib/dtk-action-agent/version.rb
+- lib/logger.rb
+- lib/positioner.rb
 homepage: ''
 licenses:
 - GPL-3.0