metasploit-model 0.25.6 → 0.25.7

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    YjRmMDM3YmZjZDE5MDM0OGY5OTFhMTFkMDg3OTNkYTM0ODU3ZDU2Yw==
+    MzQ5ZTQ5ZTE0OWUyM2ZjMmYyNTNkM2NjNDgxZDE2YjkwMjg2OWYxMw==
   data.tar.gz: !binary |-
-    OGQwZDZmMGMyM2Y5N2FjNzUxZDM5ZTBkMGNlMmFmYjdmNjA4NzQ1NQ==
+    OWEyNjhlMmQwYzkwMzAyY2U1M2Q5MmNlNTAzOGFmYjQzYmE0YjlmYQ==
 SHA512:
   metadata.gz: !binary |-
-    ZGQwNWQ2ODg4MTIyMTI1NWI0MzMxNGIxZWY3MWIyZDE0ODI3YmRiN2I4NGVm
-    ODgxMzkxN2ZlOTA5ODQ2MzQxZDBkMGNkZDU5YmYwNjBmMjQ4OGNjMTU5NzM0
-    MGNhMWM2YmVhOTA0OGVmZWUwODVmNTM4M2MzZWNlOWUxYjgwOGI=
+    YzE0OTc5MGM1MDM0MmI5MTBmM2U3Y2U2NjZkY2Q5Y2FkNjM2ZGM1YWViZTgx
+    ZjllODJiMGIwOTQyNGNiNTEzNTZiMzRiNjk3NWE1ZjkxOGE4NTU4NDk3NjA1
+    NDhiNjI2NTMyYzBjZWE1NTJkMTZhM2IyNDRhZDZlNTQ4MGE1MmI=
   data.tar.gz: !binary |-
-    ZjBkYzcwNDg1N2M3OWY3NDUwYTgxMWIyMWQyMzlmYzY0M2FiNjU1MWFlZjk0
-    ZGRhNGRhNjYyMTk1N2Q5OWI3ZWE4NjIyYzRmOGI3NzBjNGMzMmQxZjg1Zjgx
-    ZmRkMmY2Y2FiNGNiMzc5YmNjY2IwNzhkNjE0MThlOTVmNmJhZmE=
+    NGZmNDQxZTczOWJiMTA4ZmU2ODgwOWEwNTViNjBiY2YyNjMyNGZkYTRmNjIy
+    ODA2NDRlOThlMzNiODU4NGU4Y2IzMzlkZmVmNDE4N2E0YTM1ZTc2NTk0NjM5
+    YTA4NTY2YTU2ZWZhYmIwNmFlNWYyNmRiMDk2NzBlM2Q2YzhhMTM=

data/lib/metasploit/model/realm/key.rb

@@ -34,4 +34,13 @@ module Metasploit::Model::Realm::Key
       ORACLE_SYSTEM_IDENTIFIER,
       POSTGRESQL_DATABASE
   ]
+
+  # A map of short names, suitable for use on the command line, to the
+  # full human-readable constants above.
+  SHORT_NAMES = {
+    'domain' => ACTIVE_DIRECTORY_DOMAIN,
+    'db2db'  => DB2_DATABASE,
+    'sid'    => ORACLE_SYSTEM_IDENTIFIER,
+    'pgdb'   => POSTGRESQL_DATABASE,
+  }
 end

data/lib/metasploit/model/version.rb

@@ -7,7 +7,7 @@ module Metasploit
       # The minor version number, scoped to the {MAJOR} version number.
       MINOR = 25
       # The patch number, scoped to the {MINOR} version number.
-      PATCH = 6
+      PATCH = 7
 
       # 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.
@@ -23,8 +23,20 @@ module Metasploit
 
         version
       end
+
+      # The full gem version string, including the {MAJOR}, {MINOR}, {PATCH}, and optionally, the {PRERELEASE} in the
+      # {http://guides.rubygems.org/specification-reference/#version RubyGems versioning} format.
+      #
+      # @return [String] '{MAJOR}.{MINOR}.{PATCH}' on master.  '{MAJOR}.{MINOR}.{PATCH}.{PRERELEASE}' on any branch
+      #   other than master.
+      def self.gem
+        full.gsub('-', '.pre.')
+      end
     end
 
+    # @see Version.gem
+    GEM_VERSION = Version.gem
+
     # @see Version.full
     VERSION = Version.full
   end

data/metasploit-model.gemspec

@@ -5,7 +5,7 @@ require 'metasploit/model/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'metasploit-model'
-  spec.version       = Metasploit::Model::VERSION
+  spec.version       = Metasploit::Model::GEM_VERSION
   spec.authors       = ['Luke Imhoff']
   spec.email         = ['luke_imhoff@rapid7.com']
   spec.description   = %q{Common code, such as validators and mixins, that are shared between ActiveModels in metasploit-framework and ActiveRecords in metasploit_data_models.}

data/spec/lib/metasploit/model/realm/key_spec.rb

@@ -38,5 +38,18 @@ describe Metasploit::Model::Realm::Key do
       it { should == 'PostgreSQL Database' }
       it { should be_in described_class::ALL }
     end
+
+    context 'SHORT_NAMES' do
+      subject { described_class::SHORT_NAMES }
+      it 'should have String keys' do
+        subject.keys.each { |key|
+          key.should be_a(String)
+        }
+      end
+      context 'values' do
+        subject { described_class::SHORT_NAMES.values.sort }
+        it { should match_array(described_class::ALL.sort) }
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-model
 version: !ruby/object:Gem::Version
-  version: 0.25.6
+  version: 0.25.7
 platform: ruby
 authors:
 - Luke Imhoff
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-16 00:00:00.000000000 Z
+date: 2014-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler