Revert "Misc fixes"

This reverts commit f40a4669b9.

Change-Id: Ife8ce72ce76482671120d139305c900aec20d0b6
This commit is contained in:
Dmitry Ilyin 2016-09-01 10:19:48 -05:00
parent f40a4669b9
commit 804ed6db60
3 changed files with 3 additions and 5 deletions

View File

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

View File

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

View File

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