smart_proxy_pulp 1.2.0 → 1.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 449eb101bce06ca7d526b94e2d5f1ac5c494cfcd
-  data.tar.gz: e572ad1882b60f02d023a6fcabe7ec8500cedb0b
+  metadata.gz: 2cfca5cf9a70d4e21a551238e05bf7cfd7021bbd
+  data.tar.gz: 9f70189e1dac7544f34ddd7f7983106268333dd1
 SHA512:
-  metadata.gz: a5dd127eb6ea63480e5ff35121f7a56159eb321db7ae55ce1cf2f50b0a42642d6adbced81e65285adb781a2065e1fddfa4c7620674ac8ba1673bda8feb2de4ad
-  data.tar.gz: b8d31112946962ef098b5b899002b7200e5d6326d19137b2448624896e3f5baa4a606171fb3f3820635471ccfdf7ff892488fe94bfc7718474b57a1891afb597
+  metadata.gz: 573fd5cd53098343c9e6daa779c127562fd7017a461dedcac0692480203a3312300779f06cc249bcc56f5882350493ada62c98a02dc2e96d5cdc6d97d6732a66
+  data.tar.gz: af4aaee752664afe0394559852ec62ec76f55db52b9c79450c54e08762ef75babbe8680c3f3f92cb3cb2c1c95b387f4163c2eb1967e60678c05b445a8ee6c874

data/lib/smart_proxy_pulp_plugin/disk_usage.rb

@@ -10,7 +10,8 @@ module PulpProxy
       raise(::Proxy::Error::ConfigurationError, 'Unable to continue - must provide a path.') if opts[:path].nil?
       @paths_hash = validate_path(path_hash(opts[:path]))
       @path = @paths_hash.values
-      @size = SIZE[opts[:size]] || SIZE[:kilobyte]
+      @size_format = opts[:size] || :kilobyte
+      @size = SIZE[@size_format]
       @stat = {}
       find_df
       get_stat
@@ -32,22 +33,55 @@ module PulpProxy
       [command_path, "-B", "#{size}", *path]
     end
 
-    def get_stat
-      raw = Open3::popen3({"LC_ALL" => "C"}, *command) do |stdin, stdout, stderr, thread|
-        unless stderr.read.empty?
-          error_line = stderr.read
-          logger.error "[#{command_path}] #{error_line}"
-          raise(::Proxy::Error::ConfigurationError, "#{command_path} raised an error: #{error_line}")
+    # Inspired and copied from Facter
+    # @ https://github.com/puppetlabs/facter/blob/2.x/lib/facter/core/execution/base.rb
+    # @TODO: Refactor http://projects.theforeman.org/issues/15235 when removing support for 1.8.7
+    def with_env(values)
+      old = {}
+      values.each do |var, value|
+        # save the old value if it exists
+        if old_val = ENV[var]
+          old[var] = old_val
+        end
+        # set the new (temporary) value for the environment variable
+        ENV[var] = value
+      end
+      # execute the caller's block, capture the return value
+      rv = yield
+        # use an ensure block to make absolutely sure we restore the variables
+    ensure
+      # restore the old values
+      values.each do |var, value|
+        if old.include?(var)
+          ENV[var] = old[var]
+        else
+          # if there was no old value, delete the key from the current environment variables hash
+          ENV.delete(var)
         end
-        stdout.read.split("\n")
       end
-      logger.debug "[#{command_path}] #{raw.to_s}"
+      # return the captured return value
+      rv
+    end
+
+    def get_stat
+      with_env 'LC_ALL' => 'C' do
+        raw = Open3::popen3(*command) do |stdin, stdout, stderr, thread|
+          unless stderr.read.empty?
+            error_line = stderr.read
+            logger.error "[#{command_path}] #{error_line}"
+            raise(::Proxy::Error::ConfigurationError, "#{command_path} raised an error: #{error_line}")
+          end
+          stdout.read.split("\n")
+        end
+
+        logger.debug "[#{command_path}] #{raw.to_s}"
 
-      titles = normalize_titles(raw)
-      raw.each_with_index do |line, index|
-        mount_path = path[index]
-        values = normalize_values(line.split)
-        @stat[@paths_hash.key(mount_path)] = Hash[titles.zip(values)].merge({:path => mount_path, :size => SIZE.key(size)})
+        titles = normalize_titles(raw)
+        raw.each_with_index do |line, index|
+          mount_path = path[index]
+          values = normalize_values(line.split)
+          @stat[hash_key_for(mount_path)] = Hash[titles.zip(values)].merge({:path => mount_path, :size => @size_format})
+        end
       end
     end
 
@@ -55,6 +89,11 @@ module PulpProxy
       path.is_a?(Hash) ? path : Hash[path, path]
     end
 
+    def hash_key_for(path)
+      @paths_hash.select { |k,v| v == path}.first[0]
+    end
+
+
     def normalize_titles(raw)
       replacers = {"mounted on" => :mounted, "use%" => :percent}
       raw.shift.downcase.gsub(/(use%|mounted on)/) { |m| replacers.fetch(m,m)}.split.map(&:to_sym)

data/lib/smart_proxy_pulp_plugin/pulp_api.rb

@@ -21,7 +21,7 @@ module PulpProxy
 
     get '/status/disk_usage' do
       size = (params[:size] && DiskUsage::SIZE.keys.include?(params[:size].to_sym)) ? params[:size].to_sym : :kilobyte
-      monitor_dirs = ::PulpProxy::Plugin.settings.to_h.select { |key, _| key == :pulp_dir || key == :pulp_content_dir || key == :mongodb_dir }
+      monitor_dirs = Hash[::PulpProxy::Plugin.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

data/lib/smart_proxy_pulp_plugin/version.rb

@@ -1,3 +1,3 @@
 module PulpProxy
-  VERSION = "1.2.0"
+  VERSION = "1.2.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: smart_proxy_pulp
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.2.1
 platform: ruby
 authors:
 - Dmitri Dolguikh
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-26 00:00:00.000000000 Z
+date: 2016-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: test-unit