Browse Source

Revert "Misc fixes"

This reverts commit f40a4669b9.

Change-Id: Ife8ce72ce76482671120d139305c900aec20d0b6
Dmitry Ilyin 2 years ago
parent
commit
804ed6db60
3 changed files with 3 additions and 5 deletions
  1. 0
    1
      Gemfile
  2. 2
    3
      lib/noop/task/facts.rb
  3. 1
    1
      lib/noop/task/report.rb

+ 0
- 1
Gemfile View File

@@ -11,7 +11,6 @@ group :development, :test do
11 11
   gem 'colorize'
12 12
   gem 'parallel'
13 13
   gem 'openstack'
14
-  gem 'activesupport', '< 5.0.0'
15 14
 end
16 15
 
17 16
 if ENV['PUPPET_GEM_VERSION']

+ 2
- 3
lib/noop/task/facts.rb View File

@@ -1,5 +1,4 @@
1 1
 require 'yaml'
2
-require 'active_support/core_ext/hash/indifferent_access'
3 2
 
4 3
 module Noop
5 4
   class Task
@@ -71,9 +70,9 @@ module Noop
71 70
       facts_data[:puppetversion] = Puppet.version
72 71
     end
73 72
 
74
-    # @return [ActiveSupport::HashWithIndifferentAccess]
73
+    # @return [Hash]
75 74
     def facts_data
76
-      facts_data = ActiveSupport::HashWithIndifferentAccess.new
75
+      facts_data = {}
77 76
       facts_hierarchy.each do |file_path|
78 77
         begin
79 78
           file_data = YAML.load_file file_path

+ 1
- 1
lib/noop/task/report.rb View File

@@ -35,7 +35,7 @@ Facts hierarchy:
35 35
       gem = gem.to_s
36 36
       return unless Object.const_defined? 'Gem'
37 37
       return unless Gem.loaded_specs.is_a? Hash
38
-      return unless Gem.loaded_specs[gem].respond_to? :version
38
+      return unless Gem.loaded_specs[gem].is_a? Gem::Specification
39 39
       Gem.loaded_specs[gem].version
40 40
     end
41 41
 

Loading…
Cancel
Save