lookout-jruby 2.2.0 → 2.3.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: d2787a5e23b8927d67987b9b33751b54c5a3bf43
-  data.tar.gz: c8185a3ef4a80f90abf25f7bc42fa76e13d89900
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    ZmIzOGI1MjI1ZTQ4YzBiNmUzZGQ4ZmUzNmY2MjNjNTdlYzJkMzA1ZQ==
+  data.tar.gz: !binary |-
+    ZGRkYzY5MTI2YWNjMGM2MmE2Mjc5OTg2ZmI0ZjE3Y2YwM2JjNjU1Yg==
 SHA512:
-  metadata.gz: 2affda2e94e729f07340a9b60e87b509bcacc1718a0ba40c6a966cec6aced5fc0503a4e380d955e1a43672d2b4c8308dc0981fe73901d3072713e9aed9fef264
-  data.tar.gz: 7e6fe8e4a25bed4f7959692b6b1aa1c7918f6b9030c6a9ddb3186ef9a506de857dbcb0855f3c53872aed39008118ac3c5a763545cfedd14d75c678b2b6c82df5
+  metadata.gz: !binary |-
+    OTlmMWRkNmVkNTJjYjc2NGM5ZDA2MzkwZjM4MGJjYzQ3MzE0MTA4MzI4ODg1
+    Zjk1YzEwMTc3MTFmMmZkYjhiOGJmZWExYTc1MjNkZDk4ZDBlYjU0N2ZlOTk2
+    NTcwNTI3ZWFhNjBiY2NiMjgwZDBjNTM3NzM1OTZjYmZjZjc4ZTA=
+  data.tar.gz: !binary |-
+    NjAzMmQ1MTEwNGJjNjAyNWU2NzIwMGFlZmEzYzRhNjgzYTJlYTRmYzZjMzcw
+    NGIyMTE3MTVhMjViZTFiNWI2NTFiNjU5Yjk1NmE2NzcxYzllNWVmMGM2ZGZl
+    MjU1OTVhMmZlNmQ1MDBmYTM3YjE5NDc3ZWViZTA3NmFiYjVjMDk=

data/.travis.yml

@@ -1,4 +1,7 @@
 language: ruby
+
+sudo: false
+
 rvm:
-  - jruby-1.7.21
-  - jruby-9.0.0.0
+  - jruby-1.7.23
+  - jruby-9.0.4.0

data/lib/lookout/jruby.rb

@@ -5,6 +5,9 @@ module Lookout
     if RUBY_PLATFORM == 'java'
       # JRuby YAML hack
       require 'lookout/jruby/psych'
+
+      # start a cleanup immediately
+      require 'lookout/jruby/cleanup_tempfiles'
     end
   end
 end

data/lib/lookout/jruby/cleanup_tempfiles.rb

@@ -0,0 +1,9 @@
+require "lookout/jruby/version"
+require 'lookout/jruby/cleanup_tempfiles_common'
+
+if JRUBY_VERSION.start_with?('1.')
+  require 'lookout/jruby/cleanup_tempfiles_17'
+else
+  require 'lookout/jruby/cleanup_tempfiles_9k'
+end
+Lookout::Jruby.cleanup_tempfiles

data/lib/lookout/jruby/cleanup_tempfiles_17.rb

@@ -0,0 +1,15 @@
+module Lookout
+  module Jruby
+
+    class << self
+      def process_exists?(pid)
+        system("kill -0 #{pid} 2> /dev/null")
+      rescue
+        # i.e. windows
+        false
+      end
+      private :process_exists?
+      
+    end
+  end
+end

data/lib/lookout/jruby/cleanup_tempfiles_9k.rb

@@ -0,0 +1,19 @@
+module Lookout
+  module Jruby
+
+    class << self
+      
+      # stolen from process_exists gem https://github.com/wilsonsilva/process_exists/blob/master/lib/process_exists/core_ext/process.rb
+      def process_exists?(pid)
+        Process.kill(0, pid.to_i)
+        true
+      rescue Errno::ESRCH # No such process
+        false
+      rescue Errno::EPERM # The process exists, but you dont have permission to send the signal to it.
+        true
+      end
+      private :process_exists?
+
+    end
+  end
+end

data/lib/lookout/jruby/cleanup_tempfiles_common.rb

@@ -0,0 +1,23 @@
+module Lookout
+  module Jruby
+
+    class << self
+      # cleanup the jars copied to the temp directory when it gets
+      # added to the JRuby classloader. when killing jruby hard
+      # then those files remain there as the JVM does not clean them
+      # up.
+      def cleanup_tempfiles
+        Dir[File.join(ENV_JAVA['java.io.tmpdir'], 'jruby-*')].each do |dir|
+          pid = File.basename(dir)[6..-1]
+          unless process_exists?(pid)
+            # do not use fileutils here as we are in jruby-core
+            Dir[File.join(dir, '*')].each do |file|
+              File.delete(file) rescue warn "could not delete #{file}"
+            end
+            Dir.delete(dir) rescue warn "could not delete #{dir}"
+          end
+        end
+      end
+    end
+  end
+end

data/lib/lookout/jruby/psych.rb

@@ -18,11 +18,15 @@ if JRUBY_VERSION.start_with?("1.")
   end
 end
 
-# This hack is required because YAML is all kinds of messed up and incompatible
-# with our version of Configatron under JRuby
-module Psych
-  module Yecht
-    class MergeKey
+begin
+  # This hack is required because YAML is all kinds of messed up and incompatible
+  # with our version of Configatron under JRuby
+  module Psych
+    module Yecht
+      class MergeKey
+      end
     end
   end
+rescue Exception
+  # just be failsafe
 end

data/lib/lookout/jruby/version.rb

@@ -1,5 +1,5 @@
 module Lookout
   module Jruby
-    VERSION = "2.2.0"
+    VERSION = "2.3.0"
   end
 end

data/spec/cleanup_tempfile_spec.rb

@@ -0,0 +1,53 @@
+unless defined? JRUBY_VERSION
+  exit
+end
+
+$: << File.expand_path( '../../lib', __FILE__ )
+
+describe 'cleanup tempfiles' do
+
+  it 'cleanup  /tmp/jruby-*/jruby*.jar' do
+    args = [ RbConfig.ruby,
+             '-J-cp',
+             File.expand_path( '../test.jar', __FILE__ ),
+             '-e',
+             'require \'uri:classloader:/my.jar\'; sleep 1234;' ]
+
+    pid = Process.spawn(*args)
+    # give jruby some time to start
+    sleep 10
+
+    tmpdir = File.join( ENV_JAVA['java.io.tmpdir'], "jruby-#{pid}" )
+    unless File.directory?(tmpdir)
+      # some OS give the right PID some uses bash to start java
+      tmpdir = File.join( ENV_JAVA['java.io.tmpdir'], "jruby-#{pid + 1}" )
+    end
+
+    tmpfiles = File.join( tmpdir, 'jruby*.jar' )
+ 
+    expect(Dir[tmpfiles].size).to be > 0
+
+    if JRUBY_VERSION.start_with?('1.')
+      system("kill -9 #{pid}")
+    else
+      Process.kill(9, pid)
+    end
+
+    # be sure it is killed
+    sleep 1
+
+    require 'lookout/jruby'
+
+    # execute the clean manually for the test
+    Lookout::Jruby.cleanup_tempfiles
+
+    
+    if JRUBY_VERSION.start_with?('1.')
+      expect(Dir[tmpfiles].size).to eq 0
+    else
+      warn( 'pending: can not kill process with jruby-9k' )
+    end
+  end
+
+end
+ 

metadata

@@ -1,52 +1,52 @@
 --- !ruby/object:Gem::Specification
 name: lookout-jruby
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 2.3.0
 platform: ruby
 authors:
 - Ian Smith
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-04 00:00:00.000000000 Z
+date: 2015-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
-  name: bundler
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.2'
-  name: rake
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '10.2'
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '3.3'
-  name: rspec
-  prerelease: false
   type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
@@ -66,35 +66,43 @@ files:
 - README.md
 - Rakefile
 - lib/lookout/jruby.rb
+- lib/lookout/jruby/cleanup_tempfiles.rb
+- lib/lookout/jruby/cleanup_tempfiles_17.rb
+- lib/lookout/jruby/cleanup_tempfiles_9k.rb
+- lib/lookout/jruby/cleanup_tempfiles_common.rb
 - lib/lookout/jruby/psych.rb
 - lib/lookout/jruby/version.rb
 - lookout-jruby.gemspec
+- spec/cleanup_tempfile_spec.rb
 - spec/some.yml
+- spec/test.jar
 - spec/yaml_spec.rb
 homepage: https://github.com/lookout/lookout-jruby
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - 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:
+rubyforge_project: 
 rubygems_version: 2.4.5
-signing_key:
+signing_key: 
 specification_version: 4
 summary: JRuby hacks
 test_files:
+- spec/cleanup_tempfile_spec.rb
 - spec/some.yml
+- spec/test.jar
 - spec/yaml_spec.rb