ditch require_relative which requires Ruby >= 1.9.2

This commit is contained in:
Adam Spiers 2014-02-04 13:37:31 +00:00
parent 0ac14ce0df
commit abd973937c
10 changed files with 16 additions and 16 deletions

View File

@ -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))

View File

@ -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

View File

@ -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'

View File

@ -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'

View File

@ -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

View File

@ -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)

View File

@ -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

View File

@ -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 }

View File

@ -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

View File

@ -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: