metasploit-model 0.27.2 → 0.27.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzdiMDBhZGU3ZWU4NDUwOGY1ZDkyNjk0M2RkZWI0MjUzOGQ3ZTI0Zg==
+    YjBmNjY2ZGRlNTM3YTU2YzM3NDNkYTNjMzVjZGZhNDQ5NzVmN2JkMQ==
   data.tar.gz: !binary |-
-    YjJmNjk5MmI2OTRkNGM1MmIxNThlNDU5OTYzODY1NzJlNzQ4ODExOA==
+    NDQxMDVlMzA1NWU5NjdkMjQzZmFmYjc3MjAzZjA3MTY4NTNkZjc5NQ==
 SHA512:
   metadata.gz: !binary |-
-    NWFkODQ0NmJiYmQ0YmE4OTgxZDlhODhlOGM0ZDIzNGFjMTBiMGYwNDE5NzEx
-    ZDg1OGUxYmEwNWViYWIyOWU1MTA3OWVkMzE3NTlhOWFiNmZmYThlMjc4YzBi
-    Yjk5YjhkZTQzYjBlNzQzOGJlNDNiNDJiMzE0NzBlNDg2NGFkZTI=
+    NmJlNzE4OWFiNTJmYjkwNjQyOGVkZDM0MzI5ZmQzYjAzYTU5ZWVjZWFkYWQx
+    OTNlZGNhNWY1MDMwMmJhOWI5NGMzNDYyN2RlYTFlMmUzNzBhN2FiYjc2NDRm
+    MjBhOTViYmJlOTRhMDJkZGFlNDNiODQ5ZDgzZDM4MDBiZWVjZDQ=
   data.tar.gz: !binary |-
-    MmFiYjM2MGQyMGU5OTkyNDRkMTYxYzM3OGI2MDY4ZTI2MTM3ZGU1NmFmOWM1
-    NzU2YWM2MGRkNDM5ZWY2ZDc5ZmNmODVmNzRlZmE1YjIzNjQwNWQzMDBiOWZk
-    N2U1NzkyOTc3OTI2NjVjNjk1OGU1ZGUyMjU4YzJjMzZhMzgyYjA=
+    ZTRiMWM4M2Q5YmVhYzIwNDNkMWUxNjVlYTYyMDA1NGYxYWViOTJmNzhmZTAw
+    NjJhNDQ3NTQxM2ZhMTM3MmRkNDE4YTViYzJkNTkyY2EwOWFhZjQzYThjNzZl
+    OTk4NjIyZjE2MjZkOTM0YjIxMGYyMmY3MjNiOTExMzcxMDJlMTk=

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: ruby
 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