metasploit-model 0.25.6-java → 0.25.7-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 142a7058885d9036e88bd91d2cb43eda0b031424
-  data.tar.gz: 3cb71ad81b44c4c09f742bfb074acb122333dca6
+  metadata.gz: 16bdcd3ce1aa7df0883325ab4ad5f9c6b26b50bf
+  data.tar.gz: 3230b2e0248005e81d3e154b580f038088ba6211
 SHA512:
-  metadata.gz: f9c7d61b3c1bf6e51647ccbada6b2f6cc96a144b6d3842e480db07d8adc71b0573423c87b8d97c91a72a2886b318c067997bc71fa50e7fe9dca02e2432819756
-  data.tar.gz: f943c87971278d1f8586e4fbb2ab6689e54509d31a47b6ce0b7fc68e7e471a8c05696c4ccd9956bdf2ffc5883bbd86a8f4f2f6d5ad2b89f1afdadc05dad111b1
+  metadata.gz: 71ab4f8e3c6c7ffab2f25b06676d845ee43bbc5999162972326de6cff7e41e46ba0aee27935aa97ad9ad2d2a58923e747f0fb329b2e1be7c9dee10487c941e14
+  data.tar.gz: 5ab795d0d8a7020ed23e24f1352da0f010cb1a032c2122621ccd0d891e25a705be5ae8bd25b4b67a7de90f8e649e7401ce10b4c99d591f06b84af85f54a7dfd8

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: java
 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
@@ -496,7 +496,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.1.9
 signing_key:
 specification_version: 4
 summary: Metasploit Model Mixins and Validators