zold 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: '039de853771899f4201fa612666d49fd4526aeb1'
-  data.tar.gz: 19faa89ee913e57daf32b4bc0941b68bac4faede
+  metadata.gz: f6811821f5b8eed50d2d11c0e972ee9a91ba1a7e
+  data.tar.gz: f4cfbe65254ee35788815494b7529d9cae6447e7
 SHA512:
-  metadata.gz: 3ebc6d8357fedb9785fbc871d80e370bf300aaf54fbf26ba01e716438f8bb198c0ca43e027863a15e427f8df3a9e5693c377c755c8cfd91649805d036df89734
-  data.tar.gz: af6b10fca01a5c8a9cd843fe725de514a805ce5eb7532068f22883b85111f8213c16eae2d874e861655feac02d8404e9b1216515f20a89fecf38893a8b72a210
+  metadata.gz: 370fbc1d1a3b8df9369f9cfcd190849dd418e1af8f1d9a81c4257887cefac1b6427ba3072763793d29ec30864101f9268bdad7a6cedf7d55bca70441d897b3e0
+  data.tar.gz: 0d719f61975a5f6d7dadfe6a79b0fe40d05f98d71db97a6566b5d4c6fecc5e498f830a08f95748be5ac1332baec03b9df622f3d6b852350a7714fe18f6af0b0f

data/bin/zold

@@ -160,6 +160,8 @@ Available options:"
     Zold::Fetch.new(wallets: wallets, remotes: remotes, copies: copies, log: log).run(args)
     require_relative '../lib/zold/commands/merge'
     Zold::Merge.new(wallets: wallets, copies: copies, log: log).run(args)
+    require_relative '../lib/zold/commands/clean'
+    Zold::Clean.new(copies: copies, log: log).run(args)
   when 'taxes'
     require_relative '../lib/zold/commands/taxes'
     Zold::Taxes.new(wallets: wallets, log: log).run(args)

data/lib/zold/commands/clean.rb

@@ -34,7 +34,7 @@ require_relative '../copies'
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  # CLEAN pulling command
+  # CLEAN command
   class Clean
     def initialize(copies:, log: Log::Quiet.new)
       @copies = copies

data/lib/zold/copies.rb

@@ -91,9 +91,9 @@ module Zold
         {
           name: name,
           path: File.join(@dir, name),
-          score: scores.select { |s| s[:time] > Time.now - 24 * 60 }
+          score: scores.select { |s| s[:time] > Time.now - 24 * 60 * 60 }
             .map { |s| s[:score] }
-            .inject(&:+)
+            .inject(&:+) || 0
         }
       end
     end

data/lib/zold/node/entrance.rb

@@ -28,6 +28,7 @@ require_relative '../tax'
 require_relative '../commands/merge'
 require_relative '../commands/fetch'
 require_relative '../commands/push'
+require_relative '../commands/clean'
 
 # The entrance of the web front.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -81,6 +82,7 @@ module Zold
       Push.new(
         wallets: @wallets, remotes: @remotes, log: @log
       ).run(['push'] + modified.map(&:to_s))
+      Clean.new(copies: copies.root, log: @log).run(['clean', id.to_s])
       modified
     end
   end

data/lib/zold/version.rb

@@ -23,5 +23,5 @@
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  VERSION = '0.9.2'.freeze
+  VERSION = '0.9.3'.freeze
 end

data/test/test__helper.rb

@@ -30,8 +30,8 @@ if ENV['CI'] == 'true'
 end
 
 require_relative '../lib/zold/log'
-$log = Zold::Log::Quiet.new
-# $log = Zold::Log::Verbose.new
+# $log = Zold::Log::Quiet.new
+$log = Zold::Log::Verbose.new
 
 require 'minitest/autorun'
 require_relative '../lib/zold'

data/test/test_copies.rb

@@ -62,12 +62,29 @@ class TestCopies < Minitest::Test
   def test_cleans_copies
     Dir.mktmpdir 'test' do |dir|
       copies = Zold::Copies.new(dir)
-      copies.add('h1', 'zold.io', 50, 80, Time.now - 25 * 60)
-      copies.add('h1', 'zold.io', 33, 80, Time.now - 26 * 60)
+      copies.add('h1', 'zold.io', 50, 80, Time.now - 25 * 60 * 60)
+      copies.add('h1', 'zold.io', 33, 80, Time.now - 26 * 60 * 60)
       assert(File.exist?(File.join(dir, '1')))
       copies.clean
       assert(copies.all.empty?, "#{copies.all.count} is not empty")
       assert(!File.exist?(File.join(dir, '1')))
     end
   end
+
+  def test_ignores_garbage
+    Dir.mktmpdir 'test' do |dir|
+      copies = Zold::Copies.new(dir)
+      copies.add('h1', 'zold.io', 50, 80, Time.now - 25 * 60 * 60)
+      FileUtils.mkdir(File.join(dir, '55'))
+      assert_equal(1, copies.all.count)
+    end
+  end
+
+  def test_ignores_too_old_scores
+    Dir.mktmpdir 'test' do |dir|
+      copies = Zold::Copies.new(dir)
+      copies.add('h1', 'zold.io', 50, 80, Time.now - 1000 * 60 * 60)
+      assert_equal(0, copies.all[0][:score])
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - Yegor Bugayenko