tidy-ext 0.1.10 → 0.1.11

data/Rakefile

@@ -1,6 +1,5 @@
 require 'rubygems'
 require 'rake'
-require 'rake/extensiontask'
 
 begin
   require 'jeweler'
@@ -14,6 +13,8 @@ begin
     gem.extensions = FileList["ext/**/extconf.rb"]
   end
   Jeweler::GemcutterTasks.new
+
+  task :spec => :check_dependencies
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
@@ -23,21 +24,23 @@ task :console do
   exec("irb -I lib -r tidy/alone")
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
-end
-
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'spec/**/*_spec.rb'
-  spec.rcov = true
-end
+begin
+  require 'spec/rake/spectask'
+  Spec::Rake::SpecTask.new(:spec) do |spec|
+    spec.libs << 'lib' << 'spec'
+    spec.spec_files = FileList['spec/**/*_spec.rb']
+  end
 
-task :spec => :check_dependencies
+  Spec::Rake::SpecTask.new(:rcov) do |spec|
+    spec.libs << 'lib' << 'spec'
+    spec.pattern = 'spec/**/*_spec.rb'
+    spec.rcov = true
+  end
 
-task :default => :spec
+  task :default => :spec
+rescue LoadError
+  puts "RSpec (or a dependency) not available. Install it with: gem install rspec"
+end
 
 require 'rake/rdoctask'
 Rake::RDocTask.new do |rdoc|
@@ -49,19 +52,35 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-Rake::ExtensionTask.new do |ext|
-  ext.name = 'tidy'
-  ext.ext_dir = 'ext/tidy'
-  ext.config_options << '--with-coverage' if ENV['COV']
+begin
+  require 'rake/extensiontask'
+  Rake::ExtensionTask.new do |ext|
+    ext.name = 'tidy'
+    ext.ext_dir = 'ext/tidy'
+    ext.config_options << '--with-coverage' if ENV['COV']
+  end
+rescue LoadError
+  puts "rake-compiler not available. Install it with: gem install rake-compiler"
 end
 
-desc "Recompile with gcc coverage options and run specs"
-task :gcov => [:clean] do |t|
-  ENV['COV'] = '1'
-  Rake::Task[:compile].invoke
-  Rake::Task[:spec].invoke
+namespace :gcov do
+
+  desc "Recompile with gcc coverage options"
+  task :compile do |t|
+    ENV['COV'] = '1'
+    Rake::Task["compile"].invoke
+  end
+
+  desc "Run specs and output gcov info"
+  task :spec do |t|
+    Rake::Task[:spec].invoke
+    obj = Dir.glob('**/ruby-tidy.o').first
+    puts %x{cd #{File.dirname(obj)} && gcov -b --object-file #{File.basename(obj)} ruby-tidy.c}
+  end
+
+  desc "Clean, compile with gcc coverage and run specs"
+  task :all, :needs => ["clean", :compile, :spec]  do |t|
+  end
 
-  ruby_tidy_o = Dir.glob('**/ruby-tidy.o').first
-  puts %x{gcov --no-output --object-file #{ruby_tidy_o} ext/tidy/ruby-tidy.c}
 end
 

data/VERSION

@@ -1 +1 @@
-0.1.10
+0.1.11

data/features/step_definitions/tidy_steps.rb

@@ -8,7 +8,7 @@ Given /^(.+) is tidy$/ do |page_name|
     out = tidy.clean(response.body)
   end
 
-  tidy.errors.scan(/(\d+) warning, (\d+) errors were found!/) do |w,e|
+  tidy.errors.scan(/(\d+) warnings?, (\d+) errors? were found!/) do |w,e|
     warnings = w.to_i
     errors   = e.to_i
     unless warnings == 0 && errors == 0

data/spec/tidy/compat_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe "tidy compatibility methods" do
 

data/spec/tidy/remote_uri_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 require 'open-uri'
 
 describe "tidy class methods" do
@@ -13,4 +13,4 @@ describe "tidy class methods" do
     end
   end
 
-end
+end

data/spec/tidy/tidy_spec.rb

@@ -1,4 +1,4 @@
-require File.join(File.dirname(__FILE__), "..", "spec_helper")
+require "spec_helper"
 
 describe "tidy class methods" do
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: tidy-ext
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 1
-  - 10
-  version: 0.1.10
+  - 11
+  version: 0.1.11
 platform: ruby
 authors: 
 - Carl Douglas
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-23 00:00:00 +10:00
+date: 2011-02-16 00:00:00 +11:00
 default_executable: 
 dependencies: []