jenkins_api_client 1.0.0.beta.2 → 1.0.0.beta.3

data/.travis.yml

@@ -1,26 +1,15 @@
 language: ruby
+
 rvm:
   - 2.0.0
   - 1.9.3
-  - jruby-19mode
-  - rbx-19mode
-matrix:
-  allow_failures:
-    - rvm: jruby-19mode
-    - rvm: rbx-19mode
-before_install:
-  - travis/setup.sh
 
 script:
   - bundle exec rake unit_tests
-  - bundle exec rake func_tests
-  - travis/setup_crumb.sh
-  - bundle exec rake func_tests
+
 notifications:
   webhooks: https://www.buildheroes.com/api/projects/588c9dffdc8f0deff4d89d87bf370e8dba8a8a95/builds
-  email: false
   irc:
-    on_success: change
-    on_failure: always
-    channels:
-      - "irc.freenode.org##jenkins-api-client"
+    channels: ["chat.freenode.net##jenkins-api-client"]
+    use_notice: true
+    skip_join: true

data/jenkins_api_client.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "jenkins_api_client"
-  s.version = "1.0.0.beta.2"
+  s.version = "1.0.0.beta.3"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Kannan Manickam"]
-  s.date = "2013-12-18"
+  s.date = "2014-01-25"
   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/client.rb

@@ -69,7 +69,7 @@ module JenkinsApi
     #
     # @option args [String] :server_ip the IP address of the Jenkins CI server
     # @option args [String] :server_port the port on which the Jenkins listens
-    # @option args [String] :server_url the full URL address of the Jenkins CI server (http/https)
+    # @option args [String] :server_url the full URL address of the Jenkins CI server (http/https). This can include username/password. :username/:password options will override any user/pass value in the URL
     # @option args [String] :username the username used for connecting to the server (optional)
     # @option args [String] :password the password or API Key for connecting to the CI server (optional)
     # @option args [String] :password_base64 the password with base64 encoded format for connecting to the CI
@@ -105,6 +105,20 @@ module JenkinsApi
           " to Jenkins"
       end
 
+      # Get info from the server_url, if we got one
+      if @server_url
+        server_uri = URI.parse(@server_url)
+        @server_ip = server_uri.host
+        @server_port = server_uri.port
+        @ssl = server_uri.scheme == "https"
+        @jenkins_path = server_uri.path
+
+        # read username and password from the URL
+        # only set if @username and @password are not already set via explicit options
+        @username ||= server_uri.user
+        @password ||= server_uri.password
+      end
+
       # Username/password are optional as some jenkins servers do not require
       # authentication
       if @username && !(@password || @password_base64)
@@ -115,15 +129,6 @@ module JenkinsApi
           " both left nil"
       end
 
-      # Get info from the server_url, if we got one
-      if @server_url
-        server_uri = URI.parse(@server_url)
-        @server_ip = server_uri.host
-        @server_port = server_uri.port
-        @ssl = server_uri.scheme == "https"
-        @jenkins_path = server_uri.path
-      end
-
       @jenkins_path ||= ""
       @jenkins_path.gsub!(/\/$/,"") # remove trailing slash if there is one
       @server_port = DEFAULT_SERVER_PORT unless @server_port
@@ -532,6 +537,22 @@ module JenkinsApi
       response["Date"]
     end
 
+    # Executes the provided groovy script on the Jenkins CI server
+    #
+    # @param [String] script_text The text of the groovy script to execute
+    #
+    # @return [String] The output of the executed groovy script
+    #
+    def exec_script(script_text)
+      url = URI.escape("#{@jenkins_path}/scriptText")
+      request = Net::HTTP::Post.new("#{url}")
+      request.form_data = { 'script' =>  script_text }
+      @logger.info "POST #{url}"
+
+      response = make_http_request(request)
+      handle_exception(response, 'body')
+    end
+
     # Execute the Jenkins CLI
     #
     # @param command [String] command name

data/lib/jenkins_api_client/version.rb

@@ -29,7 +29,7 @@ module JenkinsApi
     # Tiny version of the gem used for patches
     TINY    = 0
     # Used for pre-releases
-    PRE     = 'beta.2'
+    PRE     = 'beta.3'
     # Version String of Jenkins API Client.
     VERSION = [MAJOR, MINOR, TINY, PRE].compact.join('.')
   end

data/spec/func_tests/client_spec.rb

@@ -65,6 +65,12 @@ describe JenkinsApi::Client do
           @client.get_hudson_version.class.should == String
         end
       end
+
+      describe "#exec_script" do
+        it "Should execute the provided groovy script" do
+          @client.exec_script('println("hi")').should == "hi\n"
+        end
+      end
     end
 
     describe "SubClassAccessorMethods" do

data/spec/unit_tests/client_spec.rb

@@ -49,6 +49,26 @@ describe JenkinsApi::Client do
         ).not_to raise_error
       end
 
+      it "initializes the username and password from server_url" do
+        client = JenkinsApi::Client.new(
+          :server_url => 'http://someuser:asdf@localhost'
+        )
+
+        client.instance_variable_get('@username').should == 'someuser'
+        client.instance_variable_get('@password').should == 'asdf'
+      end
+
+      it "uses explicit username, password over one in the server_url" do
+        client = JenkinsApi::Client.new(
+          :server_url => 'http://someuser:asdf@localhost',
+          :username => 'otheruser',
+          :password => '1234'
+        )
+
+        client.instance_variable_get('@username').should == 'otheruser'
+        client.instance_variable_get('@password').should == '1234'
+      end
+
       it "initializes with proxy args without exception" do
         expect(
           lambda do
@@ -198,6 +218,13 @@ describe JenkinsApi::Client do
         end
       end
 
+      describe "#exec_script" do
+        it "is defined and should accept script to execute" do
+          @client.respond_to?(:exec_script).should be_true
+          @client.method(:exec_script).parameters.size.should == 1
+        end
+      end
+
       describe "#exec_cli" do
         it "is defined and should execute the CLI" do
           @client.respond_to?(:exec_cli).should be_true

data/spec/unit_tests/user_spec.rb

@@ -85,7 +85,7 @@ __USERLIST
       @client.should_receive(:logger).and_return(mock_logger)
       @client.should_receive(:timeout).and_return(mock_timeout)
       @client.stub(:api_get_request).with('/asynchPeople').and_return(PEOPLE_JSON)
-      @client.stub(:api_get_request).with('/user/Fred Flintstone').and_return(FRED_JSON)
+      @client.stub(:api_get_request).with('/user/Fred%20Flintstone').and_return(FRED_JSON)
       @client.stub(:api_get_request).with('/user/fred').and_return(FRED_JSON)
       @client.stub(:api_get_request).with('/user/wilma').and_return(WILMA_JSON)
       @user = JenkinsApi::Client::User.new(@client)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jenkins_api_client
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.2
+  version: 1.0.0.beta.3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-18 00:00:00.000000000 Z
+date: 2014-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri