foreman-tasks-core 0.1.8 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8dd7e1a045b304faf9b0d322a06aaa7b41f9c64
-  data.tar.gz: 3a3052310c69eaaa79bdf09ff1ea8fd19ae2e810
+  metadata.gz: 82c45ce63472dd3fa8bdc0d67753e06c71493fa9
+  data.tar.gz: b45d72c387ea36571f352838cf56b356928f6aeb
 SHA512:
-  metadata.gz: 615b75e6c9397f65d57beae92f0d46377933295f1f70eae0705684dee53124f4c9ce7081a92b042dcd092ea5c3434355fd949ca85a41f589b7bde4f47bf23fd7
-  data.tar.gz: f757085186d4d1330f4e743876b0f5eb7793cbe4f4c6e2e8d59e26a8e727e27099c05fd9b82b1a31951a98dcbdf742671a0678e998e748b08112d76981a7e16b
+  metadata.gz: 7ca8912319a39eb83bbb1d278b0248ba4d285c7c930abfc2f7a203bc4e3485d2d770a228b41bb9e391b2df220a1eb979ad578b2968732766542daa0bde6338ff
+  data.tar.gz: e6f3570c0d8aaa850c0d7a2c7e60f6168622e06c8ed5679dfc35f18c7f33ca821a9ccb3fe1e7840b2c85d98a5ef6e2cbf3f70cebd84e8859db7213d7b772000d

data/lib/foreman_tasks_core.rb

@@ -1,10 +1,7 @@
 # The goal of ForemanTasksCore is to collect parts of foreman-tasks
 # that can be shared by the Foreman server and Foreman proxy
 
-require 'dynflow'
 require 'foreman_tasks_core/settings_loader'
-require 'foreman_tasks_core/otp_manager'
-require 'foreman_tasks_core/ticker'
 
 module ForemanTasksCore
   def self.dynflow_world
@@ -19,8 +16,4 @@ module ForemanTasksCore
   def self.dynflow_setup(dynflow_world)
     @dynflow_world = dynflow_world
   end
-
-  def self.silent_dead_letter_matchers
-    [::Dynflow::DeadLetterSilencer::Matcher.new(ForemanTasksCore::Ticker)]
-  end
 end

data/lib/foreman_tasks_core/runner/action.rb

@@ -10,8 +10,6 @@ module ForemanTasksCore
           init_run
         when Runner::Update
           process_update(event)
-        when Runner::ExternalEvent
-          process_external_event(event)
         when ::Dynflow::Action::Cancellable::Cancel
           kill_run
         else
@@ -54,11 +52,6 @@ module ForemanTasksCore
         output[:exit_status] = update.exit_status
       end
 
-      def process_external_event(event)
-        runner_dispatcher.external_event(output[:runner_id], event)
-        suspend
-      end
-
       def process_update(update)
         output[:result].concat(update.continuous_output.raw_outputs)
         if update.exit_status

data/lib/foreman_tasks_core/runner/dispatcher.rb

@@ -10,7 +10,7 @@ module ForemanTasksCore
       end
 
       class RunnerActor < ::Dynflow::Actor
-        def initialize(dispatcher, suspended_action, runner, clock, logger, _options = {})
+        def initialize(dispatcher, suspended_action, runner, clock, logger, options = {})
           @dispatcher = dispatcher
           @clock = clock
           @ticker = dispatcher.ticker
@@ -18,6 +18,7 @@ module ForemanTasksCore
           @suspended_action = suspended_action
           @runner = runner
           @finishing = false
+          @refresh_interval = options[:refresh_interval] || 1
         end
 
         def on_envelope(*args)
@@ -73,10 +74,6 @@ module ForemanTasksCore
           finish_termination
         end
 
-        def external_event(_event)
-          refresh_runner
-        end
-
         private
 
         def set_timeout
@@ -103,7 +100,7 @@ module ForemanTasksCore
         @mutex  = Mutex.new
         @clock  = clock
         @logger = logger
-        @ticker = ::ForemanTasksCore::Ticker.spawn('dispatcher-ticker', @clock, @logger, refresh_interval)
+        @ticker = ::ForemanTasksCore::Ticker.spawn('dispatcher-ticker', @clock, @logger)
         @runner_actors = {}
         @runner_suspended_actions = {}
       end
@@ -150,21 +147,10 @@ module ForemanTasksCore
         end
       end
 
-      def external_event(runner_id, external_event)
-        synchronize do
-          runner_actor = @runner_actors[runner_id]
-          runner_actor.tell([:external_event, external_event]) if runner_actor
-        end
-      end
-
       def handle_command_exception(*args)
         synchronize { _handle_command_exception(*args) }
       end
 
-      def refresh_interval
-        1
-      end
-
       private
 
       def _finish(runner_id)

data/lib/foreman_tasks_core/runner/update.rb

@@ -17,12 +17,5 @@ module ForemanTasksCore
         new(continuous_output, fatal ? 'EXCEPTION' : nil)
       end
     end
-
-    class ExternalEvent
-      attr_reader :data
-      def initialize(data = {})
-        @data = data
-      end
-    end
   end
 end

data/lib/foreman_tasks_core/ticker.rb

@@ -2,11 +2,11 @@ module ForemanTasksCore
   class Ticker < ::Dynflow::Actor
     attr_reader :clock
 
-    def initialize(clock, logger, refresh_interval)
+    def initialize(clock, logger)
       @clock = clock
       @logger = logger
       @events = []
-      @refresh_interval = refresh_interval
+      @refresh_interval = 1
       plan_next_tick
     end
 

data/lib/foreman_tasks_core/version.rb

@@ -1,3 +1,3 @@
 module ForemanTasksCore
-  VERSION = '0.1.8'.freeze
+  VERSION = '0.2.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman-tasks-core
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.2.0
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-22 00:00:00.000000000 Z
+date: 2017-07-19 00:00:00.000000000 Z
 dependencies: []
 description: |
   Common code used both at Forman and Foreman proxy regarding tasks
@@ -21,7 +21,6 @@ files:
 - LICENSE
 - lib/foreman_tasks_core.rb
 - lib/foreman_tasks_core/continuous_output.rb
-- lib/foreman_tasks_core/otp_manager.rb
 - lib/foreman_tasks_core/runner.rb
 - lib/foreman_tasks_core/runner/action.rb
 - lib/foreman_tasks_core/runner/base.rb
@@ -51,7 +50,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.12
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Common code used both at Forman and Foreman proxy regarding tasks

data/lib/foreman_tasks_core/otp_manager.rb

@@ -1,31 +0,0 @@
-require 'base64'
-require 'securerandom'
-
-module ForemanTasksCore
-  class OtpManager
-    class << self
-      def generate_otp(username)
-        otp = SecureRandom.hex
-        passwords[username] = otp.to_s
-      end
-
-      def drop_otp(username, password)
-        passwords.delete(username) if passwords[username] == password
-      end
-
-      def passwords
-        @password ||= {}
-      end
-
-      def authenticate(hash)
-        plain = Base64.decode64(hash)
-        username, otp = plain.split(':', 2)
-        drop_otp(username, otp)
-      end
-
-      def tokenize(username, password)
-        Base64.strict_encode64("#{username}:#{password}")
-      end
-    end
-  end
-end