zold 0.0.8 → 0.1

data/Rakefile

@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Zerocracy, Inc.
+# 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
@@ -40,6 +40,7 @@ Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/test_*.rb'
   test.verbose = false
+  test.warning = false
 end
 
 require 'rdoc/task'

data/bin/zold

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
 #
-# Copyright (c) 2018 Zerocracy, Inc.
+# 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
@@ -32,13 +32,8 @@ require_relative '../lib/zold/wallets'
 require_relative '../lib/zold/log'
 require_relative '../lib/zold/key'
 require_relative '../lib/zold/amount'
-require_relative '../lib/zold/commands/create'
-require_relative '../lib/zold/commands/send'
-require_relative '../lib/zold/commands/balance'
-require_relative '../lib/zold/commands/check'
-require_relative '../lib/zold/commands/pull'
-require_relative '../lib/zold/commands/push'
-require_relative '../lib/zold/node/front'
+require_relative '../lib/zold/copies'
+require_relative '../lib/zold/remotes'
 
 Encoding.default_external = Encoding::UTF_8
 Encoding.default_internal = Encoding::UTF_8
@@ -46,21 +41,29 @@ Encoding.default_internal = Encoding::UTF_8
 log = Zold::Log.new
 
 begin
-  opts = Slop.parse(ARGV, strict: true, help: true) do |o|
+  opts = Slop.parse(ARGV, strict: false, suppress_errors: true) do |o|
     o.banner = "Usage: zold [options] command [arguments]
 Available commands:
+    #{Rainbow('remote').green}
+      Manage remote nodes
     #{Rainbow('create').green}
       Creates a new wallet with a random ID
-    #{Rainbow('pull').green} [id...]
-      Pulls all local wallets and new ones explicitly required
-    #{Rainbow('check').green} id
-      Checks the validity of the wallet
-    #{Rainbow('balance').green} id
-      Prints the balance of the wallet
-    #{Rainbow('send').green} source target amount
-      Send ZOLD from one wallet to another
-    #{Rainbow('push').green} [id...]
-      Push all local wallets or the ones required
+    #{Rainbow('fetch').green} [ID...]
+      Fetch wallet copies from remote nodes
+    #{Rainbow('clean').green} [ID...]
+      Remove expired local copies
+    #{Rainbow('merge').green} [ID...]
+      Merge remote copies with the HEAD
+    #{Rainbow('pull').green} [ID...]
+      Fetch and then merge
+    #{Rainbow('show').green} [ID...]
+      Show all available information about the wallet
+    #{Rainbow('pay').green} source target amount details
+      Pay ZOLD from one wallet to another
+    #{Rainbow('status').green}
+      Show status of local copies
+    #{Rainbow('push').green} [ID...]
+      Push all/some local wallets or the ones required
     #{Rainbow('node').green} port
       Run node at the given TCP port
 Available options:"
@@ -78,71 +81,149 @@ Available options:"
     o.on '--no-colors', 'Disable colors in the ouput' do
       Rainbow.enabled = false
     end
+    o.on '--verbose', 'Enable extra logging information' do
+      log = Zold::Log::Verbose.new
+    end
     o.on '-v', '--version', 'Show current version' do
-      puts Zold::VERSION
+      log.info(Zold::VERSION)
       exit
     end
   end
 
-  if opts.help?
+  raise 'Try --help' if opts.arguments.empty? && !opts.help?
+
+  if opts.help? && opts.arguments.empty?
     log.info(opts.to_s)
     exit
   end
 
-  raise 'Command is required' if opts.arguments.empty?
-
   command = opts.arguments[0]
 
+  args = ARGV[(ARGV.index(command) + 1)..-1]
+
   wallets = Zold::Wallets.new(opts['dir'])
+  remotes = Zold::Remotes.new(File.join(opts['dir'], '.zold/remotes'))
+  copies = File.join(opts['dir'], '.zold/copies')
 
   case command
   when 'node'
-    raise 'TCP port is required' if opts.arguments[1].nil?
-    Zold::Front.run!(port: opts.arguments[1].to_i)
+    require_relative '../lib/zold/commands/node'
+    Zold::Node.new(log: log).run(args)
   when 'create'
+    require_relative '../lib/zold/commands/create'
     Zold::Create.new(
       wallets: wallets,
       pubkey: Zold::Key.new(file: opts['public-key']),
       log: log
-    ).run
-  when 'send'
-    raise "Payer wallet ID is required" if opts.arguments[1].nil?
-    raise "Recepient wallet ID is required" if opts.arguments[2].nil?
-    Zold::Send.new(
-      payer: wallets.find(Zold::Id.new(opts.arguments[1])),
-      receiver: wallets.find(Zold::Id.new(opts.arguments[2])),
-      amount: Zold::Amount.new(zld: opts.arguments[3].to_f),
-      pvtkey: Zold::Key.new(file: opts['private-key']),
-      log: log
-    ).run
-  when 'balance'
-    raise "Wallet ID is required" if opts.arguments[1].nil?
-    Zold::Balance.new(
-      wallet: wallets.find(Zold::Id.new(opts.arguments[1])),
+    ).run(args)
+  when 'remote'
+    require_relative '../lib/zold/commands/remote'
+    Zold::Remote.new(
+      remotes: remotes,
       log: log
-    ).run
-  when 'check'
-    raise "Wallet ID is required" if opts.arguments[1].nil?
-    Zold::Check.new(
-      wallet: wallets.find(Zold::Id.new(opts.arguments[1])),
-      wallets: wallets,
+    ).run(args)
+  when 'pay'
+    raise "Payer wallet ID is required" if args[0].nil?
+    raise "Recepient wallet ID is required" if args[1].nil?
+    raise "Amount is required (in Zolds)" if args[2].nil?
+    require_relative '../lib/zold/commands/pay'
+    Zold::Pay.new(
+      payer: wallets.find(Zold::Id.new(args[0])),
+      receiver: Zold::Id.new(args[1]),
+      amount: Zold::Amount.new(zld: args[2].to_f),
+      details: opts.arguments[4] ? args[3] : '-',
+      pvtkey: Zold::Key.new(file: opts['private-key']),
       log: log
-    ).run
+    ).run(args)
+  when 'show'
+    if args[0].nil?
+      require_relative '../lib/zold/commands/list'
+      Zold::List.new(
+        wallets: wallets,
+        log: log
+      ).run(args)
+    else
+      require_relative '../lib/zold/commands/show'
+      args.each do |id|
+        Zold::Show.new(
+          wallet: wallets.find(Zold::Id.new(id)),
+          log: log
+        ).run(args)
+      end
+    end
+  when 'fetch'
+    require_relative '../lib/zold/commands/fetch'
+    args.each do |id|
+      Zold::Fetch.new(
+        wallet: wallets.find(Zold::Id.new(id)),
+        remotes: remotes,
+        copies: Zold::Copies.new(File.join(copies, id)),
+        log: log
+      ).run(args)
+    end
+  when 'clean'
+    require_relative '../lib/zold/commands/clean'
+    if args.empty?
+      args = Dir.new(copies).select { |f| f =~ /[0-9a-fA-F]{16}/ }
+    end
+    args.each do |id|
+      Zold::Clean.new(
+        copies: Zold::Copies.new(File.join(copies, id)),
+        log: log
+      ).run(args)
+    end
+  when 'diff'
+    require_relative '../lib/zold/commands/diff'
+    args.each do |id|
+      Zold::Diff.new(
+        wallet: wallets.find(Zold::Id.new(id)),
+        copies: Zold::Copies.new(File.join(copies, id)),
+        log: log
+      ).run(args)
+    end
+  when 'merge'
+    require_relative '../lib/zold/commands/merge'
+    require_relative '../lib/zold/commands/propagate'
+    args.each do |id|
+      Zold::Merge.new(
+        wallet: wallets.find(Zold::Id.new(id)),
+        copies: Zold::Copies.new(File.join(copies, id)),
+        log: log
+      ).run(args)
+      Zold::Propagate.new(
+        wallet: wallets.find(Zold::Id.new(id)),
+        wallets: wallets,
+        log: log
+      ).run(args)
+    end
   when 'pull'
-    Zold::Pull.new(
-      wallet: wallets.find(Zold::Id.new(opts.arguments[1])),
-      log: log
-    ).run
+    require_relative '../lib/zold/commands/fetch'
+    require_relative '../lib/zold/commands/merge'
+    args.each do |id|
+      Zold::Fetch.new(
+        wallet: wallets.find(Zold::Id.new(id)),
+        remotes: remotes,
+        copies: Zold::Copies.new(File.join(copies, id)),
+        log: log
+      ).run(args)
+      Zold::Merge.new(
+        wallet: wallets.find(Zold::Id.new(id)),
+        copies: Zold::Copies.new(File.join(copies, id)),
+        log: log
+      ).run(args)
+    end
   when 'push'
+    require_relative '../lib/zold/commands/push'
     Zold::Push.new(
-      wallet: wallets.find(Zold::Id.new(opts.arguments[1])),
+      wallet: wallets.find(Zold::Id.new(args[0])),
+      remotes: remotes,
       log: log
-    ).run
+    ).run(args)
   else
     raise "Command '#{command}' is not supported"
   end
 rescue StandardError => ex
-  log.error(ex.message)
+  log.error("#{ex.message} (#{ex.class.name})")
   puts ex.backtrace if opts['trace']
   exit -1
 end

data/features/cli.feature

@@ -12,6 +12,6 @@ Feature: Command Line Processing
     Then Exit code is zero
 
   Scenario: Wallet can be created
-    When I run bin/zold with "create --private-key id_rsa --public-key id_rsa.pub"
+    When I run bin/zold with " --private-key id_rsa --public-key id_rsa.pub --trace create"
     Then Exit code is zero
 

data/features/step_definitions/steps.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Zerocracy, Inc.
+# 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

data/features/support/env.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Zerocracy, Inc.
+# 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

data/fixtures/scripts/push-and-pull.sh

@@ -0,0 +1,35 @@
+#!/bin/bash
+set -x
+set -e
+shopt -s expand_aliases
+
+alias zold="$1"
+
+port=`python -c 'import socket; s=socket.socket(); s.bind(("", 0)); print(s.getsockname()[1]); s.close()'`
+
+mkdir server
+cd server
+zold node --host=localhost --port=${port} --bind-port=${port} --threads=0 &
+pid=$!
+trap "kill -9 $pid" EXIT
+cd ..
+
+while ! nc -z localhost ${port}; do
+  sleep 0.1
+done
+
+zold remote clean
+zold remote add localhost ${port}
+zold remote show
+
+zold --public-key id_rsa.pub create 0000000000000000
+zold --private-key id_rsa --trace pay 0000000000000000 af5788fcadd710c5 14.99 'To save the world!'
+zold show
+zold show 0000000000000000
+
+zold push 0000000000000000
+zold fetch 0000000000000000
+zold diff 0000000000000000
+zold --trace merge 0000000000000000
+
+echo 'DONE'

data/lib/zold.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Zerocracy, Inc.
+# 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
@@ -23,7 +23,7 @@ require_relative 'zold/version'
 
 # Zold main module.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2018 Zerocracy, Inc.
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
   # to be implemented...

data/lib/zold/amount.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Zerocracy, Inc.
+# 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
@@ -22,7 +22,7 @@ require 'rainbow'
 
 # The amount.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2018 Zerocracy, Inc.
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
   # Amount
@@ -57,6 +57,14 @@ module Zold
       @coins == other.to_i
     end
 
+    def >(other)
+      @coins > other.to_i
+    end
+
+    def <(other)
+      @coins < other.to_i
+    end
+
     def +(other)
       Amount.new(coins: @coins + other.to_i)
     end

data/lib/zold/commands/{send.rb → clean.rb}

@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Zerocracy, Inc.
+# 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
@@ -18,29 +18,29 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+require 'uri'
+require 'json'
+require 'time'
 require_relative '../log.rb'
+require_relative '../http.rb'
+require_relative '../score.rb'
 
-# SEND command.
+# CLEAN command.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2018 Zerocracy, Inc.
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  # Money sending command
-  class Send
-    def initialize(payer:, receiver:, amount:, pvtkey:, log: Log::Quiet.new)
-      @payer = payer
-      @receiver = receiver
-      @amount = amount
-      @pvtkey = pvtkey
+  # CLEAN pulling command
+  class Clean
+    def initialize(copies:, log: Log::Quiet.new)
+      @copies = copies
       @log = log
     end
 
-    def run
-      raise "The amount can't be negative: #{@amount}" if @amount.negative?
-      txn = @payer.sub(@amount, @receiver.id, @pvtkey)
-      @receiver.add(txn)
-      @log.info("#{@amount} sent from #{@payer} to #{@receiver}")
-      txn[:id]
+    def run(_ = [])
+      @copies.clean
+      @log.debug("Expired local copies removed for #{@copies}, \
+#{@copies.all.count} left")
     end
   end
 end

data/lib/zold/commands/create.rb

@@ -1,4 +1,4 @@
-# Copyright (c) 2018 Zerocracy, Inc.
+# 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
@@ -24,7 +24,7 @@ require_relative '../id.rb'
 
 # CREATE command.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
-# Copyright:: Copyright (c) 2018 Zerocracy, Inc.
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
   # Create command
@@ -35,11 +35,13 @@ module Zold
       @log = log
     end
 
-    def run
-      id = Id.new
+    def run(args = [])
+      id = args.empty? ? Id.new : Id.new(args[0])
       wallet = @wallets.find(id)
       wallet.init(id, @pubkey)
-      @log.info("#{wallet} created at #{@wallets}")
+      @log.info(wallet.id)
+      @log.debug("Wallet #{Rainbow(wallet).green} \
+created at #{@wallets.path}")
       wallet
     end
   end