From: Martyn Taylor <mtaylor(a)redhat.com>
---
.rspec | 2 ++
Rakefile | 16 +++++++---------
spec/spec.opts | 3 ---
spec/spec_helper.rb | 4 ++--
4 files changed, 11 insertions(+), 14 deletions(-)
create mode 100644 .rspec
delete mode 100644 spec/spec.opts
diff --git a/.rspec b/.rspec
new file mode 100644
index 0000000..0d9a0dd
--- /dev/null
+++ b/.rspec
@@ -0,0 +1,2 @@
+--colour
+--format nested
diff --git a/Rakefile b/Rakefile
index 0ef1a90..95705ee 100644
--- a/Rakefile
+++ b/Rakefile
@@ -1,10 +1,10 @@
require 'rubygems'
require 'rake'
require 'rake/clean'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
+require 'rubygems/package_task'
+require 'rdoc/task'
require 'rake/testtask'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
require 'rake/rpmtask'
RPMBUILD_DIR = "#{File.expand_path('~')}/rpmbuild"
@@ -13,7 +13,6 @@ RPM_SPEC = "rubygem-aeolus-image.spec"
spec = Gem::Specification.new do |s|
s.name = 'aeolus-image'
s.version = '0.1.0'
- s.has_rdoc = true
s.summary= 'cli for aeolus cloud suite'
s.description = 'Commandline interface for working with the aeolus cloud management
suite'
s.author = 'Jason Guiditta, Martyn Taylor'
@@ -31,7 +30,7 @@ spec = Gem::Specification.new do |s|
s.add_development_dependency('rspec', '~>1.3.0')
end
-Rake::GemPackageTask.new(spec) do |p|
+Gem::PackageTask.new(spec) do |p|
p.gem_spec = spec
p.need_tar = true
p.need_zip = true
@@ -50,13 +49,12 @@ Rake::TestTask.new do |t|
t.test_files = FileList['test/**/*.rb']
end
-Spec::Rake::SpecTask.new do |t|
- t.spec_files = FileList['spec/**/*.rb']
- t.libs << Dir["lib"]
+RSpec::Core::RakeTask.new do |t|
+ t.pattern = FileList['spec/**/*.rb']
end
Rake::RpmTask.new(RPM_SPEC) do |rpm|
rpm.need_tar = true
rpm.package_files.include("lib/*")
rpm.topdir = "#{RPMBUILD_DIR}"
-end
+end
\ No newline at end of file
diff --git a/spec/spec.opts b/spec/spec.opts
deleted file mode 100644
index 4154052..0000000
--- a/spec/spec.opts
+++ /dev/null
@@ -1,3 +0,0 @@
---color
---format specdoc
---diff
\ No newline at end of file
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
index 013fbd3..135f090 100644
--- a/spec/spec_helper.rb
+++ b/spec/spec_helper.rb
@@ -1,4 +1,4 @@
-$: << File.expand_path(File.join(File.dirname(__FILE__), "../lib"))
+$: << File.expand_path(File.join(File.dirname(__FILE__),
"../lib/aeolus_image"))
$: << File.expand_path(File.join(File.dirname(__FILE__), "."))
require 'rubygems'
require 'config_parser'
@@ -31,7 +31,7 @@ module Helpers
end
end
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
config.include Helpers
config.before(:all) do
Aeolus::Image::BaseCommand.class_eval do
--
1.7.6