foreman_maintain 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 65b1daa7e3ed6b36c77a34061c0cde3badf9cc0d
-  data.tar.gz: '08aedcc2e9c4242dc17b8d50b5bf356bd3349d28'
+  metadata.gz: 85dd75e0de03c6b2c872e728ba047ecde645148d
+  data.tar.gz: 93d8cc2e2381e5c890c62f114b2a3f3ad9c9b460
 SHA512:
-  metadata.gz: 8a7548a663107ef22475acefbe0b0a5dc5aeff92e816c6eaf0096b2ce344c43536af033d9d67fbbc5c36f976c4d6f7e0dbb6e6d8f0343e69ad678feaa907cdc6
-  data.tar.gz: 6e0a423955cd009992767a126168609ac9ec0d1687465089bfa1861798402157f8225f335ad452fa64ba04a751468d5804cac000faafe9a450d07d75109db6bf
+  metadata.gz: 8b307b932f52b3b9686ecca55c5904d4b901f71429e0fc485ddce9cff419026aaa96393b413dce528001c74ed0e11f03ba7ab73c280f66663dbad6b03299ef80
+  data.tar.gz: bcc8b92ff358e1e5c3c4c129278af67566dfc09681e7d338330a20718a955acd5fce84b939b40738beb0f3f0fb81990632aec7bb3e37a600ea5cdfcecf9ed71e

data/definitions/procedures/candlepin/delete_orphaned_records_from_env_content.rb

@@ -7,28 +7,35 @@ module Procedures::Candlepin
       confine do
         feature(:candlepin_database) &&
           feature(:downstream) &&
-          feature(:downstream).current_minor_version == '6.2' &&
-          feature(:candlepin_database).table_exist?('cp_env_content')
+          feature(:downstream).current_minor_version == '6.2'
       end
     end
 
     def run
-      with_spinner('Deleting cp_env_content record(s) with unresolvable content') do |spinner|
-        spinner.update 'Finding cp_env_content records with unresolvable content'
-        env_content_ids = feature(:candlepin_database).env_content_ids_with_null_content
-        if env_content_ids.empty?
-          spinner.update 'No orphaned records found'
-        else
-          spinner.update 'Taking a backup of the candlepin database'
-          feature(:candlepin_database).perform_backup
-
-          puts "Total #{env_content_ids.length} records with unresolvable content"
-          spinner.update 'Deleting record(s) from cp_env_content table'
-          feature(:candlepin_database).delete_records_by_ids(
-            'cp_env_content', env_content_ids
-          )
+      if feature(:candlepin_database).table_exist?('cp_env_content')
+        with_spinner('Deleting cp_env_content record(s) with unresolvable content') do |spinner|
+          spinner.update 'Finding cp_env_content records with unresolvable content'
+          env_content_ids = feature(:candlepin_database).env_content_ids_with_null_content
+          if env_content_ids.empty?
+            spinner.update 'No orphaned records found'
+          else
+            backup_and_delete_records(spinner, env_content_ids)
+          end
         end
       end
     end
+
+    private
+
+    def backup_and_delete_records(spinner, env_content_ids)
+      spinner.update 'Taking a backup of the candlepin database'
+      feature(:candlepin_database).perform_backup
+
+      puts "Total #{env_content_ids.length} records with unresolvable content"
+      spinner.update 'Deleting record(s) from cp_env_content table'
+      feature(:candlepin_database).delete_records_by_ids(
+        'cp_env_content', env_content_ids
+      )
+    end
   end
 end

data/definitions/procedures/installer/upgrade.rb

@@ -1,16 +1,24 @@
 module Procedures::Installer
   class Upgrade < ForemanMaintain::Procedure
     def run
-      execute!("#{installer_command} --upgrade", :interactive => true)
+      execute!("LANG=en_US.utf-8 #{installer_command} #{upgrade_command?}", :interactive => true)
     end
 
     private
 
+    def upgrade_command?
+      if package_version('satellite-installer') || package_version('katello-installer')
+        '--upgrade'
+      end
+    end
+
     def installer_command
-      if package_version('satellite-installer')
-        'satellite-installer'
-      elsif package_version('katello-installer')
-        'katello-installer'
+      if feature(:downstream)
+        if feature(:downstream).current_minor_version <= '6.1'
+          'katello-installer'
+        else
+          'satellite-installer'
+        end
       else
         'foreman-installer'
       end

data/lib/foreman_maintain/concerns/base_database.rb

@@ -14,12 +14,15 @@ module ForemanMaintain
       end
 
       def psql(query, config = configuration)
-        execute("PGPASSWORD='#{config[%(password)]}' #{psql_db_connection_str(config)}",
-                :stdin => query)
+        if ping(config)
+          execute(psql_command(config), :stdin => query)
+        else
+          raise_service_error
+        end
       end
 
       def ping(config = configuration)
-        psql('SELECT 1 as ping', config)
+        execute?(psql_command(config), :stdin => 'SELECT 1 as ping')
       end
 
       def backup_file_path(config = configuration)
@@ -67,10 +70,15 @@ module ForemanMaintain
 
       private
 
-      def psql_db_connection_str(config)
+      def psql_command(config)
+        "PGPASSWORD='#{config[%(password)]}' "\
         "psql -d #{config['database']} -h #{config['host'] || 'localhost'} "\
         " -p #{config['port'] || '5432'} -U #{config['username']}"
       end
+
+      def raise_service_error
+        raise Error::Fail, 'Please check whether database service is up & running state.'
+      end
     end
   end
 end

data/lib/foreman_maintain/version.rb

@@ -1,3 +1,3 @@
 module ForemanMaintain
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: foreman_maintain
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Ivan Nečas
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-20 00:00:00.000000000 Z
+date: 2018-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: clamp