zold 0.14.38 → 0.14.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b3fc39017077100e9934e90a71f121139e4a1432
-  data.tar.gz: da8496c1bdfa6398785e5a7ab464eff0a45e02a9
+  metadata.gz: 13cff3999d82e0c3230da3fe717537fdef3337e4
+  data.tar.gz: 307f20cb6d1cf11c963f94cae910540dac9f473a
 SHA512:
-  metadata.gz: b2a9f4c3b526399c34bf84c05a66c90db67e39649ea6347abd74bf2428b848128991a73810ff06d9a421e2967140de674fa177b52bfa3f82d5e8bdf69fa4f25e
-  data.tar.gz: 85720186b77dec3343a10968310d0001a94940722490e2041b55c593ee7b230f8ebb6a5f9112622e10b78e717abd9778cc24f1b0b142d7d79dec485717638c48
+  metadata.gz: bdcbe7adf732ea4aea112322a56420a1197aad5640dcd5f330ce3b0315be4021832aac1d5ed4e2d07642f141748b6e08ac7e52b1ad5085da2f5b12fabd7b0e56
+  data.tar.gz: 379b7ec0f166019354cd3ea276edbd455baff582ea8ca3f024eb0b307d3a6e5485021a7cc3beea3eb6a59d13a0aa62bb6a4fd22e084bb654758f8bb1759b05fc

data/lib/zold/commands/node.rb

@@ -157,6 +157,7 @@ module Zold
       Front.set(:logging, @log.debug?)
       Front.set(:halt, opts['halt-code'])
       Front.set(:home, Dir.pwd)
+      @log.info("Time: #{Time.now.utc.iso8601}")
       @log.info("Home directory: #{Dir.pwd}")
       @log.info("Ruby version: #{RUBY_VERSION}")
       @log.info("Zold gem version: #{Zold::VERSION}")

data/lib/zold/commands/remote.rb

@@ -34,6 +34,7 @@ require_relative '../http'
 require_relative '../remotes'
 require_relative '../score'
 require_relative '../wallet'
+require_relative '../gem'
 
 # REMOTE command.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -223,7 +224,9 @@ Available options:"
         r.assert_score_ownership(score)
         r.assert_score_strength(score) unless opts['ignore-score-weakness']
         @remotes.rescore(score.host, score.port, score.value)
-        if Semantic::Version.new(VERSION) < Semantic::Version.new(json['version'])
+        gem = Zold::Gem.new
+        if Semantic::Version.new(VERSION) < Semantic::Version.new(json['version']) ||
+           Semantic::Version.new(VERSION) < Semantic::Version.new(gem.last_version)
           if opts['reboot']
             @log.info("#{r}: their version #{json['version']} is higher than mine #{VERSION}, reboot! \
 (use --never-reboot to avoid this from happening)")

data/lib/zold/gem.rb

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+# Copyright (c) 2018 Yegor Bugayenko
+#
+# Permission is hereby granted, free of charge, to any person obtaining a copy
+# of this software and associated documentation files (the 'Software'), to deal
+# in the Software without restriction, including without limitation the rights
+# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+# copies of the Software, and to permit persons to whom the Software is
+# furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in all
+# copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED 'AS IS', WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFINGEMENT. IN NO EVENT SHALL THE
+# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+# SOFTWARE.
+
+require 'uri'
+require 'net/http'
+require_relative 'json_page'
+
+# Class representing the Zold gem on Rubygems
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # Gem
+  class Gem
+    BASE_URI = 'rubygems.org'
+    API_VERSION = '/api/v1/'
+
+    def last_version
+      uri = URI(API_VERSION + 'versions/zold/latest.json')
+      http = Net::HTTP.new(BASE_URI)
+      path = uri.path
+      path += '?' + uri.query if uri.query
+      res = http.request_get(path)
+      JsonPage.new(res.body).to_hash['version']
+    end
+  end
+end

data/lib/zold/node/farm.rb

@@ -69,7 +69,8 @@ module Zold
         end.join(', '),
         cleanup: @cleanup.status,
         pipeline: @pipeline.size,
-        best: best.map(&:to_mnemo).join(', ')
+        best: best.map(&:to_mnemo).join(', '),
+        alive: @alive
       }
     end
 
@@ -103,7 +104,7 @@ module Zold
             @log.info("It's time to stop the cleanup thread (#{a.count} != #{max}, alive=#{@alive})...")
             break
           end
-          VerboseThread.new(@log).run do
+          VerboseThread.new(@log).run(true) do
             cleanup(host, port, strength, threads)
           end
         end

data/lib/zold/version.rb

@@ -25,6 +25,6 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.14.38'
+  VERSION = '0.14.39'
   PROTOCOL = 2
 end

data/test/commands/test_remote.rb

@@ -61,6 +61,10 @@ class TestRemote < Minitest::Test
       stub_request(:get, 'http://localhost:999/remotes').to_return(
         status: 404
       )
+      stub_request(:get, 'http://rubygems.org/api/v1/versions/zold/latest.json').to_return(
+        status: 200,
+        body: '{"version": "0.0.0"}'
+      )
       cmd = Zold::Remote.new(remotes: remotes, log: test_log)
       cmd.run(%w[remote clean])
       assert(remotes.all.empty?)
@@ -72,6 +76,40 @@ class TestRemote < Minitest::Test
     end
   end
 
+  def test_new_version_rubygems
+    Dir.mktmpdir do |dir|
+      remotes = Zold::Remotes.new(file: File.join(dir, 'remotes.txt'))
+      zero = Zold::Score::ZERO
+      stub_request(:get, "http://#{zero.host}:#{zero.port}/remotes").to_return(
+        status: 200,
+        body: {
+          version: Zold::VERSION,
+          score: zero.to_h,
+          all: [
+            { host: zero.host, port: zero.port }
+          ]
+        }.to_json
+      )
+      stub_request(:get, 'http://rubygems.org/api/v1/versions/zold/latest.json').to_return(
+        status: 200,
+        body: '{"version": "9.9.9"}'
+      )
+      log = Minitest::Test::TestLogger.new
+      cmd = Zold::Remote.new(remotes: remotes, log: log)
+      cmd.run(%w[remote clean])
+      cmd.run(['remote', 'add', zero.host, zero.port.to_s, '--skip-ping'])
+      cmd.run(['remote', 'update', '--ignore-score-weakness', '--skip-ping', '--reboot'])
+      assert(log.msg.to_s.include?(', reboot!'))
+      log.msg = []
+      stub_request(:get, 'http://rubygems.org/api/v1/versions/zold/latest.json').to_return(
+        status: 200,
+        body: "{\"version\": \"#{Zold::VERSION}\"}"
+      )
+      cmd.run(['remote', 'update', '--ignore-score-weakness', '--skip-ping', '--reboot'])
+      assert(!log.msg.to_s.include?(', reboot!'))
+    end
+  end
+
   def test_elects_a_remote
     Dir.mktmpdir do |dir|
       zero = Zold::Score::ZERO
@@ -111,6 +149,10 @@ class TestRemote < Minitest::Test
           ]
         }.to_json
       )
+      stub_request(:get, 'http://rubygems.org/api/v1/versions/zold/latest.json').to_return(
+        status: 200,
+        body: '{"version": "0.0.0"}'
+      )
       stub_request(:get, 'http://localhost:8883/remotes').to_return(status: 404)
       cmd = Zold::Remote.new(remotes: remotes, log: test_log)
       cmd.run(%w[remote clean])

data/test/test__helper.rb

@@ -91,5 +91,18 @@ module Minitest
       @test_log = Zold::Log::Quiet.new if ENV['TEST_QUIET_LOG']
       Zold::Log::Sync.new(@test_log)
     end
+
+    class TestLogger
+      attr_accessor :msg
+      def initialize
+        @msg = []
+      end
+
+      def info(msg)
+        @msg << msg
+      end
+
+      def debug(msg); end
+    end
   end
 end

data/test/test_gem.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+require_relative '../lib/zold/gem'
+require 'webmock/minitest'
+require 'minitest/autorun'
+
+class TestGem < Minitest::Test
+  def test_last_version
+    gem = Zold::Gem.new
+    version = (1..3).map { rand(9).to_s } .join('.')
+    stub_request(:get, 'http://rubygems.org/api/v1/versions/zold/latest.json').to_return(
+      status: 200,
+      body: "{\"version\": \"#{version}\"}"
+    )
+    assert_equal(version, gem.last_version)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.14.38
+  version: 0.14.39
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-08-17 00:00:00.000000000 Z
+date: 2018-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cachy
@@ -484,6 +484,7 @@ files:
 - lib/zold/commands/show.rb
 - lib/zold/commands/taxes.rb
 - lib/zold/copies.rb
+- lib/zold/gem.rb
 - lib/zold/hexnum.rb
 - lib/zold/http.rb
 - lib/zold/hungry_wallets.rb
@@ -556,6 +557,7 @@ files:
 - test/test_atomic_file.rb
 - test/test_backtrace.rb
 - test/test_copies.rb
+- test/test_gem.rb
 - test/test_hexnum.rb
 - test/test_http.rb
 - test/test_id.rb
@@ -650,6 +652,7 @@ test_files:
 - test/test_atomic_file.rb
 - test/test_backtrace.rb
 - test/test_copies.rb
+- test/test_gem.rb
 - test/test_hexnum.rb
 - test/test_http.rb
 - test/test_id.rb