Skip to content

Commit 67e63a9

Browse files
committed
Merge branch 'matt/remove_pom_support' into 'master'
Remove support for pom.xml See merge request mx/binks!5
2 parents 7be5323 + b932ef5 commit 67e63a9

8 files changed

Lines changed: 18 additions & 58 deletions

File tree

Gemfile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
# frozen_string_literal: true
22

33
source "https://rubygems.org"
4-
source "https://gems.internal.mx"
54

65
gemspec

Gemfile.lock

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -2,30 +2,25 @@ PATH
22
remote: .
33
specs:
44
binks (0.0.4)
5-
nokogiri (>= 1.10.4)
65
thor (>= 0.20.3)
76

87
GEM
98
remote: https://rubygems.org/
10-
remote: https://gems.internal.mx/
119
specs:
1210
ast (2.4.0)
1311
coderay (1.1.2)
1412
diff-lcs (1.3)
1513
docile (1.3.2)
16-
ffi (1.11.1-java)
17-
jaro_winkler (1.5.3)
18-
jaro_winkler (1.5.3-java)
19-
json (2.2.0)
20-
json (2.2.0-java)
14+
ffi (1.11.3-java)
15+
jaro_winkler (1.5.4)
16+
jaro_winkler (1.5.4-java)
17+
json (2.3.0)
18+
json (2.3.0-java)
2119
mad_rubocop (3.64.0)
2220
rubocop (~> 0.64.0)
2321
method_source (0.9.2)
24-
mini_portile2 (2.4.0)
25-
nokogiri (1.10.4)
26-
mini_portile2 (~> 2.4.0)
27-
parallel (1.18.0)
28-
parser (2.6.5.0)
22+
parallel (1.19.1)
23+
parser (2.7.0.2)
2924
ast (~> 2.4.0)
3025
powerpack (0.1.2)
3126
pry (0.12.2)
@@ -42,15 +37,15 @@ GEM
4237
rspec-core (~> 3.9.0)
4338
rspec-expectations (~> 3.9.0)
4439
rspec-mocks (~> 3.9.0)
45-
rspec-core (3.9.0)
46-
rspec-support (~> 3.9.0)
40+
rspec-core (3.9.1)
41+
rspec-support (~> 3.9.1)
4742
rspec-expectations (3.9.0)
4843
diff-lcs (>= 1.2.0, < 2.0)
4944
rspec-support (~> 3.9.0)
50-
rspec-mocks (3.9.0)
45+
rspec-mocks (3.9.1)
5146
diff-lcs (>= 1.2.0, < 2.0)
5247
rspec-support (~> 3.9.0)
53-
rspec-support (3.9.0)
48+
rspec-support (3.9.2)
5449
rubocop (0.64.0)
5550
jaro_winkler (~> 1.5.1)
5651
parallel (~> 1.10)
@@ -67,7 +62,7 @@ GEM
6762
simplecov-html (0.10.2)
6863
spoon (0.0.6)
6964
ffi
70-
thor (0.20.3)
65+
thor (1.0.1)
7166
unicode-display_width (1.4.1)
7267

7368
PLATFORMS
@@ -85,4 +80,4 @@ DEPENDENCIES
8580
simplecov
8681

8782
BUNDLED WITH
88-
1.17.1
83+
2.1.4

binks.gemspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ require "binks/version"
3131
spec.executables = ["binks"]
3232
spec.require_paths = ["lib"]
3333

34-
spec.add_dependency "nokogiri", ">= 1.10.4"
34+
# spec.add_dependency "nokogiri", ">= 1.10.4"
3535
spec.add_dependency "thor", ">= 0.20.3"
3636

3737
spec.add_development_dependency "bundler", ">= 1.16.0"

lib/binks.rb

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,5 @@
55
require "binks/git_cli"
66
require "binks/gradle"
77
require "binks/jar"
8-
require "binks/pom"
98
require "binks/version_parser"
109
require "binks/version"

lib/binks/jar.rb

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,11 +39,7 @@ def git
3939
end
4040

4141
def build_file
42-
@build_file ||= if ::File.exist?("pom.xml")
43-
::Binks::Pom.new("pom.xml")
44-
elsif ::File.exist?("build.gradle")
45-
::Binks::Gradle.new("build.gradle")
46-
end
42+
@build_file ||= ::Binks::Gradle.new("build.gradle")
4743
end
4844
end
4945
end

lib/binks/pom.rb

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

spec/binks/jar_spec.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@
55
let(:branch) { "master" }
66
let(:all_tags) { [] }
77
let(:dirty) { false }
8-
let(:pom) { double(:pom, :version => ::Binks::VersionParser.new(version)) }
8+
let(:build) { double(:build, :version => ::Binks::VersionParser.new(version)) }
99
let(:git) { double(:git) }
1010

1111
let(:options) { {} }
1212
subject { described_class.new(options) }
1313

1414
before do
1515
allow(::Binks::GitCli).to receive(:new).and_return(git)
16-
allow(::Binks::Pom).to receive(:new).and_return(pom)
16+
allow(::Binks::Gradle).to receive(:new).and_return(build)
1717

1818
allow(git).to receive(:current_branch).and_return(branch)
1919
allow(git).to receive(:all_tags).and_return(all_tags)
@@ -93,7 +93,7 @@
9393
describe "#version" do
9494
let(:version) { "0.0.2" }
9595

96-
it "gives version from pom" do
96+
it "gives version from build" do
9797
expect(subject.version.to_s).to eq(version)
9898
end
9999
end

spec/binks/pom_spec.rb

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

0 commit comments

Comments
 (0)