pushmi_pullyu 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0f283beb86e53c87da86178c6378da2522d41703
-  data.tar.gz: 629475e07add284c7af575932d6400af1ec7c50a
+  metadata.gz: 257884fa2eaea476a4765f03063c07b19927cd61
+  data.tar.gz: 858b6ae6809fca4f0b291e9a7e868686de8d5b36
 SHA512:
-  metadata.gz: d6606eb7bceef18a1a263f8e0f5ff6adc86f6d46b13a8e34ac4f3867ace42b91e9e71a00c794b1bd29a1a7a9b3dd8caae46cd1261ec988b4f6fd386644fda598
-  data.tar.gz: d8987510e6d8e4e99e27c38f49cddca65fe2cdbf17b28b0395503cb540698867065e36d43291897e4488f8e8bfc33444bc4a049f1abf52cbd52f1a438127c0d4
+  metadata.gz: 17108f728721e24db410f4957fa10401252e458dc98663774a928655cb6ad1e71b10ecc6dcfef62484cbc164ea32e6317310e6775920fa278f8dbf5e8609f1a0
+  data.tar.gz: 1601222c2a1769f1a5174afea65e01952fe3cea9ad1f162e102a16e2586c5e77801c8b6e742b8f3106efd3735db7179162916810092f1255d7169e6f4efe2091

data/examples/pushmi_pullyu.yml

@@ -16,7 +16,6 @@ workdir: tmp/work
 process_name: pushmi_pullyu
 queue_name: dev:pmpy_queue
 minimum_age: 0
-rollbar_token: 'abc123xyz'
 
 redis:
   url: redis://localhost:6379
@@ -39,3 +38,8 @@ swift:
   project_name: demo
   project_domain_name: default
   container: ERA
+
+rollbar:
+  token: 'abc123xyz'
+  proxy_host: 'your_proxy_host_url'
+  proxy_port: '80'

data/lib/pushmi_pullyu.rb

@@ -50,6 +50,8 @@ module PushmiPullyu
       project_name: 'demo',
       project_domain_name: 'default',
       container: 'ERA'
+    },
+    rollbar: {
     }
   }.freeze
 

data/lib/pushmi_pullyu/cli.rb

@@ -56,8 +56,15 @@ class PushmiPullyu::CLI
 
   def configure_rollbar
     Rollbar.configure do |config|
-      config.enabled = false unless options[:rollbar_token].present?
-      config.access_token = options[:rollbar_token]
+      config.enabled = false unless options[:rollbar][:token].present?
+      config.access_token = options[:rollbar][:token]
+      if options[:rollbar][:proxy_host].present?
+        config.proxy = {}
+        config.proxy[:host] = options[:rollbar][:proxy_host]
+        config.proxy[:port] = options[:rollbar][:proxy_port] if options[:rollbar][:proxy_port].present?
+        config.proxy[:user] = options[:rollbar][:proxy_user] if options[:rollbar][:proxy_user].present?
+        config.proxy[:password] = options[:rollbar][:proxy_password] if options[:rollbar][:proxy_password].present?
+      end
     end
   end
 
@@ -93,7 +100,10 @@ class PushmiPullyu::CLI
       end
 
       o.on('-r', '--rollbar-token TOKEN', 'Enable error reporting to Rollbar') do |token|
-        opts[:rollbar_token] = token if token.present?
+        if token.present?
+          opts[:rollbar] = {}
+          opts[:rollbar][:token] = token
+        end
       end
 
       o.on '-C', '--config PATH', 'Path for YAML config file' do |config_file|
@@ -225,7 +235,7 @@ class PushmiPullyu::CLI
       exit!(1)
     else
       # using stderr instead of logger as it uses an underlying mutex which is not allowed inside trap contexts.
-      $stderr.puts 'Exiting...  Interrupt again to force quit.'
+      warn 'Exiting...  Interrupt again to force quit.'
       PushmiPullyu.server_running = false
     end
   end

data/lib/pushmi_pullyu/version.rb

@@ -1,3 +1,3 @@
 module PushmiPullyu
-  VERSION = '0.2.6'.freeze
+  VERSION = '0.2.7'.freeze
 end

data/pushmi_pullyu.gemspec

@@ -35,11 +35,11 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.14'
   spec.add_development_dependency 'coveralls', '~> 0.8'
   spec.add_development_dependency 'danger', '~> 5.2'
+  spec.add_development_dependency 'pry', '~> 0.10', '>= 0.10.4'
   spec.add_development_dependency 'rake', '~> 12.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop', '~> 0.45'
   spec.add_development_dependency 'rubocop-rspec', '~> 1.10'
-  spec.add_development_dependency 'pry', '~> 0.10', '>= 0.10.4'
   spec.add_development_dependency 'timecop', '~> 0.8'
   spec.add_development_dependency 'vcr', '~> 3.0'
   spec.add_development_dependency 'webmock', '~> 2.1'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pushmi_pullyu
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - Shane Murnaghan
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-12 00:00:00.000000000 Z
+date: 2017-11-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -204,6 +204,26 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '5.2'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.4
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.10'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.10.4
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -260,26 +280,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.10'
-- !ruby/object:Gem::Dependency
-  name: pry
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.4
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.10'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.10.4
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
@@ -384,7 +384,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Ruby application to manage flow of content from Fedora into Swift for preservation