metasploit-model 0.29.2-java → 0.30.0-java

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b150c41b2ca68b5d851bf1861493f2b53e5d0d1d
-  data.tar.gz: 66cceb2757470aa2e26efcdb41d8cd0d665212f7
+  metadata.gz: 4570e3936093f4399b4c5e4076c40393d936dd6b
+  data.tar.gz: a879e61ad6fe1a357260e0704878555038fc0571
 SHA512:
-  metadata.gz: 4a270f0baf6f4763df5ac967078687d648bb4acdb48e03d7bd16c945feadd188d8a682e2ff7fdf6f741a6754dba1450b4429c3c6d16f66abd0f11443678459e3
-  data.tar.gz: 47d3cde65dd04c7569f9783ce0f2ec9cd4c92a8a4e4118195550ca63fb7686a858d8c92342f703a65526eb96d4a2135275520d329ffef36e940a1e2c45677f77
+  metadata.gz: 5d9bd46453342e7d0abc58b78613a150c1f4b18502b861e3e35082993c43b80fe8a9cefe64c603347c6846424cba39c601dacceab9cef2848db55cbdfa587771
+  data.tar.gz: e9c25dcddefe8b864d603da307f56def939e82efef9e2b4b20c825cdfdf05b5a86049f7024bca0379f8bc3f8f1ec9b0d67796f0604a602490f2fa65eba60b003

data/.travis.yml

@@ -1,3 +1,5 @@
+addons:
+  postgresql: '9.3'
 cache: bundler
 language: ruby
 rvm:
@@ -6,4 +8,5 @@ rvm:
   - 'jruby-1.7.13'
   # >= 1.7.14
   - 'jruby-1.7.14'
+script: bundle exec rake spec yard
 sudo: false

data/Rakefile

@@ -45,6 +45,20 @@ else
   task :default => :spec
 end
 
+# 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-yard').first
+
+if gem_specification
+
+  Dir[File.join(gem_specification.gem_dir, 'lib', 'tasks', '**', '*.rake')].each do |rake|
+    load rake
+  end
+else
+  puts "metasploit-yard not in bundle, so can't setup yard tasks. " \
+       "To run yard ensure to install the development group."
+  print_without = true
+end
+
 if print_without
   puts "Bundle currently installed '--without #{Bundler.settings.without.join(' ')}'."
   puts "To clear the without option do `bundle install --without ''` (the --without flag with an empty string) or " \

data/lib/metasploit/model/version.rb

@@ -5,9 +5,9 @@ module Metasploit
       # The major version number.
       MAJOR = 0
       # The minor version number, scoped to the {MAJOR} version number.
-      MINOR = 29
+      MINOR = 30
       # The patch number, scoped to the {MAJOR} and {MINOR} version numbers.
-      PATCH = 2
+      PATCH = 0
 
       # 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.

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-yard', '~> 1.0'
   spec.add_development_dependency 'rake'
 
   # documentation

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: metasploit-model
 version: !ruby/object:Gem::Version
-  version: 0.29.2
+  version: 0.30.0
 platform: java
 authors:
 - Luke Imhoff
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2015-04-02 00:00:00.000000000 Z
+date: 2015-04-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
         version: '1.3'
   prerelease: false
   type: :development
+- !ruby/object:Gem::Dependency
+  name: metasploit-yard
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  prerelease: false
+  type: :development
 - !ruby/object:Gem::Dependency
   name: rake
   version_requirements: !ruby/object:Gem::Requirement
@@ -189,7 +203,6 @@ files:
 - lib/metasploit/model/version.rb
 - lib/metasploit/model/visitation.rb
 - lib/metasploit/model/visitation/visit.rb
-- lib/tasks/yard.rake
 - metasploit-model.gemspec
 - script/rails
 - spec/app/models/metasploit/model/association/reflection_spec.rb
@@ -318,7 +331,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project:
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key:
 specification_version: 4
 summary: Metasploit Model Mixins and Validators

data/lib/tasks/yard.rake

@@ -1,30 +0,0 @@
-# @note All options not specific to any given rake task should go in the .yardopts file so they are available to both
-#   the below rake tasks and when invoking `yard` from the command line
-
-if defined? YARD
-  namespace :yard do
-    YARD::Rake::YardocTask.new(:doc) do |t|
-      # --no-stats here as 'stats' task called after will print fuller stats
-      t.options = ['--no-stats']
-
-      t.after = Proc.new {
-        Rake::Task['yard:stats'].execute
-      }
-    end
-
-    desc "Shows stats for YARD Documentation including listing undocumented modules, classes, constants, and methods"
-    task :stats => :environment do
-      stats = YARD::CLI::Stats.new
-      stats.run('--compact', '--list-undoc')
-    end
-  end
-
-  # @todo Figure out how to just clone description from yard:doc
-  desc "Generate YARD documentation"
-  # allow calling namespace to as a task that goes to default task for namespace
-  task :yard => ['yard:doc']
-
-  task :default => :yard
-else
-  puts 'YARD not defined, so yard tasks cannot be setup.'
-end