zold 0.11.1 → 0.11.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a4a46ff8dfd2a4472ff5d8f9fb520a94d0ad81a5
-  data.tar.gz: bde2bcb8514a8dde05c336ac86174251f16345fe
+  metadata.gz: c5af52af45ba9dfdd220e85af79232f92b919255
+  data.tar.gz: '0880267133e607466adbadaa5d12ce8361ea7ab5'
 SHA512:
-  metadata.gz: 3dd9aab9858124ca278be87f6a750d8252a02fb83a33599bfb86db6388419c37d5720ca7455d1bbbf326db5c99439a2b32e998b499f9f0d98643c2a62072690e
-  data.tar.gz: d4b0462fd4b2abcdd728d10e630914a84f997808cad6734d796f780fed7cbbe689b8fedc19267adadf2b31e7ecc49a48317c9b661acce3f9fed07a321f00476e
+  metadata.gz: f94d22443de183a1b6e2be4cabe0880384efd1941adbf082b865f5cabe91d735def081a18a045550fea718a8e8bebe34dc51778c55702e62137bcea147c10d0e
+  data.tar.gz: ccfcbbbc989f51cf00def91844f12ba763c66e9144990db8a43fddf17d7dac0a9c6b6391612cdb5bddf7a5938a441caa4d4e3ba1891bb4906d2b70a230d51e6c

data/INSTALL.md

@@ -10,6 +10,14 @@ install [Ruby 2.3+](https://www.ruby-lang.org/en/documentation/installation/),
 [Rubygems](https://rubygems.org/pages/download), and
 then the [gem](https://rubygems.org/gems/zold).
 
+## Debian 9.4
+
+```bash
+$ sudo apt update -y
+$ sudo apt install -y ruby-dev rubygems zlib1g-dev libssl-dev make
+$ gem install zold
+```
+
 ## Ubuntu 16.04
 
 ```bash

data/Rakefile

@@ -61,7 +61,7 @@ end
 
 require 'cucumber/rake/task'
 Cucumber::Rake::Task.new(:features) do |t|
-  t.cucumber_opts = 'features --format progress'
+  t.cucumber_opts = 'features --format pretty'
   Rake::Cleaner.cleanup_files(['coverage'])
 end
 Cucumber::Rake::Task.new(:'features:html') do |t|

data/bin/zold-nohup

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
 #
 # Copyright (c) 2018 Yegor Bugayenko
 #
@@ -21,10 +20,47 @@
 # OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 # SOFTWARE.
 
-if ARGV.include?('--skip-install')
-  cmd = 'echo re-run'
-else
-  cmd = 'gem install zold'
+STDOUT.sync = true
+
+require 'slop'
+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
+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|
+    stdin.close
+    loop do
+      line = stdout.gets
+      break if line.nil?
+      log(line)
+    end
+    code = thr.value.exitstatus
+    raise "Exit code #{code} (non zero)" unless code.zero?
+  end
+end
+
+$pid = fork do
+  Signal.trap('HUP') do
+    print('Received HUP, ignoring...')
+  end
+  Signal.trap('TERM') do
+    print('Received TERM, terminating...')
+    exit(-1)
+  end
+  loop do
+    exec("zold #{$opts.arguments.join(' ')}")
+    exec('gem install zold') unless $opts['skip-install']
+  end
 end
+Process.detach($pid)
 
-`nohup bash -c 'while zold #{ARGV.join(' ')}; do #{cmd}; done'`
+puts($pid)

data/features/cli.feature

@@ -16,5 +16,6 @@ Feature: Command Line Processing
     Then Exit code is zero
 
   Scenario: Failure through nohup
-    When I run bin/zold-nohup with "badcommand --skip-install"
+    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/features/step_definitions/steps.rb

@@ -39,13 +39,14 @@ end
 
 When(%r{^I run ([a-z/-]+) with "([^"]*)"$}) do |cmd, args|
   home = File.join(File.dirname(__FILE__), '../..')
-  @stdout = `ruby -I#{home}/lib #{home}/#{cmd} #{args}`
+  @stdout = `ruby -I#{home}/lib #{home}/#{cmd} #{args} 2>&1`
   @exitstatus = $CHILD_STATUS.exitstatus
 end
 
 When(/^I run bash with:$/) do |text|
   FileUtils.copy_entry(@cwd, File.join(@dir, 'zold'))
-  @stdout = `#{text}`
+  File.write('run.sh', text)
+  @stdout = `/bin/bash run.sh 2>&1`
   @exitstatus = $CHILD_STATUS.exitstatus
 end
 

data/lib/zold/commands/merge.rb

@@ -62,7 +62,7 @@ Available options:"
     private
 
     def merge(wallet, cps, _)
-      raise 'There are no remote copies, try FETCH first' if cps.all.empty?
+      raise "There are no remote copies of #{wallet.id}, try FETCH first" if cps.all.empty?
       cps = cps.all.sort_by { |c| c[:score] }.reverse
       patch = Patch.new
       main = Wallet.new(cps[0][:path])

data/lib/zold/commands/remote.rb

@@ -148,7 +148,8 @@ Available options:"
         raise "Masqueraded as #{score.host}:#{score.port}" if r.host != score.host || r.port != score.port
         @remotes.rescore(score.host, score.port, score.value)
         if opts['reboot'] && Semantic::Version.new(VERSION) < Semantic::Version.new(json['version'])
-          @log.info("#{r}: their version #{json['version']} is higher than mine #{VERSION}, reboot!")
+          @log.info("#{r}: their version #{json['version']} is higher than mine #{VERSION}, reboot! \
+(use --never-reboot to avoid this from happening)")
           exit(0)
         end
         if deep

data/lib/zold/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: zold
 version: !ruby/object:Gem::Version
-  version: 0.11.1
+  version: 0.11.2
 platform: ruby
 authors:
 - Yegor Bugayenko