Merge branch 'master' into patch-1

Author: grosser

.github/workflows/continuous_integration.yml

@@ -0,0 +1,37 @@
+name: CI
+
+on:
+  push:
+    branches: [master]
+  pull_request:
+    branches: [master]
+  workflow_dispatch:
+
+jobs:
+  continuous_integration_build:
+    continue-on-error: true
+    strategy:
+      fail-fast: false
+      matrix:
+        ruby: [2.7, 3.0, 3.2, head]
+        operating-system: [ubuntu-latest]
+
+    name: Ruby ${{ matrix.ruby }} on ${{ matrix.operating-system }}
+
+    runs-on: ${{ matrix.operating-system }}
+
+    steps:
+      - name: Checkout Code
+        uses: actions/checkout@v3
+
+      - name: Setup Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+
+      - name: Run Build
+        run: bundle exec rake build
+
+      - name: Test Gem
+        run: bundle exec rake unit_tests

.travis.yml

@@ -1,10 +1,12 @@
 language: ruby
 
 rvm:
-  - 2.2.9
-  - 2.3.6
-  - 2.4.3
-  - 2.5.0
+  - 2.2.10
+  - 2.3.8
+  - 2.4.10
+  - 2.5.8
+  - 2.6.6
+  - 2.7.1
 
 script:
   - bundle exec rake unit_tests

Gemfile

@@ -10,4 +10,5 @@ group :development do
   gem "yard"
   gem "pry"
   gem "rake"
+  gem "bump"
 end

README.md

@@ -454,8 +454,4 @@ FEATURE REQUEST:
 
 If you use this gem for your project and you think it would be nice to have a
 particular feature that is presently not implemented, I would love to hear that
-and consider working on it. Just open an issue in GitHub as a feature request.
-
-
-[![Bitdeli Badge](https://d2weczhvl823v0.cloudfront.net/arangamani/jenkins_api_client/trend.png)](https://bitdeli.com/free "Bitdeli Badge")
-
+and consider working on it. Just open an issue in GitHub as a feature request.

Rakefile

@@ -6,23 +6,20 @@ require 'yard'
 require 'bundler/setup'
 require 'bundler/gem_tasks'
 require 'rubygems/package_task'
-
+require 'bump/tasks'
 
 require 'rspec/core'
 require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new(:unit_tests) do |spec|
-  spec.pattern = FileList['spec/unit_tests/*_spec.rb']
-  spec.rspec_opts = ['--color', '--format documentation']
+  spec.pattern = 'spec/unit_tests/*_spec.rb'
 end
 
 RSpec::Core::RakeTask.new(:func_tests) do |spec|
-  spec.pattern = FileList['spec/func_tests/*_spec.rb']
-  spec.rspec_opts = ['--color', '--format documentation']
+  spec.pattern = 'spec/func_tests/*_spec.rb'
 end
 
 RSpec::Core::RakeTask.new(:test) do |spec|
-  spec.pattern = FileList['spec/*/*.rb']
-  spec.rspec_opts = ['--color', '--format documentation']
+  spec.pattern = 'spec/*/*.rb'
 end
 
 YARD::Config.load_plugin 'thor'
@@ -86,4 +83,4 @@ namespace :doc do
   end
 end
 
-task :default => [:unit_tests]
+task default: :unit_tests

jenkins_api_client.gemspec

@@ -6,17 +6,13 @@ Gem::Specification.new do |s|
   s.name = "jenkins_api_client"
   s.version = ::JenkinsApi::Client::VERSION
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.require_paths = ["lib"]
   s.authors = ["Kannan Manickam"]
   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 = ["[email protected]"]
   s.executables = ['jenkinscli']
   s.files         = `git ls-files -z`.split("\x0").select { |f| f.match(%r{lib/|bin/|java_deps/|gemspec}) }
-  s.require_paths = ['lib']
   s.homepage = 'https://github.com/arangamani/jenkins_api_client'
-  s.required_ruby_version = ::Gem::Requirement.new('~> 2.1')
-  s.rubygems_version = "2.4.5.1"
+  s.required_ruby_version = '>= 2.7'
   s.summary = "Jenkins JSON API Client"
   s.licenses = ["MIT"]
 
@@ -26,5 +22,5 @@ Gem::Specification.new do |s|
   s.add_dependency 'mixlib-shellout', '>= 1.1.0'
   s.add_dependency 'socksify', '>= 1.7.0'
   s.add_dependency 'json', '>= 1.0'
+  s.add_dependency 'addressable', '~> 2.7'
 end
-

lib/jenkins_api_client/job.rb

@@ -1687,7 +1687,7 @@ def artifact_exists?(job_name, build_number = 0)
       def find_artifacts(job_name, build_number = nil)
         response_json       = get_build_details(job_name, build_number)
         artifact_path(build_details: response_json).map do |p|
-          URI.escape("#{response_json['url']}artifact/#{p['relativePath']}")
+          path_encode("#{response_json['url']}artifact/#{p['relativePath']}")
         end
       end
 

lib/jenkins_api_client/urihelper.rb

@@ -1,4 +1,5 @@
 require 'uri'
+require 'addressable/uri'
 
 module JenkinsApi
   module UriHelper
@@ -11,7 +12,7 @@ def form_encode(string)
     # Encode a string for use in the hiearchical part of an URL
     #
     def path_encode(path)
-      URI.escape(path.encode(Encoding::UTF_8))
+      Addressable::URI.escape(path.encode(Encoding::UTF_8))
     end
   end
 end

lib/jenkins_api_client/version.rb

@@ -22,15 +22,7 @@
 
 module JenkinsApi
   class Client
-    # Major version of the gem
-    MAJOR   = 1
-    # Minor version of the gem
-    MINOR   = 5
-    # Tiny version of the gem used for patches
-    TINY    = 3
-    # Used for pre-releases
-    PRE     = nil
     # Version String of Jenkins API Client.
-    VERSION = [MAJOR, MINOR, TINY, PRE].compact.join('.')
+    VERSION = "2.0.0"
   end
 end

spec/func_tests/client_spec.rb

@@ -32,14 +32,14 @@
           client1 = JenkinsApi::Client.new(
             YAML.load_file(File.expand_path(@creds_file, __FILE__))
           )
-          client1.class.should == JenkinsApi::Client
+          expect(client1.class).to eq JenkinsApi::Client
         end
 
         it "Should accept a YAML argument when creating a new client" do
           client3 = JenkinsApi::Client.new(
             YAML.load_file(File.expand_path(@creds_file, __FILE__))
           )
-          client3.class.should == JenkinsApi::Client
+          expect(client3.class).to eq JenkinsApi::Client
         end
 
         it "Should fail if wrong credentials are given" do
@@ -49,58 +49,56 @@
             :password => 'hacked',
             :log_location => '/dev/null'
           )
-          expect(
-            lambda { client2.job.list_all }
-          ).to raise_error(JenkinsApi::Exceptions::Unauthorized)
+          expect{ client2.job.list_all }.to raise_error(JenkinsApi::Exceptions::Unauthorized)
         end
       end
       describe "#get_jenkins_version" do
         it "Should the jenkins version" do
-          @client.get_jenkins_version.class.should == String
+          expect(@client.get_jenkins_version.class).to eq String
         end
       end
 
       describe "#get_hudson_version" do
         it "Should get the hudson version" do
-          @client.get_hudson_version.class.should == String
+          expect(@client.get_hudson_version.class).to eq String
         end
       end
 
       describe "#exec_script" do
         it "Should execute the provided groovy script" do
-          @client.exec_script('println("hi")').should == "hi\n"
+          expect(@client.exec_script('println("hi")')).to eq "hi\n"
         end
       end
     end
 
     describe "SubClassAccessorMethods" do
       describe "#job" do
         it "Should return a job object on call" do
-          @client.job.class.should == JenkinsApi::Client::Job
+          expect(@client.job.class).to eq JenkinsApi::Client::Job
         end
       end
 
       describe "#node" do
         it "Should return a node object on call" do
-          @client.node.class.should == JenkinsApi::Client::Node
+          expect(@client.node.class).to eq JenkinsApi::Client::Node
         end
       end
 
       describe "#view" do
         it "Should return a view object on call" do
-          @client.view.class.should == JenkinsApi::Client::View
+          expect(@client.view.class).to eq JenkinsApi::Client::View
         end
       end
 
       describe "#system" do
         it "Should return a system object on call" do
-          @client.system.class.should == JenkinsApi::Client::System
+          expect(@client.system.class).to eq JenkinsApi::Client::System
         end
       end
 
       describe "#queue" do
         it "Should return a build queue object on call" do
-          @client.queue.class.should == JenkinsApi::Client::BuildQueue
+          expect(@client.queue.class).to eq JenkinsApi::Client::BuildQueue
         end
       end
     end
@@ -129,7 +127,7 @@
       end
 
       it "Should connect without an error" do
-        expect { client.job.list_all }.not_to raise_error
+        client.job.list_all
       end
     end
   end