metasploit_data_models 0.11.2-java → 0.12.0-java

data/app/models/mdm/host.rb

@@ -30,18 +30,6 @@ class Mdm::Host < ActiveRecord::Base
       'x86_64'
   ]
 
-  # Valid values for {#os_name}.
-  OPERATING_SYSTEM_NAMES = [
-      'FreeBSD',
-      'Linux',
-      'Mac OS X',
-      'Microsoft Windows',
-      'NetBSD',
-      'OpenBSD',
-      'Unknown',
-      'VMWare'
-  ]
-
   # Fields searched for the search scope
   SEARCH_FIELDS = [
       'address::text',
@@ -297,7 +285,7 @@ class Mdm::Host < ActiveRecord::Base
   # @!attribute [rw] os_name
   #  The name of the operating system.
   #
-  #  @return [String] an element of {OPERATING_SYSTEM_NAMES}.
+  #  @return [String]
 
   # @!attribute [rw] os_sp
   #   The service pack of the {#os_flavor} of the {#os_name}.
@@ -377,11 +365,6 @@ class Mdm::Host < ActiveRecord::Base
             :inclusion => {
                 :in => ARCHITECTURES
             }
-  validates :os_name,
-            :allow_nil => true,
-            :inclusion => {
-                :in => OPERATING_SYSTEM_NAMES
-            }
   validates :state,
             :allow_nil => true,
             :inclusion => {

data/lib/metasploit_data_models/version.rb

@@ -4,5 +4,5 @@ module MetasploitDataModels
   # metasploit-framework/data/sql/migrate to db/migrate in this project, not all models have specs that verify the
   # migrations (with have_db_column and have_db_index) and certain models may not be shared between metasploit-framework
   # and pro, so models may be removed in the future.  Because of the unstable API the version should remain below 1.0.0
-  VERSION = '0.11.2'
+  VERSION = '0.12.0'
 end

data/spec/app/models/mdm/host_spec.rb

@@ -28,19 +28,6 @@ describe Mdm::Host do
     ]
   end
 
-  let(:operating_system_names) do
-    [
-        'FreeBSD',
-        'Linux',
-        'Mac OS X',
-        'Microsoft Windows',
-        'NetBSD',
-        'OpenBSD',
-        'Unknown',
-        'VMWare'
-    ]
-  end
-
   let(:states) do
     [
         'alive',
@@ -287,10 +274,6 @@ describe Mdm::Host do
       end
     end
 
-    it 'should define OPERATING_SYSTEM_NAMES in any order' do
-      described_class::OPERATING_SYSTEM_NAMES.should =~ operating_system_names
-    end
-
 		context 'SEARCH_FIELDS' do
 			subject(:search_fields) do
 				described_class::SEARCH_FIELDS
@@ -404,7 +387,6 @@ describe Mdm::Host do
     end
 
     it { should ensure_inclusion_of(:arch).in_array(architectures).allow_nil }
-    it { should ensure_inclusion_of(:os_name).in_array(operating_system_names).allow_nil }
     it { should ensure_inclusion_of(:state).in_array(states).allow_nil }
     it { should validate_presence_of(:workspace) }
   end

data/spec/factories/mdm/hosts.rb

@@ -62,7 +62,9 @@ FactoryGirl.define do
     "Mdm::Host#os_lang #{n}"
   end
 
-  sequence :mdm_host_os_name, Mdm::Host::OPERATING_SYSTEM_NAMES.cycle
+  sequence :mdm_host_os_name do |n|
+    "Mdm::Host#os_name #{n}"
+  end
 
   sequence :mdm_host_os_sp do |n|
     "Mdm::Host#os_sp #{n}"

metadata

@@ -2,7 +2,7 @@
 name: metasploit_data_models
 version: !ruby/object:Gem::Version
   prerelease:
-  version: 0.11.2
+  version: 0.12.0
 platform: java
 authors:
 - Samuel Huckins
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-05-13 00:00:00.000000000 Z
+date: 2013-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake