sys-proctable 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 01c653a363b9c37b67d34370e882e24aefc772c95677ee7420b9601f279c2e9b
-  data.tar.gz: c3dbf4252b810a0abd69bdc3d401a653ae8b8e24d31d8be15fea7d5ddd37f7a3
+  metadata.gz: 67e97600844b87fee76e66de7ca9ce8dc437c4b0e37d8760a1a1211629ca0ad4
+  data.tar.gz: 8f3940b17936f4fa4fdcbaae499728d54a0d20160f320021882435dc42fa8e1d
 SHA512:
-  metadata.gz: 9f97e3368e08424eb1ac80dd50865f0803066de539fd93defebfb8dbd8591d44447a24a5621555b2b6e29f5f72ae33f03be2b973d3106ad87ecd1bcef67fb8eb
-  data.tar.gz: a17fd29c3cfc2aed02ab884467aa24f403258aa8bc9f4f9fa084892685d6898992808625e3dacc18d1616232f11ad8c2b7ac8ce21b80fdd3bd8faadb4e733791
+  metadata.gz: 7d9abfefc12b38b3e9961aaed71e4c0cf220418d6e719e945bcb72fe0d66a9782375ad860bb9f9dd37cedb5aefa410d689cdc97cfeb8ecc9f61e9c6eecf6fcf1
+  data.tar.gz: b1bb3b2a1fad203879b6a3c79066e730c074e9b6a5c090da0abdaebe86e4648dbccf07955c27e575ea52aa0c38acc08ae781754ee68dc50c8527f7c054433c56

data/CHANGES.rdoc

@@ -1,3 +1,12 @@
+== 1.2.6 - 25-Aug-2020
+* Made some updates so that it worked properly with TruffleRuby on Mac.
+* Fixed an issue on Linux where non-ascii environ strings could cause failure.
+  Thanks go to deemytch for the spot and original patch.
+* Removed the spec_helper.rb file, just use Process.spawn instead of messing
+  around with custom fork implementations. This also helps with implementations
+  that don't support fork.
+* Updated the MANIFEST.
+
 == 1.2.5 - 19-Jun-2020
 * Added the delayacct_blkio_ticks, guest_time, and cguest_time fields on Linux.
   These require 2.6.18 or later, but will simply be nil on earlier versions.

data/MANIFEST.rdoc

@@ -8,6 +8,8 @@
 * benchmarks/bench_ips_ps.rb
 * example/example_ps.rb
 * lib/sys-proctable.rb
+* lib/sys-top.rb
+* lib/sys/proctable.rb
 * lib/sys/top.rb
 * lib/sys/proctable/version.rb
 * lib/aix/sys/proctable.rb
@@ -16,11 +18,11 @@
 * lib/linux/sys/proctable.rb
 * lib/sunos/sys/proctable.rb
 * lib/windows/sys/proctable.rb
-* test/test_sys_proctable_aix.rb
-* test/test_sys_proctable_all.rb
-* test/test_sys_proctable_darwin.rb
-* test/test_sys_proctable_freebsd.rb
-* test/test_sys_proctable_linux.rb
-* test/test_sys_proctable_sunos.rb
-* test/test_sys_proctable_windows.rb
-* test/test_sys_top.rb
+* spec/sys_proctable_aix_spec.rb
+* spec/sys_proctable_all_spec.rb
+* spec/sys_proctable_darwin_spec.rb
+* spec/sys_proctable_freebsd_spec.rb
+* spec/sys_proctable_linux_spec.rb
+* spec/sys_proctable_sunos_spec.rb
+* spec/sys_proctable_windows_spec.rb
+* spec/sys_top_spec.rb

data/Rakefile

@@ -51,7 +51,7 @@ end
 
 desc 'Run the test suite for the sys-proctable library'
 RSpec::Core::RakeTask.new(:spec) do |t|
-  t.pattern = ['spec/spec_helper.rb', 'spec/sys_proctable_all_spec.rb']
+  t.pattern = ['spec/sys_proctable_all_spec.rb']
 
   case CONFIG['host_os']
     when /aix/i

data/lib/darwin/sys/proctable.rb

@@ -26,9 +26,13 @@ module Sys
     MAXTHREADNAMESIZE = 64
     PROC_PIDPATHINFO_MAXSIZE = MAXPATHLEN * 4
 
-    # JRuby on Mac
+    # JRuby/Truffleruby on Mac
     unless defined? FFI::StructLayout::CharArray
-      FFI::StructLayout::CharArray = FFI::StructLayout::CharArrayProxy
+      if defined? FFI::StructLayout::CharArrayProxy
+        FFI::StructLayout::CharArray = FFI::StructLayout::CharArrayProxy
+      else
+        FFI::StructLayout::CharArray = FFI::Struct::CharArray
+      end
     end
 
     class ProcBsdInfo < FFI::Struct

data/lib/linux/sys/proctable.rb

@@ -146,7 +146,7 @@ module Sys
         struct.environ = {}
 
         begin
-          IO.read("/proc/#{file}/environ").split("\0").each{ |str|
+          IO.read("/proc/#{file}/environ").force_encoding("UTF-8").split("\0").each{ |str|
             key, value = str.split('=')
             struct.environ[key] = value
           }

data/lib/sys/proctable/version.rb

@@ -1,6 +1,6 @@
 module Sys
   class ProcTable
     # The version of the sys-proctable library
-    VERSION = '1.2.5'.freeze
+    VERSION = '1.2.6'.freeze
   end
 end

data/spec/sys_proctable_all_spec.rb

@@ -16,7 +16,7 @@ describe Sys::ProcTable do
   end
 
   it "has a VERSION constant set to the expected value" do
-    expect(Sys::ProcTable::VERSION).to eql('1.2.5')
+    expect(Sys::ProcTable::VERSION).to eql('1.2.6')
     expect(Sys::ProcTable::VERSION).to be_frozen
   end
 

data/spec/sys_proctable_darwin_spec.rb

@@ -21,8 +21,8 @@ describe Sys::ProcTable do
   }
 
   before(:all) do
-    @pid1 = fork { exec('env', '-i', 'A=B', 'Z=', 'sleep', '60') }
-    @pid2 = fork { exec('ruby', '-Ilib', '-e', 'sleep \'120\'.to_i', '--', 'foo bar') }
+    @pid1 = Process.spawn({'A' => 'B', 'Z' => nil}, "sleep 60")
+    @pid2 = Process.spawn("ruby", "-Ilib", "-e", "sleep \'120\'.to_i", "--", "foo bar")
     sleep 1 # wait to make sure env is replaced by sleep
   end
 
@@ -38,7 +38,7 @@ describe Sys::ProcTable do
 
     it "returns the expected results for the fields method" do
       expect(described_class.fields).to be_kind_of(Array)
-      expect(described_class.fields).to eql(fields)
+      expect(described_class.fields).to eq(fields)
     end
   end
 
@@ -48,72 +48,72 @@ describe Sys::ProcTable do
     it "contains a pid member and returns the expected value" do
       expect(subject).to respond_to(:pid)
       expect(subject.pid).to be_kind_of(Numeric)
-      expect(subject.pid).to eql(@pid1)
+      expect(subject.pid).to eq(@pid1)
     end
 
     it "contains a ppid member and returns the expected value" do
       expect(subject).to respond_to(:ppid)
       expect(subject.ppid).to be_kind_of(Numeric)
-      expect(subject.ppid).to eql(Process.pid)
+      expect(subject.ppid).to eq(Process.pid)
     end
 
     it "contains a pgid member and returns the expected value" do
       expect(subject).to respond_to(:pgid)
       expect(subject.pgid).to be_kind_of(Numeric)
-      expect(subject.pgid).to eql(Process.getpgrp)
+      expect(subject.pgid).to eq(Process.getpgrp)
     end
 
     it "contains a ruid member and returns the expected value" do
       expect(subject).to respond_to(:ruid)
       expect(subject.ruid).to be_kind_of(Numeric)
-      expect(subject.ruid).to eql(Process.uid)
+      expect(subject.ruid).to eq(Process.uid)
     end
 
     it "contains an rgid member and returns the expected value" do
       expect(subject).to respond_to(:rgid)
       expect(subject.rgid).to be_kind_of(Numeric)
-      expect(subject.rgid).to eql(Process.gid)
+      expect(subject.rgid).to eq(Process.gid)
     end
 
     it "contains an svuid member and returns the expected value" do
       expect(subject).to respond_to(:svuid)
       expect(subject.svuid).to be_kind_of(Numeric)
-      expect(subject.svuid).to eql(Process.uid)
+      expect(subject.svuid).to eq(Process.uid)
     end
 
     it "contains an svgid member and returns the expected value" do
       expect(subject).to respond_to(:svgid)
       expect(subject.svgid).to be_kind_of(Numeric)
-      expect(subject.svgid).to eql(Process.gid)
+      expect(subject.svgid).to eq(Process.gid)
     end
 
-    it "contains a comm member and returns the expected value", :skip_jruby do
+    it "contains a comm member and returns the expected value" do
       expect(subject).to respond_to(:comm)
       expect(subject.comm).to be_kind_of(String)
-      expect(subject.comm).to eql('sleep')
+      expect(subject.comm).to eq('sleep')
     end
 
-    it "contains a cmdline member and returns the expected value", :skip_jruby do
+    it "contains a cmdline member and returns the expected value" do
       expect(subject).to respond_to(:cmdline)
       expect(subject.cmdline).to be_kind_of(String)
-      expect(subject.cmdline).to eql('sleep 60')
+      expect(subject.cmdline).to eq('sleep 60')
     end
 
-    it "returns a string with the expected arguments for the cmdline member", :skip_jruby do
+    it "returns a string with the expected arguments for the cmdline member" do
       ptable = Sys::ProcTable.ps(pid: @pid2)
-      expect(ptable.cmdline).to eql('ruby -Ilib -e sleep \'120\'.to_i -- foo bar')
+      expect(ptable.cmdline).to eq('ruby -Ilib -e sleep \'120\'.to_i -- foo bar')
     end
 
-    it "contains an exe member and returns the expected value", :skip_jruby do
+    it "contains an exe member and returns the expected value" do
       expect(subject).to respond_to(:exe)
       expect(subject.exe).to be_kind_of(String)
-      expect(subject.exe).to eql(`which sleep`.chomp)
+      expect(subject.exe).to eq(`which sleep`.chomp)
     end
 
-    it "contains an environ member and returns the expected value", :skip_jruby do
+    it "contains an environ member and returns the expected value" do
       expect(subject).to respond_to(:environ)
       expect(subject.environ).to be_kind_of(Hash)
-      expect(subject.environ['A']).to eql('B')
+      expect(subject.environ['A']).to eq('B')
       expect(subject.environ['Z']).to be_nil
     end
   end

data/sys-proctable.gemspec

@@ -2,7 +2,7 @@ require 'rubygems'
 
 Gem::Specification.new do |spec|
   spec.name       = 'sys-proctable'
-  spec.version    = '1.2.5'
+  spec.version    = '1.2.6'
   spec.author     = 'Daniel J. Berger'
   spec.license    = 'Apache-2.0'
   spec.email      = 'djberg96@gmail.com'

metadata

@@ -1,11 +1,11 @@
 --- !ruby/object:Gem::Specification
 name: sys-proctable
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Daniel J. Berger
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain:
 - |
@@ -35,7 +35,7 @@ cert_chain:
   ORVCZpRuCPpmC8qmqxUnARDArzucjaclkxjLWvCVHeFa9UP7K3Nl9oTjJNv+7/jM
   WZs4eecIcUc4tKdHxcAJ0MO/Dkqq7hGaiHpwKY76wQ1+8xAh
   -----END CERTIFICATE-----
-date: 
+date:
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ffi
@@ -125,7 +125,7 @@ metadata:
   documentation_uri: https://github.com/djberg96/sys-proctable/wiki
   source_code_uri: https://github.com/djberg96/sys-proctable
   wiki_uri: https://github.com/djberg96/sys-proctable/wiki
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -140,12 +140,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.1.4
+signing_key:
 specification_version: 4
 summary: An interface for providing process table information
 test_files:
-- spec/spec_helper.rb
 - spec/sys_proctable_aix_spec.rb
 - spec/sys_proctable_all_spec.rb
 - spec/sys_proctable_darwin_spec.rb

data/spec/spec_helper.rb

@@ -1,22 +0,0 @@
-RSpec.configure do |config|
-  config.filter_run_excluding :skip_jruby if RUBY_PLATFORM == 'java'
-end
-
-if RUBY_PLATFORM == 'java'
-  require 'ffi'
-  module Exec
-    extend FFI::Library
-    ffi_lib FFI::Library::LIBC
-    attach_function :fork, [], :int
-  end
-
-  def fork
-    pid = Exec.fork
-    if pid == 0
-      yield if block_given?
-      return nil
-    else
-      return pid
-    end
-  end
-end