Skip to content

Commit ed56424

Browse files
author
Alex Evanczuk
authored
Use packs standard (#28)
1 parent b73662e commit ed56424

File tree

8 files changed

+96
-162
lines changed

8 files changed

+96
-162
lines changed

Gemfile.lock

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
PATH
22
remote: .
33
specs:
4-
code_ownership (1.29.1)
4+
code_ownership (1.29.2)
55
code_teams (~> 1.0)
6-
parse_packwerk
6+
packs
77
sorbet-runtime
88

99
GEM
@@ -15,7 +15,7 @@ GEM
1515
coderay (1.1.3)
1616
diff-lcs (1.4.4)
1717
method_source (1.0.0)
18-
parse_packwerk (0.14.0)
18+
packs (0.0.2)
1919
sorbet-runtime
2020
parser (3.1.2.0)
2121
ast (~> 2.4.1)

code_ownership.gemspec

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
Gem::Specification.new do |spec|
22
spec.name = "code_ownership"
3-
spec.version = '1.29.1'
3+
spec.version = '1.29.2'
44
spec.authors = ['Gusto Engineers']
55
spec.email = ['[email protected]']
66
spec.summary = 'A gem to help engineering teams declare ownership of code'
@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
2727
spec.require_paths = ['lib']
2828

2929
spec.add_dependency 'code_teams', '~> 1.0'
30-
spec.add_dependency 'parse_packwerk'
30+
spec.add_dependency 'packs'
3131
spec.add_dependency 'sorbet-runtime'
3232

3333
spec.add_development_dependency 'rake'

lib/code_ownership.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
require 'code_teams'
77
require 'sorbet-runtime'
88
require 'json'
9-
require 'parse_packwerk'
9+
require 'packs'
1010
require 'code_ownership/cli'
1111
require 'code_ownership/private'
1212

@@ -140,7 +140,7 @@ def for_class(klass)
140140
end
141141
end
142142

143-
sig { params(package: ParsePackwerk::Package).returns(T.nilable(::CodeTeams::Team)) }
143+
sig { params(package: Packs::Pack).returns(T.nilable(::CodeTeams::Team)) }
144144
def for_package(package)
145145
Private::OwnershipMappers::PackageOwnership.new.owner_for_package(package)
146146
end

lib/code_ownership/private/ownership_mappers/package_ownership.rb

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,14 @@ class PackageOwnership
99
extend T::Sig
1010
include Interface
1111

12-
@@package_yml_cache = T.let({}, T::Hash[String, T.nilable(ParsePackwerk::Package)]) # rubocop:disable Style/ClassVars
12+
@@package_yml_cache = T.let({}, T::Hash[String, T.nilable(Packs::Pack)]) # rubocop:disable Style/ClassVars
1313

1414
sig do
1515
override.params(file: String).
1616
returns(T.nilable(::CodeTeams::Team))
1717
end
1818
def map_file_to_owner(file)
19-
package = ParsePackwerk.package_from_path(file)
19+
package = Packs.for_file(file)
2020

2121
return nil if package.nil?
2222

@@ -29,11 +29,11 @@ def map_file_to_owner(file)
2929
returns(T::Hash[String, T.nilable(::CodeTeams::Team)])
3030
end
3131
def map_files_to_owners(files) # rubocop:disable Lint/UnusedMethodArgument
32-
ParsePackwerk.all.each_with_object({}) do |package, res|
32+
Packs.all.each_with_object({}) do |package, res|
3333
owner = owner_for_package(package)
3434
next if owner.nil?
3535

36-
glob = package.directory.join('**/**').to_s
36+
glob = package.relative_path.join('**/**').to_s
3737
Dir.glob(glob).each do |path|
3838
res[path] = owner
3939
end
@@ -52,11 +52,11 @@ def map_files_to_owners(files) # rubocop:disable Lint/UnusedMethodArgument
5252
override.returns(T::Hash[String, T.nilable(::CodeTeams::Team)])
5353
end
5454
def codeowners_lines_to_owners
55-
ParsePackwerk.all.each_with_object({}) do |package, res|
55+
Packs.all.each_with_object({}) do |package, res|
5656
owner = owner_for_package(package)
5757
next if owner.nil?
5858

59-
res[package.directory.join('**/**').to_s] = owner
59+
res[package.relative_path.join('**/**').to_s] = owner
6060
end
6161
end
6262

@@ -65,7 +65,7 @@ def description
6565
'Owner metadata key in package.yml'
6666
end
6767

68-
sig { params(package: ParsePackwerk::Package).returns(T.nilable(CodeTeams::Team)) }
68+
sig { params(package: Packs::Pack).returns(T.nilable(CodeTeams::Team)) }
6969
def owner_for_package(package)
7070
raw_owner_value = package.metadata['owner']
7171
return nil if !raw_owner_value

sorbet/rbi/gems/[email protected]

Lines changed: 80 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

sorbet/rbi/gems/[email protected]

Lines changed: 0 additions & 146 deletions
This file was deleted.

spec/lib/code_ownership_spec.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -762,7 +762,7 @@ def prevent_false_positive!
762762
before { create_non_empty_application }
763763

764764
it 'returns the right team' do
765-
team = CodeOwnership.for_package(ParsePackwerk.find('packs/my_other_package'))
765+
team = CodeOwnership.for_package(Packs.find('packs/my_other_package'))
766766
expect(team.name).to eq 'Bar'
767767
end
768768
end

spec/spec_helper.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
config.before do
3232
CodeOwnership.bust_caches!
3333
CodeTeams.bust_caches!
34-
ParsePackwerk.bust_cache!
34+
Packs.bust_cache!
3535
allow(CodeTeams::Plugin).to receive(:registry).and_return({})
3636
end
3737
end

0 commit comments

Comments
 (0)