travis_check_rubies 0.2.5 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: ab21a220cbfd5c324fed2b89437b745669ac522e
-  data.tar.gz: 535c8f939a7d062574f920c0c1f42d28e06ed754
+SHA256:
+  metadata.gz: 754293bfea3d3b93d0cca432c90b7b792ff7cf5634a670f8cdd8f82e4d3511b6
+  data.tar.gz: af8d4c0090e245130ac90dad26bd6068e08d340fe1c2a52f73352d3b0e15d1a7
 SHA512:
-  metadata.gz: 849c73497444dfcf8e1aa7c0303e6169c8ee823d8ae072ec7190016468857cad59618cbdaaeb232b0e67c523a6eef3b3b5bcad03913baabfeb54aa88c98025ac
-  data.tar.gz: 010526626e47ad0a788cf4b15acf2849318ba4c5f4d0936ee6d729679a0f496a5f180b8a8c104af8201e4f7e4c58ef04d9853de89c7ff1f7e347c2329d2c4988
+  metadata.gz: 73413645cbabaeea6f125258ad0df781e10f7dd2df886fdde4aac740cdd5651fa4bea375fb9860274a75b6a4100bd385ca1df3c3bd70ab7cab162c86b4e45cff
+  data.tar.gz: 026aec14d310b2b61bba7c34787c7159c6a11acc403af9cb4602f2d83b0559f03806ff7ad8ee97223315189cf9e3ee9b7223309ede98daf7f7b7df3fa96e7e04

data/.travis.yml

@@ -1,23 +1,17 @@
-sudo: false
+dist: xenial
 language: ruby
 rvm:
-  - '2.0.0-p648'
-  - '2.1.10'
-  - '2.2.8'
-  - '2.3.5'
-  - '2.4.2'
-  - 'jruby-9.0.5.0'
-  - 'jruby-9.1.9.0'
+  - '2.3.8'
+  - '2.4.10'
+  - '2.5.9'
+  - '2.6.7'
+  - '2.7.3'
+  - '3.0.1'
+  - 'jruby-9.1.17.0'
+  - 'jruby-9.2.14.0'
 before_script:
   - env
   - rvm debug
 script:
   - bundle exec rspec
   - bundle exec travis_check_rubies
-matrix:
-  allow_failures:
-    - rvm: 'jruby-9.0.5.0'
-  exclude:
-    - rvm: 'jruby-9.0.5.0'
-  include:
-    - rvm: 'jruby-9.0.5.0'

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2017 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 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.
+Copyright (c) 2017-2021 Ivan Kuchin. See [LICENSE.txt](LICENSE.txt) for details.

data/bin/travis_check_rubies

@@ -6,6 +6,8 @@ require 'yaml'
 
 CONFIG_FILE = '.travis_check_rubies.yml'
 
+update = false
+
 options = if File.exist?(CONFIG_FILE)
   yaml = YAML.load_file(CONFIG_FILE) || {}
   fail "#{CONFIG_FILE} doesn't contain options hash" unless yaml.is_a?(Hash)
@@ -36,11 +38,21 @@ end
 op.on('--exclude V,V,V', Array, 'Exclude matching versions') do |exclude|
   options[:exclude] = exclude
 end
+op.on('--conservative', 'Update to first instead of last possible version') do
+  options[:conservative] = true
+end
+op.on('-u', '--update', 'Update versions') do
+  update = true
+end
 begin
   op.parse!
 rescue => e
   abort "#{e}\n\n#{op.help}"
 end
 
-suggestions = TravisCheckRubies::TravisYml.new.suggestions(options)
-abort suggestions if suggestions
+travis_yml = TravisCheckRubies::TravisYml.new(options: options)
+if update
+  abort unless travis_yml.update
+else
+  abort unless travis_yml.suggest
+end

data/lib/travis_check_rubies.rb

@@ -1,4 +1,4 @@
-require 'travis_check_rubies/version'
+require_relative 'travis_check_rubies/version'
 
 module TravisCheckRubies
 end

data/lib/travis_check_rubies/fetcher.rb

@@ -0,0 +1,44 @@
+require 'digest'
+require 'fspath'
+require 'net/http'
+require 'uri'
+
+module TravisCheckRubies
+  class Fetcher
+    CACHE_TIME = 24 * 60 * 60
+
+    attr_reader :url
+
+    def initialize(url)
+      @url = url
+    end
+
+    def data
+      cached_data || fetch_data
+    end
+
+  private
+
+    def cache_path
+      @cache_path ||= FSPath(ENV['XDG_CACHE_HOME'] || '~/.cache').expand_path / "travis_check_rubies.#{Digest::SHA1.hexdigest url}"
+    end
+
+    def cached_data
+      return unless cache_path.size?
+      return unless cache_path.mtime + CACHE_TIME > Time.now
+      cache_path.read
+    end
+
+    def fetch_data
+      data = Net::HTTP.get(URI(url))
+
+      cache_path.dirname.mkpath
+      FSPath.temp_file('travis_check_rubies', cache_path.dirname) do |f|
+        f.write(data)
+        f.path.rename(cache_path)
+      end
+
+      data
+    end
+  end
+end

data/lib/travis_check_rubies/rvm_index.rb

@@ -0,0 +1,11 @@
+require_relative 'fetcher'
+
+module TravisCheckRubies
+  class RvmIndex
+    URL = 'https://raw.githubusercontent.com/rvm/rvm/stable/config/known_strings'
+
+    def version_strings
+      TravisCheckRubies::Fetcher.new(URL).data.split("\n")
+    end
+  end
+end

data/lib/travis_check_rubies/travis_index.rb

@@ -0,0 +1,45 @@
+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|
+        url[%r{([^/]+)\.tar\.(?:gz|bz2)$}, 1]
+      end
+    end
+
+  private
+
+    def index_urls
+      @index_urls ||= TravisCheckRubies::Fetcher.new(ROOT_URL + 'index.txt').data.split("\n")
+    end
+
+    def base_url
+      @base_url ||= begin
+        base_ubuntu_url = "#{ROOT_URL}ubuntu/"
+        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
+end

data/lib/travis_check_rubies/travis_yml.rb

@@ -1,66 +1,157 @@
+require 'fspath'
 require 'yaml'
-require 'travis_check_rubies/version'
+
+require_relative 'updater'
+require_relative 'version'
 
 module TravisCheckRubies
   class TravisYml
-    attr_reader :path
-    attr_reader :versions, :allow_failures_versions, :exclude_versions, :include_versions
+    Suggestion = Struct.new(:section, :from, :choices, :to)
+
+    attr_reader :path, :options
 
-    def initialize(path = '.travis.yml')
-      @path = path
+    def initialize(path: '.travis.yml', options: {})
+      @path = FSPath(path)
+      @options = options
+    end
 
-      yaml = YAML.load_file(path)
-      @versions = Array(yaml['rvm']).map(&Version.method(:new))
-      @allow_failures_versions = matrix_versions(yaml, 'allow_failures')
-      @exclude_versions = matrix_versions(yaml, 'exclude')
-      @include_versions = matrix_versions(yaml, 'include')
+    def dist
+      original_object['dist'] || 'xenial'
     end
 
-    def suggestions(options)
-      suggestions = Hash.new{ |h, k| h[k] = [] }
+    def warnings
+      return @warnings if @warnings
 
-      updates = Version.updates(versions, options)
+      @warnings = []
 
-      versions.each do |version|
-        next unless (for_version = updates[version])
-        suggestions['rvm'] << "#{version} -> #{for_version.join(', ')}"
+      rvm_versions.group_by(&:itself).select{ |_, versions| versions.count > 1 }.each do |version, _|
+        @warnings << "#{version} in rvm is repeating"
       end
 
-      allow_failures_versions.each do |version|
-        next if versions.include?(version)
-        next if include_versions.include?(version)
-        suggestions['matrix.allow_failures'] << "#{version} in matrix.allow_failures is not in rvm or include list"
+      (allow_failures_versions - rvm_versions - include_versions).each do |version|
+        @warnings << "#{version} in matrix.allow_failures is not in rvm or include list"
       end
 
-      exclude_versions.each do |version|
-        next if versions.include?(version)
-        suggestions['matrix.exclude'] << "#{version} in matrix.exclude is not in rvm list"
+      (exclude_versions - rvm_versions).each do |version|
+        @warnings << "#{version} in matrix.exclude is not in rvm list"
+      end
+
+      @warnings
+    end
+
+    def suggestions
+      return @suggestions if @suggestions
+
+      @suggestions = []
+
+      updates = Version.updates(rvm_versions, **options)
+      rvm_versions.each do |version|
+        next unless (suggestions = updates[version])
+        @suggestions << Suggestion.new('rvm', version, suggestions)
       end
 
       {
-        'matrix.allow_failures' => allow_failures_versions,
-        'matrix.exclude' => exclude_versions,
+        'allow_failures' => allow_failures_versions,
+        'exclude' => exclude_versions,
+        'include' => include_versions,
       }.each do |section, versions|
         versions.each do |version|
-          next unless (for_version = updates[version])
-          suggestions[section] << "#{version} -> #{for_version.join(', ')}"
+          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)
         end
       end
 
-      include_versions.each do |version|
-        next unless (for_version = Version.update(version, options))
-        next if for_version.include?(version)
-        suggestions['matrix.include'] << "#{version} -> #{for_version.join(', ')}"
+      @suggestions
+    end
+
+    def suggest
+      puts warnings
+
+      suggestions.group_by(&:section).each do |section, section_suggestions|
+        puts "#{section}:"
+        section_suggestions.each do |suggestion|
+          puts "  #{suggestion.from} -> #{suggestion.choices.join(', ')}"
+        end
+      end
+
+      warnings.empty? && suggestions.empty?
+    end
+
+    def update
+      unless warnings.empty?
+        puts warnings
+
+        return false
+      end
+
+      unless YAML.load(updated_content) == expected_object
+        puts updated_content
+
+        return false
+      end
+
+      FSPath.temp_file(path.basename, path.dirname) do |f|
+        f.write(updated_content)
+        f.path.rename(path)
       end
 
-      return if suggestions.empty?
-      suggestions.map do |section, lines|
-        "#{section}:\n#{lines.map{ |line| "  #{line}" }.join("\n")}"
-      end.join("\n")
+      true
     end
 
   private
 
+    def original_content
+      @original_content ||= path.read
+    end
+
+    def original_object
+      @original_object ||= YAML.load(original_content)
+    end
+
+    def expected_object
+      @expected_object ||= YAML.load(original_content).tap do |expected|
+        suggestions.each do |suggestion|
+          if suggestion.section == 'rvm'
+            index = expected['rvm'].find_index{ |v| suggestion.from == v }
+            expected['rvm'][index, 1] = suggestion.choices.map(&:to_s)
+          else
+            entry = expected['matrix'][suggestion.section].find{ |attrs| suggestion.from == attrs['rvm'] }
+            entry['rvm'] = suggestion.to.to_s
+          end
+        end
+      end
+    end
+
+    def updated_content
+      return @updated_content if @updated_content
+
+      updater = Updater.new(original_content)
+
+      suggestions.each do |suggestion|
+        updater = updater.apply_suggestion(suggestion)
+      end
+
+      @updated_content = updater.content
+    end
+
+    def rvm_versions
+      @rvm_versions ||= Array(original_object['rvm']).map(&Version.method(:new))
+    end
+
+    def allow_failures_versions
+      @allow_failures_versions ||= matrix_versions(original_object, 'allow_failures')
+    end
+
+    def exclude_versions
+      @exclude_versions ||= matrix_versions(original_object, 'exclude')
+    end
+
+    def include_versions
+      @include_versions ||= matrix_versions(original_object, 'include')
+    end
+
     def matrix_versions(yaml, key)
       return [] unless (matrix = yaml['matrix'])
       return [] unless (list = matrix[key])

data/lib/travis_check_rubies/updater.rb

@@ -0,0 +1,98 @@
+require 'psych'
+
+module TravisCheckRubies
+  class Updater
+    attr_reader :content
+
+    def initialize(content)
+      @content = content
+    end
+
+    def apply_suggestion(suggestion)
+      lines = content.lines
+
+      if suggestion.section == 'rvm'
+        apply_rvm_suggestion(lines, suggestion)
+      else
+        apply_matrix_suggestion(lines, suggestion)
+      end
+
+      self.class.new lines.join('')
+    end
+
+  private
+
+    def apply_rvm_suggestion(lines, suggestion)
+      node = rvm_node.children.find{ |node| suggestion.from == node.to_ruby }
+
+      lines[node.start_line] = suggestion.choices.map do |version|
+        log_change suggestion.from, version, 'rvm'
+        line_with_version_change(lines, node, suggestion.from, version)
+      end.join('')
+    end
+
+    def apply_matrix_suggestion(lines, suggestion)
+      section_node = matrix_section_node(suggestion.section)
+
+      entry_node = section_node.children.find{ |node| suggestion.from == node.to_ruby['rvm'] }
+
+      node = fetch_node_mapping(entry_node, 'rvm')
+
+      log_change suggestion.from, suggestion.to, 'matrix'
+      lines[node.start_line] = line_with_version_change(lines, node, suggestion.from, suggestion.to)
+    end
+
+    def log_change(from, to, section)
+      puts "#{from} -> #{to} \# #{section} section"
+    end
+
+    def root
+      @root ||= Psych::Parser.new(Psych::TreeBuilder.new).parse(content).handler.root.children[0].children[0]
+    end
+
+    def rvm_node
+      fetch_node_mapping(root, 'rvm').tap do |rvm_node|
+        assert_type rvm_node, Psych::Nodes::Sequence
+        fail "Expected block style: #{rvm_node.to_ruby}" unless rvm_node.style == Psych::Nodes::Sequence::BLOCK
+      end
+    end
+
+    def matrix_section_node(section)
+      matrix_node = fetch_node_mapping(root, 'matrix')
+
+      fetch_node_mapping(matrix_node, section).tap do |section_node|
+        assert_type section_node, Psych::Nodes::Sequence
+      end
+    end
+
+    def fetch_node_mapping(mapping, key)
+      assert_type mapping, Psych::Nodes::Mapping
+
+      _, node = mapping.children.each_cons(2).find{ |key_node, _| key_node.to_ruby == key }
+
+      fail "Didn't find key #{key.inspect} in #{mapping.to_ruby}" unless node
+
+      node
+    end
+
+    def line_with_version_change(lines, node, from, to)
+      assert_type node, Psych::Nodes::Scalar
+
+      line = lines[node.start_line]
+
+      before = line[0...node.start_column]
+      excerpt = line[node.start_column...node.end_column]
+      after = line[node.end_column..-1]
+
+      fail "Didn't find #{from.to_s} in #{line}" unless excerpt.sub!(from.to_s, to.to_s)
+
+      "#{before}#{excerpt}#{after}"
+    end
+
+    def assert_type(node, expected_class)
+      return if node.is_a?(expected_class)
+
+      fail "Expected a #{expected_class}, got #{node.class}"
+    end
+  end
+end

data/lib/travis_check_rubies/version.rb

@@ -1,29 +1,20 @@
-require 'net/http'
-require 'fspath'
 require 'set'
-require 'uri'
+
+require_relative 'rvm_index'
+require_relative 'travis_index'
 
 module TravisCheckRubies
   class Version
-    ROOT_URL = 'https://rubies.travis-ci.org/'
-    CACHE_TIME = 24 * 60 * 60
-
     class << self
       def convert(version_or_string)
         version_or_string.is_a?(self) ? version_or_string : new(version_or_string)
       end
 
       def available
-        @available ||= begin
-          index_urls.select do |url|
-            url.start_with?(base_url)
-          end.map do |url|
-            new(url[%r{([^/]+)\.tar\.(?:gz|bz2)$}, 1])
-          end.sort
-        end
+        @available ||= [TravisIndex, RvmIndex].map(&:new).map(&:version_strings).inject(:|).map{ |s| new(s) }.sort
       end
 
-      def update(version, parts: 0..2, allow_pre: false, intermediary: true, exclude: [])
+      def update(version, parts: 0..2, allow_pre: false, intermediary: true, exclude: [], conservative: false)
         version = convert(version)
         return unless version.version_parts
 
@@ -66,53 +57,12 @@ 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
 
         Hash[versions.map{ |v| [v, updates[v]] }]
       end
-
-    private
-
-      def cache_path
-        @cache_path ||= FSPath(ENV['XDG_CACHE_HOME'] || '~/.cache').expand_path / 'travis_check_rubies.txt'
-      end
-
-      def index_urls
-        @index_urls ||= (cached_index_data || fetch_index_data).split("\n")
-      end
-
-      def cached_index_data
-        return unless cache_path.size?
-        return unless cache_path.mtime + CACHE_TIME > Time.now
-        data = cache_path.read
-        data if data.start_with?(ROOT_URL)
-      end
-
-      def fetch_index_data
-        data = Net::HTTP.get(URI(ROOT_URL + 'index.txt'))
-
-        cache_path.dirname.mkpath
-        FSPath.temp_file('travis_check_rubies', cache_path.dirname) do |f|
-          f.write(data)
-          f.path.rename(cache_path)
-        end
-
-        data
-      end
-
-      def base_url
-        @base_url ||= if ENV['TRAVIS']
-          sys_path = `rvm debug`[/(?:system|remote.path):\s*"(.*?)"/, 1]
-          "#{ROOT_URL}#{sys_path}/"
-        else
-          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{^.*/}]
-        end
-      end
     end
 
     include Comparable

data/spec/travis_check_rubies/fetcher_spec.rb

@@ -0,0 +1,48 @@
+require 'rspec'
+require 'travis_check_rubies/fetcher'
+
+describe TravisCheckRubies::Fetcher do
+  describe '#data' do
+    subject{ described_class.new(url) }
+
+    let(:url){ 'https://example.com/index.txt' }
+    let(:cache_path){ FSPath.temp_file_path }
+
+    before do
+      allow(subject).to receive(:cache_path).and_return(cache_path)
+    end
+
+    it 'returns data from url' do
+      allow(Net::HTTP).to receive(:get).with(URI(url)).
+        and_return("one\ntwo\nthree")
+
+      expect(subject.data).to eq("one\ntwo\nthree")
+    end
+
+    it 'caches result' do
+      allow(Net::HTTP).to receive(:get).with(URI(url)).
+        once.and_return("a\nb\nc")
+
+      3.times{ expect(subject.data).to eq("a\nb\nc") }
+    end
+
+    it 'reads cache from file if it is new' do
+      cache_path.write "foo\nbar"
+      allow(cache_path).to receive(:size?).and_return(616)
+      allow(cache_path).to receive(:mtime).and_return(Time.now - described_class::CACHE_TIME / 2)
+
+      expect(Net::HTTP).not_to receive(:get)
+      expect(subject.data).to eq("foo\nbar")
+    end
+
+    it 'writes cache file if it is stale' do
+      allow(cache_path).to receive(:size?).and_return(616)
+      allow(cache_path).to receive(:mtime).and_return(Time.now - described_class::CACHE_TIME * 2)
+      allow(Net::HTTP).to receive(:get).with(URI(url)).
+        once.and_return("brave\nnew\nworld")
+
+      expect(subject.data).to eq("brave\nnew\nworld")
+      expect(cache_path.read).to eq("brave\nnew\nworld")
+    end
+  end
+end

data/spec/travis_check_rubies/travis_index_spec.rb

@@ -0,0 +1,31 @@
+require 'rspec'
+require 'travis_check_rubies/travis_index'
+
+describe TravisCheckRubies::TravisIndex do
+  describe '#base_url' do
+    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(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/14.04/x86_64/')
+      end
+    end
+  end
+
+  describe '#version_strings' do
+    it 'gets versions from index urls matching base_url' 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/4.tar.gz
+        https://rubies.travis-ci.org/ubuntu/BBB/3.tar.bz2
+      ])
+      allow(subject).to receive(:base_url).and_return('https://rubies.travis-ci.org/ubuntu/BBB/')
+
+      expect(subject.version_strings).to match_array(%w[3 4])
+    end
+  end
+end

data/spec/travis_check_rubies/updater_spec.rb

@@ -0,0 +1,116 @@
+require 'rspec'
+require 'travis_check_rubies/updater'
+
+describe TravisCheckRubies::Updater do
+  describe '#apply_suggestion' do
+    subject{ described_class.new(content).apply_suggestion(suggestion) }
+
+    context 'for rvm change suggestion' do
+      let(:content) do
+        <<~YAML
+          language: ruby
+          rvm: # rvm
+            - '2.1.3' # foo
+            - '2.2.8' # bar
+            - '2.5.0' # baz
+          before_script:
+            - env # env
+        YAML
+      end
+
+      context 'removing version' do
+        let(:suggestion){ double(section: 'rvm', from: '2.2.8', choices: []) }
+
+        let(:expected) do
+          <<~YAML
+            language: ruby
+            rvm: # rvm
+              - '2.1.3' # foo
+              - '2.5.0' # baz
+            before_script:
+              - env # env
+          YAML
+        end
+
+        it{ is_expected.to have_attributes(content: expected) }
+      end
+
+      context 'changing to one version' do
+        let(:suggestion){ double(section: 'rvm', from: '2.2.8', choices: [double(to_s: '2.2.9')]) }
+
+        let(:expected) do
+          <<~YAML
+            language: ruby
+            rvm: # rvm
+              - '2.1.3' # foo
+              - '2.2.9' # bar
+              - '2.5.0' # baz
+            before_script:
+              - env # env
+          YAML
+        end
+
+        it{ is_expected.to have_attributes(content: expected) }
+      end
+
+      context 'changing to multiple versions' do
+        let(:suggestion){ double(section: 'rvm', from: '2.2.8', choices: [double(to_s: '2.2.9'), double(to_s: '2.3.4')]) }
+
+        let(:expected) do
+          <<~YAML
+            language: ruby
+            rvm: # rvm
+              - '2.1.3' # foo
+              - '2.2.9' # bar
+              - '2.3.4' # bar
+              - '2.5.0' # baz
+            before_script:
+              - env # env
+          YAML
+        end
+
+        it{ is_expected.to have_attributes(content: expected) }
+      end
+    end
+
+    context 'for matrix change suggestion' do
+      let(:content) do
+        <<~YAML
+          language: ruby
+          before_script:
+            - env # env
+          matrix:
+            allow_failures:
+              - rvm: '2.2.8' # foo
+            exclude:
+              - rvm: '2.2.8' # bar
+            include:
+              - rvm: '2.1.3' # foo
+              - rvm: '2.2.8' # bar
+              - rvm: '2.2.8' # baz
+        YAML
+      end
+
+      let(:suggestion){ double(section: 'include', from: '2.2.8', to: double(to_s: '2.2.9')) }
+
+      let(:expected) do
+        <<~YAML
+          language: ruby
+          before_script:
+            - env # env
+          matrix:
+            allow_failures:
+              - rvm: '2.2.8' # foo
+            exclude:
+              - rvm: '2.2.8' # bar
+            include:
+              - rvm: '2.1.3' # foo
+              - rvm: '2.2.9' # bar
+              - rvm: '2.2.8' # baz
+        YAML
+      end
+
+      it{ is_expected.to have_attributes(content: expected) }
+    end
+  end
+end

data/spec/travis_check_rubies/version_spec.rb

@@ -10,12 +10,6 @@ describe TravisCheckRubies::Version do
     strs.map{ |str| described_class.new(str) }
   end
 
-  def cleanup_instance_variables(o)
-    o.instance_variables.each do |name|
-      o.remove_instance_variable(name)
-    end
-  end
-
   describe 'parsing' do
     {
       '1.2.3-pre1' => {
@@ -202,116 +196,12 @@ describe TravisCheckRubies::Version do
     end
   end
 
-  describe '.index_urls' do
-    let(:cache_path){ FSPath.temp_file_path }
-
-    before do
-      cleanup_instance_variables(described_class)
-      allow(described_class).to receive(:cache_path).and_return(cache_path)
-    end
-
-    it 'returns urls from text index of rubies.travis-ci.org' do
-      allow(Net::HTTP).to receive(:get).with(URI('https://rubies.travis-ci.org/index.txt')).
-        and_return("one\ntwo\nthree")
-
-      expect(described_class.send(:index_urls)).to eq(%w[one two three])
-    end
-
-    it 'caches result' do
-      allow(Net::HTTP).to receive(:get).with(URI('https://rubies.travis-ci.org/index.txt')).
-        once.and_return("a\nb\nc")
-
-      3.times{ expect(described_class.send(:index_urls)).to eq(%w[a b c]) }
-    end
-
-    it 'reads cache from file if it is new' do
-      cache_path.write "https://rubies.travis-ci.org/foo"
-      allow(cache_path).to receive(:size?).and_return(616)
-      allow(cache_path).to receive(:mtime).and_return(Time.now - described_class::CACHE_TIME / 2)
-
-      expect(Net::HTTP).not_to receive(:get)
-      expect(described_class.send(:index_urls)).to eq(%w[https://rubies.travis-ci.org/foo])
-    end
-
-    it 'ignores bad cache' do
-      cache_path.write "http://rubies.travis-ci.org/foo"
-      allow(cache_path).to receive(:size?).and_return(616)
-      allow(cache_path).to receive(:mtime).and_return(Time.now - described_class::CACHE_TIME / 2)
-
-      allow(Net::HTTP).to receive(:get).with(URI('https://rubies.travis-ci.org/index.txt')).
-        once.and_return("brave\nnew\nworld")
-      expect(described_class.send(:index_urls)).to eq(%w[brave new world])
-      expect(cache_path.read).to eq("brave\nnew\nworld")
-    end
-
-    it 'writes cache file if it is stale' do
-      allow(cache_path).to receive(:size?).and_return(616)
-      allow(cache_path).to receive(:mtime).and_return(Time.now - described_class::CACHE_TIME * 2)
-      allow(Net::HTTP).to receive(:get).with(URI('https://rubies.travis-ci.org/index.txt')).
-        once.and_return("brave\nnew\nworld")
-
-      expect(described_class.send(:index_urls)).to eq(%w[brave new world])
-      expect(cache_path.read).to eq("brave\nnew\nworld")
-    end
-  end
-
-  describe '.base_url' do
-    before do
-      cleanup_instance_variables(described_class)
-      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(described_class).to receive(:`).with('rvm debug').
-          and_return(%Q{  foo: "xxx"  \n  system: "XXX/YYY"  \n  bar: "yyy"  })
-
-        expect(described_class.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(described_class).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
-        ])
-
-        expect(described_class.send(:base_url)).to eq('https://rubies.travis-ci.org/ubuntu/BBB/')
-      end
-    end
-  end
-
   describe '.available' do
-    before do
-      cleanup_instance_variables(described_class)
-    end
-
-    it 'gets sorted versions from index urls matching base_url' do
-      allow(described_class).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/4.tar.gz
-        https://rubies.travis-ci.org/ubuntu/BBB/3.tar.bz2
-      ])
-      allow(described_class).to receive(:base_url).and_return('https://rubies.travis-ci.org/ubuntu/BBB/')
-
-      expect(described_class.available).to eq([v('3'), v('4')])
-    end
-
-    it 'caches result' do
-      allow(described_class).to receive(:index_urls).once.and_return(%w[
-        https://rubies.travis-ci.org/ubuntu/CCC/a.tar.gz
-        https://rubies.travis-ci.org/ubuntu/CCC/b.tar.bz2
-      ])
-      allow(described_class).to receive(:base_url).and_return('https://rubies.travis-ci.org/ubuntu/CCC/')
+    it 'gets distinct sorted versions by combining indexes' do
+      allow(TravisCheckRubies::TravisIndex).to receive(:new).and_return(double(version_strings: %w[e d c b a]))
+      allow(TravisCheckRubies::RvmIndex).to receive(:new).and_return(double(version_strings: %w[d e f g h]))
 
-      3.times{ expect(described_class.available).to eq([v('a'), v('b')]) }
+      expect(described_class.available).to eq(vs(%w[a b c d e f g h]))
     end
   end
 

data/travis_check_rubies.gemspec

@@ -2,21 +2,28 @@
 
 Gem::Specification.new do |s|
   s.name        = 'travis_check_rubies'
-  s.version     = '0.2.5'
+  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    = "http://github.com/toy/#{s.name}"
+  s.homepage    = "https://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']
   s.license     = 'MIT'
 
+  s.metadata = {
+    'bug_tracker_uri'   => "https://github.com/toy/#{s.name}/issues",
+    'documentation_uri' => "https://www.rubydoc.info/gems/#{s.name}/#{s.version}",
+    'source_code_uri'   => "https://github.com/toy/#{s.name}",
+  }
+
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = %w[lib]
 
-  s.required_ruby_version = '>= 2.0.0'
+  s.required_ruby_version = '>= 2.3.0'
 
   s.add_runtime_dependency 'fspath', '~> 3.0'
+  s.add_runtime_dependency 'psych', '~> 3.0'
 
   s.add_development_dependency 'rspec', '~> 3.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis_check_rubies
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.6.0
 platform: ruby
 authors:
 - Ivan Kuchin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2017-12-13 00:00:00.000000000 Z
+date: 2021-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: psych
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -40,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: []
@@ -53,15 +67,25 @@ files:
 - README.markdown
 - bin/travis_check_rubies
 - lib/travis_check_rubies.rb
+- lib/travis_check_rubies/fetcher.rb
+- lib/travis_check_rubies/rvm_index.rb
+- lib/travis_check_rubies/travis_index.rb
 - lib/travis_check_rubies/travis_yml.rb
+- lib/travis_check_rubies/updater.rb
 - lib/travis_check_rubies/version.rb
+- spec/travis_check_rubies/fetcher_spec.rb
+- spec/travis_check_rubies/travis_index_spec.rb
+- spec/travis_check_rubies/updater_spec.rb
 - spec/travis_check_rubies/version_spec.rb
 - travis_check_rubies.gemspec
-homepage: http://github.com/toy/travis_check_rubies
+homepage: https://github.com/toy/travis_check_rubies
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  bug_tracker_uri: https://github.com/toy/travis_check_rubies/issues
+  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:
 rdoc_options: []
 require_paths:
 - lib
@@ -69,17 +93,19 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.0.0
+      version: 2.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubygems_version: 3.1.5
+signing_key:
 specification_version: 4
 summary: Are you using the latest rubies in .travis.yml?
 test_files:
+- spec/travis_check_rubies/fetcher_spec.rb
+- spec/travis_check_rubies/travis_index_spec.rb
+- spec/travis_check_rubies/updater_spec.rb
 - spec/travis_check_rubies/version_spec.rb