zold 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 14468d2087e8bc9e62ff62fbf6a8ed863676f547
-  data.tar.gz: 5a21ba21c87067c1542073e9ac2d4eee0aebd0da
+  metadata.gz: 310bfd7583912cdc9abc3b2bb8ff1c3a2d8bdc9a
+  data.tar.gz: 6b9c43db3c2534bedf560a2baf8519596e52d187
 SHA512:
-  metadata.gz: 0cfa87e3536e8950d6cab5086c9332af1a8d51c4d962554bcc3833c376e82c80edd96da966e0b6321443b4006be7ab6279628bedfa23aafbfaaced04e693fa14
-  data.tar.gz: 602357b96cf4212800d256c04d001c72563d7b10825c89e79bcf91858b2e45ccf67a208a046761cc2710143efd5e953163825f64e8f81245c2152f288d57b17f
+  metadata.gz: 34802e906d21aec4e14ba10f01e4625df22c2e767c470b0167d9879bd7337a83018ea4d7bc506dc9e3deda52c4bbf32624bcd01d8cb4f406bbfd539a82b533e9
+  data.tar.gz: 6a4f768f29cea3a6246e7c55261ade7444e3149cfccac4a367a361484b695be2170fabd8e3e9246640ed7bfebf68c15ef41e303d780b78268ab32c73ae38a07f

data/lib/zold/copies.rb

@@ -49,6 +49,10 @@ module Zold
       end
     end
 
+    def remove(host, port)
+      save(load.reject! { |s| s[:host] == host && s[:port] == port })
+    end
+
     def add(content, host, port, score, time = Time.now)
       raise "Content can't be empty" if content.empty?
       raise 'TCP port must be of type Integer' unless port.is_a?(Integer)

data/lib/zold/key.rb

@@ -21,6 +21,7 @@
 gem 'openssl'
 require 'openssl'
 require 'base64'
+require 'tempfile'
 
 # The RSA key (either private or public).
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -70,7 +71,10 @@ module Zold
     def rsa
       text = @body.call.strip
       unless text.start_with?('-----BEGIN')
-        text = OpenSSHKeyConverter.decode_pubkey(text.split[1])
+        Tempfile.open do |f|
+          File.write(f.path, text)
+          text = `ssh-keygen -f #{f.path} -e -m pem`
+        end
       end
       begin
         OpenSSL::PKey::RSA.new(text)
@@ -80,99 +84,3 @@ module Zold
     end
   end
 end
-
-# Stolen from: https://gist.github.com/tombh/f66de84fd3a63e670ad9
-module OpenSSHKeyConverter
-  # The components in a openssh .pub / known_host RSA public key.
-  RSA_COMPONENTS = ['ssh-rsa', :e, :n].freeze
-  # The components in a openssh .pub / known_host DSA public key.
-  DSA_COMPONENTS = ['ssh-dss', :p, :q, :g, :pub_key].freeze
-
-  # Encodes a key's public part in the format found in .pub & known_hosts files.
-  def self.encode_pubkey(key)
-    case key
-    when OpenSSL::PKey::RSA
-      components = RSA_COMPONENTS
-    when OpenSSL::PKey::DSA
-      components = DSA_COMPONENTS
-    else
-      raise "Unsupported key type #{key.class.name}"
-    end
-    components.map! { |c| c.is_a?(Symbol) ? encode_mpi(key.send(c)) : c }
-    # ruby tries to be helpful and adds new lines every 60 bytes :(
-    [pack_pubkey_components(components)].pack('m').delete("\n")
-  end
-
-  # Decodes an openssh public key from the format of .pub & known_hosts files.
-  def self.decode_pubkey(string)
-    components = unpack_pubkey_components Base64.decode64(string)
-    case components.first
-    when RSA_COMPONENTS.first
-      ops = RSA_COMPONENTS.zip components
-      key = OpenSSL::PKey::RSA.new
-    when DSA_COMPONENTS.first
-      ops = DSA_COMPONENTS.zip components
-      key = OpenSSL::PKey::DSA.new
-    else
-      raise "Unsupported key type #{components.first}"
-    end
-    ops.each do |o|
-      next unless o.first.is_a? Symbol
-      key.send "#{o.first}=", decode_mpi(o.last)
-    end
-    key
-  end
-
-  # Loads a serialized key from an IO instance (File, StringIO).
-  def self.load_key(io)
-    key_from_string io.read
-  end
-
-  # Reads a serialized key from a string.
-  def self.key_from_string(serialized_key)
-    header = first_line serialized_key
-    if header.index 'RSA'
-      OpenSSL::PKey::RSA.new serialized_key
-    elsif header.index 'DSA'
-      OpenSSL::PKey::DSA.new serialized_key
-    else
-      raise 'Unknown key type'
-    end
-  end
-
-  # Extracts the first line of a string.
-  def self.first_line(string)
-    string[0, string.index(/\r|\n/) || string.len]
-  end
-
-  # Unpacks the string components in an openssh-encoded pubkey.
-  def self.unpack_pubkey_components(str)
-    cs = []
-    i = 0
-    while i < str.length
-      len = str[i, 4].unpack('N').first
-      cs << str[i + 4, len]
-      i += 4 + len
-    end
-    cs
-  end
-
-  # Packs string components into an openssh-encoded pubkey.
-  def self.pack_pubkey_components(strings)
-    (strings.map { |s| [s.length].pack('N') }).zip(strings).flatten.join
-  end
-
-  # Decodes an openssh-mpi-encoded integer.
-  def self.decode_mpi(mpi_str)
-    mpi_str.unpack('C*').inject(0) { |a, e| (a << 8) | e }
-  end
-
-  # Encodes an openssh-mpi-encoded integer.
-  def self.encode_mpi(n)
-    chars = []
-    n = n.to_i
-    chars << (n & 0xff) && n >>= 8 while n != 0
-    chars << 0 if chars.empty? || chars.last >= 0x80
-    chars.reverse.pack('C*')
-  end
-end

data/lib/zold/node/front.rb

@@ -21,7 +21,6 @@
 STDOUT.sync = true
 
 require 'slop'
-require 'facter'
 require 'json'
 require 'sinatra/base'
 require 'webrick'
@@ -34,7 +33,6 @@ require_relative '../log'
 require_relative '../remotes'
 require_relative '../id'
 require_relative '../http'
-require_relative '../commands/merge'
 
 # The web front of the node.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -84,15 +82,8 @@ module Zold
       JSON.pretty_generate(
         version: VERSION,
         score: score.to_h,
-        platform: {
-          uptime: `uptime`.strip,
-          # see https://docs.puppet.com/facter/3.3/core_facts.html
-          kernel: Facter.value(:kernel),
-          processors: Facter.value(:processors)['count']
-        },
-        wallets: {
-          total: wallets.all.count
-        },
+        uptime: `uptime`.strip,
+        wallets: wallets.all.count,
         farm: settings.farm.to_json,
         date: `date  --iso-8601=seconds -u`.strip,
         age: (Time.now - settings.start) / (60 * 60),
@@ -118,7 +109,11 @@ module Zold
       request.body.rewind
       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])
+      require_relative '../commands/merge'
       Zold::Merge.new(wallets: wallets, copies: cps.root).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.3.3'.freeze
+  VERSION = '0.3.4'.freeze
 end

data/resources/remotes

@@ -1 +1,2 @@
 b1.zold.io,80,0
+b2.zold.io,4096,0

data/zold.gemspec

@@ -46,7 +46,6 @@ Gem::Specification.new do |s|
   s.extra_rdoc_files = ['README.md', 'LICENSE.txt']
   s.add_runtime_dependency 'cucumber', '1.3.17'
   s.add_runtime_dependency 'diffy', '3.2.0'
-  s.add_runtime_dependency 'facter', '2.5.1'
   s.add_runtime_dependency 'openssl', '2.0.1'
   s.add_runtime_dependency 'rainbow', '~>3.0'
   s.add_runtime_dependency 'rake', '12.0.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -38,20 +38,6 @@ dependencies:
     - - '='
       - !ruby/object:Gem::Version
         version: 3.2.0
-- !ruby/object:Gem::Dependency
-  name: facter
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.5.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '='
-      - !ruby/object:Gem::Version
-        version: 2.5.1
 - !ruby/object:Gem::Dependency
   name: openssl
   requirement: !ruby/object:Gem::Requirement