metasploit-model 0.25.6-java → 0.25.7-java

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 142a7058885d9036e88bd91d2cb43eda0b031424
4
- data.tar.gz: 3cb71ad81b44c4c09f742bfb074acb122333dca6
3
+ metadata.gz: 16bdcd3ce1aa7df0883325ab4ad5f9c6b26b50bf
4
+ data.tar.gz: 3230b2e0248005e81d3e154b580f038088ba6211
5
5
  SHA512:
6
- metadata.gz: f9c7d61b3c1bf6e51647ccbada6b2f6cc96a144b6d3842e480db07d8adc71b0573423c87b8d97c91a72a2886b318c067997bc71fa50e7fe9dca02e2432819756
7
- data.tar.gz: f943c87971278d1f8586e4fbb2ab6689e54509d31a47b6ce0b7fc68e7e471a8c05696c4ccd9956bdf2ffc5883bbd86a8f4f2f6d5ad2b89f1afdadc05dad111b1
6
+ metadata.gz: 71ab4f8e3c6c7ffab2f25b06676d845ee43bbc5999162972326de6cff7e41e46ba0aee27935aa97ad9ad2d2a58923e747f0fb329b2e1be7c9dee10487c941e14
7
+ data.tar.gz: 5ab795d0d8a7020ed23e24f1352da0f010cb1a032c2122621ccd0d891e25a705be5ae8bd25b4b67a7de90f8e649e7401ce10b4c99d591f06b84af85f54a7dfd8
@@ -34,4 +34,13 @@ module Metasploit::Model::Realm::Key
34
34
  ORACLE_SYSTEM_IDENTIFIER,
35
35
  POSTGRESQL_DATABASE
36
36
  ]
37
+
38
+ # A map of short names, suitable for use on the command line, to the
39
+ # full human-readable constants above.
40
+ SHORT_NAMES = {
41
+ 'domain' => ACTIVE_DIRECTORY_DOMAIN,
42
+ 'db2db' => DB2_DATABASE,
43
+ 'sid' => ORACLE_SYSTEM_IDENTIFIER,
44
+ 'pgdb' => POSTGRESQL_DATABASE,
45
+ }
37
46
  end
@@ -7,7 +7,7 @@ module Metasploit
7
7
  # The minor version number, scoped to the {MAJOR} version number.
8
8
  MINOR = 25
9
9
  # The patch number, scoped to the {MINOR} version number.
10
- PATCH = 6
10
+ PATCH = 7
11
11
 
12
12
  # The full version string, including the {MAJOR}, {MINOR}, {PATCH}, and optionally, the {PRERELEASE} in the
13
13
  # {http://semver.org/spec/v2.0.0.html semantic versioning v2.0.0} format.
@@ -23,8 +23,20 @@ module Metasploit
23
23
 
24
24
  version
25
25
  end
26
+
27
+ # The full gem version string, including the {MAJOR}, {MINOR}, {PATCH}, and optionally, the {PRERELEASE} in the
28
+ # {http://guides.rubygems.org/specification-reference/#version RubyGems versioning} format.
29
+ #
30
+ # @return [String] '{MAJOR}.{MINOR}.{PATCH}' on master. '{MAJOR}.{MINOR}.{PATCH}.{PRERELEASE}' on any branch
31
+ # other than master.
32
+ def self.gem
33
+ full.gsub('-', '.pre.')
34
+ end
26
35
  end
27
36
 
37
+ # @see Version.gem
38
+ GEM_VERSION = Version.gem
39
+
28
40
  # @see Version.full
29
41
  VERSION = Version.full
30
42
  end
@@ -5,7 +5,7 @@ require 'metasploit/model/version'
5
5
 
6
6
  Gem::Specification.new do |spec|
7
7
  spec.name = 'metasploit-model'
8
- spec.version = Metasploit::Model::VERSION
8
+ spec.version = Metasploit::Model::GEM_VERSION
9
9
  spec.authors = ['Luke Imhoff']
10
10
  spec.email = ['luke_imhoff@rapid7.com']
11
11
  spec.description = %q{Common code, such as validators and mixins, that are shared between ActiveModels in metasploit-framework and ActiveRecords in metasploit_data_models.}
@@ -38,5 +38,18 @@ describe Metasploit::Model::Realm::Key do
38
38
  it { should == 'PostgreSQL Database' }
39
39
  it { should be_in described_class::ALL }
40
40
  end
41
+
42
+ context 'SHORT_NAMES' do
43
+ subject { described_class::SHORT_NAMES }
44
+ it 'should have String keys' do
45
+ subject.keys.each { |key|
46
+ key.should be_a(String)
47
+ }
48
+ end
49
+ context 'values' do
50
+ subject { described_class::SHORT_NAMES.values.sort }
51
+ it { should match_array(described_class::ALL.sort) }
52
+ end
53
+ end
41
54
  end
42
55
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: metasploit-model
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.25.6
4
+ version: 0.25.7
5
5
  platform: java
6
6
  authors:
7
7
  - Luke Imhoff
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2014-07-16 00:00:00.000000000 Z
11
+ date: 2014-07-29 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: bundler
@@ -496,7 +496,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
496
496
  version: '0'
497
497
  requirements: []
498
498
  rubyforge_project:
499
- rubygems_version: 2.2.2
499
+ rubygems_version: 2.1.9
500
500
  signing_key:
501
501
  specification_version: 4
502
502
  summary: Metasploit Model Mixins and Validators