zold 0.4 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 51f052404d2cb4a53a1a15c304bd264a5c19762f
-  data.tar.gz: 17aa5f67c5b295fc68c2ca50bde2dd1be8236477
+  metadata.gz: 295d14430d8ebdd3388c4389ac84aa4690ea589d
+  data.tar.gz: 7f63a6461a39f5b4f14486d4ef2cf7ccf8a19795
 SHA512:
-  metadata.gz: c9413af92527b0f5a07e856b7ff986e0a656736173b0282440821543f3b7f5dd91b13eceb5e8b7020c5682a0c60a986ad16a7363fe0e8d359ceb00d462f462ec
-  data.tar.gz: 94f2c08f15b3539a2478b2934adb7c389ce4f9b4b0eaf3ee5e421be1867b254a9cb6f5c704696eee445eca41fb8e87ab3edfc539caf94e204ab4d3fca28d0632
+  metadata.gz: '008090bc5576401be63bb0366996f1c3e8509299d0ef9fdc691e513ee13c384fb83f35f9053294911787e50e774b8a8baa8b61525b96ea5ee186705ef24dfb5d'
+  data.tar.gz: a0d184623087e94ec76bf33ce0954c010de8f3d5793d8638bdd2a2a2209741f7f1f4f9360ae6cbd104e935f5b1b96109e94eb8794ad24104e991464b0fffd92d

data/README.md

@@ -68,7 +68,7 @@ You will need PGP keys in `~/.ssh`. To generate them, if you don't have them
 yet, you can run:
 
 ```bash
-ssh-keygen -t rsa -b 4096
+$ ssh-keygen -t rsa -b 4096
 ```
 
 ## Glossary

data/bin/zold

@@ -40,19 +40,19 @@ Encoding.default_internal = Encoding::UTF_8
 
 log = Zold::Log.new
 
-begin
-  args = []
-  config = File.expand_path('~/.zold')
-  if File.exist?(config)
-    body = File.read(config)
-    extra = body.split(/[\r\n]+/).map(&:strip)
-    args += extra
-    log.debug("Found #{body.split(/\n/).length} lines in #{config}")
-  else
-    log.debug("Default config file #{config} not found")
-  end
-  args += ARGV
+args = []
+config = File.expand_path('~/.zold')
+if File.exist?(config)
+  body = File.read(config)
+  extra = body.split(/[\r\n]+/).map(&:strip)
+  args += extra
+  log.debug("Found #{body.split(/\n/).length} lines in #{config}")
+else
+  log.debug("Default config file #{config} not found")
+end
+args += ARGV
 
+begin
   opts = Slop.parse(args, strict: false, suppress_errors: true) do |o|
     o.banner = "Usage: zold [options] command [arguments]
 Available commands:
@@ -117,7 +117,7 @@ Available options:"
 
   command = opts.arguments[0]
 
-  args = ARGV[(ARGV.index(command) + 1)..-1]
+  args = args[(args.index(command) + 1)..-1]
 
   wallets = Zold::Wallets.new(opts['dir'])
   remotes = Zold::Remotes.new(File.join(opts['dir'], '.zold/remotes'))

data/lib/zold/commands/node.rb

@@ -94,11 +94,11 @@ module Zold
       end
 
       def debug(msg)
-        @log.debug(msg)
+        # nothing
       end
 
       def debug?
-        @log.debug?
+        @log.info?
       end
     end
   end

data/lib/zold/commands/push.rb

@@ -56,7 +56,7 @@ Available options:"
     def push(wallet, _)
       raise 'The wallet is absent' unless wallet.exists?
       remote = @remotes.all[0]
-      uri = URI("#{remote[:home]}/wallet/#{wallet.id}")
+      uri = URI("#{remote[:home]}wallet/#{wallet.id}")
       response = Http.new(uri).put(File.read(wallet.path))
       unless response.code == '200'
         raise "Failed to push to #{uri}: #{response.code}/#{response.message}"

data/lib/zold/commands/remote.rb

@@ -76,6 +76,7 @@ Available options:"
         remove(opts.arguments[1], opts.arguments[2].to_i)
       when 'update'
         update(opts)
+        update(opts, false)
       else
         @log.info(opts.to_s)
       end
@@ -110,7 +111,7 @@ Available options:"
       @log.info("There are #{@remotes.all.count} remote nodes in the list")
     end
 
-    def update(opts)
+    def update(opts, deep = true)
       @remotes.all.each do |r|
         uri = URI("#{r[:home]}remotes")
         res = Http.new(uri).get
@@ -145,9 +146,11 @@ Available options:"
           next
         end
         @remotes.rescore(r[:host], r[:port], score.value)
-        json['all'].each do |s|
-          unless @remotes.exists?(s['host'], s['port'])
-            add(s['host'], s['port'])
+        if deep
+          json['all'].each do |s|
+            unless @remotes.exists?(s['host'], s['port'])
+              add(s['host'], s['port'])
+            end
           end
         end
         @log.info("#{r[:host]}:#{r[:port]}: #{Rainbow(score.value).green} \

data/lib/zold/http.rb

@@ -20,6 +20,7 @@
 
 require 'rainbow'
 require 'net/http'
+require_relative 'version'
 require_relative 'score'
 
 # HTTP page.
@@ -61,7 +62,8 @@ module Zold
 
     def headers
       headers = {
-        'User-Agent': 'Zold'
+        'User-Agent': "Zold #{VERSION}",
+        'Connection': 'close'
       }
       if @score.valid? && @score.value >= 3
         headers[SCORE_HEADER] = score.reduced(4).to_s

data/lib/zold/log.rb

@@ -29,6 +29,13 @@ STDOUT.sync = true
 module Zold
   # Logging
   class Log
+    MUTEX = Mutex.new
+    def self.print(text)
+      MUTEX.synchronize do
+        puts(text)
+      end
+    end
+
     def debug(msg)
       # nothing
     end
@@ -38,7 +45,7 @@ module Zold
     end
 
     def info(msg)
-      puts msg
+      Log.print(msg)
     end
 
     def info?
@@ -46,13 +53,13 @@ module Zold
     end
 
     def error(msg)
-      puts "#{Rainbow('ERROR').red}: #{msg}"
+      Log.print("#{Rainbow('ERROR').red}: #{msg}")
     end
 
     # Extra verbose log
     class Verbose
       def debug(msg)
-        puts msg
+        Log.print(msg)
       end
 
       def debug?
@@ -60,7 +67,7 @@ module Zold
       end
 
       def info(msg)
-        puts msg
+        Log.print(msg)
       end
 
       def info?
@@ -68,7 +75,7 @@ module Zold
       end
 
       def error(msg)
-        puts "#{Rainbow('ERROR').red}: #{msg}"
+        Log.print("#{Rainbow('ERROR').red}: #{msg}")
       end
     end
 

data/lib/zold/node/front.rb

@@ -46,7 +46,7 @@ module Zold
       set :logging, true
       set :dump_errors, true
       set :start, Time.now
-      set :lock, true
+      set :lock, false
       set :log, Log.new
       set :show_exceptions, false
       set :home, Dir.pwd
@@ -109,9 +109,15 @@ module Zold
       cps = copies(id)
       cps.add(request.body.read, 'remote', Remotes::PORT, 0)
       require_relative '../commands/fetch'
-      Zold::Fetch.new(remotes: remotes, copies: cps.root).run([id.to_s])
+      Zold::Fetch.new(
+        remotes: remotes, copies: cps.root,
+        log: settings.log
+      ).run([id.to_s])
       require_relative '../commands/merge'
-      Zold::Merge.new(wallets: wallets, copies: cps.root).run([id.to_s])
+      Zold::Merge.new(
+        wallets: wallets, copies: cps.root,
+        log: settings.log
+      ).run([id.to_s])
       cps.remove('remote', Remotes::PORT)
       "Success, #{wallet.id} balance is #{wallet.balance}"
     end

data/lib/zold/version.rb

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

data/test/commands/test_remote.rb

@@ -48,13 +48,19 @@ class TestRemote < Minitest::Test
       stub_request(:get, 'http://localhost:2/remotes').to_return(
         status: 404
       )
+      stub_request(:get, 'http://localhost:888/remotes').to_return(
+        status: 404
+      )
+      stub_request(:get, 'http://localhost:999/remotes').to_return(
+        status: 404
+      )
       cmd = Zold::Remote.new(remotes: remotes)
       cmd.run(['clean'])
       cmd.run(%w[add localhost 1])
       cmd.run(%w[add localhost 2])
       assert_equal(2, remotes.all.count)
       cmd.run(['update', '--ignore-score-weakness'])
-      assert_equal(3, remotes.all.count)
+      assert_equal(1, remotes.all.count)
     end
   end
 end

metadata

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