yard-metasploit-erd 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e886dd458898b3d6b3d5a1f208fb7c4245ad78e8
-  data.tar.gz: 04dc9b4f1e4bdc2b51edc0df0701d39224529aa8
+  metadata.gz: e0e3d4b721d93d0b077f900a6bab786f01abf609
+  data.tar.gz: 12eb06fca0d8b7ec875f49d0a45994b3ef8b44e3
 SHA512:
-  metadata.gz: 2a205f0b316ff69b6247d232b6a7ecf21c56a44d953f827e2c042a7a1a43419f5f237bede9d49c30fdc252fb62bfc12d2da56399c7bec8509212d90a2d676678
-  data.tar.gz: 73b0b703622a7c8821eea8155f63d320bd95bf5e8487816c8627d8184b40773b59b57560c0251c4ba5bae87d8522758af0ddf65ab2d7b6c46109f7b75e2fb15c
+  metadata.gz: 82a61954dadb2d9426b51a308cd8c3c24918175e726ddee6e1cb674a2c9e6ed93f0d171f35080f81289e35f905f73732b9cef2da4232f76f123058e263f9e2ca
+  data.tar.gz: 5131e99a2f73afddb258c1b405b166b3c306b55c944f7d8a6fd2681878592bb012c942ecb0ab1b14935c6832bd60fe6e2b8b81d8716ccdab623b76a50b3eabdb

data/.travis.yml

@@ -1,6 +1,11 @@
+group: stable
+sudo: false
 cache: bundler
+addons:
+  apt:
+    packages:
+      - graphviz
 language: ruby
 rvm:
-  - 2.1
+  - 2.2
 script: bundle exec rake spec yard
-sudo: false

data/Gemfile

@@ -3,6 +3,9 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in yard-metasploit-erd.gemspec
 gemspec
 
+# gem 'metasploit-yard', github: 'rapid7/metasploit-yard', branch: 'staging/rails-upgrade'
+# gem 'metasploit-erd',  github: 'rapid7/metasploit-erd',  branch: 'staging/rails-upgrade'
+
 group :development, :test do
   # markdown formatting for yard
   gem 'kramdown', platforms: :jruby

data/lib/yard/metasploit/erd/version.rb

@@ -1,56 +1,17 @@
 module YARD
   module Metasploit
     module ERD
-      # 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 = 1
-        # The minor version number, scoped to the {MAJOR} version number.
-        MINOR = 0
-        # The patch version number, scoped to the {MAJOR} and {MINOR} version numbers.
-        PATCH = 0
-
-        # The full version string, including the {YARD::Metasploit::ERD::Version::MAJOR},
-        # {YARD::Metasploit::ERD::Version::MINOR}, {YARD::Metasploit::ERD::Version::PATCH}, and optionally, the
-        # `YARD::Metasploit::ERD::Version::PRERELEASE` in the
-        # {http://semver.org/spec/v2.0.0.html semantic versioning v2.0.0} format.
-        #
-        # @return [String] '{YARD::Metasploit::ERD::Version::MAJOR}.{YARD::Metasploit::ERD::Version::MINOR}.
-        #   {YARD::Metasploit::ERD::Version::PATCH}' on master.
-        #   '{YARD::Metasploit::ERD::Version::MAJOR}.{YARD::Metasploit::ERD::Version::MINOR}.{YARD::Metasploit::ERD::Version::PATCH}-PRERELEASE'
-        #   on any branch other than master.
-        def self.full
-          version = "#{MAJOR}.#{MINOR}.#{PATCH}"
-
-          if defined? PRERELEASE
-            version = "#{version}-#{PRERELEASE}"
-          end
-
-          version
-        end
-
-        # The full gem version string, including the {YARD::Metasploit::ERD::Version::MAJOR},
-        # {YARD::Metasploit::ERD::Version::MINOR}, {YARD::Metasploit::ERD::Version::PATCH}, and optionally, the
-        # `YARD::Metasploit::ERD::Version::PRERELEASE` in the
-        # {http://guides.rubygems.org/specification-reference/#version RubyGems versioning} format.
-        #
-        # @return [String] '{YARD::Metasploit::ERD::Version::MAJOR}.{YARD::Metasploit::ERD::Version::MINOR}.{YARD::Metasploit::ERD::Version::PATCH}'
-        #   on master.  '{YARD::Metasploit::ERD::Version::MAJOR}.{YARD::Metasploit::ERD::Version::MINOR}.{YARD::Metasploit::ERD::Version::PATCH}.PRERELEASE'
-        #   on any branch other than master.
-        def self.gem
-          full.gsub('-', '.pre.')
-        end
+      # VERSION is managed by GemRelease
+      VERSION = '1.1.0'
+    
+      # @return [String]
+      #
+      # returns the VERSION
+      #
+    
+      def self.version
+        VERSION
       end
-
-      # (see Version.gem)
-      GEM_VERSION = Version.gem
-
-      # (see Version.full)
-      VERSION = Version.full
     end
   end
 end

data/spec/lib/yard/metasploit/erd_spec.rb

@@ -1,4 +1,13 @@
 RSpec.describe YARD::Metasploit::ERD do
-  it_should_behave_like 'Metasploit::Version GEM_VERSION constant'
-  it_should_behave_like 'Metasploit::Version VERSION constant'
+  context 'CONSTANTS' do
+    context 'VERSION' do
+      subject(:version) {
+        described_class::VERSION
+      }
+
+      it 'is Metasploit::ERD::Version.full' do
+        expect(version).to eq(YARD::Metasploit::ERD::VERSION)
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -4,21 +4,15 @@ require 'bundler/setup'
 require 'simplecov'
 require 'coveralls'
 
-if ENV['TRAVIS'] == 'true'
-  # don't generate local report as it is inaccessible on travis-ci, which is why coveralls is being used.
-  SimpleCov.formatter = Coveralls::SimpleCov::Formatter
-else
+# if ENV['TRAVIS'] == 'true'
+#   # don't generate local report as it is inaccessible on travis-ci, which is why coveralls is being used.
+#   SimpleCov.formatter = Coveralls::SimpleCov::Formatter
+# else
   SimpleCov.formatter = SimpleCov::Formatter::MultiFormatter[
       # either generate the local report
       SimpleCov::Formatter::HTMLFormatter
   ]
-end
-
-#
-# Gems
-#
-
-require 'metasploit/version'
+# end
 
 #
 # Project
@@ -26,12 +20,7 @@ require 'metasploit/version'
 
 require 'yard/metasploit/erd'
 
-# 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[File.join(gem_specification.gem_dir, 'spec', 'support', '**', '*.rb')].each do |f|
-  require f
-end
+Dir["./spec/support/**/*.rb"].sort.each { |f| require f}
 
 RSpec.configure do |config|
   config.expose_dsl_globally = false

data/yard-metasploit-erd.gemspec

@@ -5,7 +5,7 @@ require 'yard/metasploit/erd/version'
 
 Gem::Specification.new do |spec|
   spec.name          = 'yard-metasploit-erd'
-  spec.version       = YARD::Metasploit::ERD::GEM_VERSION
+  spec.version       = YARD::Metasploit::ERD::VERSION
   spec.authors       = ['Luke Imhoff']
   spec.email         = ['luke_imhoff@rapid7.com']
   spec.summary       = 'YARD plugin that add Metasploit::ERDs to namespaces and classes'
@@ -22,13 +22,13 @@ Gem::Specification.new do |spec|
   spec.required_ruby_version = '>= 2.1'
 
   spec.add_development_dependency 'bundler', '~> 1.5'
-  spec.add_development_dependency 'metasploit-version', '~> 0.1.3'
-  spec.add_development_dependency 'metasploit-yard', '~> 1.0'
+  spec.add_development_dependency 'metasploit-yard', '~> 1.1'
   spec.add_development_dependency 'rake', '~> 10.3'
   spec.add_development_dependency 'rspec', '~> 3.1'
+  # spec.add_development_dependency 'codeclimate-test-reporter'
 
   # Generates namespace Module and Class<ActiveRecord::Base> specific ERDs for use in templates
-  spec.add_runtime_dependency 'metasploit-erd', '~> 1.0'
+  spec.add_runtime_dependency 'metasploit-erd'#, '~> 1.0' commenting out to use the github version
   # RailsERD::Domain is used directly to generate the _index.html ERD.
   spec.add_runtime_dependency 'rails-erd'
   spec.add_runtime_dependency 'yard'

metadata

@@ -1,14 +1,91 @@
 --- !ruby/object:Gem::Specification
 name: yard-metasploit-erd
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Luke Imhoff
 autorequire: 
 bindir: bin
-cert_chain: []
-date: 2015-05-11 00:00:00.000000000 Z
+cert_chain:
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIDdTCCAl2gAwIBAgILBAAAAAABFUtaw5QwDQYJKoZIhvcNAQEFBQAwVzELMAkG
+  A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
+  b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw05ODA5MDExMjAw
+  MDBaFw0yODAxMjgxMjAwMDBaMFcxCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
+  YWxTaWduIG52LXNhMRAwDgYDVQQLEwdSb290IENBMRswGQYDVQQDExJHbG9iYWxT
+  aWduIFJvb3QgQ0EwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQDaDuaZ
+  jc6j40+Kfvvxi4Mla+pIH/EqsLmVEQS98GPR4mdmzxzdzxtIK+6NiY6arymAZavp
+  xy0Sy6scTHAHoT0KMM0VjU/43dSMUBUc71DuxC73/OlS8pF94G3VNTCOXkNz8kHp
+  1Wrjsok6Vjk4bwY8iGlbKk3Fp1S4bInMm/k8yuX9ifUSPJJ4ltbcdG6TRGHRjcdG
+  snUOhugZitVtbNV4FpWi6cgKOOvyJBNPc1STE4U6G7weNLWLBYy5d4ux2x8gkasJ
+  U26Qzns3dLlwR5EiUWMWea6xrkEmCMgZK9FGqkjWZCrXgzT/LCrBbBlDSgeF59N8
+  9iFo7+ryUp9/k5DPAgMBAAGjQjBAMA4GA1UdDwEB/wQEAwIBBjAPBgNVHRMBAf8E
+  BTADAQH/MB0GA1UdDgQWBBRge2YaRQ2XyolQL30EzTSo//z9SzANBgkqhkiG9w0B
+  AQUFAAOCAQEA1nPnfE920I2/7LqivjTFKDK1fPxsnCwrvQmeU79rXqoRSLblCKOz
+  yj1hTdNGCbM+w6DjY1Ub8rrvrTnhQ7k4o+YviiY776BQVvnGCv04zcQLcFGUl5gE
+  38NflNUVyRRBnMRddWQVDf9VMOyGj/8N7yy5Y0b2qvzfvGn9LhJIZJrglfCm7ymP
+  AbEVtQwdpf5pLGkkeB6zpxxxYu7KyJesF12KwvhHhm4qxFYxldBniYUr+WymXUad
+  DKqC5JlR3XC321Y9YeRq4VzW9v493kHMB65jUr9TU/Qr6cf9tveCX4XSQRjbgbME
+  HMUfpIBvFSDJ3gyICh3WZlXi/EjJKSZp4A==
+  -----END CERTIFICATE-----
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEKDCCAxCgAwIBAgILBAAAAAABL07hNVwwDQYJKoZIhvcNAQEFBQAwVzELMAkG
+  A1UEBhMCQkUxGTAXBgNVBAoTEEdsb2JhbFNpZ24gbnYtc2ExEDAOBgNVBAsTB1Jv
+  b3QgQ0ExGzAZBgNVBAMTEkdsb2JhbFNpZ24gUm9vdCBDQTAeFw0xMTA0MTMxMDAw
+  MDBaFw0xOTA0MTMxMDAwMDBaMFExCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9i
+  YWxTaWduIG52LXNhMScwJQYDVQQDEx5HbG9iYWxTaWduIENvZGVTaWduaW5nIENB
+  IC0gRzIwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCyTxTnEL7XJnKr
+  NpfvU79ChF5Y0Yoo/ENGb34oRFALdV0A1zwKRJ4gaqT3RUo3YKNuPxL6bfq2RsNq
+  o7gMJygCVyjRUPdhOVW4w+ElhlI8vwUd17Oa+JokMUnVoqni05GrPjxz7/Yp8cg1
+  0DB7f06SpQaPh+LO9cFjZqwYaSrBXrta6G6V/zuAYp2Zx8cvZtX9YhqCVVrG+kB3
+  jskwPBvw8jW4bFmc/enWyrRAHvcEytFnqXTjpQhU2YM1O46MIwx1tt6GSp4aPgpQ
+  STic0qiQv5j6yIwrJxF+KvvO3qmuOJMi+qbs+1xhdsNE1swMfi9tBoCidEC7tx/0
+  O9dzVB/zAgMBAAGjgfowgfcwDgYDVR0PAQH/BAQDAgEGMBIGA1UdEwEB/wQIMAYB
+  Af8CAQAwHQYDVR0OBBYEFAhu2Lacir/tPtfDdF3MgB+oL1B6MEcGA1UdIARAMD4w
+  PAYEVR0gADA0MDIGCCsGAQUFBwIBFiZodHRwczovL3d3dy5nbG9iYWxzaWduLmNv
+  bS9yZXBvc2l0b3J5LzAzBgNVHR8ELDAqMCigJqAkhiJodHRwOi8vY3JsLmdsb2Jh
+  bHNpZ24ubmV0L3Jvb3QuY3JsMBMGA1UdJQQMMAoGCCsGAQUFBwMDMB8GA1UdIwQY
+  MBaAFGB7ZhpFDZfKiVAvfQTNNKj//P1LMA0GCSqGSIb3DQEBBQUAA4IBAQAiXMXd
+  PfQLcNjj9efFjgkBu7GWNlxaB63HqERJUSV6rg2kGTuSnM+5Qia7O2yX58fOEW1o
+  kdqNbfFTTVQ4jGHzyIJ2ab6BMgsxw2zJniAKWC/wSP5+SAeq10NYlHNUBDGpeA07
+  jLBwwT1+170vKsPi9Y8MkNxrpci+aF5dbfh40r5JlR4VeAiR+zTIvoStvODG3Rjb
+  88rwe8IUPBi4A7qVPiEeP2Bpen9qA56NSvnwKCwwhF7sJnJCsW3LZMMSjNaES2dB
+  fLEDF3gJ462otpYtpH6AA0+I98FrWkYVzSwZi9hwnOUtSYhgcqikGVJwQ17a1kYD
+  sGgOJO9K9gslJO8k
+  -----END CERTIFICATE-----
+- |
+  -----BEGIN CERTIFICATE-----
+  MIIEyjCCA7KgAwIBAgISESEyE8rNriS4+1dc8jOHEUL8MA0GCSqGSIb3DQEBBQUA
+  MFExCzAJBgNVBAYTAkJFMRkwFwYDVQQKExBHbG9iYWxTaWduIG52LXNhMScwJQYD
+  VQQDEx5HbG9iYWxTaWduIENvZGVTaWduaW5nIENBIC0gRzIwHhcNMTMxMDExMTUx
+  NTM4WhcNMTYxMDExMTUxNTM4WjBgMQswCQYDVQQGEwJVUzEWMBQGA1UECBMNTWFz
+  c2FjaHVzZXR0czEPMA0GA1UEBxMGQm9zdG9uMRMwEQYDVQQKEwpSYXBpZDcgTExD
+  MRMwEQYDVQQDEwpSYXBpZDcgTExDMIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIB
+  CgKCAQEAhD//7+739c69hssg0mD6CXgf2JkuWTcU81dgD7aKcoEPqU8e1FseBvDW
+  /Q5fNK2H2NgHV/Msn18zXuK0PkaJXqj/vDsuKB3Hq0BiR2AwyDdEw8K5MK5bgQc2
+  tmcVtEAejRoy1Uv5UyfaAYAxG6zsma3buV1fjnEAC3VouRg4+EX/f65H/a6srntK
+  5Etp3D71k2f0oUl8dOqOmSsRJQQ5zSs4ktDvpjAmsvzoA+1svceLYU95mvQsIw2T
+  edpmibGMwGw/HmgV+YWBgF5UGvax6zbC2i6DF2YHnDfkNb8/1MEIaxOTAbJTazTK
+  8laCQOyay6L1BNPQKjZBgOge8LZq1wIDAQABo4IBizCCAYcwDgYDVR0PAQH/BAQD
+  AgeAMEwGA1UdIARFMEMwQQYJKwYBBAGgMgEyMDQwMgYIKwYBBQUHAgEWJmh0dHBz
+  Oi8vd3d3Lmdsb2JhbHNpZ24uY29tL3JlcG9zaXRvcnkvMAkGA1UdEwQCMAAwEwYD
+  VR0lBAwwCgYIKwYBBQUHAwMwPgYDVR0fBDcwNTAzoDGgL4YtaHR0cDovL2NybC5n
+  bG9iYWxzaWduLmNvbS9ncy9nc2NvZGVzaWduZzIuY3JsMIGGBggrBgEFBQcBAQR6
+  MHgwQAYIKwYBBQUHMAKGNGh0dHA6Ly9zZWN1cmUuZ2xvYmFsc2lnbi5jb20vY2Fj
+  ZXJ0L2dzY29kZXNpZ25nMi5jcnQwNAYIKwYBBQUHMAGGKGh0dHA6Ly9vY3NwMi5n
+  bG9iYWxzaWduLmNvbS9nc2NvZGVzaWduZzIwHQYDVR0OBBYEFE536JwFx9SpaEi3
+  w8pcq2GRFA5BMB8GA1UdIwQYMBaAFAhu2Lacir/tPtfDdF3MgB+oL1B6MA0GCSqG
+  SIb3DQEBBQUAA4IBAQAGpGXHtFLjTTivV+xQPwtZhfPuJ7f+VGTMSAAYWmfzyHXM
+  YMFYUWJzSFcuVR2YfxtbS45P7U5Qopd7jBQ0Ygk5h2a+B5nE4+UlhHj665d0zpYM
+  1eWndMaO6WBOYnqtNyi8Dqqc1foKZDNHEDggYhGso7OIBunup+N4sPL9PwQ3eYe6
+  mUu8z0E4GXYViaMPOFkqaYnoYgf2L+7L5zKYT4h/NE/P7kj7EbduHgy/v/aAIrNl
+  2SpuQH+SWteq3NXkAmFEEqvLJQ4sbptZt8OP8ghL3pVAvZNFmww/YVszSkShSzcg
+  QdihYCSEL2drS2cFd50jBeq71sxUtxbv82DUa2b+
+  -----END CERTIFICATE-----
+date: 2016-03-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,34 +101,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.5'
-- !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
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -84,16 +147,16 @@ dependencies:
   name: metasploit-erd
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rails-erd
   requirement: !ruby/object:Gem::Requirement
@@ -149,7 +212,6 @@ files:
 - lib/yard-metasploit-erd.rb
 - lib/yard/metasploit/erd.rb
 - lib/yard/metasploit/erd/version.rb
-- spec/lib/yard/metasploit/erd/version_spec.rb
 - spec/lib/yard/metasploit/erd_spec.rb
 - spec/spec_helper.rb
 - templates/default/class/html/entity_relationship_diagram.erb
@@ -179,12 +241,11 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.3
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: YARD plugin that add Metasploit::ERDs to namespaces and classes
 test_files:
-- spec/lib/yard/metasploit/erd/version_spec.rb
 - spec/lib/yard/metasploit/erd_spec.rb
 - spec/spec_helper.rb
 has_rdoc: 

data/spec/lib/yard/metasploit/erd/version_spec.rb

@@ -1,3 +0,0 @@
-RSpec.describe YARD::Metasploit::ERD::Version do
-  it_should_behave_like 'Metasploit::Version Version Module'
-end