mcollective-client 2.7.0 → 2.8.0

data/lib/mcollective.rb

@@ -27,40 +27,40 @@ require 'mcollective/exceptions'
 #   http://www.devco.net/archives/2009/10/18/middleware_for_systems_administration.php
 module MCollective
 
-  autoload :Agent, "mcollective/agent"
-  autoload :Agents, "mcollective/agents"
-  autoload :Aggregate, "mcollective/aggregate"
-  autoload :Application, "mcollective/application"
-  autoload :Applications, "mcollective/applications"
-  autoload :Client, "mcollective/client"
-  autoload :Config, "mcollective/config"
-  autoload :Connector, "mcollective/connector"
-  autoload :Data, "mcollective/data"
-  autoload :DDL, "mcollective/ddl"
-  autoload :Discovery, "mcollective/discovery"
-  autoload :Facts, "mcollective/facts"
-  autoload :Logger, "mcollective/logger"
-  autoload :Log, "mcollective/log"
-  autoload :Matcher, "mcollective/matcher"
-  autoload :Message, "mcollective/message"
-  autoload :Optionparser, "mcollective/optionparser"
-  autoload :Generators, "mcollective/generators"
-  autoload :PluginManager, "mcollective/pluginmanager"
-  autoload :PluginPackager, "mcollective/pluginpackager"
-  autoload :Registration, "mcollective/registration"
-  autoload :RPC, "mcollective/rpc"
-  autoload :Runner, "mcollective/runner"
-  autoload :RunnerStats, "mcollective/runnerstats"
-  autoload :Security, "mcollective/security"
-  autoload :Shell, "mcollective/shell"
-  autoload :SSL, "mcollective/ssl"
-  autoload :Util, "mcollective/util"
-  autoload :Validator, "mcollective/validator"
-  autoload :Vendor, "mcollective/vendor"
+  require "mcollective/agent"
+  require "mcollective/agents"
+  require "mcollective/aggregate"
+  require "mcollective/application"
+  require "mcollective/applications"
+  require "mcollective/client"
+  require "mcollective/config"
+  require "mcollective/connector"
+  require "mcollective/data"
+  require "mcollective/ddl"
+  require "mcollective/discovery"
+  require "mcollective/facts"
+  require "mcollective/logger"
+  require "mcollective/log"
+  require "mcollective/matcher"
+  require "mcollective/message"
+  require "mcollective/optionparser"
+  require "mcollective/generators"
+  require "mcollective/pluginmanager"
+  require "mcollective/pluginpackager"
+  require "mcollective/registration"
+  require "mcollective/rpc"
+  require "mcollective/runner"
+  require "mcollective/runnerstats"
+  require "mcollective/security"
+  require "mcollective/shell"
+  require "mcollective/ssl"
+  require "mcollective/util"
+  require "mcollective/validator"
+  require "mcollective/vendor"
 
   MCollective::Vendor.load_vendored
 
-  VERSION="2.7.0"
+  VERSION="2.8.0"
 
   def self.version
     VERSION

data/spec/spec_helper.rb

@@ -1,8 +1,3 @@
-dir = File.expand_path(File.dirname(__FILE__))
-$LOAD_PATH.unshift("#{dir}/")
-$LOAD_PATH.unshift("#{dir}/../lib")
-$LOAD_PATH.unshift("#{dir}/../plugins")
-
 require 'rubygems'
 
 gem 'mocha'

data/spec/unit/{plugins/mcollective → mcollective}/agent/rpcutil_spec.rb

@@ -1,6 +1,6 @@
 #!/usr/bin/env rspec
 
-@agent_file = File.join(File.dirname(__FILE__), '../../../../../', 'plugins', 'mcollective', 'agent', 'rpcutil.rb')
+@agent_file = File.join('mcollective', 'agent', 'rpcutil')
 
 require 'spec_helper'
 require @agent_file

data/spec/unit/{plugins/mcollective → mcollective}/aggregate/average_spec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env rspec
 
 require 'spec_helper'
-require File.dirname(__FILE__) + "/../../../../../plugins/mcollective/aggregate/average.rb"
+require 'mcollective/aggregate/average'
 
 module MCollective
   class Aggregate

data/spec/unit/{plugins/mcollective → mcollective}/aggregate/sum_spec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env rspec
 
 require 'spec_helper'
-require File.dirname(__FILE__) + "/../../../../../plugins/mcollective/aggregate/sum.rb"
+require 'mcollective/aggregate/sum'
 
 module MCollective
   class Aggregate

data/spec/unit/{plugins/mcollective → mcollective}/aggregate/summary_spec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env rspec
 
 require 'spec_helper'
-require File.dirname(__FILE__) + "/../../../../../plugins/mcollective/aggregate/summary.rb"
+require 'mcollective/aggregate/summary'
 
 module MCollective
   class Aggregate

data/spec/unit/{plugins/mcollective → mcollective}/application/plugin_spec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env rspec
 
 require 'spec_helper'
-require File.join(File.dirname(__FILE__), '../../../../../', 'plugins', 'mcollective', 'application', 'plugin.rb')
+require 'mcollective/application/plugin'
 
 module MCollective
   class Application

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

@@ -16,7 +16,7 @@ module MCollective
       @appsdir = File.join([@tmpdir, "mcollective", "application"])
       FileUtils.mkdir_p(@appsdir)
 
-      FileUtils.cp(File.join([File.dirname(__FILE__), "..", "fixtures", "application", "test.rb"]), @appsdir)
+      FileUtils.cp(File.join([File.dirname(__FILE__), '..', "..", "fixtures", "application", "test.rb"]), @appsdir)
     end
 
     after do

data/spec/unit/{plugins/mcollective → mcollective}/audit/logfile_spec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env rspec
 
 require 'spec_helper'
-require File.join(File.dirname(__FILE__), '../../../../../', 'plugins', 'mcollective', 'audit', 'logfile.rb')
+require 'mcollective/audit/logfile'
 
 module MCollective
   module RPC

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

@@ -5,13 +5,6 @@ require 'spec_helper'
 module MCollective
   describe Config do
     describe "#loadconfig" do
-      it "should fail when no libdir is set" do
-        File.expects(:exists?).with("/nonexisting").returns(true)
-        File.expects(:readlines).with("/nonexisting").returns([])
-        Config.instance.stubs(:set_config_defaults)
-        expect { Config.instance.loadconfig("/nonexisting") }.to raise_error("The /nonexisting config file does not specify a libdir setting, cannot continue")
-      end
-
       it "should only test that libdirs are absolute paths" do
         Util.expects(:absolute_path?).with("/one").returns(true)
         Util.expects(:absolute_path?).with("/two").returns(true)
@@ -33,6 +26,18 @@ module MCollective
         expect { Config.instance.loadconfig("/nonexisting") }.to raise_error(/should be absolute paths/)
       end
 
+      it 'should prepend $libdir to $LOAD_PATH' do
+        Util.expects(:absolute_path?).with('/test').returns(true)
+
+        File.stubs(:exists?).with("/nonexisting").returns(true)
+
+        File.expects(:readlines).with('/nonexisting').returns(['libdir = /test'])
+
+        Config.instance.loadconfig("/nonexisting")
+
+        $LOAD_PATH[0].should == '/test'
+      end
+
       it "should not allow any path like construct for identities" do
         # Taken from puppet test cases
         ['../foo', '..\\foo', './../foo', '.\\..\\foo',

data/spec/unit/{plugins/mcollective → mcollective}/connector/activemq_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 MCollective::PluginManager.clear
 
-require File.dirname(__FILE__) + '/../../../../../plugins/mcollective/connector/activemq.rb'
+require 'mcollective/connector/activemq'
 
 # create the stomp error class here as it does not always exist
 # all versions of the stomp gem and we do not want to tie tests

data/spec/unit/{plugins/mcollective → mcollective}/connector/rabbitmq_spec.rb

@@ -4,7 +4,7 @@ require 'spec_helper'
 
 MCollective::PluginManager.clear
 
-require File.dirname(__FILE__) + '/../../../../../plugins/mcollective/connector/rabbitmq.rb'
+require 'mcollective/connector/rabbitmq'
 
 # create the stomp error class here as it does not always exist
 # all versions of the stomp gem and we do not want to tie tests

data/spec/unit/{plugins/mcollective → mcollective}/data/agent_data_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-require File.dirname(__FILE__) + "/../../../../../plugins/mcollective/data/agent_data.rb"
+require 'mcollective/data/agent_data'
 
 module MCollective
   module Data

data/spec/unit/{plugins/mcollective → mcollective}/data/collective_data_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-require File.dirname(__FILE__) + "/../../../../../plugins/mcollective/data/collective_data.rb"
+require 'mcollective/data/collective_data'
 
 module MCollective
   module Data

data/spec/unit/{plugins/mcollective → mcollective}/data/fact_data_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-require File.dirname(__FILE__) + "/../../../../../plugins/mcollective/data/fact_data.rb"
+require 'mcollective/data/fact_data'
 
 module MCollective
   module Data

data/spec/unit/{plugins/mcollective → mcollective}/data/fstat_data_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-require File.dirname(__FILE__) + "/../../../../../plugins/mcollective/data/fstat_data.rb"
+require 'mcollective/data/fstat_data'
 
 module MCollective
   module Data

data/spec/unit/{plugins/mcollective → mcollective}/discovery/flatfile_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-require File.dirname(__FILE__) + '/../../../../../plugins/mcollective/discovery/flatfile.rb'
+require 'mcollective/discovery/flatfile'
 
 module MCollective
   class Discovery

data/spec/unit/{plugins/mcollective → mcollective}/discovery/mc_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-require File.dirname(__FILE__) + '/../../../../../plugins/mcollective/discovery/mc.rb'
+require 'mcollective/discovery/mc'
 
 module MCollective
   class Discovery

data/spec/unit/{plugins/mcollective → mcollective}/discovery/stdin_spec.rb

@@ -2,7 +2,7 @@
 
 require 'spec_helper'
 
-require File.dirname(__FILE__) + '/../../../../../plugins/mcollective/discovery/stdin.rb'
+require 'mcollective/discovery/stdin'
 
 module MCollective
   class Discovery

data/spec/unit/{plugins/mcollective → mcollective}/facts/yaml_facts_spec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env rspec
 
 require 'spec_helper'
-require File.join(File.dirname(__FILE__), '../../../../../', 'plugins', 'mcollective', 'facts', 'yaml_facts.rb')
+require 'mcollective/facts/yaml_facts'
 
 module MCollective
   module Facts

data/spec/unit/{plugins/mcollective → mcollective}/packagers/debpackage_packager_spec.rb

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

data/spec/unit/{plugins/mcollective → mcollective}/packagers/modulepackage_packager_spec.rb

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

data/spec/unit/{plugins/mcollective → mcollective}/packagers/ospackage_spec.rb

@@ -3,7 +3,7 @@
 require 'spec_helper'
 
 MCollective::PluginManager.clear
-require File.dirname(__FILE__) + '/../../../../../plugins/mcollective/pluginpackager/ospackage_packager.rb'
+require 'mcollective/pluginpackager/ospackage_packager'
 
 module MCollective
   module PluginPackager

data/spec/unit/{plugins/mcollective → mcollective}/packagers/rpmpackage_packager_spec.rb

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

data/spec/unit/{plugins/mcollective → mcollective}/security/aes_security_spec.rb

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

data/spec/unit/{plugins/mcollective → mcollective}/security/psk_spec.rb

@@ -1,7 +1,7 @@
 #!/usr/bin/env rspec
 
 require 'spec_helper'
-require File.dirname(__FILE__) + '/../../../../../plugins/mcollective/security/psk.rb'
+require 'mcollective/security/psk'
 
 module MCollective::Security
   describe Psk do

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

@@ -6,7 +6,7 @@ module MCollective
   describe SSL do
     before do
       @rootdir = File.dirname(__FILE__)
-      @ssl = SSL.new("#{@rootdir}/../fixtures/test-public.pem", "#{@rootdir}/../fixtures/test-private.pem")
+      @ssl = SSL.new("#{@rootdir}/../../fixtures/test-public.pem", "#{@rootdir}/../../fixtures/test-private.pem")
     end
 
     it "should be able to decode base64 text it encoded" do
@@ -51,26 +51,26 @@ module MCollective
 
       it "should take the configured value when present" do
         Config.instance.stubs("ssl_cipher").returns("aes-128-cbc")
-        @ssl = SSL.new("#{@rootdir}/../fixtures/test-public.pem", "#{@rootdir}/../fixtures/test-private.pem")
+        @ssl = SSL.new("#{@rootdir}/../../fixtures/test-public.pem", "#{@rootdir}/../../fixtures/test-private.pem")
 
         @ssl.ssl_cipher.should == "aes-128-cbc"
       end
 
       it "should set the supplied ssl cipher" do
-        @ssl = SSL.new("#{@rootdir}/../fixtures/test-public.pem", "#{@rootdir}/../fixtures/test-private.pem", nil, "aes-128-cbc")
+        @ssl = SSL.new("#{@rootdir}/../../fixtures/test-public.pem", "#{@rootdir}/../../fixtures/test-private.pem", nil, "aes-128-cbc")
         @ssl.ssl_cipher.should == "aes-128-cbc"
       end
 
       it "should prefer the supplied cipher over configured cipher" do
         Config.instance.stubs("aes_key_size").returns("foo-foo-foo")
-        @ssl = SSL.new("#{@rootdir}/../fixtures/test-public.pem", "#{@rootdir}/../fixtures/test-private.pem", nil, "aes-128-cbc")
+        @ssl = SSL.new("#{@rootdir}/../../fixtures/test-public.pem", "#{@rootdir}/../../fixtures/test-private.pem", nil, "aes-128-cbc")
 
         @ssl.ssl_cipher.should == "aes-128-cbc"
       end
 
       it "should fail on invalid ciphers" do
         expect {
-          @ssl = SSL.new("#{@rootdir}/../fixtures/test-public.pem", "#{@rootdir}/../fixtures/test-private.pem", nil, "foo-foo-foo")
+          @ssl = SSL.new("#{@rootdir}/../../fixtures/test-public.pem", "#{@rootdir}/../../fixtures/test-private.pem", nil, "foo-foo-foo")
         }.to raise_error("The supplied cipher 'foo-foo-foo' is not supported")
       end
     end
@@ -97,11 +97,11 @@ module MCollective
       end
 
       it "should read a public key" do
-        @ssl.read_key(:public, "#{@rootdir}/../fixtures/test-public.pem")
+        @ssl.read_key(:public, "#{@rootdir}/../../fixtures/test-public.pem")
       end
 
       it "should read the public key from a certificate" do
-        @ssl.read_key(:public, "#{@rootdir}/../fixtures/test-cert.pem").to_s.should match(/.+BEGIN.+PUBLIC KEY.+END.+PUBLIC KEY.+/m)
+        @ssl.read_key(:public, "#{@rootdir}/../../fixtures/test-cert.pem").to_s.should match(/.+BEGIN.+PUBLIC KEY.+END.+PUBLIC KEY.+/m)
       end
 
       it "should return nil if no key was given" do
@@ -115,15 +115,15 @@ module MCollective
       it "should clear the OpenSSL error queue on ruby 1.8" do
         Util.expects(:ruby_version).returns("1.8.7")
         OpenSSL.expects(:errors)
-        @ssl.read_key(:public, "#{@rootdir}/../fixtures/test-public.pem")
-        @ssl.read_key(:private, "#{@rootdir}/../fixtures/test-private.pem")
+        @ssl.read_key(:public, "#{@rootdir}/../../fixtures/test-public.pem")
+        @ssl.read_key(:private, "#{@rootdir}/../../fixtures/test-private.pem")
       end
 
       it "should not clear the OpenSSL error queue on ruby > 1.8" do
         Util.expects(:ruby_version).returns("1.9.3")
         OpenSSL.expects(:errors).never
-        @ssl.read_key(:public, "#{@rootdir}/../fixtures/test-public.pem")
-        @ssl.read_key(:private, "#{@rootdir}/../fixtures/test-private.pem")
+        @ssl.read_key(:public, "#{@rootdir}/../../fixtures/test-public.pem")
+        @ssl.read_key(:private, "#{@rootdir}/../../fixtures/test-private.pem")
       end
     end
 
@@ -176,7 +176,7 @@ module MCollective
         end
 
         # new ssl instance configured for aes-128-cbc, should work
-        @ssl = SSL.new("#{@rootdir}/../fixtures/test-public.pem", "#{@rootdir}/../fixtures/test-private.pem", nil, "aes-128-cbc")
+        @ssl = SSL.new("#{@rootdir}/../../fixtures/test-public.pem", "#{@rootdir}/../../fixtures/test-private.pem", nil, "aes-128-cbc")
         @ssl.aes_decrypt(key, data).should == "foo"
       end
     end