lookout-jruby 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 97fb7c5544b01d106d3995cb395e49c1593ace91
-  data.tar.gz: 65e8851a9c45f8a909943c397d8d73c228b25fec
+  metadata.gz: d2787a5e23b8927d67987b9b33751b54c5a3bf43
+  data.tar.gz: c8185a3ef4a80f90abf25f7bc42fa76e13d89900
 SHA512:
-  metadata.gz: ef3455175042a0382e9892bb2a62e68e55980b092e0753f746d44a44ed3e102d7264bae1e7e137b3188dae77fab01e37e31f4692ca50ee4c1f8f6d5442e1b7bb
-  data.tar.gz: 6f8c064aa4db61d3c5a03a1950c8912327df7d4752d535c57537fe0d3c7def6060c389886d047d9d65a60df4080ea953717ba20cc7d1296b127c18951aefb610
+  metadata.gz: 2affda2e94e729f07340a9b60e87b509bcacc1718a0ba40c6a966cec6aced5fc0503a4e380d955e1a43672d2b4c8308dc0981fe73901d3072713e9aed9fef264
+  data.tar.gz: 7e6fe8e4a25bed4f7959692b6b1aa1c7918f6b9030c6a9ddb3186ef9a506de857dbcb0855f3c53872aed39008118ac3c5a763545cfedd14d75c678b2b6c82df5

data/.travis.yml

@@ -0,0 +1,4 @@
+language: ruby
+rvm:
+  - jruby-1.7.21
+  - jruby-9.0.0.0

data/README.md

@@ -1,6 +1,6 @@
 # Lookout::Jruby
 
-JRuby hacks/compatibility code for YAML/Configatron
+JRuby hacks/compatibility code for YAML/Configatron and loading yaml files via uri:classloader:/ pseudo-protocol.
 
 ## Installation
 

data/Rakefile

@@ -1,4 +1,6 @@
 require "bundler/gem_tasks"
 
-task :test => []
-task :default => :test
+require "rspec/core/rake_task"
+RSpec::Core::RakeTask.new
+
+task :default => :spec

data/lib/lookout/jruby/psych.rb

@@ -1,3 +1,23 @@
+# this is workaround for https://github.com/jruby/jruby/issues/3306
+
+# jruby-9k just works
+if JRUBY_VERSION.start_with?("1.")
+  require 'yaml'
+  module YAML
+    class << self
+      alias :_load_file :load_file
+
+      def load_file( filename )
+        if filename.start_with?("uri:classloader:/")
+          self.load(File.read(filename))
+        else
+          _load_file(filename)
+        end
+      end
+    end
+  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

data/lib/lookout/jruby/version.rb

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

data/lookout-jruby.gemspec

@@ -9,8 +9,8 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Ian Smith"]
   spec.email         = ["ian.smith@lookout.com"]
   spec.summary       = %q{JRuby hacks}
-  spec.description   = %q{}
-  spec.homepage      = ""
+  spec.description   = %q{JRuby hacks for some yaml issues}
+  spec.homepage      = "https://github.com/lookout/lookout-jruby"
   spec.license       = "MIT"
 
   spec.files         = `git ls-files`.split($/)
@@ -19,5 +19,6 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.5"
-  spec.add_development_dependency "rake"
+  spec.add_development_dependency "rake", '~> 10.2'
+  spec.add_development_dependency 'rspec', '~> 3.3'
 end

data/spec/some.yml

@@ -0,0 +1 @@
+hello: world

data/spec/yaml_spec.rb

@@ -0,0 +1,33 @@
+unless defined? JRUBY_VERSION
+  exit
+end
+
+$: << File.expand_path( '../../lib', __FILE__ )
+
+$CLASSPATH << File.dirname(__FILE__)
+
+require 'lookout/jruby'
+require 'yaml'
+
+describe YAML do
+
+  let( :expected ) { { 'hello' => 'world' } }
+
+  it 'is not patched for jruby-9k' do
+    if JRUBY_VERSION.start_with?('9.')
+      expect( YAML.respond_to?(:_load_file) ).to be false
+    end
+  end
+
+  it 'loads file from filesystem' do
+    data = YAML.load_file(File.expand_path('../some.yml', __FILE__))
+    expect( data ).to eq expected
+  end
+
+  it 'loads file from classloader' do
+    data = YAML.load_file('uri:classloader:/some.yml')
+    expect( data ).to eq expected
+  end
+
+end
+ 

metadata

@@ -1,44 +1,58 @@
 --- !ruby/object:Gem::Specification
 name: lookout-jruby
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Ian Smith
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-06-15 00:00:00.000000000 Z
+date: 2015-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.5'
   name: bundler
+  prerelease: false
+  type: :development
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.5'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '1.5'
+        version: '10.2'
+  name: rake
   prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.2'
+- !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.3'
+  name: rspec
   prerelease: false
   type: :development
-description: ''
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '3.3'
+description: JRuby hacks for some yaml issues
 email:
 - ian.smith@lookout.com
 executables: []
@@ -46,6 +60,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -54,7 +69,9 @@ files:
 - lib/lookout/jruby/psych.rb
 - lib/lookout/jruby/version.rb
 - lookout-jruby.gemspec
-homepage: ''
+- spec/some.yml
+- spec/yaml_spec.rb
+homepage: https://github.com/lookout/lookout-jruby
 licenses:
 - MIT
 metadata: {}
@@ -78,4 +95,6 @@ rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: JRuby hacks
-test_files: []
+test_files:
+- spec/some.yml
+- spec/yaml_spec.rb