pact_broker 2.77.0 → 2.80.0

data/db/test/backwards_compatibility/Gemfile

@@ -1,12 +1,12 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'pact_broker'
-gem 'sqlite3', '~>1.3'
-gem 'pg', '~>0.21'
-gem 'mysql2', '~>0.3.15'
-gem 'thin', '~>1.3'
-gem 'appraisal'
-gem 'rspec'
-gem 'rake', '~>12.0'
-gem 'rack-reverse-proxy', '~>0.12'
-gem 'rack-test'
+gem "pact_broker"
+gem "sqlite3", "~>1.3"
+gem "pg", "~>0.21"
+gem "mysql2", "~>0.3.15"
+gem "thin", "~>1.3"
+gem "appraisal"
+gem "rspec"
+gem "rake", "~>12.0"
+gem "rack-reverse-proxy", "~>0.12"
+gem "rack-test"

data/db/test/backwards_compatibility/Rakefile

@@ -1,6 +1,6 @@
-require 'rspec/core'
-require 'rspec/core/rake_task'
-require 'open-uri'
+require "rspec/core"
+require "rspec/core/rake_task"
+require "open-uri"
 
 TESTS = [
   %w{2.1.0 9293},
@@ -24,10 +24,10 @@ def start_pact_broker code_version, port
 end
 
 def kill_servers
-  Dir.chdir('pids') { Dir.glob("*") }.collect(&:to_i).each do | pid |
+  Dir.chdir("pids") { Dir.glob("*") }.collect(&:to_i).each do | pid |
     begin
       puts "Killing broker with pid #{pid}"
-      Process.kill 'KILL', pid
+      Process.kill "KILL", pid
     rescue Errno::ESRCH
       puts "Process with pid #{pid} already killed"
     end
@@ -36,20 +36,20 @@ def kill_servers
 end
 
 def clean
-  require 'fileutils'
-  FileUtils.rm_rf 'pids'
-  FileUtils.mkdir 'pids'
-  FileUtils.rm_rf 'pact_broker_database.sqlite3'
-  FileUtils.rm_rf 'log'
+  require "fileutils"
+  FileUtils.rm_rf "pids"
+  FileUtils.mkdir "pids"
+  FileUtils.rm_rf "pact_broker_database.sqlite3"
+  FileUtils.rm_rf "log"
 end
 
 RSpec::Core::RakeTask.new(:spec) do |task|
-  task.pattern = 'spec/**/*_spec.rb'
+  task.pattern = "spec/**/*_spec.rb"
 end
 
-desc 'Ensure code from previous versions is compatible with latest database'
-task 'db:check_backwards_compatibility' do
-  ENV['PACT_BROKER_DATABASE_VERSION'] = DATABASE_VERSION
+desc "Ensure code from previous versions is compatible with latest database"
+task "db:check_backwards_compatibility" do
+  ENV["PACT_BROKER_DATABASE_VERSION"] = DATABASE_VERSION
   clean
   begin
     TESTS.each do | (code_version, port) |
@@ -60,8 +60,8 @@ task 'db:check_backwards_compatibility' do
     # so that we have the latest version of the db running
 
     TESTS.each do | (code_version, port) |
-      ENV['PACT_BROKER_CODE_VERSION'] = code_version
-      ENV['PORT'] = port
+      ENV["PACT_BROKER_CODE_VERSION"] = code_version
+      ENV["PORT"] = port
       Rake::Task["spec"].execute
     end
   ensure
@@ -69,4 +69,4 @@ task 'db:check_backwards_compatibility' do
   end
 end
 
-task :default => ['db:check_backwards_compatibility']
+task :default => ["db:check_backwards_compatibility"]

data/db/test/backwards_compatibility/config.ru

@@ -1,15 +1,15 @@
-require 'fileutils'
-require 'logger'
-require 'sequel'
-require 'pact_broker'
+require "fileutils"
+require "logger"
+require "sequel"
+require "pact_broker"
 
 FileUtils.mkdir_p "pids"
 FileUtils.touch "pids/#{Process.pid}"
 
-DATABASE_CREDENTIALS = {adapter: "sqlite", database: "pact_broker_database.sqlite3", :encoding => 'utf8'}
+DATABASE_CREDENTIALS = {adapter: "sqlite", database: "pact_broker_database.sqlite3", :encoding => "utf8"}
 
 app = PactBroker::App.new do | config |
-  config.logger.formatter = proc do |severity, datetime, progname, msg|
+  config.logger.formatter = proc do |severity, _datetime, _progname, msg|
     "v#{PactBroker::VERSION} #{severity} -- : #{msg}\n"
   end
   config.database_connection = Sequel.connect(DATABASE_CREDENTIALS.merge(:logger => config.logger))

data/db/test/backwards_compatibility/spec/publish_pact_spec.rb

@@ -1,9 +1,9 @@
-require 'rack/reverse_proxy'
-require 'securerandom'
+require "rack/reverse_proxy"
+require "securerandom"
 
-CODE_VERSION = ENV.fetch('PACT_BROKER_CODE_VERSION')
-DATABASE_VERSION = ENV.fetch('PACT_BROKER_DATABASE_VERSION')
-CONSUMER_VERSION = CODE_VERSION == 'head' ? '100.100.100' : CODE_VERSION
+CODE_VERSION = ENV.fetch("PACT_BROKER_CODE_VERSION")
+DATABASE_VERSION = ENV.fetch("PACT_BROKER_DATABASE_VERSION")
+CONSUMER_VERSION = CODE_VERSION == "head" ? "100.100.100" : CODE_VERSION
 TAG = SecureRandom.hex
 
 describe "Code version #{CODE_VERSION} running against database version #{DATABASE_VERSION}" do
@@ -15,32 +15,32 @@ describe "Code version #{CODE_VERSION} running against database version #{DATABA
   let(:path) { "/pacts/provider/Bar/consumer/Foo/version/#{CONSUMER_VERSION}" }
   let(:response_body_json) { JSON.parse(subject.body) }
   let(:pact_content) do
-    pact = load_json_fixture('foo-bar.json')
-    pact['interactions'][0]['providerState'] = "the code version is #{CODE_VERSION}"
+    pact = load_json_fixture("foo-bar.json")
+    pact["interactions"][0]["providerState"] = "the code version is #{CODE_VERSION}"
     pact.to_json
   end
 
   let(:app) do
     Rack::ReverseProxy.new do
       reverse_proxy_options preserve_host: true
-      reverse_proxy '/', "http://localhost:#{ENV.fetch('PORT')}/"
+      reverse_proxy "/", "http://localhost:#{ENV.fetch('PORT')}/"
     end
   end
 
   describe "tagging a consumer version" do
     let(:path) { "/pacticipants/Foo/versions/#{CONSUMER_VERSION}/tags/#{TAG}"}
-    subject { put path, nil, {'CONTENT_TYPE' => 'application/json' }; last_response  }
+    subject { put path, nil, {"CONTENT_TYPE" => "application/json" }; last_response  }
 
     it "returns a success status" do
-      expect(subject.status.to_s).to match /20\d/
+      expect(subject.status.to_s).to match(/20\d/)
     end
   end
 
   describe "publishing a pact" do
-    subject { put path, pact_content, {'CONTENT_TYPE' => 'application/json' }; last_response  }
+    subject { put path, pact_content, {"CONTENT_TYPE" => "application/json" }; last_response  }
 
     it "returns a success status" do
-      expect(subject.status.to_s).to match /20\d/
+      expect(subject.status.to_s).to match(/20\d/)
     end
   end
 
@@ -57,7 +57,7 @@ describe "Code version #{CODE_VERSION} running against database version #{DATABA
     subject { get path; last_response  }
 
     it "returns the latest pact" do
-      expect(subject.headers['X-Pact-Consumer-Version']).to eq CONSUMER_VERSION
+      expect(subject.headers["X-Pact-Consumer-Version"]).to eq CONSUMER_VERSION
     end
   end
 

data/db/test/backwards_compatibility/spec/spec_helper.rb

@@ -1,6 +1,6 @@
-require 'support/fixture_helpers'
-require 'support/request_helpers'
-require 'rack/test'
+require "support/fixture_helpers"
+require "support/request_helpers"
+require "rack/test"
 
 RSpec.configure do | config |
 

data/db/test/backwards_compatibility/spec/support/fixture_helpers.rb

@@ -1,4 +1,4 @@
-require 'json'
+require "json"
 
 module FixtureHelpers
   def load_fixture(file_name)
@@ -6,7 +6,7 @@ module FixtureHelpers
   end
 
   def load_json_fixture(file_name)
-    require 'json'
+    require "json"
     JSON.parse(load_fixture(file_name))
   end
 end

data/db/test/backwards_compatibility/spec/support/request_helpers.rb

@@ -1,11 +1,10 @@
 module RequestHelpers
-
   def wait_for_server_to_start
-    unless ENV['OK']
+    unless ENV["OK"]
       retries = 0
       begin
-          get "/"
-          ENV['OK'] = 'true'
+        get "/"
+        ENV["OK"] = "true"
       rescue Errno::ECONNREFUSED => error
         if retries < 10
           retries += 1

data/db/test/change_migration_strategy/Rakefile

@@ -1,9 +1,9 @@
-require 'bundler/setup'
-require 'pact_broker/tasks'
+require "bundler/setup"
+require "pact_broker/tasks"
 
 def create_connection
-  require 'sequel'
-  database_config = {adapter: "sqlite", database: "pact_broker_database.sqlite3", :encoding => 'utf8'}
+  require "sequel"
+  database_config = {adapter: "sqlite", database: "pact_broker_database.sqlite3", :encoding => "utf8"}
   Sequel.connect(database_config)
 end
 
@@ -15,7 +15,7 @@ PactBroker::DB::VersionTask.new do | task |
   task.database_connection = create_connection
 end
 
-task 'pact_broker:version' do
-  require 'pact_broker/version'
+task "pact_broker:version" do
+  require "pact_broker/version"
   puts PactBroker::VERSION
 end

data/db/test/change_migration_strategy/before/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gem "rake", "~>12.0"
 gem "pact_broker", git: "https://github.com/pact-foundation/pact_broker.git", ref: "11d3464a120ed5f76e23241c79992fa04b702701"

data/docker-compose-dev-postgres.yml

@@ -23,7 +23,9 @@ services:
     environment:
       DATABASE_URL: postgres://postgres:postgres@postgres/postgres
       PACT_BROKER_HIDE_PACTFLOW_MESSAGES: 'true'
-    command: dockerize -wait tcp://postgres:5432 /home/start.sh
+      PACT_BROKER_BASE_URL: 'http://localhost:9292 http://pact-broker:9292'
+    command: -wait tcp://postgres:5432 /usr/local/bin/start
+    entrypoint: dockerize
     volumes:
       - ./lib:/home/lib
       - ./db:/home/db
@@ -31,5 +33,11 @@ services:
       - ./tasks:/home/tasks
       - ./Rakefile:/home/Rakefile
 
+  shell:
+    image: ruby:2.5.3-alpine
+    depends_on:
+      - pact-broker
+    entrypoint: /bin/sh
+
 volumes:
   postgres-volume:

data/example/Gemfile

@@ -1,6 +1,6 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
-gem 'pact_broker'
-gem 'sqlite3', '~>1.3' # Sqlite is just for testing, replace this with your choice of database driver
+gem "pact_broker"
+gem "sqlite3", "~>1.3" # Sqlite is just for testing, replace this with your choice of database driver
 # gem 'pg' # Recommended production gem for postgres
-gem 'thin', '~>1.7' # Keep, or replace with your choice of web server
+gem "thin", "~>1.7" # Keep, or replace with your choice of web server

data/example/basic_auth/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 gem "pact_broker"
 gem "pg" 

data/example/basic_auth/config.ru

@@ -1,11 +1,11 @@
-require 'fileutils'
-require 'logger'
-require 'sequel'
-require 'pact_broker'
-require 'pg'
+require "fileutils"
+require "logger"
+require "sequel"
+require "pact_broker"
+require "pg"
 
 use Rack::Auth::Basic, "Restricted Area" do |username, password|
-  username == ENV['PACT_BROKER_USERNAME'] and password == ENV['PACT_BROKER_PASSWORD']
+  username == ENV["PACT_BROKER_USERNAME"] and password == ENV["PACT_BROKER_PASSWORD"]
 end
 
 app = PactBroker::App.new do | config |
@@ -13,7 +13,7 @@ app = PactBroker::App.new do | config |
   # config.log_dir = "./log"
   # config.auto_migrate_db = true
   # config.use_hal_browser = true
-  config.database_connection = Sequel.connect(ENV['DATABASE_URL'], adapter: "postgres", encoding: 'utf8')
+  config.database_connection = Sequel.connect(ENV["DATABASE_URL"], adapter: "postgres", encoding: "utf8")
 end
 
 run app

data/example/config.ru

@@ -1,14 +1,14 @@
-require 'fileutils'
-require 'logger'
-require 'sequel'
+require "fileutils"
+require "logger"
+require "sequel"
 # require 'pg' # for postgres
-require 'pact_broker'
+require "pact_broker"
 
-ENV['RACK_ENV'] ||= 'production'
+ENV["RACK_ENV"] ||= "production"
 
 # Create a real database, and set the credentials for it here
 # It is highly recommended to set the encoding to utf8
-DATABASE_CREDENTIALS = { adapter: "sqlite", database: "pact_broker_database.sqlite3", :encoding => 'utf8', sql_log_level: :debug }
+DATABASE_CREDENTIALS = { adapter: "sqlite", database: "pact_broker_database.sqlite3", :encoding => "utf8", sql_log_level: :debug }
 
 # For postgres:
 #
@@ -21,7 +21,7 @@ DATABASE_CREDENTIALS = { adapter: "sqlite", database: "pact_broker_database.sqli
 # Have a look at the Sequel documentation to make decisions about things like connection pooling
 # and connection validation.
 
-ENV['TZ'] = 'Australia/Melbourne' # Set the timezone you want your dates to appear in
+ENV["TZ"] = "Australia/Melbourne" # Set the timezone you want your dates to appear in
 
 app = PactBroker::App.new do | config |
   # change these from their default values if desired

data/issue-reproduction/Dockerfile-pact-broker

@@ -1,4 +1,4 @@
-FROM ruby:2.5.3-alpine
+FROM ruby:2.7.3-alpine
 
 RUN apk update \
     && apk --no-cache add \

data/lib/db.rb

@@ -1,9 +1,10 @@
-require 'sequel'
-require 'sequel/connection_pool/threaded'
-require 'yaml'
-require 'pact_broker/logging'
-require 'erb'
-require 'pact_broker/project_root'
+require "sequel"
+require "sequel/connection_pool/threaded"
+require "yaml"
+require "pact_broker/logging"
+require "erb"
+require "pact_broker/project_root"
+require "fileutils"
 
 module DB
   include PactBroker::Logging
@@ -27,17 +28,22 @@ module DB
   def self.connect db_credentials
     # Keep this conifiguration in sync with lib/pact_broker/app.rb#configure_database_connection
     Sequel.datetime_class = DateTime
-    if ENV['DEBUG'] == 'true'
+    if ENV["DEBUG"] == "true"
       logger = Logger.new($stdout)
     end
-    con = Sequel.connect(db_credentials.merge(:logger => logger, :pool_class => Sequel::ThreadedConnectionPool, :encoding => 'utf8'))
+    if db_credentials.fetch("adapter") == "sqlite"
+      FileUtils.mkdir_p(File.dirname(db_credentials.fetch("database")))
+    end
+    con = Sequel.connect(db_credentials.merge(:logger => logger, :pool_class => Sequel::ThreadedConnectionPool, :encoding => "utf8"))
     con.extension(:connection_validator)
     con.extension(:pagination)
     con.extension(:statement_timeout)
     con.extend_datasets do
+      # rubocop: disable Lint/NestedMethodDefinition
       def any?
         !empty?
       end
+      # rubocop: enable Lint/NestedMethodDefinition
     end
     con.pool.connection_validation_timeout = -1 #Check the connection on every request
     con.timezone = :utc
@@ -52,9 +58,9 @@ module DB
   end
 
   def self.configuration_for_env env
-    database_yml = PactBroker.project_root.join('config','database.yml')
+    database_yml = PactBroker.project_root.join("config","database.yml")
     config = YAML.load(ERB.new(File.read(database_yml)).result)
-    config.fetch(env).fetch(ENV.fetch('DATABASE_ADAPTER','default'))
+    config.fetch(env).fetch(ENV.fetch("DATABASE_ADAPTER","default"))
   end
 
   def self.mysql?
@@ -65,10 +71,10 @@ module DB
     !!(PACT_BROKER_DB.adapter_scheme.to_s == "postgres")
   end
 
-  PACT_BROKER_DB ||= connection_for_env ENV.fetch('RACK_ENV')
+  PACT_BROKER_DB ||= connection_for_env ENV.fetch("RACK_ENV")
 
   def self.health_check
-    PACT_BROKER_DB.synchronize do |c| c
+    PACT_BROKER_DB.synchronize do |c|
       PACT_BROKER_DB.valid_connection? c
     end
   end

data/lib/pact/doc/generator.rb

@@ -1,5 +1,5 @@
-require 'pact/doc/doc_file'
-require 'fileutils'
+require "pact/doc/doc_file"
+require "fileutils"
 
 module Pact
   module Doc
@@ -14,7 +14,7 @@ module Pact
         @file_extension = options[:file_extension]
         @index_renderer = options[:index_renderer]
         @index_name = options[:index_name]
-        @after = options.fetch(:after, lambda{|pact_dir, target_dir, consumer_contracts| })
+        @after = options.fetch(:after, lambda{|pact_dir_arg, target_dir_arg, consumer_contracts_arg| })
       end
 
       def call