Goodbye Jeweler, you were a good friend. Welcome Bundler.

simplecov-ruby · Jan 6, 2011 · fdcd16f · fdcd16f
1 parent 2997951
commit fdcd16f
Show file tree

Hide file tree

Showing 8 changed files with 57 additions and 139 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,8 +1,2 @@
 source "http://rubygems.org"
-
-gem "simplecov-html", ">= 0.3.7"
-group :development do
-  gem "shoulda", "= 2.10.3"
-  gem "rspec", "~> 2.0.0"
-  gem "jeweler", "= 1.4.0"
-end
+gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,3 +1,9 @@
+PATH
+  remote: .
+  specs:
+    simplecov (0.3.8)
+      simplecov-html (>= 0.3.7)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -31,4 +37,5 @@ DEPENDENCIES
   jeweler (= 1.4.0)
   rspec (~> 2.0.0)
   shoulda (= 2.10.3)
+  simplecov!
   simplecov-html (>= 0.3.7)
diff --git a/Rakefile b/Rakefile
@@ -1,25 +1,25 @@
-require 'rubygems'
-require 'rake'
+require 'bundler'
+Bundler::GemHelper.install_tasks
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "simplecov"
-    gem.summary = %Q{Code coverage for Ruby 1.9 with a powerful configuration library and automatic merging of coverage across test suites}
-    gem.description = %Q{Code coverage for Ruby 1.9 with a powerful configuration library and automatic merging of coverage across test suites}
-    gem.email = "christoph at olszowka de"
-    gem.homepage = "http://github.com/colszowka/simplecov"
-    gem.authors = ["Christoph Olszowka"]
-    gem.add_dependency 'simplecov-html', ">= 0.3.7"
-    gem.add_development_dependency "shoulda", "2.10.3"
-    gem.add_development_dependency "rspec", "~> 2.0.0"
-    gem.add_development_dependency "jeweler", "1.4.0"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
-end
+# begin
+#   require 'jeweler'
+#   Jeweler::Tasks.new do |gem|
+#     gem.name = "simplecov"
+#     gem.summary = %Q{Code coverage for Ruby 1.9 with a powerful configuration library and automatic merging of coverage across test suites}
+#     gem.description = %Q{Code coverage for Ruby 1.9 with a powerful configuration library and automatic merging of coverage across test suites}
+#     gem.email = "christoph at olszowka de"
+#     gem.homepage = "http://github.com/colszowka/simplecov"
+#     gem.authors = ["Christoph Olszowka"]
+#     gem.add_dependency 'simplecov-html', ">= 0.3.7"
+#     gem.add_development_dependency "shoulda", "2.10.3"
+#     gem.add_development_dependency "rspec", "~> 2.0.0"
+#     gem.add_development_dependency "jeweler", "1.4.0"
+#     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
+#   end
+#   Jeweler::GemcutterTasks.new
+# rescue LoadError
+#   puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+# end
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|

diff --git a/VERSION b/VERSION
diff --git a/lib/simplecov.rb b/lib/simplecov.rb
@@ -5,9 +5,6 @@ module SimpleCov
   # Indicates invalid coverage data
   class CoverageDataError < StandardError; end;
 
-  # The version of the simplecov gem
-  VERSION = File.read(File.join(File.dirname(__FILE__), '../VERSION'))
-
   class << self
     attr_accessor :running#, :result # TODO: Remove result?
 

diff --git a/lib/simplecov/version.rb b/lib/simplecov/version.rb
@@ -0,0 +1,3 @@
+module SimpleCov
+  VERSION = "0.3.8"
+end
diff --git a/simplecov.gemspec b/simplecov.gemspec
@@ -1,106 +1,26 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
+$:.push File.expand_path("../lib", __FILE__)
+require "simplecov/version"
 
 Gem::Specification.new do |s|
-  s.name = %q{simplecov}
-  s.version = "0.3.7"
+  s.name        = "simplecov"
+  s.version     = SimpleCov::VERSION
+  s.platform    = Gem::Platform::RUBY
+  s.authors     = ["Christoph Olszowka"]
+  s.email       = ["christoph at olszowka de"]
+  s.homepage    = "http://github.com/colszowka/simplecov"
+  s.summary     = %Q{Code coverage for Ruby 1.9 with a powerful configuration library and automatic merging of coverage across test suites}
+  s.description = %Q{Code coverage for Ruby 1.9 with a powerful configuration library and automatic merging of coverage across test suites}
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["Christoph Olszowka"]
-  s.date = %q{2010-11-06}
-  s.description = %q{Code coverage for Ruby 1.9 with a powerful configuration library and automatic merging of coverage across test suites}
-  s.email = %q{christoph at olszowka de}
-  s.extra_rdoc_files = [
-    "LICENSE",
-     "README.rdoc"
-  ]
-  s.files = [
-    ".document",
-     ".gitignore",
-     ".rvmrc",
-     "Gemfile",
-     "Gemfile.lock",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "lib/simplecov.rb",
-     "lib/simplecov/adapters.rb",
-     "lib/simplecov/command_guesser.rb",
-     "lib/simplecov/configuration.rb",
-     "lib/simplecov/filter.rb",
-     "lib/simplecov/formatter.rb",
-     "lib/simplecov/formatter/simple_formatter.rb",
-     "lib/simplecov/merge_helpers.rb",
-     "lib/simplecov/result.rb",
-     "lib/simplecov/result_merger.rb",
-     "lib/simplecov/source_file.rb",
-     "simplecov.gemspec",
-     "test/fixtures/app/controllers/sample_controller.rb",
-     "test/fixtures/app/models/user.rb",
-     "test/fixtures/frameworks/rspec_bad.rb",
-     "test/fixtures/frameworks/rspec_good.rb",
-     "test/fixtures/frameworks/testunit_bad.rb",
-     "test/fixtures/frameworks/testunit_good.rb",
-     "test/fixtures/resultset1.rb",
-     "test/fixtures/resultset2.rb",
-     "test/fixtures/sample.rb",
-     "test/helper.rb",
-     "test/test_command_guesser.rb",
-     "test/test_filters.rb",
-     "test/test_merge_helpers.rb",
-     "test/test_result.rb",
-     "test/test_return_codes.rb",
-     "test/test_source_file.rb",
-     "test/test_source_file_line.rb"
-  ]
-  s.homepage = %q{http://github.com/colszowka/simplecov}
-  s.rdoc_options = ["--charset=UTF-8"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{Code coverage for Ruby 1.9 with a powerful configuration library and automatic merging of coverage across test suites}
-  s.test_files = [
-    "test/fixtures/app/controllers/sample_controller.rb",
-     "test/fixtures/app/models/user.rb",
-     "test/fixtures/frameworks/rspec_bad.rb",
-     "test/fixtures/frameworks/rspec_good.rb",
-     "test/fixtures/frameworks/testunit_bad.rb",
-     "test/fixtures/frameworks/testunit_good.rb",
-     "test/fixtures/resultset1.rb",
-     "test/fixtures/resultset2.rb",
-     "test/fixtures/sample.rb",
-     "test/helper.rb",
-     "test/test_command_guesser.rb",
-     "test/test_filters.rb",
-     "test/test_merge_helpers.rb",
-     "test/test_result.rb",
-     "test/test_return_codes.rb",
-     "test/test_source_file.rb",
-     "test/test_source_file_line.rb"
-  ]
-
-  if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<simplecov-html>, [">= 0.3.7"])
-      s.add_development_dependency(%q<shoulda>, ["= 2.10.3"])
-      s.add_development_dependency(%q<rspec>, ["~> 2.0.0"])
-      s.add_development_dependency(%q<jeweler>, ["= 1.4.0"])
-    else
-      s.add_dependency(%q<simplecov-html>, [">= 0.3.7"])
-      s.add_dependency(%q<shoulda>, ["= 2.10.3"])
-      s.add_dependency(%q<rspec>, ["~> 2.0.0"])
-      s.add_dependency(%q<jeweler>, ["= 1.4.0"])
-    end
-  else
-    s.add_dependency(%q<simplecov-html>, [">= 0.3.7"])
-    s.add_dependency(%q<shoulda>, ["= 2.10.3"])
-    s.add_dependency(%q<rspec>, ["~> 2.0.0"])
-    s.add_dependency(%q<jeweler>, ["= 1.4.0"])
-  end
-end
+  s.rubyforge_project = "simplecov"
+
+  s.add_dependency 'simplecov-html', ">= 0.3.7"
+  s.add_development_dependency "shoulda", "2.10.3"
+  s.add_development_dependency "rspec", "~> 2.0.0"
+  s.add_development_dependency "jeweler", "1.4.0"
 
+  s.files         = `git ls-files`.split("\n")
+  s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
+  s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
+  s.require_paths = ["lib"]
+end
diff --git a/test/helper.rb b/test/helper.rb
@@ -1,16 +1,14 @@
 require 'rubygems'
-require 'bundler'
-Bundler.setup(:default, :development)
+require 'bundler/setup'
+require 'simplecov'
+
 require 'test/unit'
 require 'shoulda'
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'simplecov'
 SimpleCov.coverage_dir('tmp/coverage')
 
 class Test::Unit::TestCase
   def source_fixture(filename)
     File.expand_path(File.join(File.dirname(__FILE__), 'fixtures', filename))
   end
-end
+end