Skip to content

Commit

Permalink
Merge 9229b67 into 62f4273
Browse files Browse the repository at this point in the history
  • Loading branch information
limhoff-r7 committed Apr 16, 2015
2 parents 62f4273 + 9229b67 commit e20f30c
Show file tree
Hide file tree
Showing 5 changed files with 13 additions and 37 deletions.
1 change: 1 addition & 0 deletions .travis.yml
Expand Up @@ -5,3 +5,4 @@ before_install:
language: ruby
rvm:
- 2.1
script: bundle exec rake spec yard
10 changes: 7 additions & 3 deletions Rakefile
@@ -1,9 +1,13 @@
require "bundler/gem_tasks"
require "rspec/core/rake_task"

require 'yard'
load 'tasks/yard.rake'

RSpec::Core::RakeTask.new(:spec)

task :default => :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-yard').first

Dir[File.join(gem_specification.gem_dir, 'lib', 'tasks', '**', '*.rake')].each do |rake|
load rake
end
6 changes: 4 additions & 2 deletions lib/metasploit/erd/version.rb
Expand Up @@ -6,8 +6,10 @@ module Version
MAJOR = 0
# The minor version number, scoped to the {MAJOR} version number.
MINOR = 0
# The patch number, scoped to the {MINOR} version number.
PATCH = 1
# The patch number, scoped to the {MAJOR} and {MINOR} version numbers.
PATCH = 2
# The prerelease version, scoped to the {MAJOR}, {MINOR}, and {PATCH} version numbers.
PRERELEASE = 'metasploit-yard'

# 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.
Expand Down
32 changes: 0 additions & 32 deletions lib/tasks/yard.rake

This file was deleted.

1 change: 1 addition & 0 deletions metasploit-erd.gemspec
Expand Up @@ -22,6 +22,7 @@ Gem::Specification.new do |spec|
spec.required_ruby_version = '>= 2.1'

spec.add_development_dependency 'bundler', '~> 1.5'
spec.add_development_dependency 'metasploit-yard', '~> 1.0'
spec.add_development_dependency 'rake', '~> 10.3'
spec.add_development_dependency 'rspec', '~> 2.14'

Expand Down

0 comments on commit e20f30c

Please sign in to comment.