geohydra 0.3.1 → 0.3.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 791c5435960dcfb0c1b45f7bd32233394e4f4c6e
+  data.tar.gz: 98a8dec448332e6490a0994c6abc1f22d15f14dc
+SHA512:
+  metadata.gz: 5f53913b4b7737e32657e5bd344ebc92a03ecc963f94b321084e260ce1bce2411e36c32ff1334ebbfff057cc953c02946e175562eb285b8f429f4e2ef7da278f
+  data.tar.gz: 6d507f147a45895a0d152ffd16c2c62afb5afc7bbe2c52b73abc5a93c3bc987f466cf53d48b090b42ca05b2d8373d8c46c9dc3e67e91c625e9a1b9dea950459e

data/.gitignore

@@ -20,4 +20,5 @@ test/tmp
 test/version_tmp
 tmp
 _yardoc
-lib/ArcGIS2ISO19139.xsl
+lib/ArcGIS*.xsl
+lib/saxon*.jar

data/.travis.yml

@@ -2,6 +2,5 @@ notifications:
   email: false
 
 rvm:
-  - 1.8.7
   - 1.9.3
-  - 2.0.0
+  - 2.0.0

data/Gemfile

@@ -2,14 +2,7 @@ source 'https://rubygems.org'
 
 gemspec
 
-# Hosted on github
-group :github do
-  gem 'dor-services', :git => 'https://github.com/sul-dlss/dor-services.git', :branch => 'develop'
-  gem 'rgeoserver', :git => 'https://github.com/sul-dlss/rgeoserver.git'
-  gem 'version_bumper', :git => 'https://github.com/jondot/version_bumper.git'
-end
-
 # Stanford only
 group :stanford do
-  gem 'lyber-utils', :git => 'corn.stanford.edu:/afs/ir/dev/dlss/git/lyberteam/lyber-utils.git', :branch => 'master'
+  gem 'lyber-utils', :git => 'corn.stanford.edu:/afs/ir/dev/dlss/git/lyberteam/lyber-utils.git'
 end

data/Gemfile.lock

@@ -1,7 +1,6 @@
 GIT
   remote: corn.stanford.edu:/afs/ir/dev/dlss/git/lyberteam/lyber-utils.git
   revision: fcc3bcbe56a6b3cee14321464b4cc8e5b3b18903
-  branch: master
   specs:
     lyber-utils (0.1.2)
       bagit (>= 0.1.0)
@@ -9,78 +8,27 @@ GIT
       systemu (>= 1.2.0)
       validatable
 
-GIT
-  remote: https://github.com/jondot/version_bumper.git
-  revision: 250977316e3bf2079f1a660e03e28ee98256ddc0
-  specs:
-    version_bumper (0.4.1.pre1)
-
-GIT
-  remote: https://github.com/sul-dlss/dor-services.git
-  revision: 44054bc8523141d324ab06cc1475a20c2bba33df
-  branch: develop
-  specs:
-    dor-services (4.4.13)
-      active-fedora (~> 5.6, >= 5.6.3)
-      activesupport
-      confstruct (>= 0.2.2)
-      dor-workflow-service (~> 1.4)
-      druid-tools (>= 0.3.0)
-      equivalent-xml (>= 0.2.2)
-      json
-      lyber-utils
-      moab-versioning (= 1.3.1)
-      net-sftp
-      net-ssh
-      nokogiri (>= 1.6.0)
-      om
-      progressbar
-      rdf (= 1.0.10.2)
-      rest-client
-      rsolr-ext
-      ruby-cache
-      ruby-graphviz
-      solrizer (~> 2.0)
-      stanford-mods (>= 0.0.14)
-      systemu
-      uuidtools
-      validatable
-
-GIT
-  remote: https://github.com/sul-dlss/rgeoserver.git
-  revision: 487f866115a213c4b10f3c133c48d1d9e4a0b585
-  specs:
-    rgeoserver (0.7)
-      activemodel (~> 3.2.0)
-      activesupport (~> 3.2.0)
-      confstruct (~> 0.2.0)
-      mime-types (~> 2.0)
-      nokogiri (~> 1.6.0)
-      rest-client (~> 1.6.0)
-      rgeo (~> 0.3.0)
-      rgeo-shapefile (~> 0.2.0)
-      rubyzip (~> 0.9.0)
-
 PATH
   remote: .
   specs:
-    geohydra (0.3.1)
+    geohydra (0.3.3)
       activerecord (~> 3.2.0)
       activerecord-postgresql-adapter (~> 0.0.1)
       activesupport (~> 3.2.0)
+      addressable (= 2.3.5)
       assembly-objectfile (~> 1.6.2)
       awesome_print (~> 1.2.0)
       confstruct (~> 0.2.5)
-      dor-services (~> 4.4.5)
+      dor-services (~> 4.5)
       druid-tools (~> 0.2)
       fastimage (~> 1.5.4)
       json (~> 1.8.1)
-      mods (~> 0.0.22)
+      mods (~> 0.0.23)
       nokogiri (~> 1.6.0)
       rest-client (~> 1.6.7)
       rgeo (~> 0.3.20)
       rgeo-shapefile (~> 0.2.3)
-      rgeoserver (~> 0.7.0)
+      rgeoserver (~> 0.7)
       rsolr (~> 1.0.9)
 
 GEM
@@ -99,25 +47,25 @@ GEM
       rsolr
       rubydora (~> 1.6)
       solrizer (~> 2.1)
-    activemodel (3.2.16)
-      activesupport (= 3.2.16)
+    activemodel (3.2.17)
+      activesupport (= 3.2.17)
       builder (~> 3.0.0)
-    activerecord (3.2.16)
-      activemodel (= 3.2.16)
-      activesupport (= 3.2.16)
+    activerecord (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
       arel (~> 3.0.2)
       tzinfo (~> 0.3.29)
     activerecord-postgresql-adapter (0.0.1)
       pg
-    activeresource (3.2.16)
-      activemodel (= 3.2.16)
-      activesupport (= 3.2.16)
-    activesupport (3.2.16)
+    activeresource (3.2.17)
+      activemodel (= 3.2.17)
+      activesupport (= 3.2.17)
+    activesupport (3.2.17)
       i18n (~> 0.6, >= 0.6.4)
       multi_json (~> 1.0)
     addressable (2.3.5)
     arel (3.0.3)
-    assembly-objectfile (1.6.2)
+    assembly-objectfile (1.6.4)
       mime-types
       mini_exiftool
       nokogiri
@@ -127,38 +75,65 @@ GEM
       validatable (~> 1.6)
     builder (3.0.4)
     coderay (1.1.0)
-    confstruct (0.2.5)
+    confstruct (0.2.7)
     daemons (1.1.9)
     dbf (2.0.7)
       fastercsv (~> 1.5.4)
-    deprecation (0.0.5)
+    deprecation (0.1.0)
       activesupport
     diff-lcs (1.2.5)
     docopt (0.5.0)
-    dor-workflow-service (1.4.1)
-      activesupport
-      confstruct
-      nokogiri
-      rest-client
+    dor-services (4.6.5)
+      active-fedora (~> 5.7.1)
+      activesupport (~> 3.2.16)
+      confstruct (~> 0.2.2)
+      dor-workflow-service (~> 1.5)
+      druid-tools (~> 0.3.0)
+      equivalent-xml (~> 0.2.2)
+      json (~> 1.8.1)
+      lyber-utils (~> 0.1.2)
+      moab-versioning (= 1.3.1)
+      net-sftp (~> 2.1.2)
+      net-ssh (~> 2.7.0)
+      nokogiri (= 1.6.0)
+      om (~> 1.8.0)
+      progressbar (~> 0.21.0)
+      rdf (~> 1.0.9.0)
+      rest-client (~> 1.6.7)
+      rsolr-ext (~> 1.0.3)
+      ruby-cache (~> 0.3.0)
+      ruby-graphviz (~> 1.0.9)
+      rubydora (~> 1.6.5)
+      solrizer (~> 2.0)
+      stanford-mods (~> 0.0.14)
+      systemu (~> 2.6.0)
+      uuidtools (~> 2.1.4)
+      validatable (~> 1.6.7)
+    dor-workflow-service (1.6.2)
+      activesupport (~> 3.2)
+      confstruct (~> 0.2.7)
+      nokogiri (~> 1.6.0)
+      rest-client (~> 1.6.7)
     druid-tools (0.3.0)
-    equivalent-xml (0.4.0)
+    equivalent-xml (0.2.9)
       nokogiri (>= 1.4.3)
     fastercsv (1.5.5)
-    fastimage (1.5.4)
+    fastimage (1.5.5)
       addressable (~> 2.3, >= 2.3.5)
     happymapper (0.4.1)
       libxml-ruby (~> 2.0)
     hashery (2.1.1)
-    hooks (0.3.3)
+    hooks (0.3.6)
+      uber (~> 0.0.4)
     i18n (0.6.9)
     iso-639 (0.2.4)
     json (1.8.1)
     libxml-ruby (2.7.0)
     mediashelf-loggable (0.4.9)
     method_source (0.8.2)
-    mime-types (2.0)
-    mini_exiftool (2.3.0)
-    mini_portile (0.5.2)
+    mime-types (2.2)
+    mini_exiftool (2.4.1)
+    mini_portile (0.5.3)
     moab-versioning (1.3.1)
       confstruct
       happymapper
@@ -166,15 +141,15 @@ GEM
       json
       nokogiri
       systemu
-    mods (0.0.22)
+    mods (0.0.23)
       iso-639
       nokogiri
       nom-xml
-    multi_json (1.8.2)
+    multi_json (1.9.3)
     net-sftp (2.1.2)
       net-ssh (>= 2.6.5)
     net-ssh (2.7.0)
-    nokogiri (1.6.1)
+    nokogiri (1.6.0)
       mini_portile (~> 0.5.0)
     nom-xml (0.5.1)
       activesupport
@@ -186,14 +161,14 @@ GEM
       deprecation
       mediashelf-loggable
       nokogiri (>= 1.4.2)
-    pg (0.17.0)
+    pg (0.17.1)
     progressbar (0.21.0)
-    pry (0.9.12.4)
+    pry (0.9.12.6)
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rake (10.1.0)
-    rdf (1.0.10.2)
+    rake (10.3.1)
+    rdf (1.0.9)
       addressable (>= 2.3)
     rdf-rdfxml (0.3.9)
       rdf (>= 0.3.11)
@@ -201,16 +176,26 @@ GEM
     rdf-xsd (1.0.2.1)
       nokogiri (>= 1.5.0)
       rdf (>= 0.3.4)
-    rdoc (4.0.1)
+    rdoc (4.1.1)
       json (~> 1.4)
-    redcarpet (3.0.0)
+    redcarpet (3.1.1)
     rest-client (1.6.7)
       mime-types (>= 1.16)
     rgeo (0.3.20)
     rgeo-shapefile (0.2.3)
       dbf (>= 1.7.0)
       rgeo (>= 0.3.3)
-    rsolr (1.0.9)
+    rgeoserver (0.7.1)
+      activemodel (~> 3.2.0)
+      activesupport (~> 3.2.0)
+      confstruct (~> 0.2.0)
+      mime-types (~> 2.0)
+      nokogiri (~> 1.6.0)
+      rest-client (~> 1.6.0)
+      rgeo (~> 0.3.0)
+      rgeo-shapefile (~> 0.2.0)
+      rubyzip (~> 0.9.0)
+    rsolr (1.0.10)
       builder (>= 2.1.2)
     rsolr-ext (1.0.3)
       rsolr (>= 1.0.2)
@@ -218,10 +203,10 @@ GEM
       rspec-core (~> 2.14.0)
       rspec-expectations (~> 2.14.0)
       rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.7)
-    rspec-expectations (2.14.4)
+    rspec-core (2.14.8)
+    rspec-expectations (2.14.5)
       diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.4)
+    rspec-mocks (2.14.6)
     ruby-cache (0.3.0)
     ruby-graphviz (1.0.9)
     rubydora (1.6.5)
@@ -235,7 +220,7 @@ GEM
       nokogiri
       rest-client
     rubyzip (0.9.9)
-    slop (3.4.7)
+    slop (3.5.0)
     solrizer (2.2.0)
       activesupport
       daemons
@@ -244,21 +229,22 @@ GEM
       om (>= 1.5.0)
       stomp
       xml-simple
-    stanford-mods (0.0.22)
+    stanford-mods (0.0.24)
       mods
     stomp (1.3.2)
-    systemu (2.6.0)
-    tzinfo (0.3.38)
+    systemu (2.6.4)
+    tzinfo (0.3.39)
+    uber (0.0.4)
     uuidtools (2.1.4)
     validatable (1.6.7)
-    xml-simple (1.1.2)
-    yard (0.8.7.3)
+    version_bumper (0.3.0)
+    xml-simple (1.1.3)
+    yard (0.8.7.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  dor-services!
   equivalent-xml
   geohydra!
   lyber-utils!
@@ -266,7 +252,6 @@ DEPENDENCIES
   rake
   rdoc
   redcarpet
-  rgeoserver!
   rspec
-  version_bumper!
+  version_bumper
   yard

data/README.md

@@ -135,7 +135,7 @@ is *pre-stage*:
 
 The `geoOptions.json` contain meta-metadata about the package, including the
 druid, geometry type, and filename. These files can be generated using
-bin/build_stage_options.rb but it requires manual supervision.
+`bin/build_stage_options.rb` but it requires manual supervision.
 
     { "druid":"cg716wc7949", 
       "geometryType":"Raster", 
@@ -152,7 +152,7 @@ Once staged, the data look like this:
         preview.jpg
       temp/
         geoOptions.json
-        OGWELLS-iso19139-fc.xml
+        OGWELLS-iso19110.xml
         OGWELLS-iso19139.xml
 
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.3.3

data/bin/accession.rb

@@ -7,103 +7,113 @@ require 'druid-tools'
 
 VERSION = '0.3'
 
-# __MAIN__
-begin
-  File.umask(002)
-  flags = {
-    :admin_policy => 'druid:gz830zp4734',
-    :rights => 'stanford',
-    :tags => [
-      "Registered By : #{%x{whoami}.strip} (GeoHydra)"
-    ],
-    :tmpdir => GeoHydra::Config.geohydra.tmpdir || 'tmp',
-    :verbose => false,
-    :configtest => false,
-    :purge => false,
-    :accessionWF => false,
-    :contentMetadata => true,
-    :debug => false,
-    :shelve => false,
-    :workspacedir => GeoHydra::Config.geohydra.workspace || 'workspace'
-  }
+class Accession < GeoHydra::Process
+  def run(args)
+    begin
+      File.umask(002)
+      flags = {
+        :admin_policy => 'druid:gz830zp4734',
+        :rights => 'stanford',
+        :tags => [
+          "Registered By : #{%x{whoami}.strip} (GeoHydra)"
+        ],
+        :tmpdir => GeoHydra::Config.geohydra.tmpdir || 'tmp',
+        :verbose => false,
+        :configtest => false,
+        :purge => false,
+        :accessionWF => false,
+        :contentMetadata => true,
+        :debug => false,
+        :shelve => false,
+        :dryrun => false,
+        :workspacedir => GeoHydra::Config.geohydra.workspace || 'workspace'
+      }
 
-  OptionParser.new do |opts|
-    opts.version = VERSION
-    opts.banner = <<EOM
-Usage: #{File.basename(__FILE__)} [options] [druid [druid...]]
-       #{File.basename(__FILE__)} [options] < druids
+      OptionParser.new do |opts|
+        opts.version = VERSION
+        opts.banner = <<EOM
+    Usage: #{File.basename(__FILE__)} [options] [druid [druid...]]
+           #{File.basename(__FILE__)} [options] < druids
 EOM
-    opts.on('--apo DRUID', 'APO for collection to accession' + (flags[:admin_policy] ? " (default: #{flags[:admin_policy]})" : '')) do |druid|
-      flags[:admin_policy] = DruidTools::Druid.new(druid).druid
-    end
-    opts.on('--collection DRUID', 'Collection for accession' + (flags[:collection] ? " (default: #{flags[:collection]})" : '')) do |druid|
-      flags[:collection] = DruidTools::Druid.new(druid).druid
-    end
-    opts.on('--purge', 'Purge items before accessioning') do |b|
-      flags[:purge] = true
-    end
-    opts.on('--accessionWF', 'Kick off the accessionWF workflow') do |b|
-      flags[:accessionWF] = true
-    end
-    opts.on('--rights KEYWORD', "Rights keyword (default: #{flags[:rights]})") do |keyword|
-      flags[:rights] = keyword
-    end
-    opts.on('--tag TAG', 'Tag for each object - multiple tags allowed') do |tag|
-      flags[:tags] << tag
-    end
-    opts.on('--test', 'Verify configuration then exit') do
-      flags[:configtest] = true
-    end
-    opts.on('--tmpdir DIR', "Temporary directory for assembly (default: #{flags[:tmpdir]})") do |d|
-      flags[:tmpdir] = d
-    end
-    opts.on('-v', '--verbose', 'Run verbosely, use multiple times for debug level output') do
-      flags[:debug] = true if flags[:verbose]  # -vv
-      flags[:verbose] = true
-    end
-    opts.on('--workspace DIR', "Workspace directory for assembly (default: #{flags[:workspacedir]})") do |d|
-      flags[:workspacedir] = d
-    end
-  end.parse!
+        opts.on('--apo DRUID', 'APO for collection to accession' + (flags[:admin_policy] ? " (default: #{flags[:admin_policy]})" : '')) do |druid|
+          flags[:admin_policy] = DruidTools::Druid.new(druid).druid
+        end
+        opts.on('--collection DRUID', 'Collection for accession' + (flags[:collection] ? " (default: #{flags[:collection]})" : '')) do |druid|
+          flags[:collection] = DruidTools::Druid.new(druid).druid
+        end
+        opts.on('--purge', 'Purge items before accessioning') do |b|
+          flags[:purge] = true
+        end
+        opts.on('--accessionWF', 'Kick off the accessionWF workflow') do |b|
+          flags[:accessionWF] = true
+        end
+        opts.on('--rights KEYWORD', "Rights keyword (default: #{flags[:rights]})") do |keyword|
+          flags[:rights] = keyword
+        end
+        opts.on('--tag TAG', 'Tag for each object - multiple tags allowed') do |tag|
+          flags[:tags] << tag
+        end
+        opts.on('--test', 'Verify configuration then exit') do
+          flags[:configtest] = true
+        end
+        opts.on('--dryrun', 'Do not save objects') do
+          flags[:dryrun] = true
+        end
+        opts.on('--tmpdir DIR', "Temporary directory for assembly (default: #{flags[:tmpdir]})") do |d|
+          flags[:tmpdir] = d
+        end
+        opts.on('-v', '--verbose', 'Run verbosely, use multiple times for debug level output') do
+          flags[:debug] = true if flags[:verbose]  # -vv
+          flags[:verbose] = true
+        end
+        opts.on('--workspace DIR', "Workspace directory for assembly (default: #{flags[:workspacedir]})") do |d|
+          flags[:workspacedir] = d
+        end
+      end.parse!(args)
 
-  [flags[:tmpdir], flags[:workspacedir]].each do |d|
-    raise ArgumentError, "Missing directory #{d}" unless File.directory? d
-  end
+      [flags[:tmpdir], flags[:workspacedir]].each do |d|
+        raise ArgumentError, "Missing directory #{d}" unless File.directory? d
+      end
 
-  ap({:flags => flags}) if flags[:debug]
+      ap({:flags => flags}) if flags[:debug]
 
-  # Verify configuation
-  if flags[:configtest]
-    errs = 0
-    %w{workflow.url fedora.safeurl solrizer.url ssl.cert_file ssl.key_pass dor.service_root}.each do |k|
-      begin
-        k = "Dor::Config.#{k}"
-        if eval(k).nil?
-          $stderr.puts "ERROR: Configuration requires #{k}" 
-          errs += 1
+      # Verify configuation
+      if flags[:configtest]
+        errs = 0
+        %w{workflow.url fedora.safeurl solrizer.url ssl.cert_file ssl.key_pass dor.service_root}.each do |k|
+          begin
+            k = "Dor::Config.#{k}"
+            if eval(k).nil?
+              $stderr.puts "ERROR: Configuration requires #{k}" 
+              errs += 1
+            end
+          rescue Exception => e
+            $stderr.puts e, e.backtrace
+          end
         end
-      rescue Exception => e
-        $stderr.puts e, e.backtrace
+        puts "Configuration OK" if errs == 0
+        exit errs
       end
-    end
-    puts "Configuration OK" if errs == 0
-    exit errs
-  end
 
-  if ARGV.empty?
-    STDIN.each do |line|
-      pid = line.strip
-      druid = DruidTools::Druid.new(pid, flags[:workspacedir])
-      GeoHydra::Accession.run(druid, flags)
-    end
-  else
-    ARGV.each do |pid|
-      druid = DruidTools::Druid.new(pid, flags[:workspacedir])
-      GeoHydra::Accession.run(druid, flags)
+      if args.empty?
+        STDIN.each do |line|
+          pid = line.strip
+          druid = DruidTools::Druid.new(pid, flags[:workspacedir])
+          GeoHydra::Accession.run(druid, flags)
+        end
+      else
+        args.each do |pid|
+          druid = DruidTools::Druid.new(pid, flags[:workspacedir])
+          GeoHydra::Accession.run(druid, flags)
+        end
+      end
+    rescue SystemCallError => e
+      $stderr.puts "ERROR: #{e.message}"
+      $stderr.puts e.backtrace
+      exit(-1)
     end
   end
-rescue SystemCallError => e
-  $stderr.puts "ERROR: #{e.message}"
-  $stderr.puts e.backtrace
-  exit(-1)
 end
+
+# __MAIN__
+Accession.new.run(ARGV)