From d11b92912c16e295ecdfa74d808d9f93be73f449 Mon Sep 17 00:00:00 2001 From: Joe Siewert Date: Fri, 17 May 2024 15:35:47 -0500 Subject: [PATCH 01/17] Sort alphabetically --- .gitignore | 27 +++++++++++++-------------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index dc3f3ea..fc4dfc9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,19 +1,18 @@ -Gemfile.lock -coverage -rdoc -doc -.yardoc -.bundle -pkg -*.swp -log -*.sqlite3 -features/settings.yml *.gem +*.sqlite3 +*.swp +.bundle +.ruby-gemset .tags -TAGS .tags_sorted_by_file +.yardoc +/.idea +Gemfile.lock +TAGS coverage +doc +features/settings.yml +log +pkg +rdoc tags -/.idea -.ruby-gemset From 12303332da9e59aa1c19dce298ee99166df13ef0 Mon Sep 17 00:00:00 2001 From: Joe Siewert Date: Fri, 17 May 2024 15:40:03 -0500 Subject: [PATCH 02/17] Remove Travis CI --- .travis.yml | 16 ---------------- 1 file changed, 16 deletions(-) delete mode 100644 .travis.yml diff --git a/.travis.yml b/.travis.yml deleted file mode 100644 index b9c6d67..0000000 --- a/.travis.yml +++ /dev/null @@ -1,16 +0,0 @@ -before_install: - - gem install bundler -matrix: - allow_failures: - - rvm: ruby-head - - rvm: jruby-19mode -rvm: - - 1.9.2 - - 1.9.3 - - rbx-19mode - - jruby-19mode - - ruby-head -branches: - only: master -notifications: - email: false From dc62fa3e181785c6bb038774c577175c4ac1dd29 Mon Sep 17 00:00:00 2001 From: Joe Siewert Date: Fri, 17 May 2024 15:45:49 -0500 Subject: [PATCH 03/17] Use https --- Gemfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index c80ee36..851fabc 100644 --- a/Gemfile +++ b/Gemfile @@ -1,3 +1,2 @@ -source "http://rubygems.org" - +source 'https://rubygems.org' gemspec From 3ac42160c15e797a368fd14f3d34c8ed4170221a Mon Sep 17 00:00:00 2001 From: Joe Siewert Date: Fri, 17 May 2024 15:55:05 -0500 Subject: [PATCH 04/17] Update gem info --- bitbucket_rest_api.gemspec | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/bitbucket_rest_api.gemspec b/bitbucket_rest_api.gemspec index e1155ad..5a19659 100644 --- a/bitbucket_rest_api.gemspec +++ b/bitbucket_rest_api.gemspec @@ -6,9 +6,9 @@ Gem::Specification.new do |gem| gem.name = 'bitbucket_rest_api' gem.authors = [ "Mike Cochran" ] gem.email = "mcochran@linux.com" - gem.homepage = 'https://github.com/vongrippen/bitbucket' - gem.summary = %q{ Ruby wrapper for the BitBucket API supporting OAuth and Basic Authentication } - gem.description = %q{ Ruby wrapper for the BitBucket API supporting OAuth and Basic Authentication } + gem.homepage = 'https://github.com/codeship/bitbucket' + gem.summary = %q{ Ruby wrapper for the Bitbucket API supporting OAuth and basic authentication } + gem.description = %q{ Ruby wrapper for the Bitbucket API supporting OAuth and basic authentication } gem.version = BitBucket::VERSION::STRING.dup gem.license = "MIT" From ddc8b622b98223c25cb36e27961f88ef2c678766 Mon Sep 17 00:00:00 2001 From: Joe Siewert Date: Fri, 17 May 2024 16:00:26 -0500 Subject: [PATCH 05/17] Remove vcr gem --- bitbucket_rest_api.gemspec | 1 - spec/spec_helper.rb | 6 ------ 2 files changed, 7 deletions(-) diff --git a/bitbucket_rest_api.gemspec b/bitbucket_rest_api.gemspec index 5a19659..f139a27 100644 --- a/bitbucket_rest_api.gemspec +++ b/bitbucket_rest_api.gemspec @@ -25,7 +25,6 @@ Gem::Specification.new do |gem| gem.add_development_dependency 'rspec', '>= 0' gem.add_development_dependency 'rack-test' gem.add_development_dependency 'webmock', '~> 1.8.0' - gem.add_development_dependency 'vcr', '~> 2.2.0' gem.add_development_dependency 'simplecov', '~> 0.6.1' gem.add_development_dependency 'rake' gem.add_development_dependency 'bundler' diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index 27cfe60..f5318ae 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -3,7 +3,6 @@ require 'webmock/rspec' require 'pry' -require 'vcr' require 'bitbucket_rest_api' @@ -17,8 +16,3 @@ mocks.verify_partial_doubles = true end end - -# VCR.configure do |config| -# config.cassette_library_dir = 'spec/fixtures/vcr_cassettes' -# config.hook_into :webmock -# end From aced1a6b561305b2a632fa6a5aebffd0c3c6259e Mon Sep 17 00:00:00 2001 From: Joe Siewert Date: Fri, 17 May 2024 16:10:33 -0500 Subject: [PATCH 06/17] simplecov 0.22.0 --- bitbucket_rest_api.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitbucket_rest_api.gemspec b/bitbucket_rest_api.gemspec index f139a27..1a7d427 100644 --- a/bitbucket_rest_api.gemspec +++ b/bitbucket_rest_api.gemspec @@ -25,7 +25,7 @@ Gem::Specification.new do |gem| gem.add_development_dependency 'rspec', '>= 0' gem.add_development_dependency 'rack-test' gem.add_development_dependency 'webmock', '~> 1.8.0' - gem.add_development_dependency 'simplecov', '~> 0.6.1' + gem.add_development_dependency 'simplecov', '~> 0.22.0' gem.add_development_dependency 'rake' gem.add_development_dependency 'bundler' gem.add_development_dependency 'pry-byebug' From ee6b737df9e458faae64694dc6b4e3f30ce2baa1 Mon Sep 17 00:00:00 2001 From: Joe Siewert Date: Fri, 17 May 2024 16:15:03 -0500 Subject: [PATCH 07/17] webmock 3.23.0 --- bitbucket_rest_api.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitbucket_rest_api.gemspec b/bitbucket_rest_api.gemspec index 1a7d427..bc942b4 100644 --- a/bitbucket_rest_api.gemspec +++ b/bitbucket_rest_api.gemspec @@ -24,7 +24,7 @@ Gem::Specification.new do |gem| gem.add_development_dependency 'rspec', '>= 0' gem.add_development_dependency 'rack-test' - gem.add_development_dependency 'webmock', '~> 1.8.0' + gem.add_development_dependency 'webmock', '~> 3.23.0' gem.add_development_dependency 'simplecov', '~> 0.22.0' gem.add_development_dependency 'rake' gem.add_development_dependency 'bundler' From 6be7207c695024a68739a49efbfbe71f1b4c229d Mon Sep 17 00:00:00 2001 From: Joe Siewert Date: Fri, 17 May 2024 16:15:42 -0500 Subject: [PATCH 08/17] rspec 3 --- bitbucket_rest_api.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitbucket_rest_api.gemspec b/bitbucket_rest_api.gemspec index bc942b4..db62e0c 100644 --- a/bitbucket_rest_api.gemspec +++ b/bitbucket_rest_api.gemspec @@ -22,7 +22,7 @@ Gem::Specification.new do |gem| gem.add_dependency 'nokogiri', '>= 1.5.2' gem.add_dependency 'simple_oauth', '~> 0.2.0' - gem.add_development_dependency 'rspec', '>= 0' + gem.add_development_dependency 'rspec', '>= 3' gem.add_development_dependency 'rack-test' gem.add_development_dependency 'webmock', '~> 3.23.0' gem.add_development_dependency 'simplecov', '~> 0.22.0' From d75b2f5ce6233d3622f9206f5735ef734a1d67de Mon Sep 17 00:00:00 2001 From: Joe Siewert Date: Fri, 17 May 2024 16:17:49 -0500 Subject: [PATCH 09/17] simple_oauth 0.3.1 --- bitbucket_rest_api.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitbucket_rest_api.gemspec b/bitbucket_rest_api.gemspec index db62e0c..5ca35e0 100644 --- a/bitbucket_rest_api.gemspec +++ b/bitbucket_rest_api.gemspec @@ -20,7 +20,7 @@ Gem::Specification.new do |gem| gem.add_dependency 'multi_json', '>= 1.7.5', '< 2.0' gem.add_dependency 'faraday_middleware', '~> 0.9.0' gem.add_dependency 'nokogiri', '>= 1.5.2' - gem.add_dependency 'simple_oauth', '~> 0.2.0' + gem.add_dependency 'simple_oauth', '~> 0.3.1' gem.add_development_dependency 'rspec', '>= 3' gem.add_development_dependency 'rack-test' From 28742b870be4791d61c2a8606684be1c7709267d Mon Sep 17 00:00:00 2001 From: Joe Siewert Date: Fri, 17 May 2024 16:20:02 -0500 Subject: [PATCH 10/17] nokogiri 1.15.6 --- bitbucket_rest_api.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitbucket_rest_api.gemspec b/bitbucket_rest_api.gemspec index 5ca35e0..ca2b70f 100644 --- a/bitbucket_rest_api.gemspec +++ b/bitbucket_rest_api.gemspec @@ -19,7 +19,7 @@ Gem::Specification.new do |gem| gem.add_dependency 'faraday', '~> 0.9.0' gem.add_dependency 'multi_json', '>= 1.7.5', '< 2.0' gem.add_dependency 'faraday_middleware', '~> 0.9.0' - gem.add_dependency 'nokogiri', '>= 1.5.2' + gem.add_dependency 'nokogiri', '>= 1.15.6' gem.add_dependency 'simple_oauth', '~> 0.3.1' gem.add_development_dependency 'rspec', '>= 3' From 56e208cefe173aff1cdb70e91a83b910393b53ad Mon Sep 17 00:00:00 2001 From: Joe Siewert Date: Fri, 17 May 2024 16:50:18 -0500 Subject: [PATCH 11/17] multi_json 1.15.0 --- bitbucket_rest_api.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitbucket_rest_api.gemspec b/bitbucket_rest_api.gemspec index ca2b70f..62d133d 100644 --- a/bitbucket_rest_api.gemspec +++ b/bitbucket_rest_api.gemspec @@ -17,7 +17,7 @@ Gem::Specification.new do |gem| gem.add_dependency 'hashie' gem.add_dependency 'faraday', '~> 0.9.0' - gem.add_dependency 'multi_json', '>= 1.7.5', '< 2.0' + gem.add_dependency 'multi_json', '>= 1.15.0', '< 2.0' gem.add_dependency 'faraday_middleware', '~> 0.9.0' gem.add_dependency 'nokogiri', '>= 1.15.6' gem.add_dependency 'simple_oauth', '~> 0.3.1' From 5a88a46fa3a829ea36481c54b3bf96452527a8b6 Mon Sep 17 00:00:00 2001 From: Joe Siewert Date: Fri, 17 May 2024 16:55:29 -0500 Subject: [PATCH 12/17] faraday_middleware 1.2.0 --- bitbucket_rest_api.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitbucket_rest_api.gemspec b/bitbucket_rest_api.gemspec index 62d133d..5946bfa 100644 --- a/bitbucket_rest_api.gemspec +++ b/bitbucket_rest_api.gemspec @@ -18,7 +18,7 @@ Gem::Specification.new do |gem| gem.add_dependency 'hashie' gem.add_dependency 'faraday', '~> 0.9.0' gem.add_dependency 'multi_json', '>= 1.15.0', '< 2.0' - gem.add_dependency 'faraday_middleware', '~> 0.9.0' + gem.add_dependency 'faraday_middleware', '~> 1.2.0' gem.add_dependency 'nokogiri', '>= 1.15.6' gem.add_dependency 'simple_oauth', '~> 0.3.1' From 5df5acac935dad43d5f7a1cfd6e3eaa5ea09fed3 Mon Sep 17 00:00:00 2001 From: Joe Siewert Date: Fri, 17 May 2024 17:00:11 -0500 Subject: [PATCH 13/17] faraday 1.10.3 --- bitbucket_rest_api.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bitbucket_rest_api.gemspec b/bitbucket_rest_api.gemspec index 5946bfa..c2db655 100644 --- a/bitbucket_rest_api.gemspec +++ b/bitbucket_rest_api.gemspec @@ -16,7 +16,7 @@ Gem::Specification.new do |gem| gem.require_paths = %w[ lib ] gem.add_dependency 'hashie' - gem.add_dependency 'faraday', '~> 0.9.0' + gem.add_dependency 'faraday', '>= 1', '< 2' gem.add_dependency 'multi_json', '>= 1.15.0', '< 2.0' gem.add_dependency 'faraday_middleware', '~> 1.2.0' gem.add_dependency 'nokogiri', '>= 1.15.6' From 3cccaff12574ed57103942af1681b519e0570cd5 Mon Sep 17 00:00:00 2001 From: Joe Siewert Date: Fri, 17 May 2024 17:05:23 -0500 Subject: [PATCH 14/17] Make faraday version dynamic --- spec/bitbucket_rest_api/request_spec.rb | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/spec/bitbucket_rest_api/request_spec.rb b/spec/bitbucket_rest_api/request_spec.rb index a84c2c2..20f2113 100644 --- a/spec/bitbucket_rest_api/request_spec.rb +++ b/spec/bitbucket_rest_api/request_spec.rb @@ -22,7 +22,7 @@ 'Accept' => '*/*', 'Accept-Encoding' => 'gzip;q=1.0,deflate;q=0.6,identity;q=0.3', 'Authorization' => 'Bearer 12345', - 'User-Agent' => 'Faraday v0.9.2' + 'User-Agent' => "Faraday v#{Faraday::VERSION}" }) fake_api.new.request(:get, '/1.0/endpoint', {}, {}) @@ -35,7 +35,7 @@ 'Accept' => '*/*', 'Content-Type'=>'application/x-www-form-urlencoded', 'Authorization' => 'Bearer 12345', - 'User-Agent' => 'Faraday v0.9.2' + 'User-Agent' => "Faraday v#{Faraday::VERSION}" }) fake_api.new.request(:put, '/1.0/endpoint', { 'data' => { 'key' => 'value'} }, {}) @@ -48,7 +48,7 @@ 'Accept' => '*/*', 'Content-Type'=>'application/x-www-form-urlencoded', 'Authorization' => 'Bearer 12345', - 'User-Agent' => 'Faraday v0.9.2' + 'User-Agent' => "Faraday v#{Faraday::VERSION}" }) fake_api.new.request(:patch, '/1.0/endpoint', { 'data' => { 'key' => 'value'} }, {}) @@ -59,7 +59,7 @@ with(:headers => { 'Accept' => '*/*', 'Authorization' => 'Bearer 12345', - 'User-Agent' => 'Faraday v0.9.2' + 'User-Agent' => "Faraday v#{Faraday::VERSION}" }) fake_api.new.request(:delete, '/1.0/endpoint', {}, {}) end @@ -71,7 +71,7 @@ 'Accept' => '*/*', 'Content-Type'=>'application/x-www-form-urlencoded', 'Authorization' => 'Bearer 12345', - 'User-Agent' => 'Faraday v0.9.2' + 'User-Agent' => "Faraday v#{Faraday::VERSION}" }) fake_api.new.request(:post, '/1.0/endpoint', { 'data' => { 'key' => 'value'} }, {}) From e44b5666d63a4661d30b2f27929ef788a6d79418 Mon Sep 17 00:00:00 2001 From: Joe Siewert Date: Fri, 17 May 2024 17:10:13 -0500 Subject: [PATCH 15/17] Remove mocha gem --- bitbucket_rest_api.gemspec | 1 - spec/bitbucket_rest_api/request_spec.rb | 20 +++++++++++++------- spec/spec_helper.rb | 1 - 3 files changed, 13 insertions(+), 9 deletions(-) diff --git a/bitbucket_rest_api.gemspec b/bitbucket_rest_api.gemspec index c2db655..b892af5 100644 --- a/bitbucket_rest_api.gemspec +++ b/bitbucket_rest_api.gemspec @@ -29,5 +29,4 @@ Gem::Specification.new do |gem| gem.add_development_dependency 'rake' gem.add_development_dependency 'bundler' gem.add_development_dependency 'pry-byebug' - gem.add_development_dependency 'mocha', '~> 1.4.0' end diff --git a/spec/bitbucket_rest_api/request_spec.rb b/spec/bitbucket_rest_api/request_spec.rb index 20f2113..39a689b 100644 --- a/spec/bitbucket_rest_api/request_spec.rb +++ b/spec/bitbucket_rest_api/request_spec.rb @@ -2,8 +2,19 @@ require 'bitbucket_rest_api/request' describe BitBucket::Request do - let(:fake_api) { (Class.new { include BitBucket::Request })} - let(:faraday_connection) { Faraday.new(:url => 'https://api.bitbucket.org') } + let(:fake_api) do + Class.new do + include BitBucket::Request + + def connection(*args) + Faraday.new(:url => 'https://api.bitbucket.org') + end + + def new_access_token + '12345' + end + end + end describe "request" do it "raises an ArgumentError if an unsupported HTTP verb is used" do @@ -11,11 +22,6 @@ end context "with a connection" do - before do - (fake_api).any_instance.stubs(:connection).returns(faraday_connection) - (fake_api).any_instance.stubs(:new_access_token).returns("12345") - end - it "supports get" do stub_request(:get, "https://api.bitbucket.org/1.0/endpoint"). with(:headers => { diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb index f5318ae..196ab4c 100644 --- a/spec/spec_helper.rb +++ b/spec/spec_helper.rb @@ -9,7 +9,6 @@ RSpec.configure do |config| config.expect_with :rspec do |expectations| expectations.include_chain_clauses_in_custom_matcher_descriptions = true - config.mock_with :mocha end config.mock_with :rspec do |mocks| From 5b4b1e1d0633ee812fed9f5227854758d8a253c5 Mon Sep 17 00:00:00 2001 From: Joe Siewert Date: Fri, 17 May 2024 17:11:44 -0500 Subject: [PATCH 16/17] Update to Ruby 3.1.5 --- .ruby-version | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ruby-version b/.ruby-version index 005119b..3ad0595 100644 --- a/.ruby-version +++ b/.ruby-version @@ -1 +1 @@ -2.4.1 +3.1.5 From e40df5b0d759e09e25cf39e93268abb5fa844356 Mon Sep 17 00:00:00 2001 From: Joe Siewert Date: Fri, 17 May 2024 17:15:35 -0500 Subject: [PATCH 17/17] Bump gem version to 0.1.8 --- lib/bitbucket_rest_api/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/bitbucket_rest_api/version.rb b/lib/bitbucket_rest_api/version.rb index 28b953b..72de8f0 100644 --- a/lib/bitbucket_rest_api/version.rb +++ b/lib/bitbucket_rest_api/version.rb @@ -4,7 +4,7 @@ module BitBucket module VERSION MAJOR = 0 MINOR = 1 - PATCH = 7 + PATCH = 8 STRING = [MAJOR, MINOR, PATCH].compact.join('.') end