zold 0.12.1 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19349592bdbaac460eacf4a7dcb6d5815adb4c95
-  data.tar.gz: a8dcbc34dfdd0206075ba30fd7c738c59a590747
+  metadata.gz: ffdbb36409b1e6f281cd278d24e6c2994da8a845
+  data.tar.gz: 10e1b526ef486b2e77d225b42c8fc550c0f5c9fc
 SHA512:
-  metadata.gz: ae0cc88be90477961fec60dd68a1157118dac2f1e7bddecc276b26c5115015c8a1c281198dd18fc6ff2a2d79824d93640c922ca4ab1b4c699845cff88607f393
-  data.tar.gz: 670dedb53ebc3d1fc62872ad88684337e9ddddf35f64013033f6b0ba463c0335ec9660ec3b388cde516c1db27825a33174b93855d50b07fcabb1795c1dfcefd8
+  metadata.gz: b20bde3757d4b7de91f9e1b911449b25d83b67dd23c721a92271f602f23fa41073f6ab2444e9a0895a8efe315372278b944480ace64e0714787c9b3912cc6a49
+  data.tar.gz: 264d6b0401753c5b4460b035a88d2cdaab06d58b9f5c5e9976f5a8c27c25142a4a556708b70945c80176c20040795e1af1f5ad8a05bda14b83e0dc8bea1274f6

data/README.md

@@ -87,26 +87,25 @@ $ zold push 5f96e731e48ae21f
 That's it.
 
 You also can contribute to Zold by running a node on your server.
-In order to do that just run (with your own wallet ID, of course,
-and your own public IP address instead of `4.4.4.4`):
+In order to do that just run (with your own wallet ID, of course):
 
 ```bash
-$ zold node --trace --verbose --invoice=5f96e731e48ae21f --host=4.4.4.4
+$ zold node --invoice=5f96e731e48ae21f
 ```
 
-Then, open the page `4.4.4.4:4096` in your browser
+Then, open the page `localhost:4096` in your browser
 (you may need to open the inbound port at your
 [IP firewall](https://www.howtogeek.com/177621/the-beginners-guide-to-iptables-the-linux-firewall/)).
 If you see a simple JSON document, everything is fine.
-Next, hit <kbd>Ctrl</kbd>+<kbd>c</kbd> and run it again, but instead
-of `zold` say `zold-nohup`:
+Next, hit <kbd>Ctrl</kbd>+<kbd>c</kbd> and run it again, but with `--nohup`:
 
 ```bash
-$ zold-nohup node --trace --verbose --invoice=5f96e731e48ae21f --host=4.4.4.4
+$ zold node --nohup --invoice=5f96e731e48ae21f > log.txt
 ```
 
-Now you can close console, it will work in the background, saving the
-output logs to `nohup.out`. The software will update itself automatically to new versions.
+Now you can close the console;
+the softsare will work in the background, saving the output logs to `log.txt`.
+The software will update itself automatically to new versions.
 
 Grateful users of the system will pay "taxes" to your wallet
 for the maintenance of their wallets, and the system will occasionally

data/bin/zold

@@ -87,8 +87,8 @@ Available commands:
     #{Rainbow('score').green} host port strength [options]
       Generate score for the given host and port
 Available options:"
-    o.string '-d', '--dir',
-      'The directory where wallets are stored (default: .)',
+    o.string '--home',
+      "Home directory (default: #{Dir.pwd})",
       default: Dir.pwd
     o.bool '-h', '--help', 'Show these instructions'
     o.bool '--trace', 'Show full stack trace in case of a problem'
@@ -117,14 +117,17 @@ Available options:"
   args = opts.arguments
   args << '--help' if opts.help?
 
-  wallets = Zold::Wallets.new(opts['dir'])
-  remotes = Zold::Remotes.new(File.join(opts['dir'], '.zoldata/remotes'))
-  copies = File.join(opts['dir'], '.zoldata/copies')
+  FileUtils.mkdir_p(opts[:home])
+  Dir.chdir(opts[:home])
+
+  wallets = Zold::Wallets.new('.')
+  remotes = Zold::Remotes.new('./.zoldata/remotes')
+  copies = './.zoldata/copies'
 
   case command
   when 'node'
     require_relative '../lib/zold/commands/node'
-    Zold::Node.new(log: log).run(args)
+    Zold::Node.new(wallets: wallets, remotes: remotes, copies: copies, log: log).run(args)
   when 'create'
     require_relative '../lib/zold/commands/create'
     Zold::Create.new(wallets: wallets, log: log).run(args)

data/features/cli.feature

@@ -14,8 +14,3 @@ Feature: Command Line Processing
   Scenario: Wallet can be created
     When I run bin/zold with "--trace --public-key=id_rsa.pub create"
     Then Exit code is zero
-
-  Scenario: Failure through nohup
-    When I run bin/zold-nohup with "badcommand --skip-install --log-file=log.txt; sleep 2; cat log.txt"
-    And Stdout contains "Command 'badcommand' is not supported"
-    Then Exit code is zero

data/fixtures/scripts/_head.sh

@@ -0,0 +1,11 @@
+#!/bin/bash
+set -e
+set -x
+shopt -s expand_aliases
+
+alias zold="$1 --ignore-this-stupid-option --ignore-global-config --trace --network=test"
+
+function reserve_port {
+  python -c 'import socket; s=socket.socket(); s.bind(("", 0)); print(s.getsockname()[1]); s.close()'
+}
+

data/fixtures/scripts/calculate-scores.sh

@@ -1,8 +1,3 @@
 #!/bin/bash
-set -x
-set -e
-shopt -s expand_aliases
-
-alias zold="$1 --ignore-global-config --trace --network=test"
 
 zold score --host=zold.io --port=4096 --invoice=NOSUFFIX@ffffffffffffffff --strength=2 --max=5

data/fixtures/scripts/print-helps.sh

@@ -1,9 +1,4 @@
 #!/bin/bash
-set -x
-set -e
-shopt -s expand_aliases
-
-alias zold="$1 --ignore-global-config --trace --network=test"
 
 zold --help
 declare -a commands=(node create invoice remote pay show fetch clean diff merge propagate pull push taxes)

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

@@ -1,11 +1,6 @@
 #!/bin/bash
-set -x
-set -e
-shopt -s expand_aliases
 
-alias zold="$1 --ignore-global-config --trace --ignore-this-stupid-option --network=test"
-
-port=`python -c 'import socket; s=socket.socket(); s.bind(("", 0)); print(s.getsockname()[1]); s.close()'`
+port=$(reserve_port)
 
 mkdir server
 cd server
@@ -27,8 +22,8 @@ zold remote trim
 zold remote show
 
 zold --public-key=id_rsa.pub create 0000000000000000
-target=`zold create --public-key=id_rsa.pub`
-invoice=`zold invoice ${target}`
+target=$(zold create --public-key=id_rsa.pub)
+invoice=$(zold invoice ${target})
 zold pay --private-key=id_rsa 0000000000000000 ${invoice} 14.99 'To save the world!'
 zold propagate 0000000000000000
 zold show

data/fixtures/scripts/redeploy-on-upgrade.sh

@@ -0,0 +1,40 @@
+#!/bin/bash
+
+function start_node {
+  mkdir $1
+  cd $1
+  zold remote clean
+  zold node $3 --nohup --nohup-command='touch restarted' --nohup-log=log \
+    --expose-version=$2 --save-pid=pid --routine-immediately \
+    --verbose --trace --invoice=NOPREFIX@ffffffffffffffff \
+    --host=localhost --port=$1 --bind-port=$1 --threads=0 > /dev/null 2>&1
+  while ! nc -z localhost $1; do
+    sleep 1
+    ((c++)) && ((c==10)) && exit -1
+  done
+  cat pid
+  cd ..
+}
+
+high=$(reserve_port)
+primary=$(start_node ${high} 9.9.9 --standalone)
+
+low=$(reserve_port)
+secondary=$(start_node ${low} 1.1.1)
+zold remote add localhost ${high} --home=${low}
+
+while [ ! -f ${low}/restarted ]; do
+  sleep 1
+  ((c++)) && ((c==10)) && break
+done
+
+kill -9 ${primary} ${secondary}
+
+echo "High node logs (port ${high}):"
+cat ${high}/log
+echo "Low node logs (port ${low}):"
+cat ${low}/log
+
+if [ ! -f ${low}/restarted ]; then
+  exit -1
+fi

data/lib/zold/commands/node.rb

@@ -19,8 +19,9 @@
 # SOFTWARE.
 
 require 'slop'
+require_relative '../version'
 require_relative '../score'
-require_relative '../routines'
+require_relative '../metronome'
 require_relative '../wallets'
 require_relative '../remotes'
 require_relative '../verbose_thread'
@@ -38,7 +39,10 @@ require_relative 'pay'
 module Zold
   # NODE command
   class Node
-    def initialize(log: Log::Quiet.new)
+    def initialize(wallets:, remotes:, copies:, log: Log::Quiet.new)
+      @wallets = wallets
+      @remotes = remotes
+      @copies = copies
       @log = log
     end
 
@@ -46,7 +50,8 @@ module Zold
       opts = Slop.parse(args, help: true, suppress_errors: true) do |o|
         o.banner = 'Usage: zold node [options]'
         o.string '--invoice',
-          'The invoice you want to collect money to or the wallet ID'
+          'The invoice you want to collect money to or the wallet ID',
+          required: true
         o.integer '--port',
           "TCP port to open for the Net (default: #{Remotes::PORT})",
           default: Remotes::PORT
@@ -55,8 +60,6 @@ module Zold
           default: Remotes::PORT
         o.string '--host', "Host name (default: #{ip})",
           default: ip
-        o.string '--home', 'Home directory (default: .)',
-          default: Dir.pwd
         o.integer '--strength',
           "The strength of the score (default: #{Score::STRENGTH})",
           default: Score::STRENGTH
@@ -69,9 +72,26 @@ module Zold
         o.bool '--ignore-score-weakness',
           'Ignore score weakness of incoming requests and register those nodes anyway',
           default: false
+        o.boolean '--nohup',
+          'Run it in background, rebooting when a higher version is available in the network',
+          default: false
+        o.string '--nohup-command',
+          'The command to run in server "nohup" mode (default: "gem install zold")',
+          default: 'gem install zold'
+        o.string '--nohup-log',
+          'The file to log output into (default: zold.log)',
+          default: 'zold.log'
+        o.string '--save-pid',
+          'The file to save process ID into right after start (only in NOHUP mode)'
         o.bool '--never-reboot',
           'Don\'t reboot when a new version shows up in the network',
           default: false
+        o.bool '--routine-immediately',
+          'Run all routines immediately, without waiting between executions (for testing mostly)',
+          default: false
+        o.string '--expose-version',
+          "The version of the software to expose in JSON (default: #{VERSION})",
+          default: VERSION
         o.string '--bonus-wallet',
           'The ID of the wallet to regularly send bonuses from (for nodes online)'
         o.string '--bonus-amount',
@@ -86,31 +106,35 @@ module Zold
         @log.info(opts.to_s)
         return
       end
-      raise '--invoice is mandatory' unless opts[:invoice]
+      raise '--invoice is mandatory' unless opts['invoice']
+      if opts[:nohup]
+        pid = nohup(opts)
+        File.write(opts['save-pid'], pid) if opts['save-pid']
+        @log.debug("Process ID #{pid} saved into \"#{opts['save-pid']}\"")
+        @log.info(pid)
+        return
+      end
       Front.set(:log, @log)
+      Front.set(:version, opts['expose-version'])
       Front.set(:logging, @log.debug?)
-      FileUtils.mkdir_p(opts[:home])
-      Front.set(:home, opts[:home])
+      Front.set(:home, Dir.pwd)
+      @log.info("Home directory: #{Dir.pwd}")
       Front.set(
         :server_settings,
         Logger: WebrickLog.new(@log),
         AccessLog: []
       )
       if opts['standalone']
-        remotes = Remotes::Empty.new
+        @remotes = Remotes::Empty.new
         @log.debug('Running in standalone mode! (will never talk to other remotes)')
-      else
-        remotes = Remotes.new(File.join(opts[:home], 'zold-remotes'))
       end
       Front.set(:ignore_score_weakness, opts['ignore-score-weakness'])
-      wallets = Wallets.new(File.join(opts[:home], 'zold-wallets'))
-      Front.set(:wallets, wallets)
-      Front.set(:remotes, remotes)
-      copies = File.join(opts[:home], 'zold-copies')
-      Front.set(:copies, copies)
+      Front.set(:wallets, @wallets)
+      Front.set(:remotes, @remotes)
+      Front.set(:copies, @copies)
       address = "#{opts[:host]}:#{opts[:port]}".downcase
       Front.set(:address, address)
-      entrance = Entrance.new(wallets, remotes, copies, address, log: @log)
+      entrance = Entrance.new(@wallets, @remotes, @copies, address, log: @log)
       Front.set(:entrance, entrance)
       Front.set(:root, Dir.pwd)
       Front.set(:port, opts['bind-port'])
@@ -118,67 +142,76 @@ module Zold
       invoice = opts[:invoice]
       unless invoice.include?('@')
         require_relative 'pull'
-        Pull.new(wallets: wallets, remotes: remotes, copies: copies, log: @log).run(['pull', invoice])
+        Pull.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(['pull', invoice])
         require_relative 'invoice'
-        invoice = Invoice.new(wallets: wallets, log: @log).run(['invoice', invoice])
+        invoice = Invoice.new(wallets: @wallets, log: @log).run(['invoice', invoice])
       end
-      farm = Farm.new(invoice, File.join(opts[:home], 'farm'), log: @log)
+      farm = Farm.new(invoice, File.join(Dir.pwd, 'farm'), log: @log)
       farm.start(
-        opts[:host],
-        opts[:port],
+        opts[:host], opts[:port],
         threads: opts[:threads], strength: opts[:strength]
       )
       Front.set(:farm, farm)
-      routines = routines(wallets, remotes, copies, farm, opts)
-      @log.debug("Starting up the web front at http://#{opts[:host]}:#{opts[:port]}...")
+      metronome = metronome(farm, opts)
       begin
+        @log.info("Starting up the web front at http://#{opts[:host]}:#{opts[:port]}...")
         Front.run!
       ensure
         farm.stop
-        routines.stop
+        metronome.stop
       end
     end
 
     private
 
-    def routines(wallets, remotes, copies, farm, opts)
-      routines = Routines.new(@log)
-      routines.add do
-        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] + (opts['never-reboot'] ? [] : ['--reboot'])
-        )
+    def exec(cmd, nohup_log)
+      Open3.popen2e(cmd) do |stdin, stdout, thr|
+        nohup_log.print("Started process ##{thr.pid} from process ##{Process.pid}: #{cmd}\n")
+        stdin.close
+        until stdout.eof?
+          line = stdout.gets
+          nohup_log.print(line)
+        end
+        code = thr.value.to_i
+        nohup_log.print("Exit code of process ##{thr.pid} is #{code}: #{cmd}\n")
+        raise "Exit code #{code} (non zero)" unless code.zero?
       end
-      if opts['bonus-wallet']
-        routines.add(60) do
-          require_relative 'remote'
-          winners = Remote.new(remotes: remotes, log: @log, farm: farm).run(
-            ['remote', 'elect', opts['bonus-wallet'], '--private-key', opts['private-key']]
-          )
-          if winners.empty?
-            @log.info('No winners elected, won\'t pay any bonuses')
-          else
-            winners.each do |score|
-              Pull.new(wallets: wallets, remotes: remotes, copies: copies, log: @log).run(
-                ['pull', opts['bonus-wallet']]
-              )
-              Pay.new(wallets: wallets, remotes: remotes, log: @log).run(
-                [
-                  'pay', opts['bonus-wallet'], score.invoice, opts['bonus-amount'],
-                  "Hosting bonus for #{score.host}:#{score.port} #{score.value}",
-                  '--private-key', opts['private-key']
-                ]
-              )
-              Push.new(wallets: wallets, remotes: remotes, log: @log).run(
-                ['push', opts['bonus-wallet']]
-              )
-            end
+    end
+
+    def nohup(opts)
+      pid = fork do
+        nohup_log = NohupLog.new(opts['nohup-log'])
+        Signal.trap('HUP') do
+          nohup_log.print("Received HUP, ignoring...\n")
+        end
+        Signal.trap('TERM') do
+          nohup_log.print("Received TERM, terminating...\n")
+          exit(-1)
+        end
+        myself = File.expand_path($PROGRAM_NAME)
+        loop do
+          VerboseThread.new.run do
+            exec("#{myself} #{ARGV.delete_if { |a| a.start_with?('--nohup') }.join(' ')}", nohup_log)
+            exec(opts['nohup-command'], nohup_log)
           end
         end
       end
-      routines
+      Process.detach(pid)
+      pid
+    end
+
+    def metronome(farm, opts)
+      metronome = Metronome.new(@log)
+      unless opts[:standalone]
+        require_relative 'routines/reconnect'
+        metronome.add(Routines::Reconnect.new(opts, @remotes, log: @log))
+      end
+      if opts['bonus-wallet']
+        require_relative 'routines/bonuses'
+        metronome.add(Routines::Bonuses.new(opts, @wallets, @remotes, @copies, farm, log: @log))
+      end
+      @log.info('Metronome created')
+      metronome
     end
 
     def ip
@@ -188,6 +221,17 @@ module Zold
       addr.nil? ? '127.0.0.1' : addr.ip_address
     end
 
+    # Log facility for nohup
+    class NohupLog
+      def initialize(file)
+        @file = file
+      end
+
+      def print(data)
+        File.open(@file, 'a') { |f| f.print(data) }
+      end
+    end
+
     # Fake logging facility for Webrick
     class WebrickLog
       def initialize(log)

data/lib/zold/commands/remote.rb

@@ -127,7 +127,7 @@ Available options:"
     def add(host, port, opts)
       if @remotes.exists?(host, port)
         raise "#{host}:#{port} already exists in the list" unless opts['force']
-        @log.info("#{host}:#{port} already exists in the list")
+        @log.debug("#{host}:#{port} already exists in the list")
       else
         @remotes.add(host, port)
         @log.info("#{host}:#{port} added to the list, #{@remotes.all.count} total")
@@ -141,7 +141,7 @@ Available options:"
         @log.info("#{host}:#{port} removed from the list")
       else
         raise "#{host}:#{port} is not in the list" unless opts['force']
-        @log.info("#{host}:#{port} is not in the list")
+        @log.debug("#{host}:#{port} is not in the list")
       end
       @log.info("There are #{@remotes.all.count} remote nodes in the list")
     end
@@ -209,8 +209,7 @@ it's recommended to reboot, but I don't do it because of --never-reboot")
       end
       total = @remotes.all.size
       if total.zero?
-        @log.debug("The list of remotes is #{Rainbow('empty').red}!")
-        @log.debug("Run 'zold remote add b1.zold.io` and then `zold update`")
+        @log.debug("The list of remotes is #{Rainbow('empty').red}, run 'zold reset'!")
       else
         @log.debug("There are #{total} known remotes")
       end

data/lib/zold/commands/routines/bonuses.rb

@@ -0,0 +1,74 @@
+# 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_relative '../remote'
+require_relative '../pull'
+require_relative '../pay'
+require_relative '../push'
+
+# Pay bonuses routine.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # Routines module
+  module Routines
+    # Pay bonuses to random nodes
+    class Bonuses
+      def initialize(opts, wallets, remotes, copies, farm, log: Log::Quiet.new)
+        @opts = opts
+        @wallets = wallets
+        @remotes = remotes
+        @copies = copies
+        @farm = farm
+        @log = log
+      end
+
+      def exec(_ = 0)
+        sleep(60 * 60) unless @opts['routine-immediately']
+        raise '--private-key is required to pay bonuses' unless @opts['private-key']
+        raise '--bonus-wallet is required to pay bonuses' unless @opts['bonus-wallet']
+        raise '--bonus-amount is required to pay bonuses' unless @opts['bonus-amount']
+        winners = Remote.new(remotes: @remotes, log: @log, farm: @farm).run(
+          ['remote', 'elect', @opts['bonus-wallet'], '--private-key', @opts['private-key']]
+        )
+        if winners.empty?
+          @log.info('No winners elected, won\'t pay any bonuses')
+          return
+        end
+        winners.each do |score|
+          Pull.new(wallets: @wallets, remotes: @remotes, copies: @copies, log: @log).run(
+            ['pull', opts['bonus-wallet']]
+          )
+          Pay.new(wallets: @wallets, remotes: @remotes, log: @log).run(
+            [
+              'pay', @opts['bonus-wallet'], score.invoice, @opts['bonus-amount'],
+              "Hosting bonus for #{score.host}:#{score.port} #{score.value}",
+              '--private-key', @opts['private-key']
+            ]
+          )
+          Push.new(wallets: @wallets, remotes: @remotes, log: @log).run(
+            ['push', @opts['bonus-wallet']]
+          )
+        end
+      end
+    end
+  end
+end

data/lib/zold/commands/routines/reconnect.rb

@@ -0,0 +1,50 @@
+# 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_relative '../remote'
+
+# Reconnect routine.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+module Zold
+  # Routines module
+  module Routines
+    # Reconnect to the network
+    class Reconnect
+      def initialize(opts, remotes, log: Log::Quiet.new)
+        @opts = opts
+        @remotes = remotes
+        @log = log
+      end
+
+      def exec(_ = 0)
+        sleep(60) unless @opts['routine-immediately']
+        unless @opts['routine-immediately']
+          Remote.new(remotes: @remotes, log: @log).run(%w[remote add b1.zold.io 80 --force])
+        end
+        Remote.new(remotes: @remotes, log: @log).run(%w[remote trim])
+        Remote.new(remotes: @remotes, log: @log).run(
+          %w[remote update] + (@opts['never-reboot'] ? [] : ['--reboot'])
+        )
+      end
+    end
+  end
+end

data/lib/zold/{routines.rb → metronome.rb}

@@ -26,25 +26,28 @@ require_relative 'verbose_thread'
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
 module Zold
-  # NODE command
-  class Routines
+  # Metronome
+  class Metronome
     def initialize(log = Log::Quiet.new)
       @log = log
       @threads = []
     end
 
-    def add(minutes = 1)
+    def add(routine)
       @threads << Thread.start do
         VerboseThread.new(@log).run(true) do
-          Thread.current.name = 'routines'
-          count = 0
+          Thread.current.name = routine.class.name
+          step = 0
           loop do
-            sleep(minutes * 60)
-            yield count
-            count += 1
+            start = Time.now
+            routine.exec(step)
+            sleep(1)
+            step += 1
+            @log.debug("Routine #{routine.class.name} ##{step} done in #{((Time.now - start) / 60).round(2)}s)")
           end
         end
       end
+      @log.info("Added #{routine.class.name} to the metronome")
     end
 
     def stop

data/lib/zold/node/front.rb

@@ -47,6 +47,7 @@ module Zold
       set :lock, false
       set :show_exceptions, false
       set :server, 'webrick'
+      set :version, VERSION # to be injected at node.rb
       set :ignore_score_weakness, false # to be injected at node.rb
       set :reboot, false # to be injected at node.rb
       set :home, nil? # to be injected at node.rb
@@ -84,7 +85,7 @@ module Zold
     after do
       headers['Cache-Control'] = 'no-cache'
       headers['Connection'] = 'close'
-      headers['X-Zold-Version'] = VERSION
+      headers['X-Zold-Version'] = settings.version
       headers['Access-Control-Allow-Origin'] = '*'
       headers[Http::SCORE_HEADER] = score.reduced(16).to_s
     end
@@ -96,7 +97,7 @@ module Zold
 
     get '/version' do
       content_type 'text/plain'
-      VERSION
+      settings.version
     end
 
     get '/score' do
@@ -117,7 +118,7 @@ module Zold
     get '/' do
       content_type 'application/json'
       JSON.pretty_generate(
-        version: VERSION,
+        version: settings.version,
         score: score.to_h,
         pid: Process.pid,
         cpus: Concurrent.processor_count,
@@ -139,7 +140,7 @@ module Zold
       error 404 unless wallet.exists?
       content_type 'application/json'
       {
-        version: VERSION,
+        version: settings.version,
         score: score.to_h,
         body: AtomicFile.new(wallet.path).read
       }.to_json
@@ -172,7 +173,7 @@ module Zold
       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(
-        version: VERSION,
+        version: settings.version,
         score: score.to_h
       )
     end
@@ -180,7 +181,7 @@ module Zold
     get '/remotes' do
       content_type 'application/json'
       JSON.pretty_generate(
-        version: VERSION,
+        version: settings.version,
         score: score.to_h,
         all: settings.remotes.all
       )

data/lib/zold/version.rb

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

data/test/commands/routines/test_bonuses.rb

@@ -0,0 +1,48 @@
+# 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 'minitest/autorun'
+require_relative '../../test__helper'
+require_relative '../../fake_home'
+require_relative '../../../lib/zold/node/farm.rb'
+require_relative '../../../lib/zold/commands/routines/bonuses.rb'
+
+# Bonuses test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestBonuses < Minitest::Test
+  def test_pays_bonuses
+    FakeHome.new.run do |home|
+      wallet = home.create_wallet
+      opts = {
+        'routine-immediately' => true,
+        'private-key' => 'fixtures/id_rsa',
+        'bonus-wallet' => wallet.id.to_s,
+        'bonus-amount' => 1
+      }
+      routine = Zold::Routines::Bonuses.new(
+        opts, home.wallets, home.remotes, home.copies(wallet).root,
+        Zold::Farm::Empty, log: test_log
+      )
+      routine.exec
+    end
+  end
+end

data/test/commands/routines/test_reconnect.rb

@@ -0,0 +1,43 @@
+# 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 'minitest/autorun'
+require 'tmpdir'
+require 'webmock/minitest'
+require_relative '../../test__helper'
+require_relative '../../../lib/zold/remotes'
+require_relative '../../../lib/zold/commands/routines/reconnect.rb'
+
+# Reconnect test.
+# Author:: Yegor Bugayenko (yegor256@gmail.com)
+# Copyright:: Copyright (c) 2018 Yegor Bugayenko
+# License:: MIT
+class TestReconnect < Minitest::Test
+  def test_reconnects
+    Dir.mktmpdir 'test' do |dir|
+      remotes = Zold::Remotes.new(File.join(dir, 'remotes.csv'))
+      remotes.clean
+      stub_request(:get, 'http://b1.zold.io:80/remotes').to_return(status: 404)
+      opts = { 'never-reboot' => true, 'routine-immediately' => true }
+      routine = Zold::Routines::Reconnect.new(opts, remotes, log: test_log)
+      routine.exec
+    end
+  end
+end

data/test/commands/test_node.rb

@@ -38,21 +38,18 @@ require_relative '../node/fake_node'
 # License:: MIT
 class TestNode < Minitest::Test
   def test_push_and_fetch
-    FakeNode.new(log: test_log).run do |port|
-      Dir.mktmpdir 'test' do |dir|
-        id = Zold::Id.new
-        wallets = Zold::Wallets.new(dir)
-        wallet = wallets.find(id)
-        wallet.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
-        remotes = Zold::Remotes.new(File.join(dir, 'remotes.csv'))
-        remotes.clean
+    FakeHome.new.run do |home|
+      FakeNode.new(log: test_log).run do |port|
+        wallets = home.wallets
+        wallet = home.create_wallet
+        remotes = home.remotes
         remotes.add('localhost', port)
         Zold::Push.new(wallets: wallets, remotes: remotes, log: test_log).run(['push', '--sync'])
+        copies = home.copies(wallet)
         Zold::Fetch.new(
-          wallets: wallets, copies: File.join(dir, 'copies'),
+          wallets: wallets, copies: copies.root,
           remotes: remotes, log: test_log
         ).run(['fetch'])
-        copies = Zold::Copies.new(File.join(dir, "copies/#{id}"))
         assert_equal(1, copies.all.count)
         assert_equal('1', copies.all[0][:name])
       end

data/test/commands/test_taxes.rb

@@ -22,6 +22,7 @@ require 'minitest/autorun'
 require 'tmpdir'
 require 'webmock/minitest'
 require_relative '../test__helper'
+require_relative '../fake_home'
 require_relative '../../lib/zold/wallets'
 require_relative '../../lib/zold/amount'
 require_relative '../../lib/zold/key'
@@ -35,11 +36,9 @@ require_relative '../../lib/zold/commands/taxes'
 # License:: MIT
 class TestTaxes < Minitest::Test
   def test_pays_taxes
-    Dir.mktmpdir 'test' do |dir|
-      id = Zold::Id.new
-      wallets = Zold::Wallets.new(dir)
-      wallet = wallets.find(id)
-      wallet.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
+    FakeHome.new.run do |home|
+      wallets = home.wallets
+      wallet = home.create_wallet
       wallet.add(
         Zold::Txn.new(
           1,
@@ -48,8 +47,7 @@ class TestTaxes < Minitest::Test
           'NOPREFIX', Zold::Id.new, '-'
         )
       )
-      remotes = Zold::Remotes.new(File.join(dir, 'a/remotes'))
-      remotes.clean
+      remotes = home.remotes
       zero = Zold::Score::ZERO
       remotes.add(zero.host, zero.port)
       stub_request(:get, "http://#{zero.host}:#{zero.port}/").to_return(
@@ -60,7 +58,7 @@ class TestTaxes < Minitest::Test
       )
       Zold::Taxes.new(
         wallets: wallets, remotes: remotes, log: test_log
-      ).run(['taxes', '--private-key=fixtures/id_rsa', id.to_s])
+      ).run(['taxes', '--private-key=fixtures/id_rsa', wallet.id.to_s])
       assert_equal(Zold::Amount.new(coins: 85_856_396_247), wallet.balance)
     end
   end

data/test/fake_home.rb

@@ -21,6 +21,7 @@
 require 'tmpdir'
 require_relative '../lib/zold/id'
 require_relative '../lib/zold/wallet'
+require_relative '../lib/zold/wallets'
 require_relative '../lib/zold/key'
 
 # Fake home dir.
@@ -29,12 +30,13 @@ require_relative '../lib/zold/key'
 # License:: MIT
 class FakeHome
   attr_reader :dir
-  def initialize(dir = Dir.pwd)
+  def initialize(dir = __dir__)
     @dir = dir
   end
 
   def run
     Dir.mktmpdir 'test' do |dir|
+      FileUtils.copy(File.join(__dir__, '../fixtures/id_rsa'), File.join(dir, 'id_rsa'))
       yield FakeHome.new(dir)
     end
   end
@@ -45,11 +47,11 @@ class FakeHome
 
   def create_wallet(id = Zold::Id.new)
     wallet = Zold::Wallet.new(File.join(@dir, id.to_s))
-    wallet.init(id, Zold::Key.new(file: 'fixtures/id_rsa.pub'))
+    wallet.init(id, Zold::Key.new(file: File.join(__dir__, '../fixtures/id_rsa.pub')))
     wallet
   end
 
-  def copies(wallet)
+  def copies(wallet = create_wallet)
     Zold::Copies.new(File.join(@dir, "copies/#{wallet.id}"))
   end
 

data/test/node/fake_node.rb

@@ -20,6 +20,7 @@
 
 require 'tmpdir'
 require 'webmock/minitest'
+require_relative '../fake_home'
 require_relative '../../lib/zold/log'
 require_relative '../../lib/zold/http'
 require_relative '../../lib/zold/verbose_thread'
@@ -35,36 +36,37 @@ class FakeNode
 
   def run(args = ['--standalone'])
     WebMock.allow_net_connect!
-    Dir.mktmpdir 'test' do |dir|
+    start = Dir.pwd
+    FakeHome.new.run do |home|
       server = TCPServer.new('127.0.0.1', 0)
       port = server.addr[1]
       server.close
       node = Thread.new do
         Zold::VerboseThread.new(@log).run do
           Thread.current.abort_on_exception = true
-          home = File.join(dir, 'node-home')
+          Dir.chdir(home.dir)
           require_relative '../../lib/zold/commands/node'
-          Zold::Node.new(log: @log).run(
+          Zold::Node.new(wallets: home.wallets, remotes: home.remotes, copies: home.copies.root, log: @log).run(
             [
               '--port', port.to_s,
               '--host=localhost',
               '--bind-port', port.to_s,
               '--threads=1',
-              '--home', home,
               '--invoice=NOPREFIX@ffffffffffffffff'
             ] + args
           )
         end
       end
-      home = "http://localhost:#{port}/"
-      while Zold::Http.new(home).get.code == '599' && node.alive?
+      uri = "http://localhost:#{port}/"
+      while Zold::Http.new(uri).get.code == '599' && node.alive?
         sleep 1
-        @log.debug("Waiting for #{home}...")
+        @log.debug("Waiting for #{uri}...")
       end
       begin
         yield port
       ensure
         node.exit
+        Dir.chdir(start)
       end
     end
   end

data/test/test__helper.rb

@@ -18,6 +18,11 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
+gem 'openssl'
+require 'openssl'
+require 'minitest/autorun'
+require_relative '../lib/zold'
+
 STDOUT.sync = true
 
 ENV['RACK_ENV'] = 'test'
@@ -29,12 +34,6 @@ if ENV['CI'] == 'true'
   SimpleCov.formatter = SimpleCov::Formatter::Codecov
 end
 
-require 'minitest/autorun'
-require_relative '../lib/zold'
-
-gem 'openssl'
-require 'openssl'
-
 module Minitest
   class Test
     def test_log

data/test/{test_routines.rb → test_metronome.rb}

@@ -20,22 +20,30 @@
 
 require 'minitest/autorun'
 require_relative 'test__helper'
-require_relative '../lib/zold/routines'
+require_relative '../lib/zold/metronome'
 
-# Routines test.
+# Metronome test.
 # Author:: Yegor Bugayenko (yegor256@gmail.com)
 # Copyright:: Copyright (c) 2018 Yegor Bugayenko
 # License:: MIT
-class TestRoutines < Minitest::Test
+class TestMetronome < Minitest::Test
   def test_start_and_stop
-    routines = Zold::Routines.new
+    routines = Zold::Metronome.new(test_log)
     list = []
-    routines.add(0) do |i|
-      list << i
-      sleep(6000)
-    end
+    routines.add(FakeRoutine.new(list))
     sleep 0.1 while list.empty?
     routines.stop
     assert_equal(1, list.count)
   end
+
+  class FakeRoutine
+    def initialize(list)
+      @list = list
+    end
+
+    def exec(i)
+      @list << i
+      sleep(6000)
+    end
+  end
 end

data/test/test_zold.rb

@@ -29,12 +29,12 @@ require_relative 'test__helper'
 # License:: MIT
 class TestZold < Minitest::Test
   def test_all_scripts
-    Dir.new('fixtures/scripts').each.select { |f| f =~ /\.sh$/ }.each do |f|
+    Dir.new('fixtures/scripts').each.select { |f| f =~ /\.sh$/ && !f.start_with?('_') }.each do |f|
       Dir.mktmpdir 'test' do |dir|
         FileUtils.cp('fixtures/id_rsa.pub', dir)
         FileUtils.cp('fixtures/id_rsa', dir)
         script = File.join(dir, f)
-        FileUtils.cp("fixtures/scripts/#{f}", script)
+        File.write(script, File.read('fixtures/scripts/_head.sh') + File.read(File.join('fixtures/scripts', f)))
         bin = File.join(Dir.pwd, 'bin/zold')
         Dir.chdir(dir) do
           stdout = `/bin/bash #{f} #{bin} 2>&1`

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.12.1
+  version: 0.13.0
 platform: ruby
 authors:
 - Yegor Bugayenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-10 00:00:00.000000000 Z
+date: 2018-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -277,7 +277,6 @@ description: |-
 email: yegor256@gmail.com
 executables:
 - zold
-- zold-nohup
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -300,7 +299,6 @@ files:
 - Rakefile
 - appveyor.yml
 - bin/zold
-- bin/zold-nohup
 - cucumber.yml
 - deploy.sh
 - features/cli.feature
@@ -314,10 +312,11 @@ files:
 - fixtures/keys/1.pub
 - fixtures/keys/2
 - fixtures/keys/2.pub
+- fixtures/scripts/_head.sh
 - fixtures/scripts/calculate-scores.sh
 - fixtures/scripts/print-helps.sh
 - fixtures/scripts/push-and-pull.sh
-- fixtures/scripts/with-nohup.sh
+- fixtures/scripts/redeploy-on-upgrade.sh
 - heroku.yml
 - lib/zold.rb
 - lib/zold/amount.rb
@@ -337,6 +336,8 @@ files:
 - lib/zold/commands/pull.rb
 - lib/zold/commands/push.rb
 - lib/zold/commands/remote.rb
+- lib/zold/commands/routines/bonuses.rb
+- lib/zold/commands/routines/reconnect.rb
 - lib/zold/commands/show.rb
 - lib/zold/commands/taxes.rb
 - lib/zold/copies.rb
@@ -345,6 +346,7 @@ files:
 - lib/zold/id.rb
 - lib/zold/key.rb
 - lib/zold/log.rb
+- lib/zold/metronome.rb
 - lib/zold/node/emission.rb
 - lib/zold/node/entrance.rb
 - lib/zold/node/farm.rb
@@ -352,7 +354,6 @@ files:
 - lib/zold/patch.rb
 - lib/zold/prefixes.rb
 - lib/zold/remotes.rb
-- lib/zold/routines.rb
 - lib/zold/score.rb
 - lib/zold/signature.rb
 - lib/zold/tax.rb
@@ -362,6 +363,8 @@ files:
 - lib/zold/wallet.rb
 - lib/zold/wallets.rb
 - resources/remotes
+- test/commands/routines/test_bonuses.rb
+- test/commands/routines/test_reconnect.rb
 - test/commands/test_calculate.rb
 - test/commands/test_clean.rb
 - test/commands/test_create.rb
@@ -391,10 +394,10 @@ files:
 - test/test_http.rb
 - test/test_id.rb
 - test/test_key.rb
+- test/test_metronome.rb
 - test/test_patch.rb
 - test/test_prefixes.rb
 - test/test_remotes.rb
-- test/test_routines.rb
 - test/test_score.rb
 - test/test_signature.rb
 - test/test_tax.rb
@@ -434,6 +437,8 @@ test_files:
 - features/gem_package.feature
 - features/step_definitions/steps.rb
 - features/support/env.rb
+- test/commands/routines/test_bonuses.rb
+- test/commands/routines/test_reconnect.rb
 - test/commands/test_calculate.rb
 - test/commands/test_clean.rb
 - test/commands/test_create.rb
@@ -463,10 +468,10 @@ test_files:
 - test/test_http.rb
 - test/test_id.rb
 - test/test_key.rb
+- test/test_metronome.rb
 - test/test_patch.rb
 - test/test_prefixes.rb
 - test/test_remotes.rb
-- test/test_routines.rb
 - test/test_score.rb
 - test/test_signature.rb
 - test/test_tax.rb

data/bin/zold-nohup

@@ -1,96 +0,0 @@
-#!/usr/bin/env ruby
-#
-# 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.
-
-STDOUT.sync = true
-
-require 'slop'
-require 'tempfile'
-require 'open3'
-
-$opts = Slop.parse(ARGV, strict: false, suppress_errors: true) do |o|
-  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)
-  File.open($opts['log-file'], 'a') { |f| f.print(line) }
-end
-
-def exec(cmd)
-  Open3.popen2e(cmd) do |stdin, stdout, thr|
-    log("Started: #{cmd}\n")
-    stdin.close
-    until stdout.eof?
-      begin
-        data = stdout.read_nonblock(1024) unless stdout.eof?
-      rescue EOFError => _
-        break
-      end
-      log(data)
-    end
-    code = thr.value.to_i
-    log("Exit code is #{code}: #{cmd}\n")
-    raise "Exit code #{code} (non zero)" unless code.zero?
-  end
-end
-
-File.delete($opts['log-file']) if File.exist?($opts['log-file']) && !$opts['skip-log-trim']
-
-$pid = fork do
-  Signal.trap('HUP') do
-    log("Received HUP, ignoring...\n")
-  end
-  Signal.trap('TERM') do
-    log("Received TERM, terminating...\n")
-    exit(-1)
-  end
-  loop do
-    begin
-      exec("zold #{$opts.arguments.join(' ')}")
-      exec(($opts['sudo-install'] ? 'sudo ' : '') + 'gem install zold') unless $opts['skip-install']
-    rescue StandardError => e
-      log("#{e.class.name}: #{e.message}\n#{e.backtrace.join("\n\t")}\n")
-      raise e
-    end
-  end
-end
-Process.detach($pid)
-
-puts($pid)

data/fixtures/scripts/with-nohup.sh

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