mcollective-client 2.2.2 → 2.2.3

data/lib/mcollective/pluginpackager/agent_definition.rb

@@ -20,7 +20,7 @@ module MCollective
         @mcversion = mcdependency[:mcversion] || mcversion
         @dependencies << {:name => "#{@mcname}-common", :version => @mcversion}
 
-        @metadata[:name] = (name || @metadata[:name]).downcase.gsub(" ", "-")
+        @metadata[:name] = (name || @metadata[:name]).downcase.gsub(/\s+|_/, "-")
         identify_packages
       end
 
@@ -48,7 +48,7 @@ module MCollective
         else
           return nil
         end
-        agent[:dependencies] << {:name => "#{@mcname}-#{@metadata[:name]}-common", :version => @metadata[:version], :iteration => @iteration}
+        agent[:plugindependency] = {:name => "#{@mcname}-#{@metadata[:name]}-common", :version => @metadata[:version], :iteration => @iteration}
         agent
       end
 
@@ -63,7 +63,7 @@ module MCollective
 
         client[:files] += Dir.glob(File.join(clientdir, "*")) if PluginPackager.check_dir_present clientdir
         client[:files] += Dir.glob(File.join(aggregatedir, "*")) if PluginPackager.check_dir_present aggregatedir
-        client[:dependencies] << {:name => "#{@mcname}-#{@metadata[:name]}-common", :version => @metadata[:version], :iteration => @iteration}
+        client[:plugindependency] = {:name => "#{@mcname}-#{@metadata[:name]}-common", :version => @metadata[:version], :iteration => @iteration}
         client[:files].empty? ? nil : client
       end
 

data/lib/mcollective/pluginpackager/standard_definition.rb

@@ -19,7 +19,7 @@ module MCollective
         @mcname = mcdependency[:mcname] || "mcollective"
         @mcversion = mcdependency[:mcversion] || mcversion
         @dependencies << {:name => "#{mcname}-common", :version => @mcversion}
-        @metadata[:name] = (name || @metadata[:name]).downcase.gsub(" ", "-")
+        @metadata[:name] = (name || @metadata[:name]).downcase.gsub(/\s+|_/, "-")
         identify_packages
       end
 
@@ -44,7 +44,7 @@ module MCollective
           return nil
         end
 
-        plugindata[:dependencies] << {:name => "#{@mcname}-#{@metadata[:name]}-common",
+        plugindata[:plugindependency] = {:name => "#{@mcname}-#{@metadata[:name]}-common",
                                       :version => @metadata[:version],
                                       :iteration => @iteration} if @packagedata[:common]
         plugindata

data/lib/mcollective/rpc/client.rb

@@ -39,12 +39,16 @@ module MCollective
         end
 
         @initial_options = initial_options
+
+        @config = initial_options[:config]
+        @client = MCollective::Client.new(@config)
+        @client.options = initial_options
+
         @stats = Stats.new
         @agent = agent
         @timeout = initial_options[:timeout] || 5
         @verbose = initial_options[:verbose]
         @filter = initial_options[:filter] || Util.empty_filter
-        @config = initial_options[:config]
         @discovered_agents = nil
         @progress = initial_options[:progress_bar]
         @limit_targets = initial_options[:mcollective_limit_targets]
@@ -63,10 +67,7 @@ module MCollective
 
         agent_filter agent
 
-        @client = MCollective::Client.new(@config)
-        @client.options = initial_options
-
-        @discovery_timeout = discovery_timeout
+        @discovery_timeout = @initial_options.fetch(:disctimeout, nil)
 
         @collective = @client.collective
         @ttl = initial_options[:ttl] || Config.instance.ttl
@@ -88,7 +89,7 @@ module MCollective
         # DDLs are required, failure to find a DDL is fatal
         @ddl = DDL.new(agent)
         @stats.ddl = @ddl
-        @timeout = @ddl.meta[:timeout] + @discovery_timeout if @timeout == 5
+        @timeout = @ddl.meta[:timeout] + discovery_timeout if @timeout == 5
 
         # allows stderr and stdout to be overridden for testing
         # but also for web apps that might not want a bunch of stuff
@@ -321,10 +322,38 @@ module MCollective
       end
 
       def discovery_timeout
-        return @initial_options[:disctimeout] if @initial_options[:disctimeout]
+        return @discovery_timeout if @discovery_timeout
         return @client.discoverer.ddl.meta[:timeout]
       end
 
+      def discovery_timeout=(timeout)
+        @discovery_timeout = Float(timeout)
+
+        # we calculate the overall timeout from the DDL of the agent and
+        # the supplied discovery timeout unless someone specifically
+        # specifies a timeout to the constructor
+        #
+        # But if we also then specifically set a discovery_timeout on the
+        # agent that has to override the supplied timeout so we then
+        # calculate a correct timeout based on DDL timeout and the
+        # supplied discovery timeout
+        @timeout = @ddl.meta[:timeout] + discovery_timeout
+      end
+
+      # Sets the discovery method.  If we change the method there are a
+      # number of steps to take:
+      #
+      #  - set the new method
+      #  - if discovery options were provided, re-set those to initially
+      #    provided ones else clear them as they might now apply to a
+      #    different provider
+      #  - update the client options so it knows there is a new discovery
+      #    method in force
+      #  - reset discovery data forcing a discover on the next request
+      #
+      # The remaining item is the discovery timeout, we leave that as is
+      # since that is the user supplied timeout either via initial options
+      # or via specifically setting it on the client.
       def discovery_method=(method)
         @discovery_method = method
 
@@ -335,7 +364,7 @@ module MCollective
         end
 
         @client.options = options
-        @discovery_timeout = discovery_timeout
+
         reset
       end
 
@@ -520,7 +549,7 @@ module MCollective
       # Provides a normal options hash like you would get from
       # Optionparser
       def options
-        {:disctimeout => @discovery_timeout,
+        {:disctimeout => discovery_timeout,
          :timeout => @timeout,
          :verbose => @verbose,
          :filter => @filter,

data/spec/unit/pluginpackager/agent_definition_spec.rb

@@ -10,24 +10,36 @@ module MCollective
       end
 
       describe "#initialize" do
-        it "should replace spaces in the package name with dashes" do
+
+        before do
           AgentDefinition.any_instance.expects(:common)
+        end
+
+        it "should replace spaces in the package name with dashes" do
           agent = AgentDefinition.new(".", "test package", nil, nil, nil, nil, [], {}, "agent")
           agent.metadata[:name].should == "test-package"
         end
 
         it "should set dependencies if present" do
-          AgentDefinition.any_instance.expects(:common)
           agent = AgentDefinition.new(".", "test-package", nil, nil, nil, nil, [:name => "foo", :version => nil], {}, "agent")
           agent.dependencies.should == [{:name => "foo", :version => nil}, {:name => "mcollective-common", :version => nil}]
         end
 
         it "should set mc name and version" do
-          AgentDefinition.any_instance.expects(:common)
           agent = AgentDefinition.new(".", "test-package", nil, nil, nil, nil, [], {:mcname =>"pe-mcollective-common", :mcversion =>"1.2"}, "agent")
           agent.mcname.should == "pe-mcollective-common"
           agent.mcversion.should == "1.2"
         end
+
+        it "should replace underscored with dashes in the name" do
+          agent = AgentDefinition.new(".", "test_package", nil, nil, nil, nil, [], {:mcname =>"pe-mcollective-common", :mcversion =>"1.2"}, "agent")
+          agent.metadata[:name].should == "test-package"
+        end
+
+        it "should replace whitespaces with a single dash in the name" do
+          agent = AgentDefinition.new(".", "test    package", nil, nil, nil, nil, [], {:mcname =>"pe-mcollective-common", :mcversion =>"1.2"}, "agent")
+          agent.metadata[:name].should == "test-package"
+        end
       end
 
       describe "#identify_packages" do
@@ -77,8 +89,8 @@ module MCollective
           Dir.stubs(:glob).returns([])
 
           agent = AgentDefinition.new(".", nil, nil, nil, nil, nil, [], {}, "agent")
-          agent.packagedata[:agent][:dependencies].should == [{:name => "mcollective-common", :version => nil},
-                                                              {:name => "mcollective-foo-common", :version =>1, :iteration => 1}]
+          agent.packagedata[:agent][:dependencies].should == [{:name => "mcollective-common", :version => nil}]
+          agent.packagedata[:agent][:plugindependency].should == {:name => "mcollective-foo-common", :version =>1, :iteration => 1}
         end
       end
 
@@ -152,8 +164,8 @@ module MCollective
           Dir.expects(:glob).with("aggregatedir/*").returns(["aggregate.rb"])
 
           client = AgentDefinition.new(".", nil, nil, nil, nil, nil, [], {}, "agent")
-          client.packagedata[:client][:dependencies].should == [{:name => "mcollective-common", :version => nil},
-                                                                {:name => "mcollective-foo-common", :version => 1, :iteration => 1}]
+          client.packagedata[:client][:dependencies].should == [{:name => "mcollective-common", :version => nil}]
+          client.packagedata[:client][:plugindependency].should == {:name => "mcollective-foo-common", :version => 1, :iteration => 1}
         end
       end
     end

data/spec/unit/pluginpackager/standard_definition_spec.rb

@@ -26,6 +26,16 @@ module MCollective
           plugin.mcname.should == "pe-mcollective"
           plugin.mcversion.should == "1"
         end
+
+        it "should replace underscores with dashes in the name" do
+          plugin = StandardDefinition.new(".", "test_plugin", nil, nil, nil, nil, [], {:mcname => "pe-mcollective", :mcversion => "1"}, "testplugin")
+          plugin.metadata[:name].should == "test-plugin"
+        end
+
+        it "should replace whitespaces with a single dash in the name" do
+          plugin = StandardDefinition.new(".", "test  plugin", nil, nil, nil, nil, [], {:mcname => "pe-mcollective", :mcversion => "1"}, "testplugin")
+          plugin.metadata[:name].should == "test-plugin"
+        end
       end
 
       describe "#identify_packages" do
@@ -62,8 +72,8 @@ module MCollective
           Dir.expects(:glob).with("./testplugin/*").returns(["file.rb"])
           plugin = StandardDefinition.new(".", nil, nil, nil, nil, nil, [], {}, "testplugin")
           plugin.packagedata["testplugin"][:files].should == ["file.rb"]
-          plugin.packagedata["testplugin"][:dependencies].should == [{:name => "mcollective-common", :version => nil},
-                                                                     {:name => "mcollective-foo-common", :version => 1, :iteration => 1}]
+          plugin.packagedata["testplugin"][:dependencies].should == [{:name => "mcollective-common", :version => nil}]
+          plugin.packagedata["testplugin"][:plugindependency].should == {:name => "mcollective-foo-common", :version => 1, :iteration => 1}
         end
       end
 

data/spec/unit/plugins/mcollective/connector/stomp_spec.rb

@@ -50,6 +50,11 @@ module MCollective
       end
 
       describe "#initialize" do
+        it "should be deprecated" do
+          Log.expects(:info).with(regexp_matches(/please migrate to the/))
+          Stomp.new
+        end
+
         it "should set the @config variable" do
           c = Stomp.new
           c.instance_variable_get("@config").should == @config

data/spec/unit/rpc/client_spec.rb

@@ -50,6 +50,16 @@ module MCollective
 
           Client.new("foo", :options => {:config => "/nonexisting"})
         end
+
+        it "should default the discovery_timeout to nil" do
+          c = Client.new("rspec", :options => {:config => "/nonexisting"})
+          c.instance_variable_get("@discovery_timeout").should == nil
+        end
+
+        it "should accept a supplied discovery_timeout" do
+          c = Client.new("rspec", :options => {:config => "/nonexisting", :disctimeout => 10})
+          c.instance_variable_get("@discovery_timeout").should == 10
+        end
       end
 
       describe "#process_results_with_block" do
@@ -228,10 +238,16 @@ module MCollective
           @client.discovery_method = "rspec"
         end
 
-        it "should adjust discovery timeout for the new method" do
+        it "should adjust timeout for the new method" do
           @client.expects(:discovery_timeout).once.returns(1)
           @client.discovery_method = "rspec"
-          @client.instance_variable_get("@discovery_timeout").should == 1
+          @client.instance_variable_get("@timeout").should == 4
+        end
+
+        it "should preserve any user supplied discovery timeout" do
+          @client.discovery_timeout = 10
+          @client.discovery_method = "rspec"
+          @client.discovery_timeout.should == 10
         end
 
         it "should reset the rpc client" do
@@ -259,6 +275,21 @@ module MCollective
         end
       end
 
+      describe "#discovery_timeout=" do
+        it "should store the discovery timeout" do
+          @client.discovery_timeout = 10
+          @client.discovery_timeout.should == 10
+        end
+
+        it "should update the overall timeout with the new discovery timeout" do
+          @client.instance_variable_get("@timeout").should == 4
+
+          @client.discovery_timeout = 10
+
+          @client.instance_variable_get("@timeout").should == 12
+        end
+      end
+
       describe "#limit_method" do
         it "should force strings to symbols" do
           @client.limit_method = "first"

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: mcollective-client
 version: !ruby/object:Gem::Version 
-  hash: 3
+  hash: 1
   prerelease: 
   segments: 
   - 2
   - 2
-  - 2
-  version: 2.2.2
+  - 3
+  version: 2.2.3
 platform: ruby
 authors: 
 - R.I.Pienaar
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-01-17 00:00:00 Z
+date: 2013-02-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: systemu