metasploit-model 0.30.1 → 0.30.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 19b72a89b1fcdcb4459ce160dede143604f5e0ce
-  data.tar.gz: 11b68c410c1500654535c234335dfe051e644221
+  metadata.gz: 60f37721241e221207091b15449175cb958c986f
+  data.tar.gz: 3bcd0d59f452ea8fbf20cb4cad0b68ff3ffe1d69
 SHA512:
-  metadata.gz: ffe5d3270056d5e40288ac558ffc1a055fb9162f2e29a206b90fa103337aff8ae92657145f124aeca26129ff94c489e73d8b41d54df091875f4fbd4f449e8ca6
-  data.tar.gz: bf0dd52286b194d68e3d66a6b4c513c135a4ca2d9bd242a65e1a4a638d88c1605ba4ba23c95b56d3eba1a86c61f8a616b968455681b56eed21a959f2e9db1183
+  metadata.gz: a9c5cff62b39bacf185687c321400e1a8bcd25df6f66483503a90967b66d070522357908b9b5e38f3ee1b213767537c14cb915869b31b94d946789573f60a24e
+  data.tar.gz: 53f1a31cb92c3b5f477dea709ca1802a7797b5d943583c5dbf4d2f621cd4119242c729d8c2e4e8f8f42008642bd7d8c204b0f2fd07b120f4f14977949ff2c17e

data/CHANGELOG.md

@@ -0,0 +1,6 @@
+# Next Release
+
+* Enhancements
+* Bug Fixes
+* Deprecations
+* Incompatible Changes

data/CONTRIBUTING.md

@@ -25,19 +25,18 @@ issue tracking software.
 
 ### `PRERELEASE`
 
-1. Update `PRERELEASE` to match the `SUMMARY` in the branch name.  If you branched from `master`, and [version.rb](lib/metasploit/model/version.rb) does not have `PRERELEASE` defined, then adding the following lines after `PATCH`: 
+1. Update `PRERELEASE` to match the `SUMMARY` in the branch name.  If you branched from `master`, and [version.rb](lib/metasploit/model/version.rb) does not have `PRERELEASE` defined, then adding the following lines after `PATCH`:
 ```
-# The prerelease version, scoped to the {PATCH} version number.
+# The prerelease version, scoped to the {MAJOR}, {MINOR}, and {PATCH} version number.
 PRERELEASE = '<SUMMARY>'
 ```
 2. `rake spec`
 3.  Verify the specs pass, which indicates that `PRERELEASE` was updated correctly.
 4. Commit the change `git commit -a`
 
-
 ### Your changes
 
-Make your changes or however many commits you like, commiting each with `git commit`.
+Make your changes or however many commits you like, committing each with `git commit`.
 
 ### Pre-Pull Request Testing
 
@@ -46,12 +45,12 @@ Make your changes or however many commits you like, commiting each with `git com
 
 ### Push
 
-Push your branch to your fork on gitub: `git push push TYPE/ISSUE/SUMMARY`
+Push your branch to your fork on github: `git push TYPE/ISSUE/SUMMARY`
 
 ### Pull Request
 
 * [Create new Pull Request](https://github.com/rapid7/metasploit-model/compare/)
-* Add a Verification Steps comment
+* Add a Verification Steps to the description comment
 
 ```
 # Verification Steps
@@ -62,6 +61,7 @@ Push your branch to your fork on gitub: `git push push TYPE/ISSUE/SUMMARY`
 - [ ] `rake spec`
 - [ ] VERIFY no failures
 ```
+
 You should also include at least one scenario to manually check the changes outside of specs.
 
 * Add a Post-merge Steps comment
@@ -106,7 +106,7 @@ Perform these steps prior to pushing to DESTINATION or the build will be broke o
 - [ ] Change `PRERELEASE` from `SOURCE_SUMMARY` to `DESTINATION_SUMMARY` to match the branch (DESTINATION) summary (DESTINATION_SUMMARY)
 
 ## Gem build
-- [ ] gem build *.gemspec
+- [ ] gem build metasploit-model.gemspec
 - [ ] VERIFY the prerelease suffix has change on the gem.
 
 ## RSpec
@@ -118,45 +118,5 @@ Perform these steps prior to pushing to DESTINATION or the build will be broke o
 - [ ] `git push origin DESTINATION`
 ```
 
-* Add a 'Release Steps' comment
-
-The 'Release Steps' are a reminder to the reviewer of the Pull Request of how to release the gem.
-
-```
-# Release
-
-Complete these steps on DESTINATION
-
-## Version
-
-### Compatible changes
-
-If the change are compatible with the previous branch's API, then increment [`PATCH`](lib/metasploit/model/version.rb).
-
-### Incompatible changes
-
-If your changes are incompatible with the previous branch's API, then increment
-[`MINOR`](lib/metasploit/model/version.rb) and reset [`PATCH`](lib/metasploit/model/version.rb) to `0`.
-
-- [ ] Following the rules for [semantic versioning 2.0](http://semver.org/spec/v2.0.0.html), update
-[`MINOR`](lib/metasploit/model/version.rb) and [`PATCH`](lib/metasploit/model/version.rb) and commit the changes.
-
-## JRuby
-- [ ] `rvm use jruby@metasploit-model`
-- [ ] `rm Gemfile.lock`
-- [ ] `bundle install`
-- [ ] `rake release`
-
-## MRI Ruby
-- [ ] `rvm use ruby-2.1@metasploit-model`
-- [ ] `rm Gemfile.lock`
-- [ ] `bundle install`
-- [ ] `rake release`
-```
-
-### Downstream dependencies
-
-When releasing new versions, the following projects may need to be updated:
-
-* [metasploit_data_models](https://github.com/rapid7/metasploit_data_models)
-* [metasploit-credential](https://github.com/rapid7/metasploit-credential)
+To update the [CHANGELOG.md](CHANGELOG.md) with the merged changes or release the merged code see
+[RELEASING.md](RELEASING.md)

data/RELEASING.md

@@ -0,0 +1,86 @@
+# Releasing
+
+These steps can be added to the Pull Request description's task list to remind the reviewer of how to release the
+gem.
+
+```
+# Release
+
+Complete these steps on DESTINATION
+
+## [CHANGELOG.md](CHANGELOG.md)
+
+### Terminology
+
+* "Enhancements" are widdening the API, such as by adding new classes or methods.
+* "Bug Fixes" are fixes to the implementation that do not affect the public API.  If the public API is affected then
+  the change should be listed as both a "Bug Fix" and either an "Enhancement" or "Incompatible Change" depending on how
+  the bug was fixed.
+* "Deprecations" are changes to the implementation that cause deprecation warnings to be issued for APIs which will be
+  removed in a future major release.  "Deprecations" are usually accompanied by an Enhancement that creates a new API
+  that is meant to be used in favor of the deprecated API.
+* "Incompatbile Changes" are the removal of classes or methods or new required arguments or setup that shrink the API.
+  It is best practice to make a "Deprecation" for the API prior to its removal.
+
+### Task List
+
+- [ ] Generate the list of changes since the last release: `git log v<LAST_MAJOR>.<LAST_MINOR>.<LAST_PATCH>..HEAD`
+- [ ] For each commit in the release, find the corresponding PR by search for the commit on Github.
+- [ ] For each PR, determine whether it is an Enhancement, Bug Fix, Deprecation, and/or Incompatible Change.  A PR can
+      be in more than one category, in which case it should be listed in each category it belongs, but with a category
+      specific description of the change.
+- [ ] Add an item to each category's list in the following format: `[#<PR>](https://github.com/rapid7/metasploit-model/pull/<PR>) <consumer summary> - [@<github_user>](https://github.com/<github_user>)`
+      `consumer_summary` should be a summary of the Enhancement, Bug Fix, Deprecation, or Incompatible Change from a
+      downstream consumer's of the library's perspective.  `github_user` should be Github handle of the author of the
+      PR.
+- [ ] If you added any Deprecations or Incompatible Changes, then adding upgrading information to
+      [UPGRADING.md](UPGRADING.md)
+
+## `VERSION`
+
+The entries in the [CHANGELOG.md](CHANGELOG.md) can be used to help determine how the `VERSION` should be bumped.
+
+### Compatible changes
+
+If the [CHANGELOG.md](CHANGELOG.md) contains only Enhancements, Bug Fixes, and/or Deprecations for the Next Release then
+increment [`PATCH`](lib/metasploit/model/version.rb).
+
+### Incompatible changes
+
+If the [CHANGELOG.md](CHANGELOG.md) contains any Incompatible Changes for the Next Release, then you can either (1)
+decide to remain pre-1.0.0 or (2) advance to 1.0.0.
+
+1. To remain pre-1..0.0, then increment [`MINOR`](lib/metasploit/model/version.rb) and reset [`PATCH`](lib/metasploit/model/version.rb) to `0`.
+2. To advance to 1.0.0, increment [`MAJOR`](lib/metasploit/model/version.rb) and reset [`MINOR`](lib/metasploit/model/version.rb and [`PATCH`](lib/metasploit/model/version.rb) to `0`.
+
+## Setup [CHANGELOG.md](CHANGELOG.md) for next release
+
+- [ ] Change `Next Release` section name at the top of [CHANGELOG.md](CHANGELOG.md) to match the current `VERSION`.
+- [ ] Add a new `Next Release` section above the `VERSION`'s section you just renamed:
+<pre>
+# Next Release
+
+* Enhancements
+* Bug Fixes
+* Deprecations
+* Incompatible Changes
+</pre>
+
+## Release to rubygems.org
+
+## jruby
+- [ ] `rvm use jruby@metasploit-model`
+- [ ] `rm Gemfile.lock`
+- [ ] `bundle install`
+- [ ] `rake release`
+
+## ruby-2.1
+- [ ] `rvm use ruby-2.1@metasploit-model`
+- [ ] `rm Gemfile.lock`
+- [ ] `bundle install`
+- [ ] `rake release`
+```
+
+### Downstream dependencies
+
+There are currently no known downstream dependencies

data/UPGRADING.md

@@ -0,0 +1 @@
+No Deprecations or Incompatible Changes have been introduced at this time

data/lib/metasploit/model/version.rb

@@ -2,18 +2,29 @@ module Metasploit
   module Model
     # Holds components of {VERSION} as defined by {http://semver.org/spec/v2.0.0.html semantic versioning v2.0.0}.
     module Version
+      #
+      # CONSTANTS
+      #
+
       # The major version number.
       MAJOR = 0
       # The minor version number, scoped to the {MAJOR} version number.
       MINOR = 30
-      # The patch number, scoped to the {MAJOR} and {MINOR} version numbers.
-      PATCH = 1
+      # The patch version number, scoped to the {MAJOR} and {MINOR} version numbers.
+      PATCH = 2
+
+      #
+      # Module Methods
+      #
 
-      # The full version string, including the {MAJOR}, {MINOR}, {PATCH}, and optionally, the {PRERELEASE} in the
+      # The full version string, including the {Metasploit::Model::Version::MAJOR},
+      # {Metasploit::Model::Version::MINOR}, {Metasploit::Model::Version::PATCH}, and optionally, the
+      # `Metasploit::Model::Version::PRERELEASE` in the
       # {http://semver.org/spec/v2.0.0.html semantic versioning v2.0.0} format.
       #
-      # @return [String] '{MAJOR}.{MINOR}.{PATCH}' on master.  '{MAJOR}.{MINOR}.{PATCH}-{PRERELEASE}' on any branch
-      #   other than master.
+      # @return [String] '{Metasploit::Model::Version::MAJOR}.{Metasploit::Model::Version::MINOR}.{Metasploit::Model::Version::PATCH}'
+      #   on master. '{Metasploit::Model::Version::MAJOR}.{Metasploit::Model::Version::MINOR}.{Metasploit::Model::Version::PATCH}-PRERELEASE'
+      #   on any branch other than master.
       def self.full
         version = "#{MAJOR}.#{MINOR}.#{PATCH}"
 
@@ -24,20 +35,23 @@ module Metasploit
         version
       end
 
-      # The full gem version string, including the {MAJOR}, {MINOR}, {PATCH}, and optionally, the {PRERELEASE} in the
+      # The full gem version string, including the {Metasploit::Model::Version::MAJOR},
+      # {Metasploit::Model::Version::MINOR}, {Metasploit::Model::Version::PATCH}, and optionally, the
+      # `Metasploit::Model::Version::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.
+      # @return [String] '{Metasploit::Model::Version::MAJOR}.{Metasploit::Model::Version::MINOR}.{Metasploit::Model::Version::PATCH}'
+      #   on master.  '{Metasploit::Model::Version::MAJOR}.{Metasploit::Model::Version::MINOR}.{Metasploit::Model::Version::PATCH}.PRERELEASE'
+      #   on any branch other than master.
       def self.gem
         full.gsub('-', '.pre.')
       end
     end
 
-    # @see Version.gem
+    # (see Version.gem)
     GEM_VERSION = Version.gem
 
-    # @see Version.full
+    # (see Version.full)
     VERSION = Version.full
   end
 end

data/metasploit-model.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.1'
 
   spec.add_development_dependency 'bundler', '~> 1.3'
+  spec.add_development_dependency 'metasploit-version', '~> 0.1.3'
   spec.add_development_dependency 'metasploit-yard', '~> 1.0'
   spec.add_development_dependency 'rake'
 

data/spec/lib/metasploit/model/version_spec.rb

@@ -1,139 +1,3 @@
 RSpec.describe Metasploit::Model::Version do
-  context 'CONSTANTS' do
-    context 'MAJOR' do
-      subject(:major) do
-        described_class::MAJOR
-      end
-
-      it 'is 0 because the API is not locked yet' do
-        expect(major).to eq(0)
-      end
-    end
-
-    context 'MINOR' do
-      subject(:minor) do
-        described_class::MINOR
-      end
-
-      it { is_expected.to be_a Integer }
-    end
-
-    context 'PATCH' do
-      subject(:patch) do
-        described_class::PATCH
-      end
-
-      it { is_expected.to be_a Integer }
-    end
-
-    pull_request = ENV['TRAVIS_PULL_REQUEST']
-
-    # a pull request cannot check PRERELEASE because it will be tested in the target branch, but the source itself
-    # is from the source branch and so has the source branch PRERELEASE.
-    #
-    # PRERELEASE can only be set appropriately for a merge by merging to the target branch and then updating PRERELEASE
-    # on the target branch before committing and/or pushing to github and travis-ci.
-    if pull_request.nil? || pull_request == 'false'
-      context 'PREPRELEASE' do
-        subject(:prerelease) do
-          described_class::PRERELEASE
-        end
-
-        branch = ENV['TRAVIS_BRANCH']
-
-        if branch.blank?
-          branch = `git rev-parse --abbrev-ref HEAD`.strip
-        end
-
-        if branch == 'master'
-          it 'does not have a PRERELEASE' do
-            expect(defined? described_class::PRERELEASE).to be_nil
-          end
-        else
-          branch_regex = /\A(?<type>bug|chore|feature|staging)(\/(?<story>[^\/]+))?\/(?<prerelease>[^\/]+)\z/
-          match = branch.match(branch_regex)
-
-          if match
-            it 'matches the branch relative name' do
-              expect(prerelease).to eq(match[:prerelease])
-            end
-          else
-            tag_regex = /\Av(?<major>\d+).(?<minor>\d+).(?<patch>\d+)(\.pre\.(?<prerelease>.*))?\z/
-            # travis-ci sets TRAVIS_BRANCH to the tag name for tag builds
-            match = branch.match(tag_regex)
-
-            if match
-              tag_prerelease = match[:prerelease]
-
-              if tag_prerelease
-                it 'matches the tag prerelease converted from a gem version to a VERSION' do
-                  expect(prerelease).to eq(tag_prerelease.gsub('.pre.', '-'))
-                end
-              else
-                it 'does not have a PRERELEASE' do
-                  expect(defined? described_class::PRERELEASE).to be_nil
-                end
-              end
-            else
-              it 'has a abbreviated reference that can be parsed for prerelease' do
-                fail "Do not know how to parse #{branch.inspect} for PRERELEASE"
-              end
-            end
-          end
-        end
-      end
-    end
-  end
-
-  context 'full' do
-    subject(:full) do
-      described_class.full
-    end
-
-    #
-    # lets
-    #
-
-    let(:major) do
-      1
-    end
-
-    let(:minor) do
-      2
-    end
-
-    let(:patch) do
-      3
-    end
-
-    before(:each) do
-      stub_const("#{described_class}::MAJOR", major)
-      stub_const("#{described_class}::MINOR", minor)
-      stub_const("#{described_class}::PATCH", patch)
-    end
-
-    context 'with PRERELEASE' do
-      let(:prerelease) do
-        'prerelease'
-      end
-
-      before(:each) do
-        stub_const("#{described_class}::PRERELEASE", prerelease)
-      end
-
-      it 'is <major>.<minor>.<patch>-<prerelease>' do
-        expect(full).to eq("#{major}.#{minor}.#{patch}-#{prerelease}")
-      end
-    end
-
-    context 'without PRERELEASE' do
-      before(:each) do
-        hide_const("#{described_class}::PRERELEASE")
-      end
-
-      it 'is <major>.<minor>.<patch>' do
-        expect(full).to eq("#{major}.#{minor}.#{patch}")
-      end
-    end
-  end
-end
+  it_should_behave_like 'Metasploit::Version Version Module'
+end

data/spec/lib/metasploit/model_spec.rb

@@ -0,0 +1,4 @@
+RSpec.describe Metasploit::Model do
+  it_should_behave_like 'Metasploit::Version GEM_VERSION constant'
+  it_should_behave_like 'Metasploit::Version VERSION constant'
+end

data/spec/spec_helper.rb

@@ -15,10 +15,18 @@ SimpleCov.formatter = Coveralls::SimpleCov::Formatter
 require File.expand_path('../dummy/config/environment.rb',  __FILE__)
 require 'rspec/rails'
 
-spec_pathname = Metasploit::Model::Engine.root.join('spec')
+# Use find_all_by_name instead of find_by_name as find_all_by_name will return pre-release versions
+gem_specification = Gem::Specification.find_all_by_name('metasploit-version').first
 
-Dir[spec_pathname.join('support', '**', '*.rb')].each do |f|
-  require f
+roots = [
+    Metasploit::Model::Engine.root.to_path,
+    gem_specification.gem_dir
+]
+
+roots.each do |root|
+  Dir[File.join(root, 'spec', 'support', '**', '*.rb')].each do |f|
+    require f
+  end
 end
 
 # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration
@@ -94,7 +102,7 @@ RSpec.configure do |config|
   config.before(:suite) do
     # this must be explicitly set here because it should always be spec/tmp for w/e project is using
     # Metasploit::Model::Spec to handle file system clean up.
-    Metasploit::Model::Spec.temporary_pathname = spec_pathname.join('tmp')
+    Metasploit::Model::Spec.temporary_pathname = Metasploit::Model::Engine.root.join('spec', 'tmp')
     # Clean up any left over files from a previously aborted suite
     Metasploit::Model::Spec.remove_temporary_pathname
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-model
 version: !ruby/object:Gem::Version
-  version: 0.30.1
+  version: 0.30.2
 platform: ruby
 authors:
 - Luke Imhoff
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: metasploit-version
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.3
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.1.3
 - !ruby/object:Gem::Dependency
   name: metasploit-yard
   requirement: !ruby/object:Gem::Requirement
@@ -122,11 +136,14 @@ files:
 - ".simplecov"
 - ".travis.yml"
 - ".yardopts"
+- CHANGELOG.md
 - CONTRIBUTING.md
 - Gemfile
 - LICENSE
 - README.md
+- RELEASING.md
 - Rakefile
+- UPGRADING.md
 - app/models/metasploit/model/association/reflection.rb
 - app/models/metasploit/model/search/group/base.rb
 - app/models/metasploit/model/search/group/intersection.rb
@@ -298,6 +315,7 @@ files:
 - spec/lib/metasploit/model/translation_spec.rb
 - spec/lib/metasploit/model/version_spec.rb
 - spec/lib/metasploit/model/visitation/visit_spec.rb
+- spec/lib/metasploit/model_spec.rb
 - spec/matchers/validate_nilness_of_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers/allow_attribute.rb
@@ -429,6 +447,7 @@ test_files:
 - spec/lib/metasploit/model/translation_spec.rb
 - spec/lib/metasploit/model/version_spec.rb
 - spec/lib/metasploit/model/visitation/visit_spec.rb
+- spec/lib/metasploit/model_spec.rb
 - spec/matchers/validate_nilness_of_spec.rb
 - spec/spec_helper.rb
 - spec/support/matchers/allow_attribute.rb