Skip to content
This repository has been archived by the owner on Nov 9, 2022. It is now read-only.

Commit

Permalink
Merge pull request #16 from rvrignaud/fixed_path
Browse files Browse the repository at this point in the history
Fix require path
  • Loading branch information
ares committed Oct 29, 2014
2 parents f0e52e3 + e0fb8b3 commit 3b5ffc7
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
4 changes: 2 additions & 2 deletions lib/chef_handler_foreman.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require "chef_handler_foreman/version"
require "#{File.dirname(__FILE__)}/chef_handler_foreman/version"
require 'chef'
require 'chef_handler_foreman/foreman_hooks'
require "#{File.dirname(__FILE__)}/chef_handler_foreman/foreman_hooks"

Chef::Config.send :extend, ChefHandlerForeman::ForemanHooks
8 changes: 4 additions & 4 deletions lib/chef_handler_foreman/foreman_hooks.rb
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
require 'chef_handler_foreman/foreman_facts'
require 'chef_handler_foreman/foreman_reporting'
require "#{File.dirname(__FILE__)}/foreman_facts"
require "#{File.dirname(__FILE__)}/foreman_reporting"

# this reporter is supported in chef 11 or later
unless Gem::Version.new(Chef::VERSION) < Gem::Version.new('11.0.0')
require 'chef_handler_foreman/foreman_resource_reporter'
require "#{File.dirname(__FILE__)}/foreman_resource_reporter"
end

require 'chef_handler_foreman/foreman_uploader'
require "#{File.dirname(__FILE__)}/foreman_uploader"

module ChefHandlerForeman
module ForemanHooks
Expand Down

0 comments on commit 3b5ffc7

Please sign in to comment.