lookout-jruby 1.3.1 → 2.0.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTdkMTZjM2U1YjQyMjM3MDAzMWZlYTNmMDZiNzZjZDkyZjE0NDEzYw==
+    Y2RiNGJlNmEwMmE1NzUyZTRhNmEyZjgwOWU0MGE3MWVmNGZiNWNlYg==
   data.tar.gz: !binary |-
-    NDM0OTRhNjY4ZDc4NjBlM2QzZDQ4NWQ4YmYxODJkNjk2YTg3ZDJjYg==
+    NmQ2M2VjZWQzMmEyYjg1MTJmNzU0ZTRmMTUxMmViN2YwZTRiMDZhYg==
 SHA512:
   metadata.gz: !binary |-
-    ZGEzNWM1NDVmMDdhMzEwOGE4Y2RhMDE5NWM2MzQ2NmUzMjQyMTVkODJkOTRk
-    ZTQwODQ4ZjA1ZjE2NzM5NzVmY2Y5MzU4NTU5ODBlMmU2YTg0M2Y2ZWFlZTVl
-    ZTI4ZmMyNGQ3YTYzZjc4MGZiZDNhZjkzYjA1YzM4MjZmMjVkOGY=
+    Y2UzYmUxN2EzYzExMmRkOWU0M2M1MTIwMGJhNWNmMzUzNzI4ZWIzNzM2Nzcy
+    N2UxZmI5NjhiNmNhNjdlNjgyYTEwYTE5NjhkZGY0NmQ0MWQxOGMzMmY2NWQw
+    Y2IwMTI5MTFmNDJkN2QyMjIzNDU1MTQ5M2QwYTg1ZjcwYjA3ZDE=
   data.tar.gz: !binary |-
-    ZTQ4YTVkMzdlYzA5MTc3MTA4ODE2MjFkODFkMDU4NDg2N2M2NTdiNzhmYzFi
-    YzYyOTllNTlmMWY4NDdjOTk5NTZlNGJjYzA0YzMyYTdkZWQ0M2VlYjI2MGUx
-    YTRiMzUyYzlkMjRiNzUyYzQxZjY3N2E0MjAzODExNWZkOGE1MjM=
+    NTk4ZjhmYWQ1YmU4NTA0MGYzYTg2MTdiMDVjNzUyZTZiMjk5MzQ3ZjAyNTEx
+    MDhiOThjNWFmODBmZWEzZjEzOTQwMjNlYzlmNjViMzkzNmRhZDgxNDg0NGM5
+    OWQ4MjIyMTIzYzZlOTI0MzNiYmY5N2Y2MjdiZWU4NTA0YTFmN2Q=

data/README.md

@@ -1,12 +1,6 @@
 # Lookout::Jruby
 
-JRuby hacks/compatibility code for JRUBY-6970
-(https://jira.codehaus.org/browse/JRUBY-6970, fix taken from the Logstash
-project) and for YAML/Configatron
-
-Note: with JRuby 1.7+, openssl is baked in, and so this gem does not depend on
-jruby-openssl.  However, if you're using an older JRuby, you will need to have
-jruby-openssl in your gemfile.
+JRuby hacks/compatibility code for YAML/Configatron
 
 ## Installation
 

data/lib/lookout/jruby.rb

@@ -3,20 +3,6 @@ require "lookout/jruby/version"
 module Lookout
   module Jruby
     if RUBY_PLATFORM == 'java'
-      require 'java'
-
-      # If we can require jruby-openssl - because it's available in the bundle -
-      # do so.  If not, JRuby should have openssl baked in, as of 1.7.
-      begin
-        require 'jruby-openssl'
-      rescue LoadError => e
-        require 'openssl'
-      end
-
-      # JRuby cert/path hack
-      require 'lookout/jruby/jruby-6970'
-      require 'lookout/jruby/jruby-6970-openssl'
-
       # JRuby YAML hack
       require 'lookout/jruby/psych'
     end

data/lib/lookout/jruby/version.rb

@@ -1,5 +1,5 @@
 module Lookout
   module Jruby
-    VERSION = "1.3.1"
+    VERSION = "2.0.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lookout-jruby
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 2.0.0
 platform: ruby
 authors:
 - Ian Smith
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-22 00:00:00.000000000 Z
+date: 2014-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,8 +51,6 @@ files:
 - README.md
 - Rakefile
 - lib/lookout/jruby.rb
-- lib/lookout/jruby/jruby-6970-openssl.rb
-- lib/lookout/jruby/jruby-6970.rb
 - lib/lookout/jruby/psych.rb
 - lib/lookout/jruby/version.rb
 - lookout-jruby.gemspec

data/lib/lookout/jruby/jruby-6970-openssl.rb

@@ -1,21 +0,0 @@
-# Workaround for JRUBY-6970 (https://jira.codehaus.org/browse/JRUBY-6970)
-# taken from the Logstash project, see:
-# <https://github.com/logstash/logstash/blob/master/lib/logstash/JRUBY-6970-openssl.rb>
-class OpenSSL::SSL::SSLContext
-  alias_method :ca_path_JRUBY_6970=, :ca_path=
-  alias_method :ca_file_JRUBY_6970=, :ca_file=
-
-  def ca_file=(arg)
-    if arg =~ /^jar:file:\//
-      return ca_file_JRUBY_6970=(arg.gsub(/^jar:/, ""))
-    end
-    return ca_file_JRUBY_6970=(arg)
-  end
-
-  def ca_path=(arg)
-    if arg =~ /^jar:file:\//
-      return ca_path_JRUBY_6970=(arg.gsub(/^jar:/, ""))
-    end
-    return ca_path_JRUBY_6970=(arg)
-  end
-end

data/lib/lookout/jruby/jruby-6970.rb

@@ -1,78 +0,0 @@
-# Workaround for JRUBY-6970 (https://jira.codehaus.org/browse/JRUBY-6970)
-# taken from the Logstash project, see:
-# <https://github.com/logstash/logstash/blob/master/lib/logstash/JRUBY-6970.rb>
-#
-# Monkeypatch for JRUBY-6970
-module Kernel
-  alias_method :require_JRUBY_6970_hack, :require
-
-  def require(path)
-    # Needed because otherwise we might require faraday/request twice and then
-    # we have a superclass mismatch
-    # https://groups.google.com/forum/#!msg/jruby-users/-lG4Fc2-3UA/bM0cIR_wRr8J
-    if path.include?('faraday/request') && defined?(Faraday::Request)
-      return false
-    end
-
-    if path =~ /^jar:file:.+!.+/
-      path = path.gsub(/^jar:/, "")
-      puts "JRUBY-6970: require(#{path})" if ENV["REQUIRE_DEBUG"] == "1"
-    end
-
-    # JRUBY-7065
-    path = File.expand_path(path) if path.include?("/../")
-    rc = require_JRUBY_6970_hack(path)
-
-    # Only monkeypatch openssl after it's been loaded.
-    if path == "openssl"
-      require "lookout/jruby/jruby-6970-openssl"
-    end
-    return rc
-  end
-end
-
-# Work around for a bug in File.expand_path that doesn't account for resources
-# in jar paths.
-#
-# Should solve this error:
-#   Exception in thread "LogStash::Runner" org.jruby.exceptions.RaiseException:
-#   (Errno::ENOENT) file:/home/jls/projects/logstash/build/data/unicode.data
-class File
-  class << self
-    alias_method :expand_path_JRUBY_6970, :expand_path
-
-    def expand_path(path, dir=nil)
-      #p :expand_path => [path, dir]
-      if path =~ /(jar:)?file:\/.*\.jar!/
-        #p :expand_path_path => [path, dir]
-        jar, resource = path.split("!", 2)
-        #p :expand_path => [jar, resource]
-        if resource.nil? || resource == ""
-          # Nothing after the "!", nothing special to handle.
-          return expand_path_JRUBY_6970(path, dir)
-        else
-          resource = expand_path_JRUBY_6970(resource, dir)
-          # TODO(sissel): use LogStash::Util::UNAME
-          if RbConfig::CONFIG["host_os"] == "mswin32"
-            # 'expand_path' on "/" will return "C:/" on windows.
-            # So like.. we don't want that because technically this
-            # is the root of the jar, not of a disk.
-            puts :expand_path => [path, "#{jar}!#{resource.gsub(/^[A-Za-z]:/, "")}"]
-            return "#{jar}!#{resource.gsub(/^[A-Za-z]:/, "")}"
-          else
-            return "#{jar}!#{resource}"
-          end
-        end
-      elsif dir.to_s =~ /(jar:)?file:\/.*\.jar!/
-        jar, dir = dir.to_s.split("!", 2)
-        if dir.empty?
-          # sometimes the original dir is just 'file:/foo.jar!'
-          return File.join("#{jar}!", path)
-        end
-        return "#{jar}!#{expand_path_JRUBY_6970(path, dir)}"
-      else
-        return expand_path_JRUBY_6970(path, dir)
-      end
-    end
-  end
-end