zold 0.9.5 → 0.9.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2c5ceb71c345cd90ff80e00029ac5a6d265c3bf3
-  data.tar.gz: 318ed11fd7706413ccb09eb014dcd0d776b832bc
+  metadata.gz: 03f770700b197238978800aa6bb79d2b65dc973a
+  data.tar.gz: 0cc1fcc216c91280b4a79b5fcc37b2acb3b71129
 SHA512:
-  metadata.gz: 20d3b4781583bc883c2390336dd6411f661545a71e97e3cfe6c2fa29053db2b9ce0867503416f614394f301ee4bf19ff4064f0b96a74328e141561070eb7c708
-  data.tar.gz: 66ae4c87859accbedb9fafff33f25673df8bb265e6c3407b21cae730937254841ec4b7588db97aeb3da901fa3e08275962d4e313df9b2e80a46df74a3276f119
+  metadata.gz: 3aca2c11779ca1fee660873ff96d46ef63dc300461cdf0893be52fb169dbe517e1aae726ca36e70ba9b78cc17a6c6bd7a98b449daa1e5fd4f5a2b9c761df490e
+  data.tar.gz: 33cf35b1d960adfeee89236e51589305eff0f7c361c693b95a4c7f02380b657401c55ee436782781cc4b147cebf1edb0c32f620b46660f1a69af289ad96ebe8f

data/bin/zold

@@ -145,7 +145,7 @@ Available options:"
     Zold::Fetch.new(wallets: wallets, remotes: remotes, copies: copies, log: log).run(args)
   when 'clean'
     require_relative '../lib/zold/commands/clean'
-    Zold::Clean.new(copies: copies, log: log).run(args)
+    Zold::Clean.new(wallets: wallets, copies: copies, log: log).run(args)
   when 'diff'
     require_relative '../lib/zold/commands/diff'
     Zold::Diff.new(wallets: wallets, copies: copies, log: log).run(args)
@@ -161,7 +161,7 @@ Available options:"
     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)
+    Zold::Clean.new(wallets: wallets, 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

@@ -36,7 +36,8 @@ require_relative '../copies'
 module Zold
   # CLEAN command
   class Clean
-    def initialize(copies:, log: Log::Quiet.new)
+    def initialize(wallets:, copies:, log: Log::Quiet.new)
+      @wallets = wallets
       @copies = copies
       @log = log
     end

data/lib/zold/commands/node.rb

@@ -97,7 +97,7 @@ module Zold
       invoice = opts[:invoice]
       unless invoice.include?('@')
         require_relative 'invoice'
-        invoice = Invoice.new(wallets: @wallets, log: @log).run(['invoice', invoice])
+        invoice = Invoice.new(wallets: wallets, log: @log).run(['invoice', invoice])
       end
       farm = Farm.new(invoice, log: @log)
       farm.start(

data/lib/zold/node/entrance.rb

@@ -82,7 +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])
+      Clean.new(wallets: @wallets, 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.5'.freeze
+  VERSION = '0.9.6'.freeze
 end

data/test/commands/test_clean.rb

@@ -19,8 +19,8 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
-require 'tmpdir'
 require 'time'
+require_relative '../fake_home'
 require_relative '../test__helper'
 require_relative '../../lib/zold/copies'
 require_relative '../../lib/zold/commands/clean'
@@ -31,12 +31,12 @@ require_relative '../../lib/zold/commands/clean'
 # License:: MIT
 class TestClean < Minitest::Test
   def test_cleans_copies
-    Dir.mktmpdir 'test' do |dir|
-      id = Zold::Id.new
-      copies = Zold::Copies.new(File.join(dir, "copies/#{id}"))
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      copies = home.copies(wallet)
       copies.add('a1', 'host-1', 80, 1, Time.now - 26 * 60 * 60)
       copies.add('a2', 'host-2', 80, 2, Time.now - 26 * 60 * 60)
-      Zold::Clean.new(copies: copies.root, log: $log).run(['clean', id.to_s])
+      Zold::Clean.new(wallets: home.wallets, copies: copies.root, log: $log).run(['clean', wallet.id.to_s])
       assert(copies.all.empty?)
     end
   end

data/test/commands/test_push.rb

@@ -19,10 +19,8 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
-require 'tmpdir'
-require 'json'
-require 'time'
 require 'webmock/minitest'
+require_relative '../fake_home'
 require_relative '../test__helper'
 require_relative '../../lib/zold/wallet'
 require_relative '../../lib/zold/wallets'
@@ -37,16 +35,11 @@ require_relative '../../lib/zold/commands/push'
 # License:: MIT
 class TestPush < Minitest::Test
   def test_pushes_wallet
-    Dir.mktmpdir 'test' do |dir|
-      id = Zold::Id.new
-      wallets = Zold::Wallets.new(dir)
-      wallet = wallets.find(id)
-      wallet.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
-      remotes = Zold::Remotes.new(File.join(dir, 'remotes.csv'))
-      remotes.clean
-      stub_request(:put, "http://fake-1/wallet/#{id}").to_return(status: 304)
-      Zold::Push.new(wallets: wallets, remotes: remotes, log: $log).run(
-        ['--ignore-this-stupid-option', 'push', id.to_s]
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      stub_request(:put, "http://fake-1/wallet/#{wallet.id}").to_return(status: 304)
+      Zold::Push.new(wallets: home.wallets, remotes: home.remotes, log: $log).run(
+        ['--ignore-this-stupid-option', 'push', wallet.id.to_s]
       )
     end
   end

metadata

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