travis_check_rubies 0.5.1 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8cb26b63992baa996d1922cdee91e74f37ed36bc542458fb6325f85063167560
-  data.tar.gz: 7e0036257b4ae7cc6c8d11ed1f2ae9b5fa296d79df14f7510276e8c14341474b
+  metadata.gz: 754293bfea3d3b93d0cca432c90b7b792ff7cf5634a670f8cdd8f82e4d3511b6
+  data.tar.gz: af8d4c0090e245130ac90dad26bd6068e08d340fe1c2a52f73352d3b0e15d1a7
 SHA512:
-  metadata.gz: 51f56606429e36b3a081906604da422a2e174ab612fbfbac5e094e331bc8e9fe174cc59c9d57c59966ce71144318a44dbfa091c02c6aa7f05ea25da0dc126d19
-  data.tar.gz: 99e6f2f37440bcf7cc415ddefffa98ef4d7bd70aa7acd6b29544d6d1a7e43309176318f4a4248724ce318ece24a7d678ca0fede5d067ca08acd01595161f9b36
+  metadata.gz: 73413645cbabaeea6f125258ad0df781e10f7dd2df886fdde4aac740cdd5651fa4bea375fb9860274a75b6a4100bd385ca1df3c3bd70ab7cab162c86b4e45cff
+  data.tar.gz: 026aec14d310b2b61bba7c34787c7159c6a11acc403af9cb4602f2d83b0559f03806ff7ad8ee97223315189cf9e3ee9b7223309ede98daf7f7b7df3fa96e7e04

data/.travis.yml

@@ -1,14 +1,14 @@
-sudo: false
-dist: trusty
+dist: xenial
 language: ruby
 rvm:
   - '2.3.8'
   - '2.4.10'
-  - '2.5.8'
-  - '2.6.6'
-  - '2.7.1'
+  - '2.5.9'
+  - '2.6.7'
+  - '2.7.3'
+  - '3.0.1'
   - 'jruby-9.1.17.0'
-  - 'jruby-9.2.11.1'
+  - 'jruby-9.2.14.0'
 before_script:
   - env
   - rvm debug

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2017-2020 Ivan Kuchin
+Copyright (c) 2017-2021 Ivan Kuchin
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -43,4 +43,4 @@ bundle exec travis_check_rubies
 
 ## Copyright
 
-Copyright (c) 2017-2020 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.
+Copyright (c) 2017-2021 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.

data/lib/travis_check_rubies/travis_index.rb

@@ -1,10 +1,21 @@
 require_relative 'fetcher'
 
+require 'travis_check_rubies/travis_yml'
+
 module TravisCheckRubies
   class TravisIndex
     ROOT_URL = 'https://rubies.travis-ci.org/'
 
+    LTS_VERSIONS = {
+      precise: '12.04',
+      trusty: '14.04',
+      xenial: '16.04',
+      bionic: '18.04',
+      focal: '20.04',
+    }
+
     def version_strings
+      $stderr.puts "Using #{base_url}"
       index_urls.select do |url|
         url.start_with?(base_url)
       end.map do |url|
@@ -19,14 +30,15 @@ module TravisCheckRubies
     end
 
     def base_url
-      @base_url ||= if ENV['TRAVIS']
-        sys_path = `rvm debug`[/(?:system|remote.path):\s*"(.*?)"/, 1]
-        "#{ROOT_URL}#{sys_path}/"
-      else
+      @base_url ||= begin
         base_ubuntu_url = "#{ROOT_URL}ubuntu/"
-        first_ubuntu_url = index_urls.sort.find{ |url| url.start_with?(base_ubuntu_url) }
-        fail "First ubuntu url (#{ROOT_URL}ubuntu/*) not fount out of:\n#{index_urls.join("\n")}" unless first_ubuntu_url
-        first_ubuntu_url[%r{^.*/}]
+        dist = TravisYml.new.dist
+        version = LTS_VERSIONS[dist.to_sym]
+        if version
+          "#{base_ubuntu_url}#{version}/x86_64/"
+        else
+          fail "Unknown dist #{dist}"
+        end
       end
     end
   end

data/lib/travis_check_rubies/travis_yml.rb

@@ -15,6 +15,10 @@ module TravisCheckRubies
       @options = options
     end
 
+    def dist
+      original_object['dist'] || 'xenial'
+    end
+
     def warnings
       return @warnings if @warnings
 
@@ -40,7 +44,7 @@ module TravisCheckRubies
 
       @suggestions = []
 
-      updates = Version.updates(rvm_versions, options)
+      updates = Version.updates(rvm_versions, **options)
       rvm_versions.each do |version|
         next unless (suggestions = updates[version])
         @suggestions << Suggestion.new('rvm', version, suggestions)
@@ -52,7 +56,7 @@ module TravisCheckRubies
         'include' => include_versions,
       }.each do |section, versions|
         versions.each do |version|
-          next unless (suggestions = Version.update(version, options))
+          next unless (suggestions = Version.update(version, **options))
           next if suggestions.include?(version)
           to = section == 'include' && !options[:conservative] ? suggestions.last : suggestions.first
           @suggestions << Suggestion.new(section, version, suggestions, to)

data/lib/travis_check_rubies/version.rb

@@ -57,7 +57,7 @@ module TravisCheckRubies
         updates = {}
         has = Set.new
         versions.uniq.sort.reverse_each do |version|
-          deduplicated = (update(version, options) || [version]).select{ |v| has.add?(v) }
+          deduplicated = (update(version, **options) || [version]).select{ |v| has.add?(v) }
           updates[version] = [version] == deduplicated ? nil : deduplicated
         end
 

data/spec/travis_check_rubies/travis_index_spec.rb

@@ -3,33 +3,14 @@ require 'travis_check_rubies/travis_index'
 
 describe TravisCheckRubies::TravisIndex do
   describe '#base_url' do
-    before do
-      allow(ENV).to receive(:[]).with('TRAVIS').and_return(env_travis)
-    end
-
-    context 'when env variable TRAVIS is set' do
-      let(:env_travis){ 'true' }
-
-      it 'gets base_url from rvm debug' do
-
-        allow(subject).to receive(:`).with('rvm debug').
-          and_return(%Q{  foo: "xxx"  \n  system: "XXX/YYY"  \n  bar: "yyy"  })
-
-        expect(subject.send(:base_url)).to eq('https://rubies.travis-ci.org/XXX/YYY/')
-      end
-    end
-
     context 'when env variable TRAVIS is not set' do
       let(:env_travis){ nil }
 
       it 'gets base_url from first ubuntu url in index' do
-        allow(subject).to receive(:index_urls).and_return(%w[
-          https://rubies.travis-ci.org/osx/AAA/1.tar.gz
-          https://rubies.travis-ci.org/ubuntu/ZZZ/2.tar.gz
-          https://rubies.travis-ci.org/ubuntu/BBB/3.tar.gz
-        ])
+        allow(TravisCheckRubies::TravisYml).to receive(:new)
+          .and_return instance_double(TravisCheckRubies::TravisYml, dist: 'trusty')
 
-        expect(subject.send(:base_url)).to eq('https://rubies.travis-ci.org/ubuntu/BBB/')
+        expect(subject.send(:base_url)).to eq('https://rubies.travis-ci.org/ubuntu/14.04/x86_64/')
       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.5.1'
+  s.version     = '0.6.0'
   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    = "https://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.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Ivan Kuchin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-04-04 00:00:00.000000000 Z
+date: 2021-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -54,7 +54,7 @@ dependencies:
         version: '3.0'
 description: Check if `.travis.yml` specifies latest available rubies from listed
   on https://rubies.travis-ci.org and propose changes
-email: 
+email:
 executables:
 - travis_check_rubies
 extensions: []
@@ -83,9 +83,9 @@ licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/toy/travis_check_rubies/issues
-  documentation_uri: https://www.rubydoc.info/gems/travis_check_rubies/0.5.1
+  documentation_uri: https://www.rubydoc.info/gems/travis_check_rubies/0.6.0
   source_code_uri: https://github.com/toy/travis_check_rubies
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -100,8 +100,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
-signing_key: 
+rubygems_version: 3.1.5
+signing_key:
 specification_version: 4
 summary: Are you using the latest rubies in .travis.yml?
 test_files: