travis_check_rubies 0.2.3 → 0.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 705f3daf747e41d10b3741675911bc8e4e8c2a0b
-  data.tar.gz: e6f8c836ab2219974821ebbf9d574cb85a75e496
+  metadata.gz: 79c7c553d8c2dfe132d8271ce1b7d15d0e1af4b1
+  data.tar.gz: d79de154f958f13910b95d5064c1373c9625374b
 SHA512:
-  metadata.gz: ef52802f01db0665985b173ad44a12e01a5c9ad86f338d2123a4a5f3c3cccace827700f8958ba2b51a946076f10cc78303c3444ef8858c758d017da9c6ebd697
-  data.tar.gz: 70c2ad0b29ca21d23d5180c8beb9527c8ccf747537724d986a0c5091f82c169d3e535c7558023c07e6fdf5bca1bda2c5e8964af59f5658e179c7e1f2a09af9fc
+  metadata.gz: e5ea1758ef15bff59ca6e325d7be842e9afbe4384f3d230d0aa5746a36c0d97af85adbe1326d09932508ac4b911139db74d65874a5638fa8a207069b1a7de959
+  data.tar.gz: 6b13a16da277c44683bc7445ae2a2118c7964c5f20b78653d409aee63145b31ece17b52e1643e5bc8dcbd9eeaded78a7bff9dddd5b186755a62867eb0091fc2e

data/lib/travis_check_rubies/version.rb

@@ -30,13 +30,14 @@ module TravisCheckRubies
         parts = Array(parts)
         exclude = exclude.map{ |ev| convert(ev) }
         ordered = allow_pre ? available : available.partition(&:pre).inject(:+)
-        candidates = ordered.reverse.select do |v|
+        candidates = ordered.select do |v|
           next unless v.version_parts
           next unless v.match?(version, parts.min)
           next unless v >= version
+          next if !allow_pre && v.pre && !version.pre
           next if exclude.any?{ |ev| ev.match?(v, ev.version_parts.length) }
           true
-        end
+        end.reverse
 
         updates = if intermediary
           candidates.group_by do |v|

data/spec/travis_check_rubies/version_spec.rb

@@ -385,32 +385,50 @@ describe TravisCheckRubies::Version do
     end
 
     describe 'pre releases' do
-      let(:available_strs){ %w[2.4.0-pre 2.4.0 2.4.1 2.4.2-pre1 2.4.2-pre2] }
+      let(:available_strs){ %w[2.4.0-pre 2.4.0 2.4.1 2.4.2-pre1 2.4.2-pre2 2.5.0 2.5.1-preview1 3.0.0-preview1] }
 
-      context 'when for pre release there is only newer pre release' do
-        it 'returns next pre release' do
-          expect(described_class.update(v('2.4.2-pre1'))).to eq [v('2.4.2-pre2')]
+      context 'when allow_pre is false' do
+        context 'for release version' do
+          it 'returns only newer release versions' do
+            expect(described_class.update(v('2.4.0'))).to eq vs(%w[2.4.1 2.5.0])
+          end
         end
-      end
 
-      context 'when there is a newer release and even newer pre release' do
-        context 'for release' do
-          it 'returns newer release when allow_pre is false' do
-            expect(described_class.update(v('2.4.0'))).to eq [v('2.4.1')]
+        context 'for pre release version' do
+          context 'there are newer release versions' do
+            it 'returns newer release versions' do
+              expect(described_class.update(v('2.4.0-pre'))).to eq vs(%w[2.4.1 2.5.0 3.0.0-preview1])
+            end
+          end
+
+          context 'there are no newer release versions' do
+            it 'returns newer pre release versions' do
+              expect(described_class.update(v('2.4.2-pre1'))).to eq vs(%w[2.4.2-pre2 2.5.0 3.0.0-preview1])
+            end
           end
+        end
+      end
+
+      context 'when allow_pre is true' do
+        let(:expected){ vs(%w[2.4.2-pre2 2.5.1-preview1 3.0.0-preview1]) }
 
-          it 'returns even newer pre release when allow_pre is true' do
-            expect(described_class.update(v('2.4.0'), allow_pre: true)).to eq [v('2.4.2-pre2')]
+        context 'for release version' do
+          it 'returns newer pre release versions' do
+            expect(described_class.update(v('2.4.0'), allow_pre: true)).to eq expected
           end
         end
 
-        context 'for pre release' do
-          it 'returns release when allow_pre is false' do
-            expect(described_class.update(v('2.4.0-pre'))).to eq [v('2.4.1')]
+        context 'for pre release version' do
+          context 'there are newer release versions' do
+            it 'returns newer pre release versions' do
+              expect(described_class.update(v('2.4.0-pre'), allow_pre: true)).to eq expected
+            end
           end
 
-          it 'returns even newer pre release when allow_pre is true' do
-            expect(described_class.update(v('2.4.0-pre'), allow_pre: true)).to eq [v('2.4.2-pre2')]
+          context 'there are no newer release versions' do
+            it 'returns newer pre release versions' do
+              expect(described_class.update(v('2.4.2-pre1'), allow_pre: true)).to eq expected
+            end
           end
         end
       end

data/travis_check_rubies.gemspec

@@ -2,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'travis_check_rubies'
-  s.version     = '0.2.3'
+  s.version     = '0.2.4'
   s.summary     = 'Are you using the latest rubies in .travis.yml?'
   s.description = 'Check if `.travis.yml` specifies latest available rubies from listed on https://rubies.travis-ci.org and propose changes'
   s.homepage    = "http://github.com/toy/#{s.name}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis_check_rubies
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.2.4
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-18 00:00:00.000000000 Z
+date: 2017-11-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -77,7 +77,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Are you using the latest rubies in .travis.yml?