inventory_refresh 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00266e0193f5fcd991d5f926e9477ddcec56ef52ba3b8d516d5483b43fb6eb36
-  data.tar.gz: 2d8aeb9ca8186c4b337fbdb3813c8f72e6b331f618bb79a12ccd81f56902be26
+  metadata.gz: 6ade3208f2b15b5f3ddd1eb2ba062bc011ba4ce8fbd4bbc838ba9ccef62fb19f
+  data.tar.gz: 6aecb2c6ea69ba72b48819eb8a4af6cbffa9f3c9d475bcca8c88e6e5f5fa0cf1
 SHA512:
-  metadata.gz: 0a854c89dcccc990099dbc460b18c2aebb8ed18b93bb07f062d6ab384442d999e9afb10e5f8e03808353d4c140900f594ff09313f4dcccb0569a05639c0b5154
-  data.tar.gz: 5d8c54008b0549e32c95925b01b272056ad95b82241cc7449108f627d6898520d30a033c7adaba31d979e41d2bf3d9c367e9d59f67194b3564bc7851243a05d1
+  metadata.gz: e2d87b6841db8fd728269e4234ae05ca0c80a5612980ee08b83815d626b2945bca34644a972133eedb8f76bce19c627cc93a3d812a41c13edd8d74c9ff5d7175
+  data.tar.gz: c811d7fad848a207228595ede6cdb251a7096192ae5984bf3be0af667956553035c22c45ece7b7962807339b9e45cf06ed4f823561a7c3ccd40fa9a631db1c50

data/.rspec

@@ -1,4 +1,4 @@
---format documentation
+--format progress
 --color
 --require spec_helper
 --order random

data/.rspec_ci

@@ -1,4 +1,5 @@
 --require spec_helper
+--format progress
 --color
 --order random
 --profile 25

data/.travis.yml

@@ -3,9 +3,13 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.4.2
+- 2.4.4
+- 2.3.6
 addons:
   postgresql: '9.5'
+env:
+  global:
+  - CC_TEST_REPORTER_ID=1ef1a3a3d007395b11083d634a6fdac1e3d979b6428c39d2cd8d58556cdd68f7
 before_install:
 - gem install bundler -v 1.16.4
 - psql -c "CREATE USER root SUPERUSER PASSWORD 'smartvm';" -U postgres

data/Rakefile

@@ -18,24 +18,18 @@ namespace :spec do
   desc "Setup test database"
   task :setup => [:db_drop, :db_create, :db_load_schema]
 
-  def pg_opts
-    {
-      :adapter      => "postgresql",
-      :encoding     => "utf8",
-      :username     => "root",
-      :pool         => 5,
-      :wait_timeout => 5,
-      :min_messages => "warning",
-    }
+  def connection_spec
+    require 'yaml'
+    @connection_spec ||= YAML.load_file(File.join(__dir__, %w(config database.yml)))
   end
 
   def test_database_name
-    "inventory_refresh_dummy_test"
+    connection_spec["test"]["database"]
   end
 
   def with_connection(database_name)
     require "active_record"
-    pool = ActiveRecord::Base.establish_connection pg_opts.merge(:database => database_name)
+    pool = ActiveRecord::Base.establish_connection(connection_spec["test"].merge("database" => database_name))
     yield ActiveRecord::Base.connection
   ensure
     pool&.disconnect!

data/config/database.yml

@@ -0,0 +1,12 @@
+---
+base: &base
+  adapter: postgresql
+  encoding: utf8
+  username: root
+  pool: 5
+  wait_timeout: 5
+  min_messages: warning
+
+test: &test
+  <<: *base
+  database: inventory_refresh_dummy_test

data/lib/inventory_refresh.rb

@@ -8,13 +8,3 @@ require "inventory_refresh/save_inventory"
 require "inventory_refresh/target"
 require "inventory_refresh/target_collection"
 require "inventory_refresh/version"
-
-module InventoryRefresh
-  class << self
-    attr_accessor :log
-  end
-
-  def self.log
-    @log ||= NullLogger.new
-  end
-end

data/lib/inventory_refresh/graph/topological_sort.rb

@@ -45,14 +45,14 @@ module InventoryRefresh
           max_depth -= 1
           if max_depth <= 0
             message = "Max depth reached while doing topological sort, your graph probably contains a cycle"
-            #$log.error("#{message}:\n#{graph.to_graphviz}")
+            #logger.error("#{message}:\n#{graph.to_graphviz}")
             raise "#{message} (see log)"
           end
 
           set, nodes = nodes.partition { |v| edges.select { |e| e.second == v }.all? { |e| sets.flatten.include?(e.first) } }
           if set.blank?
             message = "Blank dependency set while doing topological sort, your graph probably contains a cycle"
-            #$log.error("#{message}:\n#{graph.to_graphviz}")
+            #logger.error("#{message}:\n#{graph.to_graphviz}")
             raise "#{message} (see log)"
           end
 

data/lib/inventory_refresh/logging.rb

@@ -1,8 +1,15 @@
-require "forwardable"
-
 module InventoryRefresh
+  class << self
+    attr_writer :logger
+  end
+
+  def self.logger
+    @logger ||= NullLogger.new
+  end
+
   module Logging
-    extend Forwardable
-    delegate :log => :InventoryRefresh
+    def logger
+      InventoryRefresh.logger
+    end
   end
 end

data/lib/inventory_refresh/save_collection/base.rb

@@ -14,16 +14,16 @@ module InventoryRefresh::SaveCollection
       # @param ems [ExtManagementSystem] manger owning the InventoryCollection object
       # @param inventory_collection [InventoryRefresh::InventoryCollection] InventoryCollection object we want to save
       def save_inventory_object_inventory(ems, inventory_collection)
-        log.debug("Saving collection #{inventory_collection} of size #{inventory_collection.size} to"\
-                  " the database, for the manager: '#{ems.name}'...")
+        logger.debug("Saving collection #{inventory_collection} of size #{inventory_collection.size} to"\
+                     " the database, for the manager: '#{ems.name}'...")
 
         if inventory_collection.custom_save_block.present?
-          log.debug("Saving collection #{inventory_collection} using a custom save block")
+          logger.debug("Saving collection #{inventory_collection} using a custom save block")
           inventory_collection.custom_save_block.call(ems, inventory_collection)
         else
           save_inventory(inventory_collection)
         end
-        log.debug("Saving collection #{inventory_collection}, for the manager: '#{ems.name}'...Complete")
+        logger.debug("Saving collection #{inventory_collection}, for the manager: '#{ems.name}'...Complete")
         inventory_collection.saved = true
       end
 

data/lib/inventory_refresh/save_collection/recursive.rb

@@ -44,7 +44,7 @@ module InventoryRefresh::SaveCollection
           end
         end
 
-        log.debug("Saving #{inventory_collection} of size #{inventory_collection.size}")
+        logger.debug("Saving #{inventory_collection} of size #{inventory_collection.size}")
         save_inventory_object_inventory(ems, inventory_collection)
       end
     end

data/lib/inventory_refresh/save_collection/saver/base.rb

@@ -140,7 +140,7 @@ module InventoryRefresh::SaveCollection
           inventory_objects_index[index] = inventory_object
         end
 
-        log.debug("Processing #{inventory_collection} of size #{inventory_collection.size}...")
+        logger.debug("Processing #{inventory_collection} of size #{inventory_collection.size}...")
         # Records that are in the DB, we will be updating or deleting them.
         ActiveRecord::Base.transaction do
           association.find_each do |record|
@@ -177,12 +177,12 @@ module InventoryRefresh::SaveCollection
             end
           end
         end
-        log.debug("Processing #{inventory_collection}, "\
-                  "created=#{inventory_collection.created_records.count}, "\
-                  "updated=#{inventory_collection.updated_records.count}, "\
-                  "deleted=#{inventory_collection.deleted_records.count}...Complete")
+        logger.debug("Processing #{inventory_collection}, "\
+                     "created=#{inventory_collection.created_records.count}, "\
+                     "updated=#{inventory_collection.updated_records.count}, "\
+                     "deleted=#{inventory_collection.deleted_records.count}...Complete")
       rescue => e
-        log.error("Error when saving #{inventory_collection} with #{inventory_collection_details}. Message: #{e.message}")
+        logger.error("Error when saving #{inventory_collection} with #{inventory_collection_details}. Message: #{e.message}")
         raise e
       end
 
@@ -204,8 +204,8 @@ module InventoryRefresh::SaveCollection
 
         all_manager_uuids_size = inventory_collection.all_manager_uuids.size
 
-        log.debug("Processing :delete_complement of #{inventory_collection} of size "\
-                  "#{all_manager_uuids_size}...")
+        logger.debug("Processing :delete_complement of #{inventory_collection} of size "\
+                     "#{all_manager_uuids_size}...")
         deleted_counter = 0
 
         inventory_collection.db_collection_for_comparison_for_complement_of(
@@ -219,8 +219,8 @@ module InventoryRefresh::SaveCollection
           end
         end
 
-        log.debug("Processing :delete_complement of #{inventory_collection} of size "\
-                  "#{all_manager_uuids_size}, deleted=#{deleted_counter}...Complete")
+        logger.debug("Processing :delete_complement of #{inventory_collection} of size "\
+                     "#{all_manager_uuids_size}, deleted=#{deleted_counter}...Complete")
       end
 
       # Deletes/soft-deletes a given record
@@ -248,8 +248,8 @@ module InventoryRefresh::SaveCollection
           # relations can return the same record multiple times. We don't want to do SELECT DISTINCT by default, since
           # it can be very slow.
           if false # TODO: Rails.env.production?
-            log.warn("Please update :association or :arel for #{inventory_collection} to return a DISTINCT result. "\
-                     " The duplicate value is being ignored.")
+            logger.warn("Please update :association or :arel for #{inventory_collection} to return a DISTINCT result. "\
+                        " The duplicate value is being ignored.")
             return false
           else
             raise("Please update :association or :arel for #{inventory_collection} to return a DISTINCT result. ")
@@ -274,7 +274,7 @@ module InventoryRefresh::SaveCollection
                     "#{inventory_collection.parent.class.name}:"\
                     "#{inventory_collection.parent.try(:id)}"
           if false # TODO: Rails.env.production?
-            log.warn("Referential integrity check violated, ignoring #{subject}")
+            logger.warn("Referential integrity check violated, ignoring #{subject}")
             return false
           else
             raise("Referential integrity check violated for #{subject}")

data/lib/inventory_refresh/save_collection/saver/concurrent_safe_batch.rb

@@ -97,7 +97,7 @@ module InventoryRefresh::SaveCollection
         all_attribute_keys << :updated_on if supports_updated_on?
         all_attribute_keys << :type if supports_sti?
 
-        log.debug("Processing #{inventory_collection} of size #{inventory_collection.size}...")
+        logger.debug("Processing #{inventory_collection} of size #{inventory_collection.size}...")
 
         unless inventory_collection.create_only?
           update_or_destroy_records!(batch_iterator(association), inventory_objects_index, attributes_index, all_attribute_keys)
@@ -123,12 +123,12 @@ module InventoryRefresh::SaveCollection
             create_or_update_partial_records(all_attribute_keys)
           end
         end
-        log.debug("Processing #{inventory_collection}, "\
-                  "created=#{inventory_collection.created_records.count}, "\
-                  "updated=#{inventory_collection.updated_records.count}, "\
-                  "deleted=#{inventory_collection.deleted_records.count}...Complete")
+        logger.debug("Processing #{inventory_collection}, "\
+                     "created=#{inventory_collection.created_records.count}, "\
+                     "updated=#{inventory_collection.updated_records.count}, "\
+                     "deleted=#{inventory_collection.deleted_records.count}...Complete")
       rescue => e
-        log.error("Error when saving #{inventory_collection} with #{inventory_collection_details}. Message: #{e.message}")
+        logger.error("Error when saving #{inventory_collection} with #{inventory_collection_details}. Message: #{e.message}")
         raise e
       end
 

data/lib/inventory_refresh/save_collection/saver/default.rb

@@ -43,8 +43,8 @@ module InventoryRefresh::SaveCollection
         if unique_db_indexes.include?(index) # Include on Set is O(1)
           # We have a duplicate in the DB, destroy it. A find_each method does automatically .order(:id => :asc)
           # so we always keep the oldest record in the case of duplicates.
-          log.warn("A duplicate record was detected and destroyed, inventory_collection: "\
-                   "'#{inventory_collection}', record: '#{record}', duplicate_index: '#{index}'")
+          logger.warn("A duplicate record was detected and destroyed, inventory_collection: "\
+                      "'#{inventory_collection}', record: '#{record}', duplicate_index: '#{index}'")
           record.destroy
           return false
         else

data/lib/inventory_refresh/save_collection/saver/sql_helper.rb

@@ -54,7 +54,7 @@ module InventoryRefresh::SaveCollection
           connection.quote(value)
         end
       rescue TypeError => e
-        log.error("Can't quote value: #{value}, of :#{name} and #{inventory_collection}")
+        logger.error("Can't quote value: #{value}, of :#{name} and #{inventory_collection}")
         raise e
       end
 

data/lib/inventory_refresh/save_collection/saver/sql_helper_update.rb

@@ -18,7 +18,7 @@ module InventoryRefresh::SaveCollection
       # @param all_attribute_keys [Array<Symbol>] Array of all columns we will be saving into each table row
       # @param hashes [Array<Hash>] data used for building a batch update sql query
       def build_update_query(all_attribute_keys, hashes)
-        log.debug("Building update query for #{inventory_collection} of size #{inventory_collection.size}...")
+        logger.debug("Building update query for #{inventory_collection} of size #{inventory_collection.size}...")
         # Cache the connection for the batch
         connection = get_connection
 
@@ -39,7 +39,7 @@ module InventoryRefresh::SaveCollection
         update_query += update_query_version_conditions(version_attribute)
         update_query += update_query_returning
 
-        log.debug("Building update query for #{inventory_collection} of size #{inventory_collection.size}...Complete")
+        logger.debug("Building update query for #{inventory_collection} of size #{inventory_collection.size}...Complete")
 
         update_query
       end

data/lib/inventory_refresh/save_collection/saver/sql_helper_upsert.rb

@@ -20,7 +20,7 @@ module InventoryRefresh::SaveCollection
       # @param on_conflict [Symbol, NilClass] defines behavior on conflict with unique index constraint, allowed values
       #        are :do_update, :do_nothing, nil
       def build_insert_query(all_attribute_keys, hashes, on_conflict: nil, mode:, column_name: nil)
-        log.debug("Building insert query for #{inventory_collection} of size #{inventory_collection.size}...")
+        logger.debug("Building insert query for #{inventory_collection} of size #{inventory_collection.size}...")
 
         # Cache the connection for the batch
         connection = get_connection
@@ -33,7 +33,7 @@ module InventoryRefresh::SaveCollection
         insert_query += insert_query_on_conflict_behavior(all_attribute_keys, on_conflict, mode, ignore_cols, column_name)
         insert_query += insert_query_returning
 
-        log.debug("Building insert query for #{inventory_collection} of size #{inventory_collection.size}...Complete")
+        logger.debug("Building insert query for #{inventory_collection} of size #{inventory_collection.size}...Complete")
 
         insert_query
       end

data/lib/inventory_refresh/save_collection/topological_sort.rb

@@ -17,21 +17,21 @@ module InventoryRefresh::SaveCollection
 
         layers = InventoryRefresh::Graph::TopologicalSort.new(graph).topological_sort
 
-        log.debug("Saving manager #{ems.name}...")
+        logger.debug("Saving manager #{ems.name}...")
 
         sorted_graph_log = "Topological sorting of manager #{ems.name} resulted in these layers processable in parallel:\n"
         sorted_graph_log += graph.to_graphviz(:layers => layers)
-        log.debug(sorted_graph_log)
+        logger.debug(sorted_graph_log)
 
         layers.each_with_index do |layer, index|
-          log.debug("Saving manager #{ems.name} | Layer #{index}")
+          logger.debug("Saving manager #{ems.name} | Layer #{index}")
           layer.each do |inventory_collection|
             save_inventory_object_inventory(ems, inventory_collection) unless inventory_collection.saved?
           end
-          log.debug("Saved manager #{ems.name} | Layer #{index}")
+          logger.debug("Saved manager #{ems.name} | Layer #{index}")
         end
 
-        log.debug("Saving manager #{ems.name}...Complete")
+        logger.debug("Saving manager #{ems.name}...Complete")
       end
     end
   end

data/lib/inventory_refresh/save_inventory.rb

@@ -12,11 +12,11 @@ module InventoryRefresh
       # @param inventory_collections [Array<InventoryRefresh::InventoryCollection>] array of InventoryCollection objects
       #        for saving
       def save_inventory(ems, inventory_collections, strategy = nil)
-        log.debug("#{log_header(ems)} Scanning Inventory Collections...Start")
+        logger.debug("#{log_header(ems)} Scanning Inventory Collections...Start")
         InventoryRefresh::InventoryCollection::Scanner.scan!(inventory_collections)
-        log.debug("#{log_header(ems)} Scanning Inventory Collections...Complete")
+        logger.debug("#{log_header(ems)} Scanning Inventory Collections...Complete")
 
-        log.info("#{log_header(ems)} Saving EMS Inventory...")
+        logger.info("#{log_header(ems)} Saving EMS Inventory...")
 
         if strategy.try(:to_sym) == :recursive
           InventoryRefresh::SaveCollection::Recursive.save_collections(ems, inventory_collections)
@@ -24,7 +24,7 @@ module InventoryRefresh
           InventoryRefresh::SaveCollection::TopologicalSort.save_collections(ems, inventory_collections)
         end
 
-        log.info("#{log_header(ems)} Saving EMS Inventory...Complete")
+        logger.info("#{log_header(ems)} Saving EMS Inventory...Complete")
         ems
       end
 

data/lib/inventory_refresh/version.rb

@@ -1,3 +1,3 @@
 module InventoryRefresh
-  VERSION = "0.1.0".freeze
+  VERSION = "0.1.1".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: inventory_refresh
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - ManageIQ Developers
@@ -158,6 +158,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- config/database.yml
 - inventory_refresh.gemspec
 - lib/inventory_refresh.rb
 - lib/inventory_refresh/application_record_iterator.rb