Make tests work with rspec 2.0

Rakefile

@@ -64,23 +64,12 @@ Rake::GemPackageTask.new(gemspec) do |pkg|
 end
 
 begin
-  require 'spec/rake/spectask'
-  Spec::Rake::SpecTask.new(:spec) do |spec|
-      spec.libs << 'lib' << 'spec'
-      spec.spec_files = ['spec/**/*_spec.rb']
-  end
-
-  Spec::Rake::SpecTask.new(:rcov) do |spec|
-      spec.libs << 'lib' << 'spec'
-      spec.pattern = 'spec/**/*_spec.rb'
-      spec.rcov = true
-  end
+  require 'rspec/core/rake_task'
+  RSpec::Core::RakeTask.new(:spec)
 rescue LoadError
   task :spec do
     puts 'ERROR! RSpec not found, install it by running: sudo gem install rspec'
   end
-
-  task :rcov => :spec
 end
 
 task :default => :spec

lib/puppet/module/tool/applications/generator.rb

@@ -19,7 +19,11 @@ def initialize(full_name, options)
       def skeleton
         @skeleton ||= Skeleton.new
       end
-
+
+      def get_binding
+        binding
+      end
+
       def run
         if destination.directory?
           abort "#{destination} already exists."
@@ -95,7 +99,7 @@ def target
         end
         def contents
           template = ERB.new(read)
-          template.result(@generator.send(:binding))
+          template.result(@generator.send(:get_binding))
         end
         def install!
           target.open('w') { |f| f.write contents }

spec/integration/cli_spec.rb

@@ -270,9 +270,9 @@ def app
 
         app.install("#{@release_name}.tar.gz")
 
-        File.directory?(@full_name).should == true
-        File.file?(File.join(@full_name, 'metadata.json')).should == true
-      end.should =~ /Installed "myuser-mymodule-0.0.1" into directory: myuser-mymodule/
+        File.directory?(@module_name).should == true
+        File.file?(File.join(@module_name, 'metadata.json')).should == true
+      end.should =~ /Installed "myuser-mymodule-0.0.1" into directory: mymodule/
     end
 
     it "should install a module from a webserver URL" do
@@ -289,9 +289,9 @@ def app
 
         app.install(@full_name)
 
-        File.directory?(@full_name).should == true
-        File.file?(File.join(@full_name, 'metadata.json')).should == true
-      end.should =~ /Installed #{@release_name.inspect} into directory: #{@full_name}/
+        File.directory?(@module_name).should == true
+        File.file?(File.join(@module_name, 'metadata.json')).should == true
+      end.should =~ /Installed #{@release_name.inspect} into directory: #{@module_name}/
     end
 
     it "should install a module from a webserver URL using a version requirement" # TODO
@@ -357,7 +357,7 @@ def app
         end
         puts "CHANGES:"
         app.changes(".")
-      end.should =~ /CHANGES:.+Modulefile\s*\z/m
+      end.should match /CHANGES:.+Modulefile\s*metadata.json\s*\z/m
     end
   end
 

spec/spec_helper.rb

@@ -1,15 +1,14 @@
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 
-require 'spec'
-require 'spec/autorun'
+require 'rspec'
 
 require 'puppet/module/tool'
 
 Dir[File.join(File.dirname(__FILE__), 'support', '*.rb')].each do |support_file|
   require support_file
 end
 
-Spec::Runner.configure do |config|
+RSpec.configure do |config|
   config.mock_with :mocha
 end