Skip to content

Commit

Permalink
switch to simplecov from rcov, all working
Browse files Browse the repository at this point in the history
  • Loading branch information
Capncavedan committed Sep 24, 2013
1 parent 3aa1bf3 commit a174901
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 43 deletions.
10 changes: 7 additions & 3 deletions Gemfile.lock
@@ -1,18 +1,22 @@
PATH
remote: .
specs:
tracking_number (0.4.0)
tracking_number (0.5.0)

GEM
remote: http://rubygems.org/
specs:
rcov (0.9.9)
multi_json (1.8.0)
shoulda (2.11.3)
simplecov (0.7.1)
multi_json (~> 1.0)
simplecov-html (~> 0.7.1)
simplecov-html (0.7.1)

PLATFORMS
ruby

DEPENDENCIES
rcov
shoulda
simplecov
tracking_number!
20 changes: 0 additions & 20 deletions Rakefile
@@ -1,34 +1,14 @@
require 'rubygems'
require 'bundler'
Bundler::GemHelper.install_tasks

# if not defined?(Bundler)
# require 'bundler'
# begin
# Bundler.setup(:default, :development)
# rescue Bundler::BundlerError => e
# $stderr.puts e.message
# $stderr.puts "Run `bundle install` to install missing gems"
# exit e.status_code
# end
# end

require 'rake'

require 'rake/testtask'
Rake::TestTask.new(:test) do |test|
test.libs << 'lib' << 'test'
test.pattern = 'test/**/*_test.rb'
test.verbose = true
end

require 'rcov/rcovtask'
Rcov::RcovTask.new do |test|
test.libs << 'test'
test.pattern = 'test/**/*_test.rb'
test.verbose = true
end

task :default => :test

require 'rdoc/task'
Expand Down
14 changes: 3 additions & 11 deletions test/test_helper.rb
@@ -1,14 +1,6 @@
require 'simplecov'
SimpleCov.start
require 'rubygems'
# if not defined?(Bundler)
# require 'bundler'
# begin
# Bundler.setup(:default, :development)
# rescue Bundler::BundlerError => e
# $stderr.puts e.message
# $stderr.puts "Run `bundle install` to install missing gems"
# exit e.status_code
# end
# end
require 'test/unit'
require 'shoulda'

Expand Down Expand Up @@ -38,7 +30,7 @@ def search_string(number)
end

def should_detect_number_variants(valid_number, type)
possible_strings(valid_number).each do |string|
possible_strings(valid_number).each do |string|
results = type.search(string)
assert_equal 1, results.size, "could not find #{type} #{valid_number} in #{string}"
end
Expand Down
12 changes: 3 additions & 9 deletions tracking_number.gemspec
Expand Up @@ -30,20 +30,14 @@ Gem::Specification.new do |s|

if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
s.add_development_dependency(%q<shoulda>, [">= 0"])
# s.add_development_dependency(%q<bundler>, ["~> 1.0.0"])
# s.add_development_dependency(%q<jeweler>, ["~> 1.5.2"])
s.add_development_dependency(%q<rcov>, [">= 0"])
s.add_development_dependency(%q<simplecov>, [">= 0"])
else
s.add_dependency(%q<shoulda>, [">= 0"])
# s.add_dependency(%q<bundler>, ["~> 1.0.0"])
# s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
s.add_dependency(%q<rcov>, [">= 0"])
s.add_dependency(%q<simplecov>, [">= 0"])
end
else
s.add_dependency(%q<shoulda>, [">= 0"])
# s.add_dependency(%q<bundler>, ["~> 1.0.0"])
# s.add_dependency(%q<jeweler>, ["~> 1.5.2"])
s.add_dependency(%q<rcov>, [">= 0"])
s.add_dependency(%q<simplecov>, [">= 0"])
end
end

0 comments on commit a174901

Please sign in to comment.