RubyGems - zold - Versions diffs - 0.9.11 → 0.10 - Mend

zold 0.9.11 → 0.10

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (9) hide show

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 76a4eedb7d10def207298c7f125a6c9fbe392bec
-  data.tar.gz: 04f8e073cea64e11e7989d1c943a629295e45425
+  metadata.gz: 8a814090449cd1c18d0ecbe1829aff24ea56faec
+  data.tar.gz: 3c123ae97703d66da02fadb2504c1e880da5c1a0
 SHA512:
-  metadata.gz: b70bdc247fa5230a8a6709578d603f1e7a87f8b3a758abc663dc5cf603136f49f8049a1df90fb709c728cf8a9d8b4ca9fcedbc9b0e15ee209ec2556cffe996be
-  data.tar.gz: 9dbfe9ece397a9ef7a6ee65e771ac560fe4aacc2ceb1ac77d291bb53b0d263ddc4349ae45e00ecc8c47564dab15f304a639e6440828325a7cded1a2e7de4db52
+  metadata.gz: 34da8c63b94f5fa6227c8ad1b432f444647d1ce6482d4b5bab48b127072976c0f956131ed660330653b2135ba343e17604d8693ad759a299ce9b693d5b01bf4f
+  data.tar.gz: c6a8bb7d55f2f2171cded95ad75c5b43877cbd77ff95f321979ff54d860a322cc269c3e2081f8f1874a112e1b8363b42095434092c4b38e04571cd4b403bc15c

data/Procfile CHANGED Viewed

	@@ -1 +1 @@
1	- web: LC_ALL=UTF-8 ./bin/zold node --no-colors --verbose --trace --bind-port=$PORT --port=80 --host=b1.zold.io --threads=0 --~~standalone --~~invoice=JKFq17yipfjLtX@0000000000000000 --never-reboot
1	+ web: LC_ALL=UTF-8 ./bin/zold node --no-colors --verbose --trace --bind-port=$PORT --port=80 --host=b1.zold.io --threads=0 --invoice=JKFq17yipfjLtX@0000000000000000 --never-reboot

data/html/map.html ADDED Viewed

@@ -0,0 +1,128 @@
+<?xml version="1.0"?>
+<!--
+(The MIT License)
+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 NONINFRINGEMENT. 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.
+-->
+<!DOCTYPE html>
+<html>
+  <head>
+    <meta charset="utf-8"/>
+    <title>Zold nodes map</title>
+    <meta name="description" content="Full map of visible Zold nodes"/>
+    <meta name="keywords" content="zerocracy, management, robotocracy, meritocracy"/>
+    <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+    <link rel="shortcut icon" href="https://www.zold.io/logo.png"/>
+    <script src="https://maps.google.com/maps/api/js">
+      // Should be empty
+    </script>
+    <script src="https://code.jquery.com/jquery-3.3.1.min.js">
+      // Should be empty
+    </script>
+    <style>
+      * { box-sizing: border-box; margin: 0; padding: 0; font-family: "Helvetica Neue",Helvetica,Arial,sans-serif; }
+      html { height: 100% }
+      body { height: 100%; }
+      #container { width: 100%; height: 100% }
+      #map { width: 80%; height: 100%; display: inline-block; }
+      #nodes { width: 20%; height: 100%; background-color: #f5f5f5; float: right; padding: 1em; }
+      #logo { position: absolute; bottom: 1em; right: 1em; width: 48px; height: 48px; }
+      #remotes { margin-top: 1em; }
+      #remotes li { list-style: none; }
+    </style>
+    <script>
+      function init() {
+        var options = {
+          center: new google.maps.LatLng(55.751244, 37.618423),
+          mapTypeId: google.maps.MapTypeId.ROADMAP,
+          zoom: 3
+        };
+        var remotes = {};
+        var map = new google.maps.Map(document.getElementById("map"), options);
+        $.getJSON('/', function(data) {
+          $('#header').html(
+            'Version: ' + data['version'] + '<br/>' +
+            'Host: ' + data['score']['host'] + ':' + data['score']['port'] + '<br/>' +
+            'Score: ' + data['score']['value'] + '<br/>' +
+            'Wallets: ' + data['wallets']
+          );
+        });
+        window.setInterval(function() {
+          $.getJSON('/remotes', function(data) { remotes = data['all']; });
+        }, 10000);
+        window.setInterval(function() {
+          $('#remotes li').each(function (li) {
+            found = $.grep(remotes, function (r, i) { return r['host'] + ':' + r['port'] == li.attr('data-coords'); });
+            if (!found.length) {
+              li.remove();
+            }
+          });
+        }, 10000);
+        window.setInterval(function() {
+          $.each(remotes, function (idx, remote) {
+            var host = remote['host'], port = remote['port'];
+            var coords = host + ':' + port;
+            var items = $('#remotes li[data-coords="' + coords + '"]');
+            if (items.length) {
+              var li = items.first();
+              $.getJSON('http://' + coords + '/', function(data) {
+                coords + ': ' + data['score']['value'] + '/' + data['wallets'] + ' (' + li.html(data['version'] + ')');
+              })
+                .done(function() { li.css('color', 'darkgreen'); })
+                .fail(function() { li.css('color', 'red'); });
+              var ip = host;
+              if (!ip.match(/[0-9\.]+/)) {
+                $.get('http://api.konvert.me/forward-dns/' + host, function(data) {
+                  ip = data
+                });
+              }
+              $.getJSON('http://ip-api.com/json/' + ip, function(data) {
+                new google.maps.Marker({
+                  position: { lat: data['lat'], lng: data['lon'] },
+                  map: map,
+                  title: coords
+                });
+              });
+            } else {
+              $('#remotes').append('<li data-coords="' + coords + '">' + coords + '</li>')
+            }
+          });
+        }, 1000);
+      };
+    </script>
+  </head>
+  <body onload="init();">
+    <div id="container">
+      <div id="map">
+        <!-- Empty on start -->
+      </div>
+      <div id="nodes">
+        <div id="header">
+          <!-- Empty on start -->
+        </div>
+        <ul id="remotes">
+          <!-- Empty on start -->
+        </ul>
+      </div>
+      <img id="logo" src="https://www.zold.io/logo.svg"/>
+    </div>
+  </body>
+</html>

data/lib/zold/commands/node.rb CHANGED Viewed

@@ -96,6 +96,7 @@ module Zold
       Zold::Front.set(
         :entrance, Entrance.new(wallets, remotes, copies, address, log: @log)
       )
+      Zold::Front.set(:root, Dir.pwd)
       Zold::Front.set(:port, opts['bind-port'])
       Zold::Front.set(:reboot, !opts['never-rebootw'])
       invoice = opts[:invoice]

data/lib/zold/node/front.rb CHANGED Viewed

@@ -74,6 +74,7 @@ module Zold
       headers['Cache-Control'] = 'no-cache'
       headers['Connection'] = 'close'
       headers['X-Zold-Version'] = VERSION
+      headers['Access-Control-Allow-Origin'] = '*'
     end
     get '/robots.txt' do
@@ -143,6 +144,11 @@ module Zold
       )
     end
+    get %r{/(?<page>.+\.html)} do
+      content_type 'text/html'
+      File.read(File.join(settings.root, "html/#{params[:page]}"))
+    end
     not_found do
       status 404
       content_type 'text/plain'

data/lib/zold/version.rb CHANGED Viewed

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

data/test/node/fake_node.rb CHANGED Viewed

@@ -22,7 +22,6 @@ require 'tmpdir'
 require 'webmock/minitest'
 require_relative '../../lib/zold/log'
 require_relative '../../lib/zold/http'
-require_relative '../../lib/zold/commands/node'
 # Fake node.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
@@ -43,6 +42,7 @@ class FakeNode
         begin
           Thread.current.abort_on_exception = true
           home = File.join(dir, 'node-home')
+          require_relative '../../lib/zold/commands/node'
           Zold::Node.new(log: @log).run(
             [
               '--standalone',
@@ -55,7 +55,7 @@ class FakeNode
             ]
           )
         rescue StandardError => e
-          @log.error(e.message + "\n" + e.backtrace.join("\n"))
+          @log.error(e.message + "\n" + e.backtrace.join("\n\t"))
         end
       end
       home = URI("http://localhost:#{port}/")

data/test/node/test_front.rb CHANGED Viewed

@@ -35,6 +35,7 @@ class FrontTest < Minitest::Test
         '200' => [
           '/robots.txt',
           '/',
+          '/map.html',
           '/remotes'
         ],
         '404' => [

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.9.11
+  version: '0.10'
 platform: ruby
 authors:
 - Yegor Bugayenko
@@ -290,6 +290,7 @@ files:
 - fixtures/scripts/calculate-scores.sh
 - fixtures/scripts/print-helps.sh
 - fixtures/scripts/push-and-pull.sh
+- html/map.html
 - lib/zold.rb
 - lib/zold/amount.rb
 - lib/zold/commands/args.rb