zold 0.11.17 → 0.11.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c756ab9df322c31f1b31c030d2f6f56971d2ef36
-  data.tar.gz: c03dc1d19510c459ed571a40e60d1e47d3ececd9
+  metadata.gz: 169a0ce80fa0bdabfba606230c2b12f918688457
+  data.tar.gz: 582eac190a1f5d87daf92195379c6c755d83dded
 SHA512:
-  metadata.gz: a2f402cb7258a1f85966d2f9a46e15b4a12d44eccc1150259208221a98141553511b23fbec78d93a780af64a59fe94f3c58a36ab8862e442bd1b76313406eac7
-  data.tar.gz: 682b3ad6c5bdec21e0eb95d94c7bac6dd04ad0776027cb96716bfef916bdbb4f4ec935e84f9832b26bc05fe684cb9b7968cd0c7ddfcd3203aabd1909a3061747
+  metadata.gz: f9313dd0f6b72d3745a3cf4768fd8617c4d098beb5eeb075b9873ac08ba118dfc0154d20daf00dd6d22a8050361e7ada151b1d2d46f645f53efca5d0b5866eee
+  data.tar.gz: cb64a87a705868388b46a8ca0c9636cb9cc4510b6f0750df388bc693bdb0f08c9145b09335f4cfd30932c2a76f6c88913cd514259e5c2373a774abcf373653a1

data/bin/zold-nohup

@@ -27,9 +27,26 @@ require 'tempfile'
 require 'open3'
 
 $opts = Slop.parse(ARGV, strict: false, suppress_errors: true) do |o|
-  o.string '--log-file', 'The file to save logs into', default: 'zold-node.log'
-  o.bool '--skip-install', 'Don\'t re-install Zold gem', default: false
-  o.bool '--sudo-install', 'Install Zold gem via sudo', default: false
+  o.banner = "Usage: zold-nohup [options] ...
+Run 'zold --help' for the full list of options and commands"
+  o.bool '-h', '--help', 'Show these instructions'
+  o.string '--log-file',
+    'The file to save logs into (default: ./zold-nohup.log)',
+    default: './zold-nohup.log'
+  o.bool '--skip-log-trim',
+    'Don\'t trim the log file before start (default: false)',
+    default: false
+  o.bool '--skip-install',
+    'Don\'t re-install Zold gem (default: false)',
+    default: false
+  o.bool '--sudo-install',
+    'Install Zold gem via sudo (default: false)',
+    default: false
+end
+
+if $opts.help?
+  puts($opts.to_s)
+  exit(0)
 end
 
 def log(line)
@@ -51,6 +68,8 @@ def exec(cmd)
   end
 end
 
+File.delete($opts['log-file']) if File.exist?($opts['log-file']) && !$opts['skip-log-trim']
+
 $pid = fork do
   Signal.trap('HUP') do
     print('Received HUP, ignoring...')

data/deploy.sh

@@ -1,11 +1,14 @@
 #!/bin/bash
 set -e
+set -x
 
 cd $(dirname $0)
 bundle update
-rake
-trap 'git reset HEAD~1 && git checkout -- .gitignore' EXIT
+# rake
+trap 'git reset HEAD~1 && rm bonus.key && git checkout -- .gitignore' EXIT
+cp /code/home/assets/zold/bonus.key .
 sed -i -s 's|Gemfile.lock||g' .gitignore
+git add bonus.key
 git add Gemfile.lock
 git add .gitignore
 git commit -m 'configs for heroku'

data/fixtures/scripts/with-nohup.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+set -x
+set -e
+shopt -s expand_aliases
+
+alias zold="$1-nohup"
+
+zold --help

data/heroku.yml

@@ -1,9 +1,10 @@
 build:
   languages:
     - ruby
+  config:
+    LC_ALL: UTF-8
 run:
-  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 \
-      --bonus-wallet=81c9c25789b03876 --private-key=bonus.key --bonus-amount=1
+  web: "./bin/zold node --no-colors --verbose --trace
+    --bind-port=$PORT --port=80 --host=b1.zold.io --threads=0
+    --invoice=JKFq17yipfjLtX@0000000000000000 --never-reboot
+    --bonus-wallet=81c9c25789b03876 --private-key=bonus.key --bonus-amount=1"

data/lib/zold/commands/node.rb

@@ -146,7 +146,9 @@ module Zold
         require_relative 'remote'
         Remote.new(remotes: remotes, log: @log, farm: farm).run(%w[remote add b1.zold.io 80 --force])
         Remote.new(remotes: remotes, log: @log, farm: farm).run(%w[remote trim])
-        Remote.new(remotes: remotes, log: @log, farm: farm).run(%w[remote update --reboot])
+        Remote.new(remotes: remotes, log: @log, farm: farm).run(
+          %w[remote update] + (opts['never-reboot'] ? [] : ['--reboot'])
+        )
       end
       if opts['bonus-wallet']
         routines.add do

data/lib/zold/node/front.rb

@@ -23,6 +23,7 @@ STDOUT.sync = true
 require 'json'
 require 'sinatra/base'
 require 'webrick'
+require 'diffy'
 require 'concurrent'
 require_relative '../version'
 require_relative '../wallet'
@@ -154,6 +155,12 @@ module Zold
         status 304
         return
       end
+      if before != after && before.length == after.length
+        settings.log.debug(
+          "Weird... the wallet #{id} is of the same length #{after.length}, but the content is different:\n" +
+          Diffy::Diff.new(before, after, context: 0).to_s
+        )
+      end
       settings.log.info("Wallet #{id} is new: #{before.length}b != #{after.length}b")
       settings.entrance.push(id, after, sync: !params[:sync].nil?)
       JSON.pretty_generate(

data/lib/zold/version.rb

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

data/test/commands/test_node.rb

@@ -55,7 +55,6 @@ class TestNode < Minitest::Test
         copies = Zold::Copies.new(File.join(dir, "copies/#{id}"))
         assert_equal(1, copies.all.count)
         assert_equal('1', copies.all[0][:name])
-        assert_equal(0, copies.all[0][:score])
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.11.17
+  version: 0.11.18
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-09 00:00:00.000000000 Z
+date: 2018-06-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -317,6 +317,7 @@ files:
 - fixtures/scripts/calculate-scores.sh
 - fixtures/scripts/print-helps.sh
 - fixtures/scripts/push-and-pull.sh
+- fixtures/scripts/with-nohup.sh
 - heroku.yml
 - lib/zold.rb
 - lib/zold/amount.rb