smart_proxy_pulp 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
---- 
-SHA512: 
-  data.tar.gz: 9715773f6848f17c6cc187e45216f691d2ca409880e6c6517ccded0fd93212085cd3609608caeb32e860e0fd415c8e82cc444e0afa574d3ecc45ec4fef3a4ba6
-  metadata.gz: ce1c540879134ec42f46b8fffa3b5fb741045d50d4d3af5537b084d2d42a4e972640afb6e1a29cf8e91b57e90172e876b1c7a6937866c0c8dc842ea84ba7bf66
-SHA1: 
-  data.tar.gz: acfcc667bd6786b91f23002e369e21616a572b9a
-  metadata.gz: f0d4f3cc1953e3a7078578ec6c05ab4d62c3b233
+---
+SHA1:
+  metadata.gz: d466a8b14430625f9d636f3324f5a617ce5ff96f
+  data.tar.gz: adc6fa1e589b56a2504b374b4d880a52a4f2105f
+SHA512:
+  metadata.gz: f0d5b5abc4b048205f9347745651d5ead876475b0eb24ed5ea8667240b407141eb9e2ca9042c5f73777e12ee7b0c54797eb9dc65084d7dc8cc42b2cdfbe1a36b
+  data.tar.gz: 72d174734b54cf88d1d0d39221ccf225a3cdb846d1e716c2cd9e81af61ed32d2439fb443b928ece14b57243ad24ef882b64c644cb73df0138496fec5564cdf60

data/Gemfile

@@ -4,3 +4,6 @@ gemspec
 group :development do
   gem 'smart_proxy', :git => 'https://github.com/theforeman/smart-proxy', :branch => 'develop'
 end
+
+gem 'addressable', '< 2.4.0', :platforms => :ruby_18
+gem 'json', '~> 1.0', :platforms => [:ruby_18, :ruby_19]

data/lib/smart_proxy_pulp_plugin/pulp_api.rb

@@ -1,6 +1,7 @@
 require 'sinatra'
 require 'smart_proxy_pulp_plugin/pulp_client'
 require 'smart_proxy_pulp_plugin/disk_usage'
+require 'smart_proxy_pulp_plugin/settings'
 
 module PulpProxy
   class Api < Sinatra::Base
@@ -11,24 +12,28 @@ module PulpProxy
       begin
         result = PulpClient.get("/api/v2/status/")
         return result.body if result.is_a?(Net::HTTPSuccess)
-        log_halt result.code, "Pulp server at #{::PulpProxy::Plugin.settings.pulp_url} returned an error: '#{result.message}'"
+        log_halt result.code, "Pulp server at #{::PulpProxy::Settings.settings.pulp_url} returned an error: '#{result.message}'"
       rescue Errno::ECONNREFUSED => e
-        log_halt 503, "Pulp server at #{::PulpProxy::Plugin.settings.pulp_url} is not responding"
+        log_halt 503, "Pulp server at #{::PulpProxy::Settings.settings.pulp_url} is not responding"
       rescue SocketError => e
-        log_halt 503, "Pulp server '#{URI.parse(::PulpProxy::Plugin.settings.pulp_url.to_s).host}' is unknown"
+        log_halt 503, "Pulp server '#{URI.parse(::PulpProxy::Settings.settings.pulp_url.to_s).host}' is unknown"
       end
     end
 
     get '/status/disk_usage' do
       size = (params[:size] && DiskUsage::SIZE.keys.include?(params[:size].to_sym)) ? params[:size].to_sym : :kilobyte
-      monitor_dirs = Hash[::PulpProxy::Plugin.settings.marshal_dump.select { |key, _| key == :pulp_dir || key == :pulp_content_dir || key == :mongodb_dir }]
+      monitor_dirs = Hash[::PulpProxy::Settings.settings.marshal_dump.select { |key, _| key == :pulp_dir || key == :pulp_content_dir || key == :mongodb_dir }]
       begin
         pulp_disk = DiskUsage.new({:path => monitor_dirs, :size => size})
         pulp_disk.to_json
       rescue ::Proxy::Error::ConfigurationError
         log_halt 500, 'Could not find df command to evaluate disk space'
       end
+    end
 
+    get '/status/puppet' do
+      content_type :json
+      {:puppet_content_dir => ::PulpProxy::Settings.settings.puppet_content_dir}.to_json
     end
   end
 end

data/lib/smart_proxy_pulp_plugin/pulp_client.rb

@@ -1,11 +1,12 @@
 require 'net/http'
 require 'net/https'
 require 'uri'
+require 'smart_proxy_pulp_plugin/settings'
 
 module PulpProxy
   class PulpClient
     def self.get(path)
-      uri = URI.parse(::PulpProxy::Plugin.settings.pulp_url.to_s)
+      uri = URI.parse(::PulpProxy::Settings.settings.pulp_url.to_s)
       path = [uri.path, path].join('/') unless uri.path.empty?
       req = Net::HTTP::Get.new(URI.join(uri.to_s, path).path)
       req.add_field('Accept', 'application/json')
@@ -14,7 +15,7 @@ module PulpProxy
     end
 
     def self.http
-      uri = URI.parse(::PulpProxy::Plugin.settings.pulp_url.to_s)
+      uri = URI.parse(::PulpProxy::Settings.settings.pulp_url.to_s)
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = uri.scheme == 'https'
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE

data/lib/smart_proxy_pulp_plugin/pulp_node_plugin.rb

@@ -1,9 +1,10 @@
-module PulpMasterProxy
+module PulpNodeProxy
   class Plugin < ::Proxy::Plugin
     plugin "pulpnode", ::PulpProxy::VERSION
     default_settings :pulp_url => 'https://localhost/pulp',
                      :pulp_dir => '/var/lib/pulp',
                      :pulp_content_dir => '/var/lib/pulp/content',
+                     :puppet_content_dir => '/etc/puppet/environments',
                      :mongodb_dir => '/var/lib/mongodb'
 
     http_rackup_path File.expand_path("pulp_node_http_config.ru", File.expand_path("../", __FILE__))

data/lib/smart_proxy_pulp_plugin/pulp_plugin.rb

@@ -4,6 +4,7 @@ module PulpProxy
     default_settings :pulp_url => 'https://localhost/pulp',
                      :pulp_dir => '/var/lib/pulp',
                      :pulp_content_dir => '/var/lib/pulp/content',
+                     :puppet_content_dir => '/etc/puppet/environments',
                      :mongodb_dir => '/var/lib/mongodb'
 
     http_rackup_path File.expand_path("pulp_http_config.ru", File.expand_path("../", __FILE__))

data/lib/smart_proxy_pulp_plugin/settings.rb

@@ -0,0 +1,12 @@
+require 'sinatra'
+require 'smart_proxy_pulp_plugin/pulp_node_plugin'
+require 'smart_proxy_pulp_plugin/pulp_plugin'
+
+module PulpProxy
+  class Settings 
+    def self.settings 
+      # work around until pulp node settings are no longer needed by foreman proxy, as pulp nodes have been removed
+      ::PulpProxy::Plugin.settings.pulp_url ? ::PulpProxy::Plugin.settings : ::PulpNodeProxy::Plugin.settings
+    end
+  end
+end

data/lib/smart_proxy_pulp_plugin/version.rb

@@ -1,3 +1,3 @@
 module PulpProxy
-  VERSION = "1.2.2"
+  VERSION = "1.3.0"
 end

data/settings.d/pulp.yml.example

@@ -4,4 +4,5 @@
 # Path to pulp, pulp content and mongodb directories
 #:pulp_dir: /var/lib/pulp
 #:pulp_content_dir: /var/lib/pulp/content
+#:puppet_content_dir: /etc/pupppet/environments
 #:mongodb_dir: /var/lib/mongodb

data/settings.d/pulpnode.yml.example

@@ -4,4 +4,5 @@
 # Path to pulp, pulp content and mongodb directories
 #:pulp_dir: /var/lib/pulp
 #:pulp_content_dir: /var/lib/pulp/content
+#:puppet_content_dir: /etc/puppet/environments
 #:mongodb_dir: /var/lib/mongodb

metadata

@@ -1,115 +1,129 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: smart_proxy_pulp
-version: !ruby/object:Gem::Version 
-  version: 1.2.2
+version: !ruby/object:Gem::Version
+  version: 1.3.0
 platform: ruby
-authors: 
+authors:
 - Dmitri Dolguikh
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2016-07-15 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2016-09-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: test-unit
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "2"
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mocha
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: webmock
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "1"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: rack-test
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "0"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1'
+- !ruby/object:Gem::Dependency
+  name: rack-test
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        version: "10"
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
   type: :development
-  version_requirements: *id005
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '10'
 description: "    Basic Pulp support for Foreman Smart-Proxy\n"
-email: 
+email:
 - dmitri@redhat.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
+- Gemfile
+- LICENSE
 - bundler.d/pulp.rb
 - lib/smart_proxy_pulp.rb
+- lib/smart_proxy_pulp_plugin/disk_usage.rb
+- lib/smart_proxy_pulp_plugin/pulp_api.rb
 - lib/smart_proxy_pulp_plugin/pulp_client.rb
-- lib/smart_proxy_pulp_plugin/pulp_node_plugin.rb
-- lib/smart_proxy_pulp_plugin/version.rb
 - lib/smart_proxy_pulp_plugin/pulp_http_config.ru
 - lib/smart_proxy_pulp_plugin/pulp_node_http_config.ru
-- lib/smart_proxy_pulp_plugin/disk_usage.rb
+- lib/smart_proxy_pulp_plugin/pulp_node_plugin.rb
 - lib/smart_proxy_pulp_plugin/pulp_plugin.rb
-- lib/smart_proxy_pulp_plugin/pulp_api.rb
+- lib/smart_proxy_pulp_plugin/settings.rb
+- lib/smart_proxy_pulp_plugin/version.rb
 - settings.d/pulp.yml.example
 - settings.d/pulpnode.yml.example
-- LICENSE
-- Gemfile
 homepage: https://github.com/theforeman/smart-proxy-pulp-plugin
-licenses: 
+licenses:
 - GPLv3
 metadata: {}
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - &id006 
-    - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - *id006
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Basic Pulp support for Foreman Smart-Proxy
 test_files: []
-