metasploit_data_models 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60deb791f704876c50f895cd02bdbefaf5645e00
-  data.tar.gz: d3fb432169d4f2aac4297526b59e413f2114ef2c
+  metadata.gz: 562f975548e17f7621220480539f493209b44f03
+  data.tar.gz: acfde161424352e9b4d0f44923236c7fa5aa2019
 SHA512:
-  metadata.gz: 5073af40ac98c059cbb14a211c2d1073badf1461d55d2144c39751772488996546b5c724465c8f8ebf7beaa200a634d043e031da0eec6a7d07b7fe19c3648328
-  data.tar.gz: 14efb21a95c00b71a818fb0ea1e4130ac9ce408ce54b154fe948ca4a1e61d869fb402eaab2c999f35c493d25ed4e269ee68c806ae2932213684ea43bd8463ea9
+  metadata.gz: 9ee871e974b2bf8edfb12b81d1e2758191cd9417ad3551eb0ac58c66a23905a94ed225daae5b4af8c1635fa8d7317ba93157b9bb32620200a2349ed53b98ec0c
+  data.tar.gz: e000f095ed40f27947536cf23ead58f2b909c46b0111e30309ddcdfe1ea49f7fa00dddf68eb76e805c90356a1e3c9aa6b86a2643286b88a60eca9e5dd59499b9

data/.travis.yml

@@ -1,17 +1,21 @@
-addons:
-  postgresql: '9.5'
-group: stable
 sudo: false
+group: stable
 cache: bundler
 addons:
+  postgresql: '9.3'
   apt:
     packages:
+      - libpcap-dev
       - graphviz
 language: ruby
 rvm:
-  - 2.2.4
+  - '2.3.1'
+  
 before_script:
   - cp spec/dummy/config/database.yml.travis spec/dummy/config/database.yml
   - bundle exec rake --version
   - bundle exec rake db:create db:migrate
-script: bundle exec rake spec yard
+script:
+  - git diff --exit-code spec/dummy/db/structure.sql
+  - bundle exec rake spec
+  - bundle exec rake yard

data/config/initializers/ipaddr.rb

@@ -1,35 +1,24 @@
 module IPAddrExtensions
   extend ActiveSupport::Concern
   included do
-    begin
-      remove_method :==
-    rescue NameError => e
-      puts e.message
-    end
-    
-    alias_method :spaceship_without_rescue, :<=>
-    alias_method :<=>, :spaceship_with_rescue
-    
-    alias_method_chain :include?, :rescue
+    alias_method_chain :coerce_other, :rescue
   end
   
-
-  def spaceship_with_rescue(other)
+  def coerce_other_with_rescue(other)
     begin
-      spaceship_without_rescue(other)
-    rescue ArgumentError
-      false
+      case other
+      when IPAddr
+        other
+      when String
+        self.class.new(other)
+      else
+        self.class.new(other, @family)
+      end
+    rescue ArgumentError => e
+      OpenStruct.new(family: false, to_i: false)
     end
   end
-
-  def include_with_rescue?(other)
-    begin
-      include_without_rescue?(other)
-    rescue ArgumentError
-      false
-    end
-  end
-
+  
 end
 
 IPAddr.send(:include, IPAddrExtensions)

data/lib/metasploit_data_models/version.rb

@@ -1,6 +1,6 @@
 module MetasploitDataModels
   # VERSION is managed by GemRelease
-  VERSION = '2.0.6'
+  VERSION = '2.0.7'
 
   # @return [String]
   #

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Samuel Huckins
@@ -91,7 +91,7 @@ cert_chain:
   G+Hmcg1v810agasPdoydE0RTVZgEOOMoQ07qu7JFXVWZ9ZQpHT7qJATWL/b2csFG
   8mVuTXnyJOKRJA==
   -----END CERTIFICATE-----
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-11-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: metasploit-yard