lyber-core 4.1.5 → 5.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: c9b8675c858e0dbf15994666e5f8f9a069f0aa21
-  data.tar.gz: 1d8111d21ff39fcd244976e702f14096c8ba8290
+SHA256:
+  metadata.gz: 238ef0f4203fa0303db394acaa64de7baa7180b711c8716e32778519c7a53410
+  data.tar.gz: 7cf2b763be36843efd52572cb6d5545326831fe6bb2379223d7127f50d99f271
 SHA512:
-  metadata.gz: cfcadb4929c95bdfb28b5e223a639ee1d83215610304190540a54460effb1cdaf4855cb1cefc78632801308a51888724c586741a5753f5b4c8da2d47d3417135
-  data.tar.gz: 81c6b4c966488601c0ace0485414eb253da37783cd96a03622bd636e4a76702ecca0e14b03471b27506304b2d9b1ef888ba49abab349950161e6b008b87e3eaf
+  metadata.gz: b0b0c7c39594aa2ffac22e48a58e02d0b421088affda0f2e5197dcfb30341912c54b67da455b623a4fdbf0541a7ecc4a48d1f96d05526f13320e2d72288fb402
+  data.tar.gz: 2b8240abf814d1063838081abb58ac1eddab4c274d3c5595eeb9798a6aad2e8098a1c7a8326f3f9748e5ade519ad821e98577d9639810f77a59af6f1fc76b9d6

data/lib/lyber_core.rb

@@ -1,6 +1,4 @@
-require 'dor-workflow-service'
-
-require 'lyber_core/base'
+require 'dor-services'
 require 'lyber_core/log'
 require 'lyber_core/robot'
 require 'lyber_core/return_state'

data/lib/lyber_core/robot.rb

@@ -51,7 +51,7 @@ module LyberCore
       @workflow_name = workflow_name
       @step_name = step_name
       @check_queued_status = opts.fetch(:check_queued_status, true)
-      @workflow_service = opts.fetch(:workflow_service, Dor::WorkflowService)
+      @workflow_service = opts.fetch(:workflow_service) { Dor::Config.workflow.client }
     end
 
     # Sets up logging, timing and error handling of the job
@@ -78,7 +78,6 @@ module LyberCore
       else
         workflow_state = 'completed'
       end
-
       # update the workflow status from its current state to the state returned by perform (or 'completed' as the default)
       workflow_service.update_workflow_status(@repo, druid, @workflow_name, @step_name, workflow_state, elapsed: elapsed, note: note)
       LyberCore::Log.info "Finished #{druid} in #{sprintf('%0.4f', elapsed)}s"
@@ -96,7 +95,7 @@ module LyberCore
   private
 
     def item_queued?(druid)
-      status = workflow_service.get_workflow_status(@repo, druid, @workflow_name, @step_name)
+      status = workflow_service.workflow_status(@repo, druid, @workflow_name, @step_name)
       return true if status =~ /queued/i
       LyberCore::Log.warn "Item #{druid} is not queued, but has status of '#{status}'. Will skip processing"
       false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lyber-core
 version: !ruby/object:Gem::Version
-  version: 4.1.5
+  version: 5.0.0
 platform: ruby
 authors:
 - Alpana Pande
@@ -16,7 +16,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-20 00:00:00.000000000 Z
+date: 2019-05-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -33,25 +33,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: dor-workflow-service
+  name: dor-services
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.7'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.7'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: coveralls
   requirement: !ruby/object:Gem::Requirement
@@ -162,7 +156,6 @@ files:
 - LICENSE
 - README.md
 - lib/lyber_core.rb
-- lib/lyber_core/base.rb
 - lib/lyber_core/log.rb
 - lib/lyber_core/return_state.rb
 - lib/lyber_core/robot.rb
@@ -187,7 +180,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.6
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Core services used by the SUL Digital Library

data/lib/lyber_core/base.rb

@@ -1,91 +0,0 @@
-require 'benchmark'
-require 'active_support'
-
-module LyberCore
-  # The skeleton of robots, a replacement for LyberCore::Robot
-  # @example To migrate from LyberCore::Robot, replace
-  #   class MyRobot
-  #     include LyberCore::Robot
-  #     def initialize
-  #       new(REPOSITORY, WORKFLOW_NAME, ROBOT_NAME)
-  #     end
-  #     def perform ...
-  #   end
-  # @example Usage: implement self.worker and override #perform, as before
-  #   class MyRobot < LyberCore::Base
-  #     def self.worker
-  #       new('sdr', 'preservationIngestWF', 'ingest-poison')
-  #     end
-  #     def perform ...
-  #   end
-  class Base
-    # Called by job-manager: instantiate the Robot and call #work with the druid
-    # @param [String] druid
-    # @note Override the instance method #perform, probably not this one
-    def self.perform(druid)
-      worker.work(druid)
-    end
-
-    # get an instance, without knowing the params for .new()
-    # @return [LyberCore::Base]
-    def self.worker
-      raise NotImplementedError, 'Implement class method self.worker on the subclass'
-    end
-
-    attr_accessor :repo, :workflow_name, :step_name, :check_queued_status, :workflow_service
-
-    def initialize(repo, workflow_name, step_name, opts = {})
-      Signal.trap('QUIT') { puts "#{Process.pid} ignoring SIGQUIT" } # SIGQUIT ignored to let the robot finish
-      @repo = repo
-      @workflow_name = workflow_name
-      @step_name = step_name
-      @check_queued_status = opts.fetch(:check_queued_status, true)
-      @workflow_service = opts.fetch(:workflow_service, Dor::WorkflowService)
-    end
-
-    # @return [Logger]
-    def logger
-      unless @log_init # one time
-        LyberCore::Log.set_logfile($stdout) # let process manager(bluepill) handle logging
-        @log_init = true
-      end
-      LyberCore::Log
-    end
-
-    # Sets up logging, timing and error handling of the job
-    # Calls the #perform method, then sets workflow to 'completed' or 'error' depending on success
-    def work(druid)
-      logger.info "#{druid} processing"
-      return if check_queued_status && !item_queued?(druid)
-      result = nil
-      elapsed = Benchmark.realtime { result = perform(druid) }
-      if result.is_a?(LyberCore::Robot::ReturnState)
-        workflow_state = result.status
-        note = result.note unless result.note.blank?
-      else
-        workflow_state = 'completed' # default
-      end
-      note ||= Socket.gethostname # default
-      workflow_service.update_workflow_status(repo, druid, workflow_name, step_name, workflow_state, elapsed: elapsed, note: note)
-      logger.info "Finished #{druid} in #{format('%0.4f', elapsed)}s"
-    rescue StandardError => e
-      Honeybadger.notify(e) if defined? Honeybadger
-      begin
-        logger.error e.message + "\n" + e.backtrace.join("\n")
-        workflow_service.update_workflow_error_status(repo, druid, workflow_name, step_name, e.message, error_text: Socket.gethostname)
-      rescue StandardError => e2
-        logger.error "Cannot set #{druid} to status='error'\n" + e2.message + "\n" + e2.backtrace.join("\n")
-        raise e2 # send exception to Resque failed queue
-      end
-    end
-
-  private
-
-    def item_queued?(druid)
-      status = workflow_service.get_workflow_status(repo, druid, workflow_name, step_name)
-      return true if status =~ /queued/i
-      logger.warn "Item #{druid} is not queued, but has status of '#{status}'. Will skip processing"
-      false
-    end
-  end
-end