metasploit-model 0.27.2-java → 0.27.3-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c46dce723315fb4a86dcd57d2801f925142d73c8
-  data.tar.gz: 89af4916b2791506fa3173e1084c938fc3f0310c
+  metadata.gz: 8f169ffc2ee698dff8714d1756150bee02cafc92
+  data.tar.gz: 543fe4f1899063a7384934f7d0d9234b094fb78c
 SHA512:
-  metadata.gz: 1f3769e90062bc8b63bbffe3ad8cd214eb626d800013db1ff1b95d711c90520a40e048d6c5f889b105da6c63712c5e3f53edf7e6d660502d1c5b6b2e8a1bd666
-  data.tar.gz: ef110769de258bf7fd1ab25dd66894a3de53b6585a2b02849a4fbcc708e2a84a5d02709bc1819f34c7575e1397673bc7982d296621174269c9dbe009f99566c5
+  metadata.gz: 044a7b6c43b7c04dee098f4e83ef1eea639cb2fe4aeeb773b0cdc2497622b60f5db6406e1d65532d4c435862350ca51d1b0201c6503e321fed43a63dc8a0e816
+  data.tar.gz: 046c15aadb40c580c3a022ab92eafec39a86dd4841b198322999fef1f09cfe20716624459bbe4549bc66eb5e2700687f4c166e41d388fc4154e9ee954827f7f5

data/.travis.yml

@@ -3,4 +3,7 @@ rvm:
   - '1.9.3'
   - '2.0'
   - '2.1'
+  # < 1.7.14
+  - 'jruby-1.7.13'
+  # >= 1.7.14
   - 'jruby-19mode'

data/lib/metasploit/model/file.rb

@@ -1,49 +1,47 @@
-if RUBY_PLATFORM =~ /java/
+require 'metasploit/model'
+
+if RUBY_PLATFORM =~ /java/ && Gem::Version.new(JRUBY_VERSION) < Gem::Version.new('1.7.14')
   require 'java'
-end
 
-module Metasploit
-  module Model
-    # Re-implement methods on ruby's File that are buggy in JRuby so that the platform specific logic can be in this
-    # module instead of everywhere these methods are used.
-    module File
-      if RUBY_PLATFORM =~ /java/
-        # On JRuby, File.realpath does not resolve symlinks, so need to drop to Java to get the real path.
-        #
-        # @param path [String] a path that may contain `'.'`, `'..'`, or symlinks
-        # @return [String] canonical path
-        # @see https://github.com/jruby/jruby/issues/538
-        def self.realpath(path)
-          file = java.io.File.new(path)
+  # Re-implement methods on ruby's File that are buggy in JRuby so that the platform specific logic can be in this
+  # module instead of everywhere these methods are used.
+  module Metasploit::Model::File
+    # On JRuby (< 1.7.14), File.realpath does not resolve symlinks, so need to drop to Java to get the real path.
+    #
+    # @param path [String] a path that may contain `'.'`, `'..'`, or symlinks
+    # @return [String] canonical path
+    # @see https://github.com/jruby/jruby/issues/538
+    def self.realpath(path)
+      file = java.io.File.new(path)
 
-          file.canonical_path
-        end
-      end
+      file.canonical_path
+    end
 
-      class << self
-        # Delegates to `::File` if `::File` supports the method when {Metasploit::Model::File} does not implement an
-        # override to fix different platform incompatibilities.
-        #
-        # @param method_name [Symbol] name of method.
-        # @param args [Array] arguments passed to method with name `method_name`.
-        # @param block [Proc] block to pass after `args` to method with name `method_name`.
-        def method_missing(method_name, *args, &block)
-          if ::File.respond_to?(method_name)
-            ::File.public_send(method_name, *args, &block)
-          else
-            super
-          end
+    class << self
+      # Delegates to `::File` if `::File` supports the method when {Metasploit::Model::File} does not implement an
+      # override to fix different platform incompatibilities.
+      #
+      # @param method_name [Symbol] name of method.
+      # @param args [Array] arguments passed to method with name `method_name`.
+      # @param block [Proc] block to pass after `args` to method with name `method_name`.
+      def method_missing(method_name, *args, &block)
+        if ::File.respond_to?(method_name)
+          ::File.public_send(method_name, *args, &block)
+        else
+          super
         end
+      end
 
-        # Whether this module or `::File` responds to `method_name`.
-        #
-        # @param method_name [Symbol] name of method.
-        # @param include_private [Boolean] whether to include private methods.
-        # @return [Boolean]
-        def respond_to?(method_name, include_private=false)
-          ::File.respond_to?(method_name, include_private) || super
-        end
+      # Whether this module or `::File` responds to `method_name`.
+      #
+      # @param method_name [Symbol] name of method.
+      # @param include_private [Boolean] whether to include private methods.
+      # @return [Boolean]
+      def respond_to?(method_name, include_private=false)
+        ::File.respond_to?(method_name, include_private) || super
       end
     end
   end
-end
+else
+  Metasploit::Model::File = ::File
+end

data/lib/metasploit/model/version.rb

@@ -7,7 +7,7 @@ module Metasploit
       # The minor version number, scoped to the {MAJOR} version number.
       MINOR = 27
       # The patch number, scoped to the {MINOR} version number.
-      PATCH = 2
+      PATCH = 3
 
       # The full version string, including the {MAJOR}, {MINOR}, {PATCH}, and optionally, the {PRERELEASE} in the
       # {http://semver.org/spec/v2.0.0.html semantic versioning v2.0.0} format.

data/spec/lib/metasploit/model/file_spec.rb

@@ -1,6 +1,12 @@
 require 'spec_helper'
 
 describe Metasploit::Model::File do
+  unless RUBY_PLATFORM =~ /java/ && Gem::Version.new(JRUBY_VERSION) < Gem::Version.new('1.7.14')
+    it 'aliases ::File' do
+      expect(described_class).to equal(::File)
+    end
+  end
+
   context 'realpath' do
     let(:real_basename) do
       'real'
@@ -30,7 +36,7 @@ describe Metasploit::Model::File do
       described_class.realpath(symlink_pathname.to_path)
     end
 
-    if RUBY_PLATFORM =~ /java/
+    if RUBY_PLATFORM =~ /java/ && Gem::Version.new(JRUBY_VERSION) < Gem::Version.new('1.7.14')
       it 'should be necessary because File.realpath does not resolve symlinks' do
         File.realpath(symlink_pathname.to_path).should_not == real_pathname.to_path
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-model
 version: !ruby/object:Gem::Version
-  version: 0.27.2
+  version: 0.27.3
 platform: java
 authors:
 - Luke Imhoff
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2014-09-23 00:00:00.000000000 Z
+date: 2014-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler