foreman_maintain 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6541f1ff74d6b4f49f684fdf4a90169407fff41c
-  data.tar.gz: 0de3f21c5ec4b3f20da234dd4ab6de64914e1da4
+  metadata.gz: 18fd98c7a843565d1557576d646eed3836b4531d
+  data.tar.gz: 28bf7c63c9992e72d14cc6341aafa4ec77245721
 SHA512:
-  metadata.gz: c728131aed58b4939b2d8b2e1d4c0df2adfa192a28523643072ee16a1348f9136feb178987bd4a230ffc123adad54298be86697b6a657956c6c970c49313bb25
-  data.tar.gz: 643d48edb17bd4d7dafc84fd0a80b0404152c9ee77b834b88a4d10c960c107fe5b71bdb2da5a0801552d4cc31017bbe870f55c7b0b1f4154e79a62e2c7dd6ede
+  metadata.gz: a208375098dcdd9afa2cfe24f0be922933e28b979133f4bf5af5a7f09c54dcb8718f4029bb65bf0982fdffa16b2f644917b0039ba6e3eee274fdad53b90a2d6b
+  data.tar.gz: 8fdd5953b332088338c2b624016b57713733de79a90f1ef88bed936abf1d772ac15458fd7e1949351ccd00fc827b36b432aa523c2c27c282974462e86782e4d9

data/README.md

@@ -227,7 +227,7 @@ class Procedures::InstallPackage < ForemanMaintain::Procedure
   end
 
   def run
-    install_packages(@packages)
+    packages_action(:install, @packages)
   end
 
   # if false, the step will be considered as done: it will not be executed

data/definitions/features/foreman_tasks.rb

@@ -16,6 +16,7 @@ class Features::ForemanTasks < ForemanMaintain::Feature
   EXCLUDE_ACTIONS_FOR_RUNNING_TASKS = %w[
     Actions::Candlepin::ListenOnCandlepinEvents
     Actions::Katello::EventQueue::Monitor
+    Actions::Insights::EmailPoller
   ].freeze
 
   metadata do

data/definitions/procedures/packages/update.rb

@@ -6,7 +6,9 @@ module Procedures::Packages
     end
 
     def run
-      packages_action(:update, @packages, :assumeyes => @assumeyes.nil? ? assumeyes? : @assumeyes)
+      assumeyes_val = @assumeyes.nil? ? assumeyes? : @assumeyes
+      clean_all_packages(:assumeyes => assumeyes_val)
+      packages_action(:update, @packages, :assumeyes => assumeyes_val)
     end
 
     def necessary?

data/lib/foreman_maintain/concerns/finders.rb

@@ -29,6 +29,10 @@ module ForemanMaintain
         detector.available_scenarios(conditions)
       end
 
+      def find_all_scenarios(conditions)
+        detector.all_scenarios(conditions)
+      end
+
       private
 
       def ensure_one_object(object_type, label_or_class)

data/lib/foreman_maintain/concerns/system_helpers.rb

@@ -76,13 +76,6 @@ module ForemanMaintain
         execute('hostname -f')
       end
 
-      def install_packages(packages, options = {})
-        options.validate_options!(:assumeyes)
-        yum_options = []
-        yum_options << '-y' if options[:assumeyes]
-        execute!("yum #{yum_options.join(' ')} install #{packages.join(' ')}", :interactive => true)
-      end
-
       def server?
         find_package('foreman')
       end
@@ -103,6 +96,15 @@ module ForemanMaintain
                  :interactive => true)
       end
 
+      def clean_all_packages(options = {})
+        options.validate_options!(:assumeyes)
+        yum_options = []
+        yum_options << '-y' if options[:assumeyes]
+        execute!("yum #{yum_options.join(' ')} clean all", :interactive => true)
+        execute!('rm -rf /var/cache/yum')
+        execute!('rm -rf /var/cache/dnf')
+      end
+
       def package_version(name)
         # space for extension to support non-rpm distributions
         rpm_version(name)

data/lib/foreman_maintain/config.rb

@@ -52,8 +52,8 @@ module ForemanMaintain
       begin
         FileUtils.mkdir_p(dir_path, :mode => 0o750) unless File.exist?(dir_path)
       rescue StandardError => e
-        $stderr.puts "No permissions to create dir #{dir_path_str}"
-        $stderr.puts e.message.inspect
+        warn "No permissions to create dir #{dir_path_str}"
+        warn e.message.inspect
       end
       dir_path
     end

data/lib/foreman_maintain/detector.rb

@@ -24,6 +24,7 @@ module ForemanMaintain
       @all_features_scanned = false
       @available_checks = nil
       @available_scenarios = nil
+      @scenarios ||= Scenario.all_sub_classes.select(&:autodetect?)
     end
 
     def available_features(filter_conditions = nil)
@@ -57,8 +58,7 @@ module ForemanMaintain
     def available_scenarios(filter_conditions = nil)
       unless @available_scenarios
         ensure_features_detected
-        @available_scenarios = Scenario.all_sub_classes.select(&:autodetect?).
-                               select(&:present?).map(&:new)
+        @available_scenarios = @scenarios.select(&:present?).map(&:new)
       end
       filter(@available_scenarios, filter_conditions)
     end
@@ -73,6 +73,10 @@ module ForemanMaintain
       @all_features_scanned = true
     end
 
+    def all_scenarios(filter_conditions = nil)
+      filter(@scenarios.map(&:new), filter_conditions)
+    end
+
     private
 
     def sort(collection)

data/lib/foreman_maintain/executable.rb

@@ -72,7 +72,7 @@ module ForemanMaintain
       raise Error::Warn, message
     end
 
-    # rubocop:disable Style/AccessorMethodName
+    # rubocop:disable Naming/AccessorMethodName
     def set_fail(message)
       execution.status = :fail
       execution.output << message

data/lib/foreman_maintain/scenario.rb

@@ -158,7 +158,7 @@ module ForemanMaintain
     end
 
     def self.new_from_hash(hash)
-      scenarios = find_scenarios(:label => hash[:label])
+      scenarios = find_all_scenarios(:label => hash[:label])
       unless scenarios.size == 1
         raise "Could not find scenario #{hash[:label]}, found #{scenarios.size} scenarios"
       end

data/lib/foreman_maintain/upgrade_runner.rb

@@ -67,7 +67,7 @@ module ForemanMaintain
     def scenario(phase)
       return @scenario_cache[phase] if @scenario_cache.key?(phase)
       condition = { :tags => [tag, phase] }
-      matching_scenarios = find_scenarios(condition)
+      matching_scenarios = find_all_scenarios(condition)
       raise "Too many scenarios match #{condition.inspect}" if matching_scenarios.size > 1
       @scenario_cache[phase] = matching_scenarios.first
     end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.0.10'.freeze
+  VERSION = '0.0.11'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-10-18 00:00:00.000000000 Z
+date: 2017-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp
@@ -53,21 +53,21 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.3'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 11.0.0
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 11.0.0
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: mocha
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 11.0.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 11.0.0
 description: Provides various features that helps keeping the Foreman/Satellite up
   and running.
 email: inecas@redhat.com