pasv_lib 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: aa74128e7460dd05f4f33ceba041ef09317847fd
-  data.tar.gz: 6f6616a982aa7d8f7f641b5fbddf6e743e789c39
+SHA256:
+  metadata.gz: 50e4d7a31367670be250e437270f02fd37b8638fbd7a541fa91ab0ec7e35dccb
+  data.tar.gz: 304eab6bd2becd3995b14c92bfdd1a39adda5d73687598eea0c64faeffd03651
 SHA512:
-  metadata.gz: eeea7fcf9d95d698e040ef08eccba270185a26e2441bb27328f8b80d949bc4aca3f9daa0cb10510b6fb4df38c36aa079b30df1d467183270cf812784efc15554
-  data.tar.gz: b5127d3147bc32c3860559e73ee927c8ac82e5eb6104306292ac23ccd1ae6758c4ec03a0f9283036ba7ec32c78da40c33ba7f71765ecfc5988f1162e6a20ae4b
+  metadata.gz: 2f550d96c0a73954f1a39ddce847580197ec75bcdf0e69733926ba5d794e986c4d13f76d47a9d4872d20156b095381b052b983ded6dd364d56e414aea21b08de
+  data.tar.gz: d72ecf0b88674b51d0622878659d12f29d22b3bf815ec64b75eb6e120b00dc4f571744ebeb48f1c334bc91e94569ed2673b2c9e78a7bf82ad8fdd0ba04a01d5f

data/.gitignore

@@ -10,3 +10,5 @@
 
 # rspec failure tracking
 .rspec_status
+
+.idea

data/lib/pasv_lib/version.rb

@@ -1,3 +1,3 @@
 module PasvLib
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end

data/lib/pasv_lib.rb

@@ -1,5 +1,5 @@
 require "pasv_lib/version"
-require "systemu"
+require File.join __dir__, "..", "vendor", "systemu"
 
 module PasvLib
   module CoreExtensions
@@ -35,7 +35,7 @@ module PasvLib
       include CoreExtensions::Time
 
       def run_it *a, &b
-        exit_status, stdout, stderr = systemu *a, &b
+        exit_status, stdout, stderr = SystemUniversal::Run.systemu *a, &b
 
 
         puts stdout unless stdout.empty?

data/pasv_lib.gemspec

@@ -23,6 +23,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.15"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
-
-  spec.add_runtime_dependency "systemu", "~> 2.6", ">= 2.6.5"
 end

data/vendor/systemu.rb

@@ -0,0 +1,416 @@
+# encoding: utf-8
+
+# 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.
+#
+
+# This is a modified version of systemu by me (Ryan Moore).
+
+require 'tmpdir'
+require 'socket'
+require 'fileutils'
+require 'rbconfig'
+require 'thread'
+
+# Change to this to not pollute Object.
+
+class SystemUniversal
+  class Run
+    def self.systemu(*a, &b)
+      Object::SystemUniversal.new(*a, &b).systemu
+    end
+  end
+
+#
+# error class
+#
+  class Error < RuntimeError
+  end
+
+#
+# constants
+#
+  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
+    "universal capture of stdout and stderr and handling of child process pid for windows, *nix, etc."
+  end
+#
+# class methods
+#
+
+  @host = Socket.gethostname
+  @ppid = Process.ppid
+  @pid = Process.pid
+  @turd = ENV['SYSTEMU_TURD']
+  @ruby = nil
+
+  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(ruby, '-e', '42')
+              ruby
+            else
+              system('ruby', '-e', '42') ? 'ruby' : warn('no ruby in PATH/CONFIG')
+            end
+  end
+
+  class << SystemUniversal
+    %w( host ppid pid turd ).each{|a| attr_accessor a}
+
+    def quote(*words)
+      words.map{|word| word.inspect}.join(' ')
+    end
+  end
+
+#
+# instance methods
+#
+
+  def initialize argv, opts = {}, &block
+    getopt = getopts opts
+
+    @argv = argv
+    @block = block
+
+    @stdin = getopt[ ['stdin', 'in', '0', 0] ]
+    @stdout = getopt[ ['stdout', 'out', '1', 1] ]
+    @stderr = getopt[ ['stderr', 'err', '2', 2] ]
+    @env = getopt[ 'env' ]
+    @cwd = getopt[ 'cwd' ]
+
+    @host = getopt[ 'host', self.class.host ]
+    @ppid = getopt[ 'ppid', self.class.ppid ]
+    @pid = getopt[ 'pid', self.class.pid ]
+    @ruby = getopt[ 'ruby', self.class.ruby ]
+  end
+
+  def systemu
+    tmpdir do |tmp|
+      c = child_setup tmp
+      status = nil
+
+      begin
+        thread = nil
+
+        quietly{
+          IO.popen "#{ quote(@ruby) } #{ quote(c['program']) }", 'rb+' do |pipe|
+            line = pipe.gets
+            case line
+            when %r/^pid: \d+$/
+              cid = Integer line[%r/\d+/]
+            else
+              begin
+                buf = pipe.read
+                buf = "#{ line }#{ buf }"
+                e = Marshal.load buf
+                raise unless Exception === e
+                raise e
+              rescue
+                raise Error "systemu: Error - process interrupted!\n#{ buf }\n"
+              end
+            end
+            thread = new_thread cid, @block if @block
+            pipe.read rescue nil
+          end
+        }
+        status = $?
+      ensure
+        if thread
+          begin
+            class << status
+              attr 'thread'
+            end
+            status.instance_eval{ @thread = thread }
+          rescue
+            42
+          end
+        end
+      end
+
+      if @stdout or @stderr
+        open(c['stdout'], 'rb'){|f| relay f => @stdout} if @stdout
+        open(c['stderr'], 'rb'){|f| relay f => @stderr} if @stderr
+        status
+      else
+        [status, open(c['stdout'], 'rb'){|f| f.read}, open(c['stderr'], 'rb'){|f| f.read}]
+      end
+    end
+  end
+
+  def quote *args, &block
+    SystemUniversal.quote(*args, &block)
+  end
+
+  def new_thread child_pid, block
+    q = Queue.new
+    Thread.new(child_pid) do |cid|
+      current = Thread.current
+      current.abort_on_exception = true
+      q.push current
+      block.call cid
+    end
+    q.pop
+  end
+
+  def child_setup tmp
+    stdin = File.expand_path(File.join(tmp, 'stdin'))
+    stdout = File.expand_path(File.join(tmp, 'stdout'))
+    stderr = File.expand_path(File.join(tmp, 'stderr'))
+    program = File.expand_path(File.join(tmp, 'program'))
+    config = File.expand_path(File.join(tmp, 'config'))
+
+    if @stdin
+      open(stdin, 'wb'){|f| relay @stdin => f}
+    else
+      FileUtils.touch stdin
+    end
+    FileUtils.touch stdout
+    FileUtils.touch stderr
+
+    c = {}
+    c['argv'] = @argv
+    c['env'] = @env
+    c['cwd'] = @cwd
+    c['stdin'] = stdin
+    c['stdout'] = stdout
+    c['stderr'] = stderr
+    c['program'] = program
+    open(config, 'wb'){|f| Marshal.dump(c, f)}
+
+    open(program, 'wb'){|f| f.write child_program(config)}
+
+    c
+  end
+
+  def quietly
+    v = $VERBOSE
+    $VERBOSE = nil
+    yield
+  ensure
+    $VERBOSE = v
+  end
+
+  def child_program config
+    <<-program
+      # encoding: utf-8
+
+      PIPE = STDOUT.dup
+      begin
+        config = Marshal.load(IO.read('#{ config }',:mode=>"rb"))
+
+        argv = config['argv']
+        env = config['env']
+        cwd = config['cwd']
+        stdin = config['stdin']
+        stdout = config['stdout']
+        stderr = config['stderr']
+
+        Dir.chdir cwd if cwd
+        env.each{|k,v| ENV[k.to_s] = v.to_s} if env
+
+        STDIN.reopen stdin
+        STDOUT.reopen stdout
+        STDERR.reopen stderr
+
+        PIPE.puts "pid: \#{ Process.pid }"
+        PIPE.flush                        ### the process is ready yo!
+        PIPE.close
+
+        exec *argv
+      rescue Exception => e
+        PIPE.write Marshal.dump(e) rescue nil
+        exit 42
+      end
+    program
+  end
+
+  def relay srcdst
+    src, dst, _ = srcdst.to_a.first
+    if src.respond_to? 'read'
+      while((buffer = src.read(8192))); dst << buffer; end
+    else
+      if src.respond_to?(:each_line)
+        src.each_line{|buf| dst << buf}
+      else
+        src.each{|buf| dst << buf}
+      end
+    end
+  end
+
+  def slug_for(*args)
+    options = args.last.is_a?(Hash) ? args.pop : {}
+    join = (options[:join] || options['join'] || '_').to_s
+    string = args.flatten.compact.join(join)
+    words = string.to_s.scan(%r|[/\w]+|)
+    words.map!{|word| word.gsub %r|[^/0-9a-zA-Z_-]|, ''}
+    words.delete_if{|word| word.nil? or word.strip.empty?}
+    words.join(join).downcase.gsub('/', (join * 2))
+  end
+
+  def tmpdir d = Dir.tmpdir, max = 42, &b
+    i = -1 and loop{
+      i += 1
+
+      tmp = File.join(d, slug_for("systemu_#{ @host }_#{ @ppid }_#{ @pid }_#{ rand }_#{ i += 1 }"))
+
+      begin
+        Dir.mkdir tmp
+      rescue Errno::EEXIST
+        raise Error if i >= max
+        next
+      end
+
+      break(
+        if b
+          begin
+            b.call tmp
+          ensure
+            FileUtils.rm_rf tmp unless SystemU.turd
+          end
+        else
+          tmp
+        end
+      )
+    }
+  end
+
+  def getopts opts = {}
+    lambda do |*args|
+      keys, default, _ = args
+      catch(:opt) do
+        [keys].flatten.each do |key|
+          [key, key.to_s, key.to_s.intern].each do |k|
+            throw :opt, opts[k] if opts.has_key?(k)
+          end
+        end
+        default
+      end
+    end
+  end
+end
+
+# some monkeypatching for JRuby
+if defined? JRUBY_VERSION
+  require 'jruby'
+  java_import org.jruby.RubyProcess
+
+  class SystemUniversal
+    def systemu
+      split_argv = JRuby::PathHelper.smart_split_command @argv
+      process = java.lang.Runtime.runtime.exec split_argv.to_java(:string)
+
+      stdout, stderr = [process.input_stream, process.error_stream].map do |stream|
+        StreamReader.new(stream)
+      end
+
+      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,
+        stderr.join
+      ]
+    end
+
+    class StreamReader
+      def initialize(stream)
+        @data = ""
+        @thread = Thread.new do
+          reader = java.io.BufferedReader.new java.io.InputStreamReader.new(stream)
+
+          while line = reader.read_line
+            @data << line << "\n"
+          end
+        end
+      end
+
+      def join
+        @thread.join
+        @data
+      end
+    end
+  end
+end
+
+
+
+SystemU = SystemUniversal unless defined? SystemU
+Systemu = SystemUniversal unless defined? Systemu
+
+
+
+
+
+
+
+
+
+
+
+
+
+if $0 == __FILE__
+#
+# date
+#
+  date = %q( ruby -e"  t = Time.now; STDOUT.puts t; STDERR.puts t  " )
+
+  status, stdout, stderr = systemu date
+  p [status, stdout, stderr]
+
+  status = systemu date, 1=>(stdout = '')
+  p [status, stdout]
+
+  status = systemu date, 2=>(stderr = '')
+  p [status, stderr]
+#
+# sleep
+#
+  sleep = %q( ruby -e"  p(sleep(1))  " )
+  status, stdout, stderr = systemu sleep
+  p [status, stdout, stderr]
+
+  sleep = %q( ruby -e"  p(sleep(42))  " )
+  status, stdout, stderr = systemu(sleep){|cid| Process.kill 9, cid}
+  p [status, stdout, stderr]
+#
+# env
+#
+  env = %q( ruby -e"  p ENV['A']  " )
+  status, stdout, stderr = systemu env, :env => {'A' => 42}
+  p [status, stdout, stderr]
+#
+# cwd
+#
+  env = %q( ruby -e"  p Dir.pwd  " )
+  status, stdout, stderr = systemu env, :cwd => Dir.tmpdir
+  p [status, stdout, stderr]
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pasv_lib
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Ryan Moore
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-01-31 00:00:00.000000000 Z
+date: 2019-02-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,26 +52,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: systemu
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.6.5
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '2.6'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 2.6.5
 description: 
 email:
 - moorer@udel.edu
@@ -91,6 +71,7 @@ files:
 - lib/pasv_lib.rb
 - lib/pasv_lib/version.rb
 - pasv_lib.gemspec
+- vendor/systemu.rb
 homepage: http://www.github.com/mooreryan/pasv_lib
 licenses: []
 metadata: {}
@@ -109,8 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.1
 signing_key: 
 specification_version: 4
 summary: Library code for PASV