travis_check_rubies 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bfd262c7e986d7ca949f6811db98ef99f2aab55e
-  data.tar.gz: 65c395fa0c08ae67e8e0c35f526891091f02ab8d
+  metadata.gz: da70d316f180f2b40b4840ea6fe7c886d74ea85a
+  data.tar.gz: 76536fb82b627a7f853d3f0c62ca814b6cace50a
 SHA512:
-  metadata.gz: 86c99d9aa7055c649b3611d29181429f25b4997c253504c4af5740973606f8838eeb466355d9cb961f07e1e79556d76ef6accb3bc2ad42abcd5767a2054a6b44
-  data.tar.gz: d71305cf683e36b261330a182b2c77de094e4f6be19b795aed62908091323abb8ad319b3dd37db1b09a9f0879f30d576787be107815fe6e0f9ffd50f2ba7a8f4
+  metadata.gz: 285e6d2050aaff7efc281f542f2e83f207859655c1c697452f6505645bdf17cc49750ce120bee743d6b11c0585bb208ded8e62806b7b768eedd328f63dc636d7
+  data.tar.gz: e1a3efb71f362b24a51349e9862db65bbd819e4ff9f451e0da4dfd55a4331067c34b6076cf7bd38f14a43a8cc592583e518f2b4bba8560ae21a068f3a5dfc0cf

data/.travis.yml

@@ -3,9 +3,9 @@ language: ruby
 rvm:
   - '2.0.0-p648'
   - '2.1.10'
-  - '2.2.6'
-  - '2.3.3'
-  - '2.4.0'
+  - '2.2.7'
+  - '2.3.4'
+  - '2.4.1'
   - 'jruby-9.0.5.0'
   - 'jruby-9.1.5.0'
 script:

data/README.markdown

@@ -3,7 +3,7 @@
 
 # travis\_check\_rubies
 
-Check if `.travis.yml` specifies latest available rubies from listed on http://rubies.travis-ci.org and propose changes.
+Check if `.travis.yml` specifies latest available rubies from listed on https://rubies.travis-ci.org and propose changes.
 
 ## Gem installation
 

data/lib/travis_check_rubies/version.rb

@@ -5,7 +5,7 @@ require 'uri'
 
 module TravisCheckRubies
   class Version
-    ROOT_URL = 'http://rubies.travis-ci.org/'
+    ROOT_URL = 'https://rubies.travis-ci.org/'
     CACHE_TIME = 24 * 60 * 60
 
     class << self
@@ -79,21 +79,26 @@ module TravisCheckRubies
       end
 
       def index_urls
-        @index_urls ||= begin
-          if cache_path.size? && cache_path.mtime + CACHE_TIME > Time.now
-            cache_path.read
-          else
-            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
+        @index_urls ||= (cached_index_data || fetch_index_data).split("\n")
+      end
 
-            data
-          end
-        end.split("\n")
+      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
@@ -103,7 +108,7 @@ module TravisCheckRubies
         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 not fount out of:\n#{index_urls.join("\n")}" unless first_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

data/spec/travis_check_rubies/version_spec.rb

@@ -211,32 +211,43 @@ describe TravisCheckRubies::Version do
     end
 
     it 'returns urls from text index of rubies.travis-ci.org' do
-      allow(Net::HTTP).to receive(:get).with(URI('http://rubies.travis-ci.org/index.txt')).
+      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('http://rubies.travis-ci.org/index.txt')).
+      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)
-      allow(cache_path).to receive(:read).and_return("foo\nbar")
 
       expect(Net::HTTP).not_to receive(:get)
-      expect(described_class.send(:index_urls)).to eq(%w[foo bar])
+      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('http://rubies.travis-ci.org/index.txt')).
+      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])
@@ -257,7 +268,7 @@ describe TravisCheckRubies::Version 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('http://rubies.travis-ci.org/XXX/YYY/')
+        expect(described_class.send(:base_url)).to eq('https://rubies.travis-ci.org/XXX/YYY/')
       end
     end
 
@@ -266,12 +277,12 @@ describe TravisCheckRubies::Version do
 
       it 'gets base_url from first ubuntu url in index' do
         allow(described_class).to receive(:index_urls).and_return(%w[
-          http://rubies.travis-ci.org/osx/AAA/1.tar.gz
-          http://rubies.travis-ci.org/ubuntu/ZZZ/2.tar.gz
-          http://rubies.travis-ci.org/ubuntu/BBB/3.tar.gz
+          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('http://rubies.travis-ci.org/ubuntu/BBB/')
+        expect(described_class.send(:base_url)).to eq('https://rubies.travis-ci.org/ubuntu/BBB/')
       end
     end
   end
@@ -283,22 +294,22 @@ describe TravisCheckRubies::Version do
 
     it 'gets sorted versions from index urls matching base_url' do
       allow(described_class).to receive(:index_urls).and_return(%w[
-        http://rubies.travis-ci.org/osx/AAA/1.tar.gz
-        http://rubies.travis-ci.org/ubuntu/ZZZ/2.tar.gz
-        http://rubies.travis-ci.org/ubuntu/BBB/4.tar.gz
-        http://rubies.travis-ci.org/ubuntu/BBB/3.tar.bz2
+        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('http://rubies.travis-ci.org/ubuntu/BBB/')
+      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[
-        http://rubies.travis-ci.org/ubuntu/CCC/a.tar.gz
-        http://rubies.travis-ci.org/ubuntu/CCC/b.tar.bz2
+        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('http://rubies.travis-ci.org/ubuntu/CCC/')
+      allow(described_class).to receive(:base_url).and_return('https://rubies.travis-ci.org/ubuntu/CCC/')
 
       3.times{ expect(described_class.available).to eq([v('a'), v('b')]) }
     end

data/travis_check_rubies.gemspec

@@ -2,9 +2,9 @@
 
 Gem::Specification.new do |s|
   s.name        = 'travis_check_rubies'
-  s.version     = '0.2.0'
+  s.version     = '0.2.1'
   s.summary     = 'Are you using the latest rubies in .travis.yml?'
-  s.description = 'Check if `.travis.yml` specifies latest available rubies from listed on http://rubies.travis-ci.org and propose changes'
+  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.authors     = ['Ivan Kuchin']
   s.license     = 'MIT'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: travis_check_rubies
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-11 00:00:00.000000000 Z
+date: 2017-04-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fspath
@@ -39,7 +39,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '3.0'
 description: Check if `.travis.yml` specifies latest available rubies from listed
-  on http://rubies.travis-ci.org and propose changes
+  on https://rubies.travis-ci.org and propose changes
 email: 
 executables:
 - travis_check_rubies