mcollective-client 2.7.0 → 2.8.0

data/spec/unit/{util_spec.rb → mcollective/util_spec.rb}

@@ -193,6 +193,28 @@ module MCollective
       end
     end
 
+    describe '#config_file_for_user' do
+      before :each do
+        File.stubs(:expand_path).raises
+        File.stubs(:readable?).returns(false)
+        Util.stubs(:windows?).returns(false)
+      end
+
+      it 'should default to /etc/puppetlabs/agent/mcollective/client.cfg if ~/.mcollective can not be expanded' do
+        Util.config_file_for_user.should == '/etc/puppetlabs/agent/mcollective/client.cfg'
+      end
+
+      it 'should default to ~/.mcollective if it can be expanded' do
+        File.expects(:expand_path).with('~/.mcollective').returns('/home/mco/.mcollective')
+        Util.config_file_for_user.should == '/home/mco/.mcollective'
+      end
+
+      it 'should choose /etc/mcollective/client.cfg if it is readable' do
+        File.expects(:readable?).with('/etc/mcollective/client.cfg').returns(true)
+        Util.config_file_for_user.should == '/etc/mcollective/client.cfg'
+      end
+    end
+
     describe "#default_options" do
       it "should supply correct default options" do
         Config.instance.stubs(:default_discovery_options).returns([])
@@ -462,8 +484,8 @@ module MCollective
         Util.stubs(:terminal_dimensions).returns([0,0])
 
         rootdir = File.dirname(__FILE__)
-        input = File.read("#{rootdir}/../fixtures/util/4.in")
-        output = File.read("#{rootdir}/../fixtures/util/4.out")
+        input = File.read("#{rootdir}/../../fixtures/util/4.in")
+        output = File.read("#{rootdir}/../../fixtures/util/4.out")
 
         (Util.align_text(input, nil, 3) + "\n").should == output
       end
@@ -486,14 +508,14 @@ module MCollective
       it "should correctly align strings" do
         rootdir = File.dirname(__FILE__)
         (1..2).each do |i|
-          input = File.read("#{rootdir}/../fixtures/util/#{i}.in")
-          output = File.read("#{rootdir}/../fixtures/util/#{i}.out")
+          input = File.read("#{rootdir}/../../fixtures/util/#{i}.in")
+          output = File.read("#{rootdir}/../../fixtures/util/#{i}.out")
 
           (Util.align_text(input, 158 , 5) + "\n").should == output
         end
 
-        input = File.read("#{rootdir}/../fixtures/util/3.in")
-        output = File.read("#{rootdir}/../fixtures/util/3.out")
+        input = File.read("#{rootdir}/../../fixtures/util/3.in")
+        output = File.read("#{rootdir}/../../fixtures/util/3.out")
 
         (Util.align_text(input, 30, 0) + "\n").should == output
       end

data/spec/unit/{plugins/mcollective → mcollective}/validator/array_validator_spec.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
-require File.dirname(__FILE__) + '/../../../../../plugins/mcollective/validator/array_validator.rb'
+require 'mcollective/validator/array_validator'
 
 module MCollective
   module Validator

data/spec/unit/{plugins/mcollective → mcollective}/validator/ipv4address_validator_spec.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
-require File.dirname(__FILE__) + '/../../../../../plugins/mcollective/validator/ipv4address_validator.rb'
+require 'mcollective/validator/ipv4address_validator'
 
 module MCollective
   module Validator

data/spec/unit/{plugins/mcollective → mcollective}/validator/ipv6address_validator_spec.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
-require File.dirname(__FILE__) + '/../../../../../plugins/mcollective/validator/ipv6address_validator.rb'
+require 'mcollective/validator/ipv6address_validator'
 
 module MCollective
   module Validator

data/spec/unit/{plugins/mcollective → mcollective}/validator/length_validator_spec.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
-require File.dirname(__FILE__) + '/../../../../../plugins/mcollective/validator/length_validator.rb'
+require 'mcollective/validator/length_validator'
 
 module MCollective
   module Validator

data/spec/unit/{plugins/mcollective → mcollective}/validator/regex_validator_spec.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
-require File.dirname(__FILE__) + '/../../../../../plugins/mcollective/validator/regex_validator.rb'
+require 'mcollective/validator/regex_validator'
 
 module MCollective
   module Validator

data/spec/unit/{plugins/mcollective → mcollective}/validator/shellsafe_validator_spec.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
-require File.dirname(__FILE__) + '/../../../../../plugins/mcollective/validator/shellsafe_validator.rb'
+require 'mcollective/validator/shellsafe_validator'
 
 module MCollective
   module Validator

data/spec/unit/{plugins/mcollective → mcollective}/validator/typecheck_validator_spec.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env rspec
 require 'spec_helper'
-require File.dirname(__FILE__) + '/../../../../../plugins/mcollective/validator/typecheck_validator.rb'
+require 'mcollective/validator/typecheck_validator'
 
 module MCollective
   module Validator

data/spec/unit/{validator_spec.rb → mcollective/validator_spec.rb}

@@ -1,7 +1,7 @@
 #!/usr/bin/env rspec
 
 require 'spec_helper'
-require File.dirname(__FILE__) + '/../../plugins/mcollective/validator/array_validator.rb'
+require 'mcollective/validator/array_validator'
 
 module MCollective
   module Validator

data/spec/unit/{vendor_spec.rb → mcollective/vendor_spec.rb}

@@ -7,7 +7,7 @@ module MCollective
     describe "#vendor_dir" do
       it "should return correct vendor directory" do
         specdir = File.dirname(__FILE__)
-        expected_dir = File.expand_path("#{specdir}/../../lib/mcollective/vendor")
+        expected_dir = File.expand_path("#{specdir}/../../../lib/mcollective/vendor")
         Vendor.vendor_dir.should == expected_dir
       end
     end
@@ -15,7 +15,7 @@ module MCollective
     describe "#load_entry" do
       it "should attempt to load the correct path" do
         specdir = File.dirname(__FILE__)
-        expected_dir = File.expand_path("#{specdir}/../../lib/mcollective/vendor")
+        expected_dir = File.expand_path("#{specdir}/../../../lib/mcollective/vendor")
 
         Class.any_instance.stubs("load").with("#{expected_dir}/foo").once