Hello community, here is the log from the commit of package rubygem-daemons for openSUSE:Factory checked in at 2017-10-23 16:52:56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/rubygem-daemons (Old) and /work/SRC/openSUSE:Factory/.rubygem-daemons.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "rubygem-daemons" Mon Oct 23 16:52:56 2017 rev:12 rq:535850 version:1.2.5 Changes: -------- --- /work/SRC/openSUSE:Factory/rubygem-daemons/rubygem-daemons.changes 2016-08-25 09:55:16.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.rubygem-daemons.new/rubygem-daemons.changes 2017-10-23 16:53:35.247854615 +0200 @@ -1,0 +2,10 @@ +Mon Oct 23 05:47:31 UTC 2017 - [email protected] + +- updated to version 1.2.5 + + == Release 1.2.5: October 22, 2017 + + * In Application#stop, call zap, not cleanup on the pidfile (thanks to wevanscfi) + * Use File.expand_path on and output and log files (thanks to Dave Harris) + +------------------------------------------------------------------- Old: ---- daemons-1.2.4.gem New: ---- daemons-1.2.5.gem ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ rubygem-daemons.spec ++++++ --- /var/tmp/diff_new_pack.bmOHxa/_old 2017-10-23 16:53:35.671834772 +0200 +++ /var/tmp/diff_new_pack.bmOHxa/_new 2017-10-23 16:53:35.675834584 +0200 @@ -1,7 +1,7 @@ # # spec file for package rubygem-daemons # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2017 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -24,7 +24,7 @@ # Name: rubygem-daemons -Version: 1.2.4 +Version: 1.2.5 Release: 0 %define mod_name daemons %define mod_full_name %{mod_name}-%{version} @@ -33,7 +33,7 @@ BuildRequires: %{ruby} BuildRequires: ruby-macros >= 5 Url: https://github.com/thuehlinger/daemons -Source: http://rubygems.org/gems/%{mod_full_name}.gem +Source: https://rubygems.org/gems/%{mod_full_name}.gem Source1: gem2rpm.yml Summary: A toolkit to create and control daemons in different ways License: MIT ++++++ daemons-1.2.4.gem -> daemons-1.2.5.gem ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/LICENSE new/LICENSE --- old/LICENSE 2016-08-02 20:22:22.000000000 +0200 +++ new/LICENSE 2017-10-22 19:12:58.000000000 +0200 @@ -1,4 +1,4 @@ -Copyright (c) 2005-2016 Thomas Uehlinger, 2014-2016 Aaron Stone +Copyright (c) 2005-2017 Thomas Uehlinger, 2014-2016 Aaron Stone Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/README.md new/README.md --- old/README.md 2016-08-02 20:22:22.000000000 +0200 +++ new/README.md 2017-10-22 19:12:58.000000000 +0200 @@ -1,6 +1,6 @@ Ruby Daemons ============ -[](https://codeclimate.com/github/acuppy/daemons)[](https://circleci.com/gh/acuppy/daemons) +[](https://travis-ci.org/thuehlinger/daemons)[](https://codeclimate.com/github/acuppy/daemons)[](https://circleci.com/gh/acuppy/daemons) Daemons provides an easy way to wrap existing ruby scripts (for example a self-written server) to be _run as a daemon_ and to be _controlled by simple start/stop/restart commands_. @@ -204,4 +204,4 @@ Author ------ -Written 2005-2016 by Thomas Uehlinger, 2014-2016 by Aaron Stone. +Written 2005-2017 by Thomas Uehlinger, 2014-2016 by Aaron Stone. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/Releases new/Releases --- old/Releases 2016-08-02 20:22:22.000000000 +0200 +++ new/Releases 2017-10-22 19:12:58.000000000 +0200 @@ -1,5 +1,10 @@ = Daemons Release History +== Release 1.2.5: October 22, 2017 + +* In Application#stop, call zap, not cleanup on the pidfile (thanks to wevanscfi) +* Use File.expand_path on and output and log files (thanks to Dave Harris) + == Release 1.2.4: August 1, 2016 * add :shush option Binary files old/checksums.yaml.gz and new/checksums.yaml.gz differ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/daemons/application.rb new/lib/daemons/application.rb --- old/lib/daemons/application.rb 2016-08-02 20:22:22.000000000 +0200 +++ new/lib/daemons/application.rb 2017-10-22 19:12:58.000000000 +0200 @@ -28,6 +28,10 @@ @options = group.options.dup @options.update(add_options) + ['dir', 'log_dir', 'logfilename', 'output_logfilename'].each do |k| + @options[k] = File.expand_path(@options[k]) if @options.key?(k) + end + @dir_mode = @dir = @script = nil @force_kill_waittime = @options[:force_kill_waittime] || 20 @@ -416,7 +420,7 @@ unless Pid.running?(pid) # We try to remove the pid-files by ourselves, in case the application # didn't clean it up. - begin; @pid.cleanup; rescue ::Exception; end + zap! @report.stopped_process(group.app_name, pid) $stdout.flush diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/daemons/application_group.rb new/lib/daemons/application_group.rb --- old/lib/daemons/application_group.rb 2016-08-02 20:22:22.000000000 +0200 +++ new/lib/daemons/application_group.rb 2017-10-22 19:12:58.000000000 +0200 @@ -23,19 +23,22 @@ @app_name = app_name @options = options - if options[:script] - @script = File.expand_path(options[:script]) + if @options[:script] + @script = File.expand_path(@options[:script]) end @monitor = nil - @multiple = options[:multiple] || false + @multiple = @options[:multiple] || false - @dir_mode = options[:dir_mode] || :script - @dir = options[:dir] || '' + @dir_mode = @options[:dir_mode] || :script + ['dir'].each do |k| + @options[k] = File.expand_path(@options[k]) if @options.key?(k) + end + @dir = @options[:dir] || '' - @keep_pid_files = options[:keep_pid_files] || false - @no_pidfiles = options[:no_pidfiles] || false + @keep_pid_files = @options[:keep_pid_files] || false + @no_pidfiles = @options[:no_pidfiles] || false @applications = [] end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/daemons/controller.rb new/lib/daemons/controller.rb --- old/lib/daemons/controller.rb 2016-08-02 20:22:22.000000000 +0200 +++ new/lib/daemons/controller.rb 2017-10-22 19:12:58.000000000 +0200 @@ -61,7 +61,7 @@ @group.stop_all(@options[:no_wait]) when 'restart' unless @group.applications.empty? - @group.stop_all + @group.stop_all(@options[:no_wait]) sleep(1) @group.start_all else diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/daemons/monitor.rb new/lib/daemons/monitor.rb --- old/lib/daemons/monitor.rb 2016-08-02 20:22:22.000000000 +0200 +++ new/lib/daemons/monitor.rb 2017-10-22 19:12:58.000000000 +0200 @@ -107,7 +107,7 @@ end rescue ::Exception => e $stderr.puts "exception while trying to stop monitor process #{pid}: #{e}" - $stderr.puts 'deleting pid-file.' + $stderr.puts "deleting pid-file." end # We try to remove the pid-files by ourselves, in case the monitor diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/daemons/pidfile.rb new/lib/daemons/pidfile.rb --- old/lib/daemons/pidfile.rb 2016-08-02 20:22:22.000000000 +0200 +++ new/lib/daemons/pidfile.rb 2017-10-22 19:12:58.000000000 +0200 @@ -100,9 +100,9 @@ end def zap - File.delete(filename) + File.delete(filename) if exist? end - + def pid begin File.open(filename) do |f| diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/daemons/version.rb new/lib/daemons/version.rb --- old/lib/daemons/version.rb 2016-08-02 20:22:22.000000000 +0200 +++ new/lib/daemons/version.rb 2017-10-22 19:12:58.000000000 +0200 @@ -1,3 +1,3 @@ module Daemons - VERSION = '1.2.4' + VERSION = '1.2.5' end diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/lib/daemons.rb new/lib/daemons.rb --- old/lib/daemons.rb 2016-08-02 20:22:22.000000000 +0200 +++ new/lib/daemons.rb 2017-10-22 19:12:58.000000000 +0200 @@ -238,23 +238,26 @@ # end # def call(options = {}, &block) - unless block_given? - fail 'Daemons.call: no block given' - end + new_app = Daemons.new(options, &block) + new_app.start + new_app + end + module_function :call - options[:proc] = block - options[:mode] = :proc + # Create a new Daemon application, like <tt>Daemons.call</tt>, but will not start it automatically + def new(options = {}, &block) + fail 'Daemons.call: no block given' unless block_given? options[:app_name] ||= 'proc' + options[:proc] = Proc.new + options[:mode] = :proc + options[:dir_mode] = :normal @group ||= ApplicationGroup.new(options[:app_name], options) - new_app = @group.new_application(options) - new_app.start - - new_app + @group.new_application(options) end - module_function :call + module_function :new # Daemonize the currently runnig process, i.e. the calling process will become a daemon. # diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/metadata new/metadata --- old/metadata 2016-08-02 20:22:22.000000000 +0200 +++ new/metadata 2017-10-22 19:12:58.000000000 +0200 @@ -1,71 +1,71 @@ --- !ruby/object:Gem::Specification name: daemons version: !ruby/object:Gem::Version - version: 1.2.4 + version: 1.2.5 platform: ruby authors: - Thomas Uehlinger autorequire: bindir: bin cert_chain: [] -date: 2016-08-01 00:00:00.000000000 Z +date: 2017-10-22 00:00:00.000000000 Z dependencies: - !ruby/object:Gem::Dependency name: rake requirement: !ruby/object:Gem::Requirement requirements: - - - ~> + - - "~>" - !ruby/object:Gem::Version version: '0' type: :development prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - - ~> + - - "~>" - !ruby/object:Gem::Version version: '0' - !ruby/object:Gem::Dependency name: rspec requirement: !ruby/object:Gem::Requirement requirements: - - - ~> + - - "~>" - !ruby/object:Gem::Version version: '3.1' type: :development prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - - ~> + - - "~>" - !ruby/object:Gem::Version version: '3.1' - !ruby/object:Gem::Dependency name: simplecov requirement: !ruby/object:Gem::Requirement requirements: - - - ~> + - - "~>" - !ruby/object:Gem::Version version: '0' type: :development prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - - ~> + - - "~>" - !ruby/object:Gem::Version version: '0' - !ruby/object:Gem::Dependency name: pry-byebug requirement: !ruby/object:Gem::Requirement requirements: - - - ~> + - - "~>" - !ruby/object:Gem::Version - version: '0' + version: 3.0.0 type: :development prerelease: false version_requirements: !ruby/object:Gem::Requirement requirements: - - - ~> + - - "~>" - !ruby/object:Gem::Version - version: '0' + version: 3.0.0 description: |2 Daemons provides an easy way to wrap existing ruby scripts (for example a self-written server) to be run as a daemon and to be controlled by simple @@ -137,17 +137,17 @@ - lib required_ruby_version: !ruby/object:Gem::Requirement requirements: - - - '>=' + - - ">=" - !ruby/object:Gem::Version version: '0' required_rubygems_version: !ruby/object:Gem::Requirement requirements: - - - '>=' + - - ">=" - !ruby/object:Gem::Version version: '0' requirements: [] rubyforge_project: -rubygems_version: 2.4.6 +rubygems_version: 2.5.2 signing_key: specification_version: 4 summary: A toolkit to create and control daemons in different ways
