pushmi_pullyu 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 849c251f6663e84222fd4528bb031fbab790d527
-  data.tar.gz: 05bcd89a079192f5095ab3bd4c09fdeda04d3bed
+  metadata.gz: aa937d14979ab2d2816e710c8ab07953161538d0
+  data.tar.gz: 4b941305b25f708ed1cec36d96e0573e73e83d64
 SHA512:
-  metadata.gz: e69dd08099c4b360a4a4dfca2198d6488b7a5f79cd35cf285f7cfd33c8f4490541b9f57cec84522fa0a5a6df955d290ceedef4f224b17026b0717a9ca1376a56
-  data.tar.gz: 2b2820ea74975108d758bcb7e8532b42ea2928d71b1e0ebd56f37bec86945f202177f2292862a320333f1f2c513b89abfd42f1bfd2b0dd03a7d8f9ee80625b5c
+  metadata.gz: ba32265c07780fb2bc9e894505cdc44c893c1c61eed805a409263f0f0208410f6313c09624b5bc2afec132b5d4c2203f0e4039ea8cd41f7744d4e2d6ddffa757
+  data.tar.gz: 9f5ba89beb76ce3102a2ebf232021d6f6d401553e46c310e79c0f8956f02855a79392b7b1831fba8b0b246bce2f9eaf463659244032ab09741ea5b7f6423c61c

data/examples/pushmi_pullyu.yml

@@ -28,10 +28,7 @@ fedora:
   base_path: /dev
 
 database:
-  encoding: utf8
-  url: postgresql://jupiter:mysecretpassword@127.0.0.1
-  database: jupiter_development
-  pool: 5
+  url: postgresql://jupiter:mysecretpassword@127.0.0.1/jupiter_development
 
 #parameters project_name and project_domain_name are required only for keystone v3 authentication
 swift:

data/lib/pushmi_pullyu/aip/owner_email_editor.rb

@@ -11,8 +11,6 @@ class PushmiPullyu::AIP::OwnerEmailEditor
   end
 
   def run
-    ensure_database_connection
-
     is_modified = false
     prefixes = nil
     # Read once to load prefixes (the @things at the top of an n3 file)
@@ -37,26 +35,4 @@ class PushmiPullyu::AIP::OwnerEmailEditor
     raise NoOwnerPredicate
   end
 
-  private
-
-  def ensure_database_connection
-    return if ActiveRecord::Base.connected?
-    ActiveRecord::Base.establish_connection(database_configuration)
-  end
-
-  def database_configuration
-    # Config either from URL, or with more granular options (the later taking precedence)
-    config = {}
-    uri = URI.parse(PushmiPullyu.options[:database][:url])
-    config[:adapter] = PushmiPullyu.options[:database][:adaptor] || uri.scheme
-    config[:host] = PushmiPullyu.options[:database][:host] || uri.host
-    config[:database] = PushmiPullyu.options[:database][:database] || uri.path.split('/')[1].to_s
-    config[:username] = PushmiPullyu.options[:database][:username] || uri.user
-    config[:password] = PushmiPullyu.options[:database][:password] || uri.password
-    params = CGI.parse(uri.query || '')
-    config[:encoding] = PushmiPullyu.options[:database][:encoding] || params['encoding'].to_a.first
-    config[:pool] = PushmiPullyu.options[:database][:pool] || params['pool'].to_a.first
-    config
-  end
-
 end

data/lib/pushmi_pullyu/cli.rb

@@ -48,6 +48,7 @@ class PushmiPullyu::CLI
     setup_signal_traps
 
     setup_log
+    setup_db_connection
     print_banner
 
     run_tick_loop
@@ -169,6 +170,7 @@ class PushmiPullyu::CLI
 
   def run_preservation_cycle
     item = queue.wait_next_item
+    return unless item.present?
 
     # add additional information about the error context to errors that occur while processing this item.
     Rollbar.scoped(noid: item) do
@@ -262,4 +264,12 @@ class PushmiPullyu::CLI
     end
   end
 
+  def setup_db_connection
+    ActiveRecord::Base.establish_connection(database_configuration)
+  end
+
+  def database_configuration
+    PushmiPullyu.options[:database][:url]
+  end
+
 end

data/lib/pushmi_pullyu/version.rb

@@ -1,3 +1,3 @@
 module PushmiPullyu
-  VERSION = '1.0.2'.freeze
+  VERSION = '1.0.3'.freeze
 end

data/pushmi_pullyu.gemspec

@@ -32,7 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency 'rdf', '>= 1.99', '< 4.0'
   spec.add_runtime_dependency 'rdf-n3', '>= 1.99', '< 4.0'
   spec.add_runtime_dependency 'redis', '>= 3.3', '< 5.0'
-  spec.add_runtime_dependency 'rest-client', '~> 1.8'
+  spec.add_runtime_dependency 'rest-client', '>= 1.8', '< 3.0'
   spec.add_runtime_dependency 'rollbar', '~> 2.14'
 
   spec.add_development_dependency 'bundler', '~> 1.14'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushmi_pullyu
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Shane Murnaghan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-08-17 00:00:00.000000000 Z
+date: 2018-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -204,16 +204,22 @@ dependencies:
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '1.8'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rollbar
   requirement: !ruby/object:Gem::Requirement