compare_linker 1.4.1 → 1.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6c38322e782230d1ef5e12c31808dbadeb564fe452bd91df5a65518fb809e95
-  data.tar.gz: e650a0d48a4c4785a2abdf83ad18985eeebf698a417381eb16547ebb84aeaa93
+  metadata.gz: 65da887b73e5fabab1db09457461a5579fd2bb42471e5f6880d09641c68acb5c
+  data.tar.gz: 4b29c00670d32ee28010f07ad31d88590d128a61c48aa4ca814b95a5335ed2d6
 SHA512:
-  metadata.gz: aa6d3ac40c49e0ad9be1b03d72384c43c825befb840c966462aca21118a7a69d9105dab2998ae8669ec79cce7a7ace5826a23e6e451845ed457ffeffb5511247
-  data.tar.gz: 3072a1d8d189c2ccf6d6791d9490773893e37e88cf2395e735d31d486bbd4d98de3e2630661bcc39d93d05453af4c17b38fa24679f9b6be49e503bfda8ad222f
+  metadata.gz: 01066c681a37b6b9368814a6653792ab7c77c2b917a12e20b83fb40b74ff2f5cc29f9c0f6b5fa96ead45737d8f176ef8df081486f87b9cb007539e4658a16e84
+  data.tar.gz: 7fcdf4d543eb414a30e2bcaeae80863917c282a28b55adcb6cf553d48f8c8b4588abc8727fa31eb9141b1613ff2cc8d9579867655eab462625bdf85bf5e9f7dd

data/lib/compare_linker/formatter/base.rb

@@ -18,9 +18,9 @@ class CompareLinker
       end
 
       def downgrade?(old_ver, new_ver, old_tag, new_tag, old_rev, new_rev)
-        Gem::Version.new(new_ver) < Gem::Version.new(old_ver) ||
-          (old_tag && new_tag && Gem::Version.new(to_ver(new_tag)) < Gem::Version.new(to_ver(old_tag))) ||
-          (old_rev && new_rev && Gem::Version.new(to_ver(new_rev)) < Gem::Version.new(to_ver(old_rev)))
+        (old_ver && new_ver && (Gem::Version.new(new_ver) < Gem::Version.new(old_ver))) ||
+          (old_tag && new_tag && (Gem::Version.new(to_ver(new_tag)) < Gem::Version.new(to_ver(old_tag)))) ||
+          (old_rev && new_rev && (Gem::Version.new(to_ver(new_rev)) < Gem::Version.new(to_ver(old_rev))))
       rescue ArgumentError # Gem::Version raise ArgumentError if it is invalid as version
         false
       end

data/lib/compare_linker/version.rb

@@ -1,3 +1,3 @@
 class CompareLinker
-  VERSION = "1.4.1"
+  VERSION = "1.4.2"
 end

data/spec/factories/gem_info.rb

@@ -143,6 +143,31 @@ FactoryGirl.define do
       end
     end
 
+    factory :g_invalid_version__old_rev__new_rev do
+      defaults = {
+        owner: 'sds',
+        gem_name: 'slim-lint',
+      }
+
+      factory :g_upgrade__invalid_version__old_rev__new_rev do
+        initialize_with do
+          defaults.merge(
+            old_rev: '111e56fa5f4f75c03ad4043023232f7e972100d8',
+            new_rev: 'dc24a0900a4bd29209b812e9119f5bc6eb3eb649'
+          )
+        end
+      end
+
+      factory :g_downgrade__invalid_version__old_rev__new_rev do
+        initialize_with do
+          defaults.merge(
+            old_rev: 'dc24a0900a4bd29209b812e9119f5bc6eb3eb649',
+            new_rev: '111e56fa5f4f75c03ad4043023232f7e972100d8'
+          )
+        end
+      end
+    end
+
     factory :g_else do
       defaults = {
         owner:        nil,

data/spec/lib/compare_linker/formatter/markdown_spec.rb

@@ -31,6 +31,11 @@ describe CompareLinker::Formatter::Markdown do
         it { is_expected.to eq '* [ ] [sfl](https://github.com/ujihisa/spawn-for-legacy): `2.2...2.3`' }
       end
 
+      context 'given invalid version' do
+        let(:gem_info) { build(:g_upgrade__invalid_version__old_rev__new_rev) }
+        it { is_expected.to eq '* [ ] [slim-lint](https://github.com/sds/slim-lint): [`111e56fa5f4f75c03ad4043023232f7e972100d8...dc24a0900a4bd29209b812e9119f5bc6eb3eb649`](https://github.com/sds/slim-lint/compare/111e56fa5f4f75c03ad4043023232f7e972100d8...dc24a0900a4bd29209b812e9119f5bc6eb3eb649)' }
+      end
+
       context 'given else' do
         let(:gem_info) { build(:g_upgrade__else) }
         it { is_expected.to eq '* [ ] json: (link not found) `1.8.1...1.8.2`' }
@@ -64,6 +69,11 @@ describe CompareLinker::Formatter::Markdown do
         it { is_expected.to eq '* [ ] [sfl](https://github.com/ujihisa/spawn-for-legacy): `2.3...2.2` (downgrade)' }
       end
 
+      context 'given invalid version' do
+        let(:gem_info) { build(:g_downgrade__invalid_version__old_rev__new_rev) }
+        it { is_expected.to eq '* [ ] [slim-lint](https://github.com/sds/slim-lint): [`dc24a0900a4bd29209b812e9119f5bc6eb3eb649...111e56fa5f4f75c03ad4043023232f7e972100d8`](https://github.com/sds/slim-lint/compare/dc24a0900a4bd29209b812e9119f5bc6eb3eb649...111e56fa5f4f75c03ad4043023232f7e972100d8)' }
+      end
+
       context 'given else' do
         let(:gem_info) { build(:g_downgrade__else) }
         it { is_expected.to eq '* [ ] json: (link not found) `1.8.2...1.8.1` (downgrade)' }

data/spec/lib/compare_linker/formatter/text_spec.rb

@@ -31,6 +31,11 @@ describe CompareLinker::Formatter::Text do
         it { is_expected.to eq 'sfl: https://github.com/ujihisa/spawn-for-legacy 2.2...2.3' }
       end
 
+      context 'given invalid version' do
+        let(:gem_info) { build(:g_upgrade__invalid_version__old_rev__new_rev) }
+        it { is_expected.to eq 'slim-lint: https://github.com/sds/slim-lint/compare/111e56fa5f4f75c03ad4043023232f7e972100d8...dc24a0900a4bd29209b812e9119f5bc6eb3eb649' }
+      end
+
       context 'given else' do
         let(:gem_info) { build(:g_upgrade__else) }
         it { is_expected.to eq 'json (link not found): 1.8.1...1.8.2' }
@@ -64,6 +69,10 @@ describe CompareLinker::Formatter::Text do
         it { is_expected.to eq 'sfl: https://github.com/ujihisa/spawn-for-legacy 2.3...2.2 (downgrade)' }
       end
 
+      context 'given invalid version' do
+        let(:gem_info) { build(:g_downgrade__invalid_version__old_rev__new_rev) }
+        it { is_expected.to eq 'slim-lint: https://github.com/sds/slim-lint/compare/dc24a0900a4bd29209b812e9119f5bc6eb3eb649...111e56fa5f4f75c03ad4043023232f7e972100d8' }
+      end
       context 'given else' do
         let(:gem_info) { build(:g_downgrade__else) }
         it { is_expected.to eq 'json (link not found): 1.8.2...1.8.1 (downgrade)' }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compare_linker
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
 platform: ruby
 authors:
 - Kensuke Nagae