diff --git a/libraries/pacemaker.rb b/libraries/pacemaker.rb index cb108c6..b3971f5 100644 --- a/libraries/pacemaker.rb +++ b/libraries/pacemaker.rb @@ -1,2 +1,2 @@ -require_relative 'pacemaker/resource/primitive' -require_relative 'pacemaker/resource/clone' +require File.join(File.dirname(__FILE__), %w(pacemaker resource primitive)) +require File.join(File.dirname(__FILE__), %w(pacemaker resource clone)) diff --git a/libraries/pacemaker/resource.rb b/libraries/pacemaker/resource.rb index 68e35a8..c9af753 100644 --- a/libraries/pacemaker/resource.rb +++ b/libraries/pacemaker/resource.rb @@ -1,5 +1,5 @@ require 'chef/mixin/shell_out' -require_relative 'cib_object' +require File::join(File.dirname(__FILE__), 'cib_object') module Pacemaker class Resource < Pacemaker::CIBObject diff --git a/libraries/pacemaker/resource/clone.rb b/libraries/pacemaker/resource/clone.rb index 6cb8433..1ef523e 100644 --- a/libraries/pacemaker/resource/clone.rb +++ b/libraries/pacemaker/resource/clone.rb @@ -1,4 +1,4 @@ -require_relative File::join(%w(.. resource)) +require File::join(File.dirname(__FILE__), %w(.. resource)) class Pacemaker::Resource::Clone < Pacemaker::Resource register_type 'clone' diff --git a/libraries/pacemaker/resource/primitive.rb b/libraries/pacemaker/resource/primitive.rb index 41b8ad5..5677f9b 100644 --- a/libraries/pacemaker/resource/primitive.rb +++ b/libraries/pacemaker/resource/primitive.rb @@ -1,5 +1,5 @@ require 'shellwords' -require_relative File::join(%w(.. resource)) +require File::join(File.dirname(__FILE__), %w(.. resource)) class Pacemaker::Resource::Primitive < Pacemaker::Resource TYPE = 'primitive' diff --git a/spec/fixtures/clone_resource.rb b/spec/fixtures/clone_resource.rb index f76789a..904968c 100644 --- a/spec/fixtures/clone_resource.rb +++ b/spec/fixtures/clone_resource.rb @@ -1,6 +1,6 @@ require ::File.join(::File.dirname(__FILE__), *%w(.. .. libraries pacemaker resource clone)) -require_relative 'keystone_primitive' +require ::File.join(::File.dirname(__FILE__), 'keystone_primitive') module Chef::RSpec module Pacemaker diff --git a/spec/helpers/common_object_examples.rb b/spec/helpers/common_object_examples.rb index d136c81..1df2687 100644 --- a/spec/helpers/common_object_examples.rb +++ b/spec/helpers/common_object_examples.rb @@ -1,5 +1,5 @@ require 'mixlib/shellout' -require_relative File.join(%w(.. .. libraries pacemaker cib_object)) +require File.join(File.dirname(__FILE__), %w(.. .. libraries pacemaker cib_object)) shared_examples "a CIB object" do def expect_to_match_fixture(obj) diff --git a/spec/libraries/pacemaker/cib_object_spec.rb b/spec/libraries/pacemaker/cib_object_spec.rb index 95bbbd8..989e539 100644 --- a/spec/libraries/pacemaker/cib_object_spec.rb +++ b/spec/libraries/pacemaker/cib_object_spec.rb @@ -1,8 +1,8 @@ require 'spec_helper' require 'mixlib/shellout' -require_relative File.join(%w(.. .. .. libraries pacemaker)) -require_relative File.join(%w(.. .. fixtures keystone_primitive)) +require File.join(File.dirname(__FILE__), %w(.. .. .. libraries pacemaker)) +require File.join(File.dirname(__FILE__), %w(.. .. fixtures keystone_primitive)) describe Pacemaker::CIBObject do diff --git a/spec/libraries/pacemaker/resource/primitive_spec.rb b/spec/libraries/pacemaker/resource/primitive_spec.rb index eed0a9c..3410c17 100644 --- a/spec/libraries/pacemaker/resource/primitive_spec.rb +++ b/spec/libraries/pacemaker/resource/primitive_spec.rb @@ -1,7 +1,7 @@ require 'spec_helper' -require_relative File.join(%w(.. .. .. .. libraries pacemaker resource primitive)) -require_relative File.join(%w(.. .. .. fixtures keystone_primitive)) -require_relative File.join(%w(.. .. .. helpers common_object_examples)) +require File.join(File.dirname(__FILE__), %w(.. .. .. .. libraries pacemaker resource primitive)) +require File.join(File.dirname(__FILE__), %w(.. .. .. fixtures keystone_primitive)) +require File.join(File.dirname(__FILE__), %w(.. .. .. helpers common_object_examples)) describe Pacemaker::Resource::Primitive do let(:fixture) { Chef::RSpec::Pacemaker::Config::KEYSTONE_PRIMITIVE.dup } diff --git a/spec/libraries/pacemaker/resource_spec.rb b/spec/libraries/pacemaker/resource_spec.rb index e9572a1..4f2c1be 100644 --- a/spec/libraries/pacemaker/resource_spec.rb +++ b/spec/libraries/pacemaker/resource_spec.rb @@ -1,5 +1,5 @@ require 'spec_helper' -require_relative File.join(%w(.. .. .. libraries pacemaker resource)) +require File.join(File.dirname(__FILE__), %w(.. .. .. libraries pacemaker resource)) describe Pacemaker::Resource do describe "#running?" do diff --git a/spec/providers/primitive_spec.rb b/spec/providers/primitive_spec.rb index bb802e4..8958ba2 100644 --- a/spec/providers/primitive_spec.rb +++ b/spec/providers/primitive_spec.rb @@ -1,7 +1,7 @@ require 'chef/application' -require_relative File.join(%w(.. spec_helper)) -require_relative File.join(%w(.. helpers common)) -require_relative File.join(%w(.. fixtures keystone_primitive)) +require File.join(File.dirname(__FILE__), %w(.. spec_helper)) +require File.join(File.dirname(__FILE__), %w(.. helpers common)) +require File.join(File.dirname(__FILE__), %w(.. fixtures keystone_primitive)) describe "Chef::Provider::PacemakerPrimitive" do # for use inside examples: