zold 0.4.4 → 0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 148ca4cd62aba20f6f36418633367a7e40507ba8
-  data.tar.gz: a3f2c6133d23487bacb37b4ba9dddaf4a1035d2d
+  metadata.gz: 28d39fb05a13cc3dc2a6856289b717c137e751dc
+  data.tar.gz: 42b2b142eb06e8f360b4d2f311bcf8c86aec7395
 SHA512:
-  metadata.gz: d9e53c293c80ad8ac94f4270f2cb6501265c7bade6fa2b98e0bf55c4c8da1982c50a149736ce357c781379b0fc61dcbaf50a46edaa1929517abeeff24682f476
-  data.tar.gz: 16fe75629039be9c7ea748891900788a37a317fc64d800b29abd263bfeabf60547c081638a9a1276594a2573b43e6568466c0204d71a284cc2ea32b0260fb73c
+  metadata.gz: 63424ca129a20ac442879e53255572e885c952c32d10bc5b5cddaaca33a04d3698cc0c8114f8b79479988295df8c5bbe6f4bbd65a7c7752d1cbc031768272e68
+  data.tar.gz: f91e1c18246b1dd7f6fe790ac71a43e4cbdf0c2eae9a718229e7cc4004aea419352986f3b1036ff750200ed40be1aed1a21e9c82aba40de67529d091bbf2dbdd

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

@@ -15,7 +15,8 @@ trap "kill -9 $pid" EXIT
 cd ..
 
 while ! nc -z localhost ${port}; do
-  sleep 0.1
+  sleep 0.5
+  ((c++)) && ((c==20)) && break
 done
 
 zold --trace remote clean

data/lib/zold/commands/node.rb

@@ -20,7 +20,11 @@
 
 require 'slop'
 require_relative '../score'
+require_relative '../wallets'
+require_relative '../remotes'
+require_relative '../node/entrance'
 require_relative '../node/front'
+require_relative '../node/farm'
 
 # NODE command.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -61,9 +65,10 @@ module Zold
         @log.info(opts.to_s)
         return
       end
-      Zold::Front.set(:suppress_messages, true)
       Zold::Front.set(:log, @log)
       Zold::Front.set(:logging, @log.debug?)
+      FileUtils.mkdir_p(opts[:home])
+      Zold::Front.set(:home, opts[:home])
       Zold::Front.set(
         :server_settings,
         Logger: WebrickLog.new(@log),
@@ -79,10 +84,18 @@ module Zold
           )
         )
       end
+      wallets = Wallets.new(File.join(opts[:home], 'zold-wallets'))
+      Zold::Front.set(:wallets, wallets)
+      remotes = Remotes.new(File.join(opts[:home], 'zold-remotes'))
+      Zold::Front.set(:remotes, remotes)
+      copies = File.join(opts[:home], 'zold-copies')
+      Zold::Front.set(:copies, copies)
+      address = "#{opts[:host]}:#{opts[:port]}".downcase
+      Zold::Front.set(:address, address)
+      Zold::Front.set(
+        :entrance, Entrance.new(wallets, remotes, copies, address, log: @log)
+      )
       Zold::Front.set(:port, opts['bind-port'])
-      FileUtils.mkdir_p(opts[:home])
-      Zold::Front.set(:home, opts[:home])
-      Zold::Front.set(:me, "#{opts[:host]}:#{opts[:port]}".downcase)
       farm = Farm.new(log: @log)
       farm.start(
         opts[:host], opts[:port],

data/lib/zold/commands/push.rb

@@ -77,6 +77,7 @@ Available options:"
           @log.error("#{uri} invalid score")
           next
         end
+        @log.info("#{uri} accepted: #{Rainbow(score.value).green}")
         total += score.value
       end
       @log.info("Total score is #{total}")

data/lib/zold/node/entrance.rb

@@ -0,0 +1,70 @@
+# 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 'concurrent'
+require_relative '../log'
+require_relative '../remotes'
+require_relative '../copies'
+require_relative '../commands/merge'
+require_relative '../commands/fetch'
+require_relative '../commands/push'
+
+# The entrance of the web front.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # The entrance
+  class Entrance
+    def initialize(wallets, remotes, copies, address, log: Log::Quiet.new)
+      @wallets = wallets
+      @remotes = remotes
+      @copies = copies
+      @address = address
+      @log = log
+      @semaphores = Concurrent::Map.new
+    end
+
+    def push(id, body)
+      @semaphores.put_if_absent(id, Mutex.new)
+      @semaphores.get(id).synchronize do
+        push_unsafe(id, body)
+      end
+    end
+
+    def push_unsafe(id, body)
+      copies = Copies.new(File.join(@copies, id.to_s))
+      copies.add(body, 'remote', Remotes::PORT, 0)
+      Zold::Fetch.new(
+        remotes: @remotes, copies: copies.root, log: @log
+      ).run([id.to_s, "--ignore-node=#{@address}"])
+      modified = Zold::Merge.new(
+        wallets: @wallets, copies: copies.root, log: @log
+      ).run([id.to_s])
+      copies.remove('remote', Remotes::PORT)
+      modified.each do |m|
+        Zold::Push.new(
+          wallets: @wallets, remotes: @remotes, log: @log
+        ).run([m.to_s])
+      end
+      modified
+    end
+  end
+end

data/lib/zold/node/front.rb

@@ -20,17 +20,13 @@
 
 STDOUT.sync = true
 
-require 'slop'
 require 'json'
 require 'sinatra/base'
 require 'webrick'
 
-require_relative 'farm'
 require_relative '../version'
 require_relative '../wallet'
-require_relative '../wallets'
 require_relative '../log'
-require_relative '../remotes'
 require_relative '../id'
 require_relative '../http'
 
@@ -43,16 +39,21 @@ module Zold
   class Front < Sinatra::Base
     configure do
       set :bind, '0.0.0.0'
-      set :logging, true
+      set :suppress_messages, true
       set :dump_errors, true
       set :start, Time.now
       set :lock, false
-      set :log, Log.new
       set :show_exceptions, false
-      set :home, Dir.pwd
-      set :me, 'localhost:4096'
-      set :farm, Farm.new
       set :server, 'webrick'
+      set :home, nil? # to be injected at node.rb
+      set :logging, true # to be injected at node.rb
+      set :log, nil? # to be injected at node.rb
+      set :address, nil? # to be injected at node.rb
+      set :farm, nil? # to be injected at node.rb
+      set :entrance, nil? # to be injected at node.rb
+      set :wallets, nil? # to be injected at node.rb
+      set :remotes, nil? # to be injected at node.rb
+      set :copies, nil? # to be injected at node.rb
     end
 
     before do
@@ -66,6 +67,7 @@ module Zold
 
     after do
       headers['Cache-Control'] = 'no-cache'
+      headers['Connection'] = 'close'
       headers['X-Zold-Version'] = VERSION
     end
 
@@ -83,7 +85,7 @@ module Zold
         version: VERSION,
         score: score.to_h,
         uptime: `uptime`.strip,
-        wallets: wallets.all.count,
+        wallets: settings.wallets.all.count,
         farm: settings.farm.to_json,
         date: `date  --iso-8601=seconds -u`.strip,
         hours_alive: ((Time.now - settings.start) / (60 * 60)).round(2),
@@ -93,7 +95,7 @@ module Zold
 
     get %r{/wallet/(?<id>[A-Fa-f0-9]{16})} do
       id = Id.new(params[:id])
-      wallet = wallets.find(id)
+      wallet = settings.wallets.find(id)
       error 404 unless wallet.exists?
       content_type 'application/json'
       {
@@ -105,33 +107,14 @@ module Zold
 
     put %r{/wallet/(?<id>[A-Fa-f0-9]{16})/?} do
       id = Id.new(params[:id])
-      wallet = wallets.find(id)
+      wallet = settings.wallets.find(id)
       request.body.rewind
       body = request.body.read
       if wallet.exists? && File.read(wallet.path) == body
         status 304
         return
       end
-      cps = copies(id)
-      cps.add(body, 'remote', Remotes::PORT, 0)
-      require_relative '../commands/fetch'
-      Zold::Fetch.new(
-        remotes: settings.remotes, copies: cps.root,
-        log: settings.log
-      ).run([id.to_s, "--ignore-node=#{settings.me}"])
-      require_relative '../commands/merge'
-      modified = Zold::Merge.new(
-        wallets: wallets, copies: cps.root,
-        log: settings.log
-      ).run([id.to_s])
-      cps.remove('remote', Remotes::PORT)
-      require_relative '../commands/push'
-      modified.each do |m|
-        Zold::Push.new(
-          wallets: wallets, remotes: settings.remotes,
-          log: settings.log
-        ).run([m.to_s])
-      end
+      modified = settings.entrance.push(id, body)
       JSON.pretty_generate(
         version: VERSION,
         score: score.to_h,
@@ -175,14 +158,6 @@ module Zold
 
     private
 
-    def copies(id)
-      Copies.new(File.join(settings.home, ".zoldata/copies/#{id}"))
-    end
-
-    def wallets
-      Wallets.new(settings.home)
-    end
-
     def score
       best = settings.farm.best
       error 404 if best.empty?

data/lib/zold/version.rb

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

data/lib/zold/wallets.rb

@@ -33,11 +33,12 @@ module Zold
     end
 
     def path
+      FileUtils.mkdir_p(@dir)
       File.expand_path(@dir)
     end
 
     def all
-      Dir.new(@dir).select do |f|
+      Dir.new(path).select do |f|
         file = File.join(@dir, f)
         File.file?(file) &&
           !File.directory?(file) &&
@@ -47,7 +48,7 @@ module Zold
     end
 
     def find(id)
-      Zold::Wallet.new(File.join(@dir, id.to_s))
+      Zold::Wallet.new(File.join(path, id.to_s))
     end
   end
 end

data/zold.gemspec

@@ -44,6 +44,7 @@ Gem::Specification.new do |s|
   s.test_files = s.files.grep(%r{^(test|spec|features)/})
   s.rdoc_options = ['--charset=UTF-8']
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
+  s.add_runtime_dependency 'concurrent-ruby', '1.0.5'
   s.add_runtime_dependency 'cucumber', '1.3.17'
   s.add_runtime_dependency 'diffy', '3.2.0'
   s.add_runtime_dependency 'openssl', '2.0.1'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.4.4
+  version: '0.5'
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -10,6 +10,20 @@ bindir: bin
 cert_chain: []
 date: 2018-05-13 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: concurrent-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.5
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.0.5
 - !ruby/object:Gem::Dependency
   name: cucumber
   requirement: !ruby/object:Gem::Requirement
@@ -279,6 +293,7 @@ files:
 - lib/zold/id.rb
 - lib/zold/key.rb
 - lib/zold/log.rb
+- lib/zold/node/entrance.rb
 - lib/zold/node/farm.rb
 - lib/zold/node/front.rb
 - lib/zold/patch.rb