zold 0.9.6 → 0.9.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03f770700b197238978800aa6bb79d2b65dc973a
-  data.tar.gz: 0cc1fcc216c91280b4a79b5fcc37b2acb3b71129
+  metadata.gz: c7c1b5e4219998688aaec4f6ca49d4f417d472fd
+  data.tar.gz: 1773d14213af2c9aa5548c3a98ae255243978432
 SHA512:
-  metadata.gz: 3aca2c11779ca1fee660873ff96d46ef63dc300461cdf0893be52fb169dbe517e1aae726ca36e70ba9b78cc17a6c6bd7a98b449daa1e5fd4f5a2b9c761df490e
-  data.tar.gz: 33cf35b1d960adfeee89236e51589305eff0f7c361c693b95a4c7f02380b657401c55ee436782781cc4b147cebf1edb0c32f620b46660f1a69af289ad96ebe8f
+  metadata.gz: e39ad8edca90cf93a11f6fddc204175491b42ec1f3f1e178c744a2f9bd1393f28d6ee29476d84f31bd80e087d06a76a047e580cf7b07d82d906c606b32fefeca
+  data.tar.gz: b2ab87529c40fc152e7a9cb4d87a8d911723161040185606173e50a95a0e793091dd4cc39399e7d82c76751ec7a9908110061c3704b18660d16235dcdfbb6d10

data/bin/zold

@@ -156,12 +156,8 @@ Available options:"
     require_relative '../lib/zold/commands/propagate'
     Zold::Propagate.new(wallets: wallets, log: log).run(args)
   when 'pull'
-    require_relative '../lib/zold/commands/fetch'
-    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(wallets: wallets, copies: copies, log: log).run(args)
+    require_relative '../lib/zold/commands/pull'
+    Zold::Pull.new(wallets: wallets, remotes: remotes, 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/invoice.rb

@@ -48,8 +48,9 @@ Available options:"
       end
       mine = Args.new(opts, @log).take || return
       raise 'Receiver wallet ID is required' if mine[0].nil?
-      wallet = @wallets.find(Zold::Id.new(mine[0]))
-      raise 'Wallet doesn\'t exist, do \'fetch\' first' unless wallet.exists?
+      id = Zold::Id.new(mine[0])
+      wallet = @wallets.find(id)
+      raise "Wallet #{id} doesn\'t exist in #{@wallets}, do 'fetch' first" unless wallet.exists?
       invoice(wallet, opts)
     end
 

data/lib/zold/commands/node.rb

@@ -96,6 +96,8 @@ module Zold
       Zold::Front.set(:port, opts['bind-port'])
       invoice = opts[:invoice]
       unless invoice.include?('@')
+        require_relative 'pull'
+        Pull.new(wallets: wallets, remotes: remotes, copies: copies, log: @log).run(['pull', invoice])
         require_relative 'invoice'
         invoice = Invoice.new(wallets: wallets, log: @log).run(['invoice', invoice])
       end

data/lib/zold/commands/pull.rb

@@ -0,0 +1,46 @@
+# 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_relative '../log'
+require_relative 'fetch'
+require_relative 'merge'
+require_relative 'clean'
+
+# PULL command.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # PULL command
+  class Pull
+    def initialize(wallets:, remotes:, copies:, log: Log::Quiet.new)
+      @wallets = wallets
+      @remotes = remotes
+      @copies = copies
+      @log = log
+    end
+
+    def run(args = [])
+      Zold::Fetch.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(args)
+      Zold::Merge.new(wallets: @wallets, copies: @copies, log: @log).run(args)
+      Zold::Clean.new(wallets: @wallets, copies: @copies, log: @log).run(args)
+    end
+  end
+end

data/lib/zold/id.rb

@@ -34,9 +34,11 @@ module Zold
       end
     end
 
+    # The ID of the root wallet.
     ROOT = Id.new('0000000000000000')
 
     def==(other)
+      raise 'Can only compare with Id' unless other.is_a?(Id)
       to_s == other.to_s
     end
 

data/lib/zold/node/entrance.rb

@@ -78,11 +78,11 @@ module Zold
       modified = Merge.new(
         wallets: @wallets, copies: copies.root, log: @log
       ).run(['merge', id.to_s])
+      Clean.new(wallets: @wallets, copies: copies.root, log: @log).run(['clean', id.to_s])
       copies.remove('remote', Remotes::PORT)
       Push.new(
         wallets: @wallets, remotes: @remotes, log: @log
       ).run(['push'] + modified.map(&: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.6'.freeze
+  VERSION = '0.9.7'.freeze
 end

data/lib/zold/wallets.rb

@@ -32,6 +32,13 @@ module Zold
       @dir = dir
     end
 
+    # @todo #70:30min Let's make it smarter. Instead of returning
+    #  the full path let's substract the prefix from it if it's equal
+    #  to the current directory in Dir.pwd.
+    def to_s
+      path
+    end
+
     def path
       FileUtils.mkdir_p(@dir)
       File.expand_path(@dir)

data/test/commands/test_pay.rb

@@ -19,8 +19,8 @@
 # SOFTWARE.
 
 require 'minitest/autorun'
-require 'tmpdir'
 require_relative '../test__helper'
+require_relative '../fake_home'
 require_relative '../../lib/zold/wallets'
 require_relative '../../lib/zold/amount'
 require_relative '../../lib/zold/key'
@@ -46,4 +46,19 @@ class TestPay < Minitest::Test
       assert_equal(amount * -1, source.balance)
     end
   end
+
+  def test_sends_from_root_wallet
+    FakeHome.new.run do |home|
+      source = home.create_wallet(Zold::Id::ROOT)
+      target = home.create_wallet
+      amount = Zold::Amount.new(zld: 14.95)
+      Zold::Pay.new(wallets: home.wallets, remotes: home.remotes, log: $log).run(
+        [
+          'pay', '--private-key=fixtures/id_rsa',
+          source.id.to_s, target.id.to_s, amount.to_zld, 'For the car'
+        ]
+      )
+      assert_equal(amount * -1, source.balance)
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -290,6 +290,7 @@ files:
 - lib/zold/commands/node.rb
 - lib/zold/commands/pay.rb
 - lib/zold/commands/propagate.rb
+- lib/zold/commands/pull.rb
 - lib/zold/commands/push.rb
 - lib/zold/commands/remote.rb
 - lib/zold/commands/show.rb