Skip to content

Commit

Permalink
Merge branch 'feat/DEX-2410/remove/sbmt-app-dependency' into 'master'
Browse files Browse the repository at this point in the history
[DEX-2410] feat: remove sbmt app dependency

Closes DEX-2410

See merge request nstmrt/rubygems/sbmt-pact!18
  • Loading branch information
bibendi committed Sep 11, 2024
2 parents b2ce506 + 98ae777 commit 0d0b19a
Show file tree
Hide file tree
Showing 30 changed files with 43 additions and 1,019 deletions.
2 changes: 2 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,5 @@ lefthook-local.yml
/gemfiles/*gemfile*
/spec/internal/log/*.log
/spec/internal/pacts
test.log

6 changes: 0 additions & 6 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,3 @@
source ENV.fetch("RUBYGEMS_PUBLIC_SOURCE", "https://rubygems.org/")

gemspec

source ENV.fetch("RUBYGEMS_PRIVATE_SOURCE", "https://nexus.sbmt.io/repository/ruby-gems-sbermarket/") do
group :development, :test do
gem "sbmt-app"
end
end
2 changes: 1 addition & 1 deletion lib/sbmt/pact/version.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@

module Sbmt
module Pact
VERSION = "0.11.1"
VERSION = "0.12.0"
end
end
5 changes: 3 additions & 2 deletions sbmt-pact.gemspec
Original file line number Diff line number Diff line change
Expand Up @@ -33,17 +33,17 @@ Gem::Specification.new do |spec|

spec.add_dependency "zeitwerk", "~> 2.3"
spec.add_dependency "pact-ffi", "~> 0.4.22"
spec.add_dependency "rack", "~> 2.0"
spec.add_dependency "webrick"
spec.add_dependency "rack-proxy"

spec.add_development_dependency "appraisal", ">= 2.4"
spec.add_development_dependency "bundler", ">= 2.3"
spec.add_development_dependency "combustion", ">= 1.3"
spec.add_development_dependency "gruf", ">= 2.18"
spec.add_development_dependency "rake", ">= 13.0"
spec.add_development_dependency "sbmt-app", ">= 1.43.1"
spec.add_development_dependency "sbmt-kafka_consumer", ">= 2.0.1"
spec.add_development_dependency "sbmt-kafka_producer", ">= 1.0"
spec.add_development_dependency "dry-monads", "~> 1.3"
spec.add_development_dependency "rspec"
spec.add_development_dependency "rspec-rails"
spec.add_development_dependency "rspec_junit_formatter"
Expand All @@ -53,6 +53,7 @@ Gem::Specification.new do |spec|
spec.add_development_dependency "rubocop-performance"
spec.add_development_dependency "standard", ">= 1.35.1"
spec.add_development_dependency "vcr", ">= 6.0"
spec.add_development_dependency "faraday", "> 1.0"
spec.add_development_dependency "webmock", ">= 3.0"
spec.add_development_dependency "gruf-rspec", ">= 0.6.0"
end

This file was deleted.

4 changes: 0 additions & 4 deletions spec/internal/app/api_clients/pet_store/open_api.rb

This file was deleted.

14 changes: 0 additions & 14 deletions spec/internal/app/api_clients/pet_store/open_api/v1.rb

This file was deleted.

2 changes: 0 additions & 2 deletions spec/internal/app/consumers/pet_json_consumer.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# frozen_string_literal: true

require "sbmt/kafka_consumer"

class PetJsonConsumer < Sbmt::KafkaConsumer::BaseConsumer
def process_message(message)
pet_id = message.payload["id"]
Expand Down
2 changes: 0 additions & 2 deletions spec/internal/app/consumers/pet_proto_consumer.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# frozen_string_literal: true

require "sbmt/kafka_consumer"

class PetProtoConsumer < Sbmt::KafkaConsumer::BaseConsumer
def process_message(message)
Rails.logger.info "Pet ID: #{message.payload.id}"
Expand Down
2 changes: 0 additions & 2 deletions spec/internal/app/producers/pet_json_producer.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# frozen_string_literal: true

require "sbmt/kafka_producer"

class PetJsonProducer < Sbmt::KafkaProducer::BaseProducer
option :topic, default: -> { "json-topic" }
option :uuid, default: -> { SecureRandom.uuid }
Expand Down
2 changes: 0 additions & 2 deletions spec/internal/app/producers/pet_proto_producer.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,5 @@
# frozen_string_literal: true

require "sbmt/kafka_producer"

class PetProtoProducer < Sbmt::KafkaProducer::BaseProducer
option :topic, default: -> { "proto-topic" }
option :uuid, default: -> { SecureRandom.uuid }
Expand Down
2 changes: 1 addition & 1 deletion spec/internal/app/rpc/pet_store/pet_store_controller.rb
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# frozen_string_literal: true

module PetStore
class PetStoreController < Sbmt::App::Gruf::Server::Controller
class PetStoreController < Gruf::Controllers::Base
bind PetStore::Grpc::PetStore::V1::Pets::Service

def pet_by_id
Expand Down
6 changes: 0 additions & 6 deletions spec/internal/config/configs/pet_store_grpc_config.rb

This file was deleted.

6 changes: 0 additions & 6 deletions spec/internal/config/configs/pet_store_open_api_config.rb

This file was deleted.

16 changes: 0 additions & 16 deletions spec/internal/config/grpc_server.yml

This file was deleted.

11 changes: 9 additions & 2 deletions spec/internal/config/initializers/grpc_server.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,11 @@
# frozen_string_literal: true

Sbmt::App::Gruf::Server.configure!
Sbmt::App::Grpc.load_server_packages
::Gruf.interceptors.clear

::Gruf.configure do |c|
c.server_binding_url = "0.0.0.0:3009"
c.logger = Rails.logger
end

Rails.root.glob("pkg/server/**/*_services_pb.rb").sort.each { require _1 }
Rails.root.glob("app/rpc/**/*.rb").sort.each { require _1 }
17 changes: 0 additions & 17 deletions spec/internal/config/pet_store_open_api.yml

This file was deleted.

15 changes: 0 additions & 15 deletions spec/internal/configs/app.toml

This file was deleted.

10 changes: 0 additions & 10 deletions spec/internal/pkg/client/pet_store/open_api/v1.rb

This file was deleted.

119 changes: 0 additions & 119 deletions spec/internal/pkg/client/pet_store/open_api/v1/PetsApi.md

This file was deleted.

Loading

0 comments on commit 0d0b19a

Please sign in to comment.