assembly-utils 1.4.6 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3cab491b6f6fa7b7ef55be7efe3778c938f86021
-  data.tar.gz: 3dd67bee16cac2409e1838c69d9baa1404d6d748
+  metadata.gz: 8c19397f0ebcaf5de55f5688ad4ba4b200381bd3
+  data.tar.gz: 969da5c2c4405fad4b673ce1e9a9440ffe2a9bb8
 SHA512:
-  metadata.gz: 229e597cc957ad504ea2f90f3b6299908ef9b07853ab3e6fcfde235d7aa5cabeca6a6d3ffc5654699fe081b2c5a0189ff6e638400e3c9bee61ad35efcb385a28
-  data.tar.gz: 09f142c4c163d41ee9e6e62f1c2129317190a99d7c2c0c8ba41202dffcc2300570dba2d081f4bb9c004169f651e3dddc02f87543a76a18864c4841847cdddda9
+  metadata.gz: 1c2737172052da178d7406749e03fba104e6eadc7c670eb84f0a95f70bf530b2ffe236cf9f5d35c8cdecfed850f4dcf45e4ed5a22c925638592409196c1c0ee9
+  data.tar.gz: ff3d45febaa56d776f2cf4d1e9b56ae60d116b11a587bc631f503abf8d2b28fe4a62aae91d51787011f27524ed1c385b6ecb2196808f2a51573213f74889b55d

data/.rubocop.yml

@@ -5,9 +5,8 @@ Style/SpaceBeforeBlockBraces:
   Exclude:
     - 'spec/**/*_spec.rb'
 
-# Allow for alignment
 Style/SpaceAroundOperators:
-  MultiSpaceAllowedForOperators: true
+  AllowForAlignment: true
 
 Style/EmptyLineBetweenDefs:
   AllowAdjacentOneLineDefs: true

data/README.md

@@ -49,6 +49,7 @@ manipulate DOR objects for assembly and accessioning.
 *   1.2.8 add a new constant for technical metadata filename
 *   1.4.1-2 update gems and fix typos
 *   1.4.6 rubocop fixes, and other refactoring
+*   1.5.0 relax dependency pinning to support rails 5, and dor-workflow-service
 
 ## Running tests
 

data/assembly-utils.gemspec

@@ -18,15 +18,9 @@ Gem::Specification.new do |s|
   s.require_paths = ['lib']
 
   s.add_dependency 'nokogiri'
-  s.add_dependency 'csv-mapper'
-  s.add_dependency 'fastercsv'
   s.add_dependency 'druid-tools', '>= 0.2.6'
 
-  s.add_dependency 'dor-services', '~> 5.3'
-  s.add_dependency 'dor-workflow-service', '>=1.3.1'
-
-  s.add_dependency 'activesupport'
-  s.add_dependency 'activeresource'
+  s.add_dependency 'dor-services', '~> 5.5'
 
   s.add_development_dependency 'rake'
   s.add_development_dependency 'rspec', '~> 3.1'

data/config/boot.rb

@@ -9,5 +9,3 @@ puts "RUNNING IN #{environment} mode"
 $LOAD_PATH.unshift(project_root + '/lib')
 
 require 'assembly-utils'
-
-Dor::WorkflowService.configure(Dor::Config.workflow.url)

data/lib/assembly-utils/utils.rb

@@ -1,6 +1,5 @@
 require 'net/ssh'
 require 'csv'
-require 'csv-mapper'
 require 'druid-tools'
 
 begin
@@ -11,7 +10,6 @@ end
 module Assembly
   # The Utils class contains methods to help with accessioning and assembly
   class Utils
-    WFS  = Dor::WorkflowService
     REPO = 'dor'
 
     # Get the staging directory tree given a druid, and optionally prepend a basepath.
@@ -163,7 +161,7 @@ module Assembly
     #   puts Assembly::Utils.get_workflow_status('druid:aa000aa0001','assemblyWF','jp2-create')
     #   > "completed"
     def self.get_workflow_status(druid, workflow, step)
-      Dor::WorkflowService.get_workflow_status('dor', druid, workflow, step)
+      Dor::Config.workflow.client.get_workflow_status('dor', druid, workflow, step)
     end
 
     # Cleanup a list of objects and associated files given a list of druids.  WARNING: VERY DESTRUCTIVE.
@@ -264,8 +262,8 @@ module Assembly
       if steps.include?(:workflows)
         puts "-- deleting #{pid} accessionWF and assemblyWF workflows from Fedora #{ENV['ROBOT_ENVIRONMENT']}"
         unless dry_run
-          Dor::WorkflowService.delete_workflow('dor', pid, 'accessionWF')
-          Dor::WorkflowService.delete_workflow('dor', pid, 'assemblyWF')
+          Dor::Config.workflow.client.delete_workflow('dor', pid, 'accessionWF')
+          Dor::Config.workflow.client.delete_workflow('dor', pid, 'assemblyWF')
         end
       end
     rescue Exception => e
@@ -428,7 +426,7 @@ module Assembly
       wf_name = Assembly::ASSEMBLY_WF
       msg     = 'Integration testing'
       params  = ['dor', pid, wf_name, step, msg]
-      resp    = Dor::WorkflowService.update_workflow_error_status *params
+      resp    = Dor::Config.workflow.client.update_workflow_error_status *params
       raise 'update_workflow_error_status() returned false.' unless resp == true
     end
 
@@ -440,7 +438,7 @@ module Assembly
     # e.g.
     # Assembly::Utils.delete_all_workflows('druid:oo000oo0001')
     def self.delete_all_workflows(pid, repo = 'dor')
-      Dor::WorkflowService.get_workflows(pid).each {|workflow| Dor::WorkflowService.delete_workflow(repo, pid, workflow)}
+      Dor::Config.workflow.client.get_workflows(pid).each {|workflow| Dor::Config.workflow.client.delete_workflow(repo, pid, workflow)}
     end
 
     # Reindex the supplied PID in solr.
@@ -460,7 +458,7 @@ module Assembly
       repo      = 'dor'
       wf        = 'assemblyWF'
       msg       = 'Integration testing'
-      wfs       = Dor::WorkflowService
+      wfs       = Dor::Config.workflow.client
       steps     = Assembly::ASSEMBLY_WF_STEPS.map { |s| s[0] }
       completed = steps[0]
 
@@ -483,7 +481,7 @@ module Assembly
     #   Assembly::Utils.is_ingested?('druid:oo000oo0001')
     #   > false
     def self.is_ingested?(pid)
-      WFS.get_lifecycle(REPO, pid, 'accessioned') ? true : false
+      Dor::Config.workflow.client.get_lifecycle(REPO, pid, 'accessioned') ? true : false
     end
 
     # Check if the object is currently in accessioning
@@ -495,7 +493,7 @@ module Assembly
     #   Assembly::Utils.in_accessioning?('druid:oo000oo0001')
     #   > false
     def self.in_accessioning?(pid)
-      WFS.get_active_lifecycle(REPO, pid, 'submitted') ? true : false
+      Dor::Config.workflow.client.get_active_lifecycle(REPO, pid, 'submitted') ? true : false
     end
 
     # Check if the object is on ingest hold
@@ -507,7 +505,7 @@ module Assembly
     #   Assembly::Utils.ingest_hold?('druid:oo000oo0001')
     #   > false
     def self.ingest_hold?(pid)
-      WFS.get_workflow_status(REPO, pid, 'accessionWF', 'sdr-ingest-transfer') == 'hold'
+      Dor::Config.workflow.client.get_workflow_status(REPO, pid, 'accessionWF', 'sdr-ingest-transfer') == 'hold'
     end
 
     # Check if the object is submitted
@@ -519,7 +517,7 @@ module Assembly
     #   Assembly::Utils.is_submitted?('druid:oo000oo0001')
     #   > false
     def self.is_submitted?(pid)
-      WFS.get_lifecycle(REPO, pid, 'submitted').nil?
+      Dor::Config.workflow.client.get_lifecycle(REPO, pid, 'submitted').nil?
     end
 
     # Check if the updates are allowed on the object
@@ -570,7 +568,7 @@ module Assembly
           workflows.each do |workflow, steps|
             steps.each do |step|
               puts "Updating #{workflow}:#{step} to #{state}"
-              Dor::WorkflowService.update_workflow_status 'dor', druid, workflow, step, state
+              Dor::Config.workflow.client.update_workflow_status 'dor', druid, workflow, step, state
             end
           end
         rescue Exception => e
@@ -587,14 +585,14 @@ module Assembly
     # Example:
     #   Assembly::Utils.read_druids_from_file('download.csv') # ['druid:xxxxx', 'druid:yyyyy']
     def self.read_druids_from_file(csv_filename)
-      rows = CsvMapper.import(csv_filename) do read_attributes_from_file end
-      druids = []
-      rows.each do |row|
-        druid = row.druid
+      return to_enum(:read_druids_from_file, csv_filename) unless block_given?
+
+      CSV.foreach(csv_filename, :headers => true) do |row|
+        druid = row['druid']
         druid = "druid:#{druid}" unless druid.include?('druid:')
-        druids << druid
+
+        yield druid
       end
-      druids
     end
 
     # Get a list of druids that have errored out in a particular workflow and step
@@ -608,7 +606,7 @@ module Assembly
     # result=Assembly::Utils.get_errored_objects_for_workstep('accessionWF','content-metadata','Project : Revs')
     # => {"druid:qd556jq0580"=>"druid:qd556jq0580 - Item error; caused by #<Rubydora::FedoraInvalidRequest: Error modifying datastream contentMetadata for druid:qd556jq0580. See logger for details>"}
     def self.get_errored_objects_for_workstep(workflow, step, tag = '')
-      result = Dor::WorkflowService.get_errored_objects_for_workstep workflow, step, 'dor'
+      result = Dor::Config.workflow.client.get_errored_objects_for_workstep workflow, step, 'dor'
       return result if tag == ''
       filtered_result = {}
       result.each do |druid, error|

data/lib/assembly-utils/version.rb

@@ -3,6 +3,6 @@ module Assembly
   # Main Utils class
   class Utils
     # Project version number
-    VERSION = '1.4.6'
+    VERSION = '1.5.0'
   end
 end

data/spec/spec_helper.rb

@@ -2,7 +2,8 @@ TEST_PID = 'druid:dd999dd9999'
 TEST_PID_FILENAME = TEST_PID.tr(':', '_')
 TEST_APO_OBJECT = 'druid:qv648vd4392' # this is a real APO object in dor-dev that must exist for the tests to pass
 PATH = File.expand_path(File.dirname(__FILE__))
-TEST_OUTPUT_DIR = File.join(PATH, 'test_data', 'output')
+FIXTURES_DIR = File.join(PATH, 'test_data')
+TEST_OUTPUT_DIR = File.join(FIXTURES_DIR, 'output')
 ENV['ROBOT_ENVIRONMENT'] = 'development'
 
 require 'rspec'

data/spec/test_data/druids.csv

@@ -0,0 +1,4 @@
+druid,x,y
+a,0,1
+b,1,2
+druid:c,3,4

data/spec/utils_spec.rb

@@ -115,4 +115,12 @@ describe Assembly::Utils do
 
   end
 
+  describe '.read_druids_from_file' do
+    it 'extracts the druids from a CSV file' do
+      druids = Assembly::Utils.read_druids_from_file(File.join(FIXTURES_DIR, 'druids.csv'))
+
+      expect(druids.to_a).to match_array ['druid:a', 'druid:b', 'druid:c']
+    end
+  end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: assembly-utils
 version: !ruby/object:Gem::Version
-  version: 1.4.6
+  version: 1.5.0
 platform: ruby
 authors:
 - Peter Mangiafico
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-08 00:00:00.000000000 Z
+date: 2016-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -25,34 +25,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: csv-mapper
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: fastercsv
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: druid-tools
   requirement: !ruby/object:Gem::Requirement
@@ -73,56 +45,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
+        version: '5.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '5.3'
-- !ruby/object:Gem::Dependency
-  name: dor-workflow-service
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.3.1
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: activeresource
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '5.5'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -195,6 +125,7 @@ files:
 - spec/spec_helper.rb
 - spec/test_data/druid_aa000bb1111.xml
 - spec/test_data/druid_dd999dd9999.xml
+- spec/test_data/druids.csv
 - spec/test_data/local_dev_revs.yaml
 - spec/test_data/test_log.yaml
 - spec/utils_spec.rb
@@ -217,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: assembly-utils
-rubygems_version: 2.4.6
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby gem of methods usesful for assembly and accessioning.
@@ -225,7 +156,7 @@ test_files:
 - spec/spec_helper.rb
 - spec/test_data/druid_aa000bb1111.xml
 - spec/test_data/druid_dd999dd9999.xml
+- spec/test_data/druids.csv
 - spec/test_data/local_dev_revs.yaml
 - spec/test_data/test_log.yaml
 - spec/utils_spec.rb
-has_rdoc: