inventory_refresh 0.3.1 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b326cffd9bf55a9d960022f65397575975b631ddf00b95bc2b19b520464fec94
-  data.tar.gz: 97ab5734fe7dcb1782fb1aaac1047f4222d988b028d39b43084b10565b4f88f4
+  metadata.gz: c45babbc585f12693544de305f05e4011e1e3ef7ccb4d3fb1dd306d17d8814b2
+  data.tar.gz: 8512e2e81eb065b5ddd486ab5a53e1ca0e2c09f7fa426fa82ffbeab12dc322ec
 SHA512:
-  metadata.gz: 7f8b0916b49e99eed8c53041a25c828614909b532770dcaff905bbab908c47129a797bb522a6ded215b4ffd7d97e675afde384e0f308d926a848d860da54c0f6
-  data.tar.gz: 7d42174e2b279952f7e921318697d974db62823066760e62923383fee3c779578935b2489ac51ee26b73a5a56d191298c80a1007213d78069d5bc74e1350d35c
+  metadata.gz: f41ba870e4a66782549e2a6baae960281ec2604c70633d37ef993b013ac3201b887a4346c68d277167b4b5d688986d95a937e9934d9b1dd3057939644fc3eed4
+  data.tar.gz: f8a1644db501c32caebe8f7fa5eea9602b3a140180e822b1abe941676b654595743fe9f87ec73574a4a842a7b2373ada8aba325c17667eeb159b55f27ebf799d

data/.codeclimate.yml

@@ -34,6 +34,7 @@ engines:
   rubocop:
     enabled: true
     config: '.rubocop_cc.yml'
+    channel: rubocop-0-69
 prepare:
   fetch:
   - url: "https://raw.githubusercontent.com/ManageIQ/guides/master/.rubocop_base.yml"

data/.github/CODEOWNERS

@@ -0,0 +1 @@
+* @agrare @Fryguy @Ladas @slemrmartin

data/.travis.yml

@@ -3,8 +3,8 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-- 2.4.4
-- 2.3.6
+- 2.5.7
+- 2.6.5
 addons:
   postgresql: '10'
 env:

data/inventory_refresh.gemspec

@@ -23,13 +23,15 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_dependency "activerecord", "~> 5.0"
-  spec.add_dependency "more_core_extensions", "~> 3.5"
+  spec.add_dependency "more_core_extensions", ">=3.5", "< 5"
   spec.add_dependency "pg", "> 0"
 
   spec.add_development_dependency "ancestry"
-  spec.add_development_dependency "bundler", "~> 2.0.1"
+  spec.add_development_dependency "bundler", "~> 2.0"
   spec.add_development_dependency "factory_bot", "~> 4.11.1"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
+  spec.add_development_dependency "rubocop"
+  spec.add_development_dependency "rubocop-performance"
   spec.add_development_dependency "simplecov"
 end

data/lib/inventory_refresh/inventory_collection.rb

@@ -342,13 +342,25 @@ module InventoryRefresh
     #
     # @return [Array<Symbol>] attributes that are needed for saving of the record
     def fixed_attributes
+      not_null_attributes = []
+
       if model_class
+        # Attrs having presence validator
         presence_validators = model_class.validators.detect { |x| x.kind_of?(ActiveRecord::Validations::PresenceValidator) }
+        not_null_attributes += presence_validators.attributes if presence_validators.present?
+
+        # Column names having NOT NULL constraint
+        non_null_constraints = model_class.columns_hash.values.reject(&:null).map(&:name) - [model_class.primary_key]
+        not_null_attributes += non_null_constraints.map(&:to_sym)
+
+        # Column names having NOT NULL constraint transformed to relation names
+        not_null_attributes += non_null_constraints.map {|x| foreign_key_to_association_mapping[x]}.compact
       end
       # Attributes that has to be always on the entity, so attributes making unique index of the record + attributes
       # that have presence validation
+
       fixed_attributes = manager_ref
-      fixed_attributes += presence_validators.attributes if presence_validators.present?
+      fixed_attributes += not_null_attributes.uniq
       fixed_attributes
     end
 

data/lib/inventory_refresh/inventory_collection/helpers/questions_helper.rb

@@ -52,7 +52,7 @@ module InventoryRefresh
 
         # @return [Boolean] true if the model_class supports STI
         def supports_sti?
-          @supports_sti_cache = model_class.column_names.include?("type") if @supports_sti_cache.nil?
+          @supports_sti_cache = model_class&.column_names.to_a.include?("type") if @supports_sti_cache.nil?
           @supports_sti_cache
         end
 
@@ -62,7 +62,7 @@ module InventoryRefresh
           @supported_cols_cache ||= {}
           return @supported_cols_cache[column_name.to_sym] unless @supported_cols_cache[column_name.to_sym].nil?
 
-          include_col = model_class.column_names.include?(column_name.to_s)
+          include_col = model_class&.column_names.to_a.include?(column_name.to_s)
           if %w(created_on created_at updated_on updated_at).include?(column_name.to_s)
             include_col &&= ActiveRecord::Base.record_timestamps
           end

data/lib/inventory_refresh/persister.rb

@@ -5,7 +5,10 @@ module InventoryRefresh
 
     attr_reader :manager, :collections
 
-    attr_accessor :refresh_state_uuid, :refresh_state_part_uuid, :total_parts, :sweep_scope, :retry_count, :retry_max
+    attr_accessor :refresh_state_uuid, :refresh_state_part_uuid, :refresh_time_tracking, :total_parts, :sweep_scope, :retry_count, :retry_max
+    attr_accessor :persister_started_at, :persister_finished_at,
+                  :refresh_state_part_collected_at, :refresh_state_part_sent_at,
+                  :refresh_state_started_at, :refresh_state_sent_at, :ingress_api_sent_at
 
     # @param manager [ManageIQ::Providers::BaseManager] A manager object
     def initialize(manager)
@@ -13,6 +16,8 @@ module InventoryRefresh
 
       @collections = {}
 
+      self.persister_started_at = Time.now.utc.to_datetime.to_s
+
       initialize_inventory_collections
     end
 
@@ -105,13 +110,19 @@ module InventoryRefresh
       end.compact
 
       {
-        :refresh_state_uuid      => refresh_state_uuid,
-        :refresh_state_part_uuid => refresh_state_part_uuid,
-        :retry_count             => retry_count,
-        :retry_max               => retry_max,
-        :total_parts             => total_parts,
-        :sweep_scope             => sweep_scope_to_hash(sweep_scope),
-        :collections             => collections_data,
+        :refresh_state_uuid              => refresh_state_uuid,
+        :refresh_state_part_uuid         => refresh_state_part_uuid,
+        :refresh_state_part_collected_at => refresh_state_part_collected_at,
+        :refresh_state_part_sent_at      => refresh_state_part_sent_at,
+        :refresh_state_started_at        => refresh_state_started_at,
+        :refresh_state_sent_at           => refresh_state_sent_at,
+        :ingress_api_sent_at             => ingress_api_sent_at,
+        :refresh_time_tracking           => refresh_time_tracking,
+        :retry_count                     => retry_count,
+        :retry_max                       => retry_max,
+        :total_parts                     => total_parts,
+        :sweep_scope                     => sweep_scope_to_hash(sweep_scope),
+        :collections                     => collections_data,
       }
     end
 
@@ -137,12 +148,17 @@ module InventoryRefresh
             inventory_collection.from_hash(collection, persister.collections)
           end
 
-          persister.refresh_state_uuid      = persister_data['refresh_state_uuid']
-          persister.refresh_state_part_uuid = persister_data['refresh_state_part_uuid']
-          persister.retry_count             = persister_data['retry_count']
-          persister.retry_max               = persister_data['retry_max']
-          persister.total_parts             = persister_data['total_parts']
-          persister.sweep_scope             = sweep_scope_from_hash(persister_data['sweep_scope'], persister.collections)
+          persister.refresh_state_uuid              = persister_data['refresh_state_uuid']
+          persister.refresh_state_part_uuid         = persister_data['refresh_state_part_uuid']
+          persister.refresh_state_part_collected_at = persister_data['refresh_state_part_collected_at']
+          persister.refresh_state_part_sent_at      = persister_data['refresh_state_part_sent_at']
+          persister.refresh_state_started_at        = persister_data['refresh_state_started_at']
+          persister.refresh_state_sent_at           = persister_data['refresh_state_sent_at']
+          persister.ingress_api_sent_at             = persister_data['ingress_api_sent_at']
+          persister.retry_count                     = persister_data['retry_count']
+          persister.retry_max                       = persister_data['retry_max']
+          persister.total_parts                     = persister_data['total_parts']
+          persister.sweep_scope                     = sweep_scope_from_hash(persister_data['sweep_scope'], persister.collections)
         end
       end
 

data/lib/inventory_refresh/version.rb

@@ -1,3 +1,3 @@
 module InventoryRefresh
-  VERSION = "0.3.1".freeze
+  VERSION = "0.3.6".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: inventory_refresh
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.6
 platform: ruby
 authors:
 - ManageIQ Developers
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-09 00:00:00.000000000 Z
+date: 2020-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -28,16 +28,22 @@ dependencies:
   name: more_core_extensions
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
         version: '3.5'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +78,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.0.1
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: factory_bot
   requirement: !ruby/object:Gem::Requirement
@@ -122,6 +128,34 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop-performance
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -143,6 +177,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".codeclimate.yml"
+- ".github/CODEOWNERS"
 - ".gitignore"
 - ".rspec"
 - ".rspec_ci"
@@ -221,8 +256,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.6.2
+rubygems_version: 3.1.3
 signing_key: 
 specification_version: 4
 summary: Topological Inventory Persister