travis_check_rubies 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a243f7a9ee9c49601007f8f17c7aba32dd69203521976ecbc5a14887c46e54db
-  data.tar.gz: 9a409034a7d17c73f43b1209ffb25b1322cb80fa055d982b0cadc36c1f1766f6
+  metadata.gz: 15957908f03062b38d455967278099f4dfe2c238b776dd7b857085b65d8a2874
+  data.tar.gz: c669a1631123c15e642b57c62a1c50a0ce9a00aa538a9382604fb4f57680f7d2
 SHA512:
-  metadata.gz: 2001eaef85bfee1bbfb69eab2d5c06716c74abd711e801d227a23ab1f99325b9b08fe1bd973dc3190f5c11c8b37eb352f33bb6a88c77b7c349e1110ade2199be
-  data.tar.gz: 60e6630469d3ae1af191e61c92eb15b4048f3cbe7abd4345e3547170a351e3510de63b02702de27942146a5c70d59ff12e907214932e688a2729395dbde0bf20
+  metadata.gz: 860cbc5c33ecf76f270430024f3c0d6e352431b0b095b7fb011214a57e60f5b0b57297b009f5792b6795968430458d8aeeb5ac6edd77350e9d465a754b50ff42
+  data.tar.gz: '08a6fe9982b9d32b29b063585574655d6f24ec5e4539ae079d61f8e1c0d0ad6f0a568ab5b53c284b16c452401d997bad4723de3d29576445b39ac6473b8cfe10'

data/.travis.yml

@@ -1,11 +1,13 @@
 sudo: false
+dist: trusty
 language: ruby
 rvm:
   - '2.3.8'
-  - '2.4.6'
-  - '2.5.5'
-  - '2.6.2'
-  - 'jruby-9.1.9.0'
+  - '2.4.7'
+  - '2.5.6'
+  - '2.6.4'
+  - 'jruby-9.1.17.0'
+  - 'jruby-9.2.7.0'
 before_script:
   - env
   - rvm debug

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,33 @@
+require_relative 'fetcher'
+
+module TravisCheckRubies
+  class TravisIndex
+    ROOT_URL = 'https://rubies.travis-ci.org/'
+
+    def version_strings
+      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 ||= 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
+end

data/lib/travis_check_rubies/travis_yml.rb

@@ -1,7 +1,8 @@
 require 'fspath'
 require 'yaml'
-require 'travis_check_rubies/updater'
-require 'travis_check_rubies/version'
+
+require_relative 'updater'
+require_relative 'version'
 
 module TravisCheckRubies
   class TravisYml

data/lib/travis_check_rubies/version.rb

@@ -1,26 +1,17 @@
-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: [], conservative: false)
@@ -72,47 +63,6 @@ module TravisCheckRubies
 
         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,50 @@
+require 'rspec'
+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
+        ])
+
+        expect(subject.send(:base_url)).to eq('https://rubies.travis-ci.org/ubuntu/BBB/')
+      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/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,7 +2,7 @@
 
 Gem::Specification.new do |s|
   s.name        = 'travis_check_rubies'
-  s.version     = '0.4.0'
+  s.version     = '0.5.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}"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis_check_rubies
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-02 00:00:00.000000000 Z
+date: 2019-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -67,9 +67,14 @@ 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
@@ -78,7 +83,7 @@ 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.4.0
+  documentation_uri: https://www.rubydoc.info/gems/travis_check_rubies/0.5.0
   source_code_uri: https://github.com/toy/travis_check_rubies
 post_install_message: 
 rdoc_options: []
@@ -95,10 +100,12 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 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