[DRE-commits] [ruby-systemu] 01/01: Imported Upstream version 2.6.5

Lucas Nussbaum lucas at moszumanska.debian.org
Tue May 12 12:20:47 UTC 2015


This is an automated email from the git hooks/post-receive script.

lucas pushed a commit to annotated tag upstream/2.6.5
in repository ruby-systemu.

commit 749b96580c3564e9de7db9a85694bc119c9c6855
Author: Lucas Nussbaum <lucas at debian.org>
Date:   Tue May 12 13:43:02 2015 +0200

    Imported Upstream version 2.6.5
---
 BSDL              |  23 ++++++++++++++++++++++
 LICENSE           |  58 ++++++++++++++++++++++++++++++++++++++++++++++++++++--
 Rakefile          |   6 +++---
 checksums.yaml.gz | Bin 429 -> 0 bytes
 lib/systemu.rb    |  26 ++++++++++++++----------
 metadata.yml      |   7 ++++---
 systemu.gemspec   |   7 ++++---
 7 files changed, 106 insertions(+), 21 deletions(-)

diff --git a/BSDL b/BSDL
new file mode 100644
index 0000000..654ce3d
--- /dev/null
+++ b/BSDL
@@ -0,0 +1,23 @@
+Copyright (c) 2010, Ara T. Howard
+All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+* Redistributions of source code must retain the above copyright notice, this
+  list of conditions and the following disclaimer.
+
+* Redistributions in binary form must reproduce the above copyright notice,
+  this list of conditions and the following disclaimer in the documentation
+  and/or other materials provided with the distribution.
+
+THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
+AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
+FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
+DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
+CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
+OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
diff --git a/LICENSE b/LICENSE
index 38060d8..fbe7e19 100644
--- a/LICENSE
+++ b/LICENSE
@@ -1,3 +1,57 @@
-same as Ruby's
+systemu is copyrighted free software by Ara T. Howard <ara.t.howard at gmail.com>.
+You can redistribute it and/or modify it under either the terms of the
+2-clause BSDL (see the file BSDL), or the conditions below:
+
+  1. You may make and give away verbatim copies of the source form of the
+     software without restriction, provided that you duplicate all of the
+     original copyright notices and associated disclaimers.
+
+  2. You may modify your copy of the software in any way, provided that
+     you do at least ONE of the following:
+
+       a) place your modifications in the Public Domain or otherwise
+          make them Freely Available, such as by posting said
+	  modifications to Usenet or an equivalent medium, or by allowing
+	  the author to include your modifications in the software.
+
+       b) use the modified software only within your corporation or
+          organization.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  3. You may distribute the software in object code or binary form,
+     provided that you do at least ONE of the following:
+
+       a) distribute the binaries and library files of the software,
+	  together with instructions (in the manual page or equivalent)
+	  on where to get the original distribution.
+
+       b) accompany the distribution with the machine-readable source of
+	  the software.
+
+       c) give non-standard binaries non-standard names, with
+          instructions on where to get the original software distribution.
+
+       d) make other distribution arrangements with the author.
+
+  4. You may modify and include the part of the software into any other
+     software (possibly commercial).  But some files in the distribution
+     are not written by the author, so that they are not under these terms.
+
+     For the list of those files and their copying conditions, see the
+     file LEGAL.
+
+  5. The scripts and library files supplied as input to or produced as 
+     output from the software do not automatically fall under the
+     copyright of the software, but belong to whomever generated them, 
+     and may be sold commercially, and may be aggregated with this
+     software.
+
+  6. THIS SOFTWARE IS PROVIDED "AS IS" AND WITHOUT ANY EXPRESS OR
+     IMPLIED WARRANTIES, INCLUDING, WITHOUT LIMITATION, THE IMPLIED
+     WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+     PURPOSE.
 
-http://www.ruby-lang.org/en/LICENSE.txt
diff --git a/Rakefile b/Rakefile
index 5ec3ac3..a51f986 100644
--- a/Rakefile
+++ b/Rakefile
@@ -4,7 +4,7 @@ This.email = "ara.t.howard at gmail.com"
 This.homepage = "https://github.com/ahoward/#{ This.lib }"
 
 task :license do
-  open('LICENSE', 'w'){|fd| fd.puts "same as ruby's"}
+  open('LICENSE', 'w'){|fd| fd.puts "Ruby"}
 end
 
 task :default do
@@ -93,7 +93,7 @@ task :gemspec do
   test_files  = "test/#{ lib }.rb" if File.file?("test/#{ lib }.rb")
   summary     = object.respond_to?(:summary) ? object.summary : "summary: #{ lib } kicks the ass"
   description = object.respond_to?(:description) ? object.description : "description: #{ lib } kicks the ass"
-  license     = object.respond_to?(:license) ? object.license : "same as ruby's"
+  license     = object.respond_to?(:license) ? object.license : "Ruby"
 
   if This.extensions.nil?
     This.extensions = []
@@ -297,7 +297,7 @@ BEGIN {
 
 # discover full path to this ruby executable
 #
-  c = Config::CONFIG
+  c = RbConfig::CONFIG
   bindir = c["bindir"] || c['BINDIR']
   ruby_install_name = c['ruby_install_name'] || c['RUBY_INSTALL_NAME'] || 'ruby'
   ruby_ext = c['EXEEXT'] || ''
diff --git a/checksums.yaml.gz b/checksums.yaml.gz
deleted file mode 100644
index 73212be..0000000
Binary files a/checksums.yaml.gz and /dev/null differ
diff --git a/lib/systemu.rb b/lib/systemu.rb
index e4dd7e7..3812d4e 100644
--- a/lib/systemu.rb
+++ b/lib/systemu.rb
@@ -14,7 +14,7 @@ class SystemUniversal
 #
 # constants
 #
-  SystemUniversal::VERSION = '2.6.4' unless SystemUniversal.send(:const_defined?, :VERSION)
+  SystemUniversal::VERSION = '2.6.5' unless SystemUniversal.send(:const_defined?, :VERSION)
   def SystemUniversal.version() SystemUniversal::VERSION end
   def version() SystemUniversal::VERSION end
   def SystemUniversal.description
@@ -28,17 +28,22 @@ class SystemUniversal
   @ppid = Process.ppid
   @pid = Process.pid
   @turd = ENV['SYSTEMU_TURD']
+  @ruby = nil
 
-  c = begin; ::RbConfig::CONFIG; rescue NameError; ::Config::CONFIG; end
-  ruby = File.join(c['bindir'], c['ruby_install_name']) << c['EXEEXT']
-  @ruby = if system('%s -e 42' % ruby)
-    ruby
-  else
-    system('%s -e 42' % 'ruby') ? 'ruby' : warn('no ruby in PATH/CONFIG')
+  def self.ruby
+    return @ruby if @ruby
+
+    c = begin; ::RbConfig::CONFIG; rescue NameError; ::Config::CONFIG; end
+    ruby = File.join(c['bindir'], c['ruby_install_name']) << c['EXEEXT']
+    @ruby = if system('%s -e 42' % ruby)
+      ruby
+    else
+      system('%s -e 42' % 'ruby') ? 'ruby' : warn('no ruby in PATH/CONFIG')
+    end
   end
 
   class << SystemUniversal
-    %w( host ppid pid ruby turd ).each{|a| attr_accessor a}
+    %w( host ppid pid turd ).each{|a| attr_accessor a}
 
     def quote(*words)
       words.map{|word| word.inspect}.join(' ')
@@ -179,7 +184,7 @@ class SystemUniversal
 
       PIPE = STDOUT.dup
       begin
-        config = Marshal.load(IO.read('#{ config }'))
+        config = Marshal.load(IO.read('#{ config }',:mode=>"rb"))
 
         argv = config['argv']
         env = config['env']
@@ -286,10 +291,11 @@ if defined? JRUBY_VERSION
         StreamReader.new(stream)
       end
 
-      exit_code = process.wait_for
       field = process.get_class.get_declared_field("pid")
       field.set_accessible(true)
       pid = field.get(process)
+      thread = new_thread pid, @block if @block
+      exit_code = process.wait_for
       [
         RubyProcess::RubyStatus.new_process_status(JRuby.runtime, exit_code, pid),
         stdout.join,
diff --git a/metadata.yml b/metadata.yml
index 17e8aaa..16dfb1c 100644
--- a/metadata.yml
+++ b/metadata.yml
@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: systemu
 version: !ruby/object:Gem::Version
-  version: 2.6.4
+  version: 2.6.5
 platform: ruby
 authors:
 - Ara T. Howard
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-04 00:00:00.000000000 Z
+date: 2015-03-19 00:00:00.000000000 Z
 dependencies: []
 description: universal capture of stdout and stderr and handling of child process
   pid for windows, *nix, etc.
@@ -17,6 +17,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- BSDL
 - LICENSE
 - README
 - README.erb
@@ -33,7 +34,7 @@ files:
 - test/testing.rb
 homepage: https://github.com/ahoward/systemu
 licenses:
-- same as ruby's
+- Ruby
 metadata: {}
 post_install_message: 
 rdoc_options: []
diff --git a/systemu.gemspec b/systemu.gemspec
index dc217b7..bef416e 100644
--- a/systemu.gemspec
+++ b/systemu.gemspec
@@ -3,14 +3,15 @@
 
 Gem::Specification::new do |spec|
   spec.name = "systemu"
-  spec.version = "2.6.4"
+  spec.version = "2.6.5"
   spec.platform = Gem::Platform::RUBY
   spec.summary = "systemu"
   spec.description = "universal capture of stdout and stderr and handling of child process pid for windows, *nix, etc."
-  spec.license = "same as ruby's"
+  spec.license = "Ruby"
 
   spec.files =
-["LICENSE",
+["BSDL",
+ "LICENSE",
  "README",
  "README.erb",
  "Rakefile",

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-ruby-extras/ruby-systemu.git



More information about the Pkg-ruby-extras-commits mailing list