jenkins_api_client 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 58d034d4ed3f397f82ac0db50f4bdd3f955e162c
-  data.tar.gz: 96e93335ff4401d5077def1902fe7211c054351b
+  metadata.gz: 7abcfd6bd7ac3400c06000f1d1caa93becb358fa
+  data.tar.gz: e4a2df8fd4b6d38543a298451ba784f93773d5b4
 SHA512:
-  metadata.gz: 7c286e0b68b5db499f97e2fac0545678127303d796c6bd29be9afabab715a23c6d4219b97b3b5e07427cfe818703a3bbe6dbf1e66caa3b56fd1a2e985fdd869c
-  data.tar.gz: 81ef02baf6791a223e5ba72337d4ecfd040d332c51660d1137628df691affac6b011851e04bd4f07b45a535281a36c4dad152650518f90bc0c77f2de5d7ad127
+  metadata.gz: 8a5eef38d0003108b8c0111347fee500a769f26217b2f2989074e540f99fbd9fb88d3511d946e4b93bd65d885eed661159f8a78980aac77082f77348098804de
+  data.tar.gz: a185e613312035062cb531f5623c7ad7b36064d1e8b55b8bf0f9ce4b36d9f1f8e489506291e5f00ca45fc883934d7d8fda9da2edc866fbac30e5db7e7013b6aa

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 
 rvm:
-  - 2.1.2
+  - 2.1.5
   - 1.9.3
 
 script:

data/CHANGELOG.md

@@ -4,6 +4,20 @@ CHANGELOG
 upcoming
 --------
 
+v1.4.0   [08-JUN-2015]
+----------------------
+* [#161][] Fix job#build method when true/false values are passed as timeout parameter. Credit: [@jlucasps][]
+* [#172][] Promotion plugin config support. Credit: [@AndrewHanes][]
+* [#168][] Added ability to pass "tree" parameter to the Job#get_builds call. Credit: [@bkon][]
+* [#169][] Add optional parameters to cli job build. Credit: [@cyrez][]
+* [#167][] Add ability to override the default logger. Credit: [@gpetras][]
+* [#174][] Use the specified client ssl when downloading artifacts. Credit: [@paulgeringer][]
+* [#165][] Fix for is_offline? bug reporting all nodes as being offline. Credit: [@bsnape][]
+* [#176][] Add ability to delete a promotion configuration. Credit: [@l8nite][]
+* [#59][] Add capability to take the node offline and online. Credit: [@stjohnjohnson][]
+* [#177][] Add ability to create promotion processes. Credit: [@AndrewHanes][]
+* [#179][] Clean up Node calls to make only one call for the computer item. Credit: [@stjohnjohnson][]
+
 v1.3.0   [03-JAN-2015]
 ----------------------
 * [#159][] Add ability to configure git tool for a job. Credit: [@hubert][]
@@ -276,6 +290,7 @@ v0.0.1  [15-OCT-2012]
 [#23]: https://github.com/arangamani/jenkins_api_client/issues/23
 [#27]: https://github.com/arangamani/jenkins_api_client/issues/27
 [#42]: https://github.com/arangamani/jenkins_api_client/issues/42
+[#59]: https://github.com/arangamani/jenkins_api_client/issues/59
 [#85]: https://github.com/arangamani/jenkins_api_client/issues/85
 [#106]: https://github.com/arangamani/jenkins_api_client/issues/106
 [#112]: https://github.com/arangamani/jenkins_api_client/issues/112
@@ -300,28 +315,46 @@ v0.0.1  [15-OCT-2012]
 [#157]: https://github.com/arangamani/jenkins_api_client/issues/157
 [#158]: https://github.com/arangamani/jenkins_api_client/issues/158
 [#159]: https://github.com/arangamani/jenkins_api_client/issues/159
+[#161]: https://github.com/arangamani/jenkins_api_client/issues/161
 [#163]: https://github.com/arangamani/jenkins_api_client/issues/163
+[#165]: https://github.com/arangamani/jenkins_api_client/issues/165
+[#167]: https://github.com/arangamani/jenkins_api_client/issues/167
+[#168]: https://github.com/arangamani/jenkins_api_client/issues/168
+[#169]: https://github.com/arangamani/jenkins_api_client/issues/169
+[#172]: https://github.com/arangamani/jenkins_api_client/issues/172
+[#174]: https://github.com/arangamani/jenkins_api_client/issues/174
+[#176]: https://github.com/arangamani/jenkins_api_client/issues/176
+[#177]: https://github.com/arangamani/jenkins_api_client/issues/177
+[#179]: https://github.com/arangamani/jenkins_api_client/issues/179
+[@AndrewHanes]: https://github.com/AndrewHanes
 [@Loa]: https://github.com/Loa
 [@Niarfe]: https://github.com/Niarfe
+[@bkon]: https://github.com/bkon
 [@bobbrez]: https://github.com/bobbrez
 [@brettporter]: https://github.com/brettporter
+[@bsnape]: https://github.com/bsnape
 [@chilicheech]: https://github.com/chilicheech
 [@client]: https://github.com/client
 [@cylol]: https://github.com/cylol
 [@cynipe]: https://github.com/cynipe
+[@cyrez]: https://github.com/cyrez
 [@dieterdemeyer]: https://github.com/dieterdemeyer
 [@dkerwin]: https://github.com/dkerwin
 [@dougforpres]: https://github.com/dougforpres
 [@drnic]: https://github.com/drnic
+[@gpetras]: https://github.com/gpetras
 [@hubert]: https://github.com/hubert
+[@jlucasps]: https://github.com/jlucasps
 [@joelneubert]: https://github.com/joelneubert
 [@kevinhcross]: https://github.com/kevinhcross
+[@l8nite]: https://github.com/l8nite
 [@lheinlen-os]: https://github.com/lheinlen-os
 [@madisp]: https://github.com/madisp
 [@mattrose]: https://github.com/mattrose
 [@missedone]: https://github.com/missedone
 [@n-rodriguez]: https://github.com/n-rodriguez
 [@notruthless]: https://github.com/notruthless
+[@paulgeringer]: https://github.com/paulgeringer
 [@riywo]: https://github.com/riywo
 [@rubytester]: https://github.com/rubytester
 [@scotje]: https://github.com/scotje

data/jenkins_api_client.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: jenkins_api_client 1.3.0 ruby lib
+# stub: jenkins_api_client 1.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "jenkins_api_client"
-  s.version = "1.3.0"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Kannan Manickam"]
-  s.date = "2015-01-03"
+  s.date = "2015-06-09"
   s.description = "\nThis is a simple and easy-to-use Jenkins Api client with features focused on\nautomating Job configuration programaticaly and so forth"
   s.email = ["arangamani.kannan@gmail.com"]
   s.executables = ["jenkinscli"]

data/lib/jenkins_api_client/cli/job.rb

@@ -61,9 +61,11 @@ module JenkinsApi
       #
       # @param [String] job Name of the job
       #
+      option :params, :type => :hash, :default => {}
+      option :opts, :type => :hash, :default => {}
       def build(job)
         @client = Helper.setup(parent_options)
-        @client.job.build(job)
+        @client.job.build(job, options[:params], options[:opts])
       end
 
       desc "status JOB", "Get the current build status of a job"

data/lib/jenkins_api_client/client.rb

@@ -57,6 +57,7 @@ module JenkinsApi
       "username",
       "password",
       "password_base64",
+      "logger",
       "log_location",
       "log_level",
       "timeout",
@@ -90,6 +91,7 @@ module JenkinsApi
     # @option args [Boolean] :follow_redirects this argument causes the client to follow a redirect (jenkins can
     #   return a 30x when starting a build)
     # @option args [Fixnum] :timeout (120) This argument sets the timeout for operations that take longer (in seconds)
+    # @option args [Logger] :logger a Logger object, used to override the default logger (optional)
     # @option args [String] :log_location (STDOUT) the location for the log file
     # @option args [Fixnum] :log_level (Logger::INFO) The level for messages to be logged. Should be one of:
     #   Logger::DEBUG (0), Logger::INFO (1), Logger::WARN (2), Logger::ERROR (2), Logger::FATAL (3)
@@ -100,6 +102,7 @@ module JenkinsApi
     # @raise [ArgumentError] when required options are not provided.
     #
     def initialize(args)
+      args = symbolize_keys(args)
       args.each do |key, value|
         if value && VALID_PARAMS.include?(key.to_s)
           instance_variable_set("@#{key}", value)
@@ -145,11 +148,16 @@ module JenkinsApi
       @ssl ||= false
 
       # Setting log options
-      @log_location = STDOUT unless @log_location
-      @log_level = Logger::INFO unless @log_level
-      @logger = Logger.new(@log_location)
-      @logger.level = @log_level
-
+      if @logger
+        raise ArgumentError, "logger parameter must be a Logger object" unless @logger.is_a?(Logger)
+        raise ArgumentError, "log_level should not be set if using custom logger" if @log_level
+        raise ArgumentError, "log_location should not be set if using custom logger" if @log_location
+      else
+        @log_location = STDOUT unless @log_location
+        @log_level = Logger::INFO unless @log_level
+        @logger = Logger.new(@log_location)
+        @logger.level = @log_level
+      end
 
       # Base64 decode inserts a newline character at the end. As a workaround
       # added chomp to remove newline characters. I hope nobody uses newline
@@ -260,7 +268,7 @@ module JenkinsApi
       uri = URI.parse(@artifact)
       http = Net::HTTP.new(uri.host, uri.port)
       http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      http.use_ssl = true
+      http.use_ssl = @ssl
       request = Net::HTTP::Get.new(uri.request_uri)
       request.basic_auth(@username, @password)
       response = http.request(request)
@@ -363,6 +371,8 @@ module JenkinsApi
     #
     # @param [String] url_prefix The prefix to be used in the URL
     # @param [Hash] form_data Form data to send with POST request
+    # @param [Boolean] raw_response Return complete Response object instead of
+    #   JSON body of response
     #
     # @return [String] Response code form Jenkins Response
     #
@@ -683,6 +693,25 @@ module JenkinsApi
       end
     end
 
+    # Private method.  Converts keys passed in as strings into symbols.
+    #
+    # @param hash [Hash] Hash containing arguments to login to jenkins.
+    #
+    def symbolize_keys(hash)
+      hash.inject({}){|result, (key, value)|
+        new_key = case key
+          when String then key.to_sym
+          else key
+          end
+        new_value = case value
+          when Hash then symbolize_keys(value)
+          else value
+          end
+        result[new_key] = new_value
+        result
+      }
+    end
+
     # Private method that handles the exception and raises with proper error
     # message with the type of exception and returns the required values if no
     # exceptions are raised.

data/lib/jenkins_api_client/job.rb

@@ -324,7 +324,7 @@ module JenkinsApi
               "#{params[:block_build_when_downstream_building]}")
             xml.blockBuildWhenUpstreamBuilding(
               "#{params[:block_build_when_upstream_building]}")
-            xml.triggers.vector do 
+            xml.triggers.vector do
               if params[:timer]
                 xml.send("hudson.triggers.TimerTrigger") do
                   xml.spec params[:timer]
@@ -360,7 +360,7 @@ module JenkinsApi
             xml.buildWrappers
           end
         end
-        
+
         xml_doc = Nokogiri::XML(builder.to_xml)
         plugin_collection.configure(xml_doc).to_xml
       end
@@ -449,7 +449,7 @@ module JenkinsApi
       # @option artifact_params [Boolean] :default_excludes (false)
       #   exclude defaults automatically
       #
-      # @return [Nokogiri::XML::Builder] 
+      # @return [Nokogiri::XML::Builder]
       #
       def artifact_archiver(artifact_params, xml)
         return xml if artifact_params.nil?
@@ -712,9 +712,12 @@ module JenkinsApi
       #
       # @param [String] job_name
       #
-      def get_builds(job_name)
+      def get_builds(job_name, options = {})
         @logger.info "Obtaining the build details of '#{job_name}'"
-        response_json = @client.api_get_request("/job/#{path_encode job_name}")
+        url = "/job/#{path_encode job_name}"
+
+        tree = options[:tree] || nil
+        response_json = @client.api_get_request url, tree_string(tree)
         response_json["builds"]
       end
 
@@ -827,9 +830,9 @@ module JenkinsApi
       # @return [String] HTTP response code (per prev. behavior) (NO TIMEOUT SPECIFIED)
       #
       def build(job_name, params={}, opts = {})
-        if opts.nil? || opts.class.is_a?(FalseClass)
+        if opts.nil? || opts.is_a?(FalseClass)
           opts = {}
-        elsif opts.class.is_a?(TrueClass)
+        elsif opts.is_a?(TrueClass)
           opts = { 'build_start_timeout' => @client_timeout }
         end
 
@@ -1494,6 +1497,52 @@ module JenkinsApi
         result
       end
 
+
+      # Create a new promotion process
+      #
+      # This must be called before set/get promote config can be used on a process
+      #
+      # Must be called after updating the job's config
+      # @param  [String] job_name
+      # @param  [String] process The process name
+      # @return [String] Process config
+      def init_promote_process(job_name, process, config)
+        @logger.info "Creating new process #{process} for job #{job_name}"
+        @client.post_config("/job/#{job_name}/promotion/createProcess?name=#{process}", config)
+      end
+
+
+      # Get a job's promotion config
+      #
+      # @param  [String] job_name
+      # @param  [String] process The process name
+      # @return [String] Promote config
+      def get_promote_config(job_name, process)
+        @logger.info "Getting promote config for job '#{job_name}' process '#{process}'"
+        @client.get_config("/job/#{job_name}/promotion/process/#{process}/config.xml")
+      end
+
+      # Set a job's promotion config
+      #
+      # @param  [String] job_name
+      # @param  [String] process The process name
+      # @param  [String] Job config
+      # @return nil
+      def set_promote_config(job_name, process, config)
+        @logger.info "Setting promote config for job '#{job_name}' process '#{process}' to #{config}"
+        @client.post_config("/job/#{job_name}/promotion/process/#{process}/config.xml", config)
+      end
+
+      # Delete a job's promotion config
+      #
+      # @param [String] job_name
+      # @param [String] process The process name
+      # @return nil
+      def delete_promote_config(job_name, process)
+        @logger.info "Deleting promote config for job '#{job_name}' process '#{process}'"
+        @client.post_config("/job/#{job_name}/promotion/process/#{process}/doDelete")
+      end
+
       #A Method to find artifacts path from the Current Build
       #
       # @param [String] job_name
@@ -1741,6 +1790,11 @@ module JenkinsApi
           }
         }
       end
+
+      def tree_string tree_value
+        return nil unless tree_value
+        "tree=#{tree_value}"
+      end
     end
   end
 end

data/lib/jenkins_api_client/node.rb

@@ -244,7 +244,7 @@ module JenkinsApi
       GENERAL_ATTRIBUTES.each do |meth_suffix|
         define_method("get_#{meth_suffix}") do
           @logger.info "Obtaining '#{meth_suffix}' attribute from jenkins"
-          response_json = @client.api_get_request("/computer")
+          response_json = @client.api_get_request("/computer", "tree=#{path_encode meth_suffix}")
           response_json["#{meth_suffix}"]
         end
       end
@@ -254,8 +254,9 @@ module JenkinsApi
       NODE_PROPERTIES.each do |meth_suffix|
         define_method("is_#{meth_suffix}?") do |node_name|
           @logger.info "Obtaining '#{meth_suffix}' property of '#{node_name}'"
-          response_json = @client.api_get_request("/computer")
-          resp = response_json["computer"][index(node_name)]["#{meth_suffix}"]
+          node_name = "(master)" if node_name == "master"
+          response_json = @client.api_get_request("/computer/#{path_encode node_name}", "tree=#{path_encode meth_suffix}")
+          resp = response_json["#{meth_suffix}"].to_s
           resp =~ /False/i ? false : true
         end
       end
@@ -264,8 +265,9 @@ module JenkinsApi
       NODE_ATTRIBUTES.each do |meth_suffix|
         define_method("get_node_#{meth_suffix}") do |node_name|
           @logger.info "Obtaining '#{meth_suffix}' attribute of '#{node_name}'"
-          response_json = @client.api_get_request("/computer")
-          response_json["computer"][index(node_name)]["#{meth_suffix}"]
+          node_name = "(master)" if node_name == "master"
+          response_json = @client.api_get_request("/computer/#{path_encode node_name}", "tree=#{path_encode meth_suffix}")
+          response_json["#{meth_suffix}"]
         end
       end
 
@@ -292,7 +294,7 @@ module JenkinsApi
       def get_config(node_name)
         @logger.info "Obtaining the config.xml of node '#{node_name}'"
         node_name = "(master)" if node_name == "master"
-        @client.get_config("/computer/#{ path_encode node_name}")
+        @client.get_config("/computer/#{path_encode node_name}")
       end
 
       # Posts the given config.xml to the Jenkins node
@@ -306,6 +308,22 @@ module JenkinsApi
         @client.post_config("/computer/#{path_encode node_name}/config.xml", xml)
       end
 
+      # Toggles the temporarily offline state of the Jenkins node
+      #
+      # @param [String] node_name name of the node
+      # @param [String] reason Offline reason why the node is offline
+      #
+      def toggle_temporarilyOffline(node_name, reason="")
+        @logger.info "Toggling the temporarily offline status of of node '#{node_name}' with reason '#{reason}'"
+        node_name = "(master)" if node_name == "master"
+        previous_state = is_temporarilyOffline?(node_name)
+        @client.api_post_request("/computer/#{path_encode node_name}/toggleOffline?offlineMessage=#{path_encode reason}")
+        new_state = is_temporarilyOffline?(node_name)
+        if new_state == previous_state
+          raise "The specified node '#{node_name}' was unable to change offline state."
+        end
+        new_state
+      end
     end
   end
 end

data/lib/jenkins_api_client/version.rb

@@ -25,7 +25,7 @@ module JenkinsApi
     # Major version of the gem
     MAJOR   = 1
     # Minor version of the gem
-    MINOR   = 3
+    MINOR   = 4
     # Tiny version of the gem used for patches
     TINY    = 0
     # Used for pre-releases

data/scripts/login_with_irb.rb

@@ -38,8 +38,9 @@ else
 end
 
 begin
-  client_opts = YAML.load_file(File.expand_path(config_file))
-  unless client_opts.has_key?(:username)
+  client_opts = Hash[YAML.load_file(File.expand_path(config_file)).map { | (k,v) | [k.to_sym, v]} ]
+
+  unless client_opts.has_key?(:username) 
     client_opts[:username] = prompt_for_username()
   end
   unless client_opts.has_key?(:password) or client_opts.has_key?(:password_base64)

data/spec/unit_tests/client_spec.rb

@@ -420,4 +420,52 @@ describe JenkinsApi::Client do
       end
     end
   end
+
+  context "With logging configuration" do
+
+    it "Should fail if logger is not a Logger object" do
+      expect(
+        lambda do
+          JenkinsApi::Client.new({
+            :server_ip => '127.0.0.1',
+            :logger    => 'testing',
+          })
+        end
+      ).to raise_error
+    end
+
+    it "Should set logger instance variable to Logger" do
+      client = JenkinsApi::Client.new(
+        :server_ip => '127.0.0.1',
+        :logger    => Logger.new(STDOUT),
+      )
+
+      client.instance_variable_get('@logger').class.should == Logger
+    end
+
+    it "Should fail if logger and log_level are both set" do
+      expect(
+        lambda do
+          JenkinsApi::Client.new({
+            :server_ip => '127.0.0.1',
+            :logger    => Logger.new(STDOUT),
+            :log_level => Logger::INFO,
+          })
+        end
+      ).to raise_error
+    end
+
+    it "Should fail if logger and log_location are both set" do
+      expect(
+        lambda do
+          JenkinsApi::Client.new({
+            :server_ip    => '127.0.0.1',
+            :logger       => Logger.new(STDOUT),
+            :log_location => 'test.log',
+          })
+        end
+      ).to raise_error
+    end
+
+  end
 end

data/spec/unit_tests/job_spec.rb

@@ -400,15 +400,31 @@ describe JenkinsApi::Client::Job do
         ### OLD NON-QUEUE RESPONSE JENKINS ###
         # Next tests confirm it deals with different jenkins versions and waits
         # for build to start (or not)
-        it "accepts the job name and builds the job (w/timeout)" do
-          @client.should_receive(:api_get_request).with(
-            "/job/test_job").and_return({})
+        context "accepts the job name and builds the job (w/timeout)" do
+          before do
+            @client.should_receive(:api_get_request).with(
+              "/job/test_job").and_return({})
+            @client.should_receive(:api_post_request).with(
+              "/job/test_job/build", {}, true).and_return(FakeResponse.new(302))
+            @client.should_receive(:api_get_request).with(
+              "/job/test_job/1/").and_return({})
+            @client.should_receive(:get_jenkins_version).and_return("1.1")
+          end
+
+          it "passes a number of seconds for timeout in opts={} parameter" do
+            @job.build("test_job", {}, {'build_start_timeout' => 10}).should == 1
+          end
+
+          it "passes a true value for timeout in opts={} parameter" do
+            @job.instance_variable_set :@client_timeout, 10
+            @job.build("test_job", {}, true).should == 1
+          end
+        end
+
+        it "accepts the job name and builds the job (with a false timeout value)" do
           @client.should_receive(:api_post_request).with(
             "/job/test_job/build", {}, true).and_return(FakeResponse.new(302))
-          @client.should_receive(:api_get_request).with(
-            "/job/test_job/1/").and_return({})
-          @client.should_receive(:get_jenkins_version).and_return("1.1")
-          @job.build("test_job", {}, {'build_start_timeout' => 10}).should == 1
+          @job.build("test_job", {}, false).should == "302"
         end
 
         # wait for build to start (or not) (initial response will fail)
@@ -616,6 +632,27 @@ describe JenkinsApi::Client::Job do
         end
       end
 
+      describe "#get_promote_config" do
+        it "accepts name and process and returns promotion config" do
+          @client.should_receive(:get_config).with('/job/testjob/promotion/process/promo/config.xml')
+          @job.get_promote_config('testjob', 'promo')
+        end
+      end
+
+      describe "#set_promote_config" do
+        it "accepts name, process and config." do
+          @client.should_receive(:post_config).with('/job/testjob/promotion/process/promo/config.xml', 'xml')
+          @job.set_promote_config('testjob', 'promo', 'xml')
+        end
+      end
+
+      describe "#delete_promote_config" do
+        it "accepts name and process and deletes promotion config" do
+          @client.should_receive(:post_config).with('/job/testjob/promotion/process/promo/doDelete')
+          @job.delete_promote_config('testjob', 'promo')
+        end
+      end
+
       describe '#scm_git' do
         before do
           @job.send(:scm_git, {

data/spec/unit_tests/node_spec.rb

@@ -7,11 +7,32 @@ describe JenkinsApi::Client::Node do
       mock_logger = Logger.new "/dev/null"
       @client.should_receive(:logger).and_return(mock_logger)
       @node = JenkinsApi::Client::Node.new(@client)
-      @sample_json_computer_response = {
+      @sample_json_list_response = {
         "computer" => [
           "displayName" => "slave"
         ]
       }
+      @sample_json_computer_response = {
+        "displayName" => "slave"
+      }
+      @offline_slave                 = {
+        "displayName"        => "slave",
+        "offline"            => true,
+        "temporarilyOffline" => true,
+      }
+      @online_slave                  = {
+        "displayName"        => "slave",
+        "offline"            => false,
+        "temporarilyOffline" => false,
+      }
+      @offline_slave_in_string       = {
+        "displayName" => "slave",
+        "offline"     => "true",
+      }
+      @online_slave_in_string        = {
+        "displayName" => "slave",
+        "offline"     => "false",
+      }
       computer_sample_xml_filename = '../fixtures/files/computer_sample.xml'
       @sample_computer_xml = File.read(
         File.expand_path(computer_sample_xml_filename , __FILE__)
@@ -91,7 +112,7 @@ describe JenkinsApi::Client::Node do
           ).with(
             "/computer"
           ).and_return(
-            @sample_json_computer_response
+            @sample_json_list_response
           )
           @client.should_receive(
             :api_post_request
@@ -109,7 +130,7 @@ describe JenkinsApi::Client::Node do
           ).with(
             "/computer"
           ).and_return(
-            @sample_json_computer_response
+            @sample_json_list_response
           )
           expect(
             lambda{ @node.delete(slave_name) }
@@ -121,8 +142,10 @@ describe JenkinsApi::Client::Node do
         it "accepts filter and lists all nodes matching the filter" do
           @client.should_receive(
             :api_get_request
+          ).with(
+            "/computer"
           ).and_return(
-            @sample_json_computer_response
+            @sample_json_list_response
           )
           @node.list("slave").class.should == Array
         end
@@ -135,8 +158,11 @@ describe JenkinsApi::Client::Node do
             it "should get the #{attribute} attribute" do
               @client.should_receive(
                 :api_get_request
+              ).with(
+                "/computer",
+                "tree=#{attribute}"
               ).and_return(
-                @sample_json_computer_response
+                @sample_json_list_response
               )
               @node.method("get_#{attribute}").call
             end
@@ -151,15 +177,80 @@ describe JenkinsApi::Client::Node do
             it "should get the #{property} property" do
               @client.should_receive(
                 :api_get_request
-              ).twice.and_return(
+              ).with(
+                "/computer/slave",
+                "tree=#{property}"
+              ).and_return(
                 @sample_json_computer_response
               )
               @node.method("is_#{property}?").call("slave")
             end
+
+            it "should get the #{property} property for master" do
+              @client.should_receive(
+                :api_get_request
+              ).with(
+                "/computer/(master)",
+                "tree=#{property}"
+              ).and_return(
+                @sample_json_computer_response
+              )
+              @node.method("is_#{property}?").call("master")
+            end
           end
         end
       end
 
+      describe 'is_offline?' do
+        it "returns true if the node is offline" do
+          @client.should_receive(
+            :api_get_request
+          ).with(
+            "/computer/slave",
+            "tree=offline"
+          ).and_return(
+            @offline_slave
+          )
+          @node.method("is_offline?").call("slave").should be_true
+        end
+
+        it "returns false if the node is online" do
+          @client.should_receive(
+            :api_get_request
+          ).with(
+            "/computer/slave",
+            "tree=offline"
+          ).and_return(
+            @online_slave
+          )
+          @node.method("is_offline?").call("slave").should be_false
+        end
+
+        it "returns false if the node is online and have a string value on its attr" do
+          @client.should_receive(
+            :api_get_request
+          ).with(
+            "/computer/slave",
+            "tree=offline"
+          ).and_return(
+            @offline_slave_in_string
+          )
+          @node.method("is_offline?").call("slave").should be_true
+        end
+
+        it "returns false if the node is online and have a string value on its attr" do
+          @client.should_receive(
+            :api_get_request
+          ).with(
+            "/computer/slave",
+            "tree=offline"
+          ).and_return(
+            @online_slave_in_string
+          )
+          @node.method("is_offline?").call("slave").should be_false
+        end
+      end
+
       describe "NodeAttributes" do
         node_attributes = JenkinsApi::Client::Node::NODE_ATTRIBUTES
         node_attributes.each do |attribute|
@@ -167,11 +258,26 @@ describe JenkinsApi::Client::Node do
             it "should get the #{attribute} node attribute" do
               @client.should_receive(
                 :api_get_request
-              ).twice.and_return(
+              ).with(
+                "/computer/slave",
+                "tree=#{attribute}"
+              ).and_return(
                 @sample_json_computer_response
               )
               @node.method("get_node_#{attribute}").call("slave")
             end
+
+            it "should get the #{attribute} node attribute for master" do
+              @client.should_receive(
+                :api_get_request
+              ).with(
+                "/computer/(master)",
+                "tree=#{attribute}"
+              ).and_return(
+                @sample_json_computer_response
+              )
+              @node.method("get_node_#{attribute}").call("master")
+            end
           end
         end
       end
@@ -194,6 +300,43 @@ describe JenkinsApi::Client::Node do
         end
       end
 
+      describe "#toggle_temporarilyOffline" do
+        it "successfully toggles an offline status of a node" do
+          @client.should_receive(:api_post_request).with(
+            "/computer/slave/toggleOffline?offlineMessage=foo%20bar"
+          ).and_return("302")
+          @client.should_receive(
+            :api_get_request
+          ).with(
+            "/computer/slave",
+            "tree=temporarilyOffline"
+          ).and_return(
+            @offline_slave,
+            @online_slave
+          )
+          @node.method("toggle_temporarilyOffline").call("slave", "foo bar").should be_false
+        end
+
+        it "fails to toggle an offline status of a node" do
+          @client.should_receive(:api_post_request).with(
+            "/computer/slave/toggleOffline?offlineMessage=foo%20bar"
+          ).and_return("302")
+          @client.should_receive(
+            :api_get_request
+          ).with(
+            "/computer/slave",
+            "tree=temporarilyOffline"
+          ).and_return(
+            @online_slave,
+            @online_slave
+          )
+          expect(
+            lambda{
+              @node.toggle_temporarilyOffline("slave", "foo bar")
+            }
+          ).to raise_error
+        end
+      end
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_api_client
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Kannan Manickam
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-03 00:00:00.000000000 Z
+date: 2015-06-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri