Use bundler's gem tasks instead of jeweler

coupler · Jun 5, 2012 · 9338ac6 · 9338ac6
1 parent 7bef233
commit 9338ac6
Show file tree

Hide file tree

Showing 6 changed files with 59 additions and 188 deletions.
diff --git a/Gemfile b/Gemfile
@@ -1,18 +1,16 @@
-source "http://rubygems.org"
+source 'http://rubygems.org'
 
-gem "sequel"
+gemspec
 
 group :development do
-  gem "bundler"
+  gem 'bundler'
-  gem "jeweler"
+  gem 'test-unit'
-  gem "test-unit"
+  gem 'mocha'
-  gem "mocha"
+  gem 'sqlite3'
-  gem "sqlite3"
+  gem 'yard'
-  gem "yard"
+  gem 'rake'
-  gem "rake"
+  gem 'versionomy'
-  gem "versionomy"
+  gem 'mysql2'
-  gem "mysql2"
-  gem 'pry'
   gem 'rdiscount'
   gem 'guard-test'
   gem 'guard-yard'

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,46 +1,48 @@
+PATH
+  remote: .
+  specs:
+    linkage (0.6)
+      sequel
+      sequel-collation
+
 GEM
   remote: http://rubygems.org/
   specs:
     blockenspiel (0.4.3)
-    coderay (1.0.6)
     ffi (1.0.11)
-    git (1.2.5)
+    guard (1.1.1)
-    guard (1.0.1)
+      listen (>= 0.4.2)
-      ffi (>= 0.5.0)
+      thor (>= 0.14.6)
-      thor (~> 0.14.6)
+    guard-test (0.5.0)
-    guard-test (0.4.3)
+      guard (>= 1.1.0)
-      guard (>= 0.4)
       test-unit (~> 2.2)
     guard-yard (1.0.2)
       guard (>= 0.2.2)
       yard (>= 0.7.0)
-    jeweler (1.8.3)
+    listen (0.4.2)
-      bundler (~> 1.0)
+      rb-fchange (~> 0.0.5)
-      git (>= 1.2.5)
+      rb-fsevent (~> 0.9.1)
-      rake
+      rb-inotify (~> 0.8.8)
-      rdoc
-    json (1.6.6)
     metaclass (0.0.1)
-    method_source (0.7.1)
+    mocha (0.11.4)
-    mocha (0.10.5)
       metaclass (~> 0.0.1)
     mysql2 (0.3.11)
-    pry (0.9.9)
-      coderay (~> 1.0.5)
-      method_source (~> 0.7.1)
-      slop (>= 2.4.4, < 3)
     rake (0.9.2.2)
+    rb-fchange (0.0.5)
+      ffi
+    rb-fsevent (0.9.1)
+    rb-inotify (0.8.8)
+      ffi (>= 0.5.0)
     rdiscount (1.6.8)
-    rdoc (3.12)
+    sequel (3.36.1)
-      json (~> 1.4)
+    sequel-collation (0.0.1)
-    sequel (3.34.1)
+      sequel
-    slop (2.4.4)
     sqlite3 (1.3.6)
-    test-unit (2.4.8)
+    test-unit (2.4.9)
-    thor (0.14.6)
+    thor (0.15.2)
     versionomy (0.4.3)
       blockenspiel (>= 0.4.3)
-    yard (0.7.5)
+    yard (0.8.1)
 
 PLATFORMS
   ruby
@@ -49,13 +51,11 @@ DEPENDENCIES
   bundler
   guard-test
   guard-yard
-  jeweler
+  linkage!
   mocha
   mysql2
-  pry
   rake
   rdiscount
-  sequel
   sqlite3
   test-unit
   versionomy

diff --git a/Rakefile b/Rakefile
@@ -10,20 +10,7 @@ rescue Bundler::BundlerError => e
   exit e.status_code
 end
 require 'rake'
-
+require "bundler/gem_tasks"
-require 'jeweler'
-Jeweler::Tasks.new do |gem|
-  # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
-  gem.name = "linkage"
-  gem.homepage = "http://github.com/coupler/linkage"
-  gem.license = "MIT"
-  gem.summary = %Q{Record linkage library}
-  gem.description = %Q{Performs record linkage between one or two datasets, using Sequel on the backend}
-  gem.email = "jeremy.f.stephens@vanderbilt.edu"
-  gem.authors = ["Jeremy Stephens"]
-  # dependencies defined in Gemfile
-end
-Jeweler::RubygemsDotOrgTasks.new
 
 require 'rake/testtask'
 Rake::TestTask.new(:test) do |test|
@@ -34,19 +21,7 @@ end
 
 task :default => :test
 
-require 'rdoc/task'
-Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
-
-  rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "linkage #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
-end
-
 require 'yard'
 YARD::Rake::YardocTask.new do |t|
   t.files = ['lib/**/*.rb']
 end
-
-task :build => :gemspec
diff --git a/lib/linkage.rb b/lib/linkage.rb
@@ -6,6 +6,7 @@ module Linkage
 end
 
 path = Pathname.new(File.expand_path(File.dirname(__FILE__))) + 'linkage'
+require path + 'version'
 require path + 'utils'
 require path + 'warnings'
 require path + 'dataset'

diff --git a/lib/linkage/version.rb b/lib/linkage/version.rb
@@ -0,0 +1,3 @@
+module Linkage
+  VERSION = 0.6
+end
diff --git a/linkage.gemspec b/linkage.gemspec
@@ -1,126 +1,20 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
+require File.expand_path('../lib/linkage/version', __FILE__)
 
-Gem::Specification.new do |s|
+Gem::Specification.new do |gem|
-  s.name = "linkage"
+  gem.authors       = ["Jeremy Stephens"]
-  s.version = "0.0.6"
+  gem.email         = ["jeremy.f.stephens@vanderbilt.edu"]
+  gem.description   = %q{Performs record linkage between one or two datasets, using Sequel on the backend}
+  gem.summary       = %q{Record linkage library}
+  gem.homepage      = "http://github.com/coupler/linkage"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  gem.files         = `git ls-files`.split($\)
-  s.authors = ["Jeremy Stephens"]
+  gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
-  s.date = "2012-05-08"
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  s.description = "Performs record linkage between one or two datasets, using Sequel on the backend"
+  gem.name          = "linkage"
-  s.email = "jeremy.f.stephens@vanderbilt.edu"
+  gem.require_paths = ["lib"]
-  s.extra_rdoc_files = [
+  gem.version       = Linkage::VERSION
-    "LICENSE.txt",
-    "README.markdown"
-  ]
-  s.files = [
-    ".document",
-    ".vimrc",
-    "Gemfile",
-    "Gemfile.lock",
-    "Guardfile",
-    "LICENSE.txt",
-    "README.markdown",
-    "Rakefile",
-    "VERSION",
-    "lib/linkage.rb",
-    "lib/linkage/configuration.rb",
-    "lib/linkage/data.rb",
-    "lib/linkage/dataset.rb",
-    "lib/linkage/field.rb",
-    "lib/linkage/field_set.rb",
-    "lib/linkage/function.rb",
-    "lib/linkage/functions/strftime.rb",
-    "lib/linkage/functions/trim.rb",
-    "lib/linkage/group.rb",
-    "lib/linkage/import_buffer.rb",
-    "lib/linkage/result_set.rb",
-    "lib/linkage/runner.rb",
-    "lib/linkage/runner/single_threaded.rb",
-    "lib/linkage/utils.rb",
-    "lib/linkage/warnings.rb",
-    "linkage.gemspec",
-    "test/config.yml",
-    "test/helper.rb",
-    "test/integration/test_cross_linkage.rb",
-    "test/integration/test_dataset.rb",
-    "test/integration/test_dual_linkage.rb",
-    "test/integration/test_functions.rb",
-    "test/integration/test_self_linkage.rb",
-    "test/unit/functions/test_strftime.rb",
-    "test/unit/functions/test_trim.rb",
-    "test/unit/runner/test_single_threaded.rb",
-    "test/unit/test_configuration.rb",
-    "test/unit/test_data.rb",
-    "test/unit/test_dataset.rb",
-    "test/unit/test_field.rb",
-    "test/unit/test_field_set.rb",
-    "test/unit/test_function.rb",
-    "test/unit/test_group.rb",
-    "test/unit/test_import_buffer.rb",
-    "test/unit/test_linkage.rb",
-    "test/unit/test_result_set.rb",
-    "test/unit/test_runner.rb",
-    "test/unit/test_utils.rb"
-  ]
-  s.homepage = "http://github.com/coupler/linkage"
-  s.licenses = ["MIT"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.23"
-  s.summary = "Record linkage library"
 
-  if s.respond_to? :specification_version then
+  gem.add_dependency "sequel"
-    s.specification_version = 3
+  gem.add_dependency "sequel-collation"
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<sequel>, [">= 0"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, [">= 0"])
-      s.add_development_dependency(%q<test-unit>, [">= 0"])
-      s.add_development_dependency(%q<mocha>, [">= 0"])
-      s.add_development_dependency(%q<sqlite3>, [">= 0"])
-      s.add_development_dependency(%q<yard>, [">= 0"])
-      s.add_development_dependency(%q<rake>, [">= 0"])
-      s.add_development_dependency(%q<versionomy>, [">= 0"])
-      s.add_development_dependency(%q<mysql2>, [">= 0"])
-      s.add_development_dependency(%q<pry>, [">= 0"])
-      s.add_development_dependency(%q<rdiscount>, [">= 0"])
-      s.add_development_dependency(%q<guard-test>, [">= 0"])
-      s.add_development_dependency(%q<guard-yard>, [">= 0"])
-    else
-      s.add_dependency(%q<sequel>, [">= 0"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, [">= 0"])
-      s.add_dependency(%q<test-unit>, [">= 0"])
-      s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<sqlite3>, [">= 0"])
-      s.add_dependency(%q<yard>, [">= 0"])
-      s.add_dependency(%q<rake>, [">= 0"])
-      s.add_dependency(%q<versionomy>, [">= 0"])
-      s.add_dependency(%q<mysql2>, [">= 0"])
-      s.add_dependency(%q<pry>, [">= 0"])
-      s.add_dependency(%q<rdiscount>, [">= 0"])
-      s.add_dependency(%q<guard-test>, [">= 0"])
-      s.add_dependency(%q<guard-yard>, [">= 0"])
-    end
-  else
-    s.add_dependency(%q<sequel>, [">= 0"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, [">= 0"])
-    s.add_dependency(%q<test-unit>, [">= 0"])
-    s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<sqlite3>, [">= 0"])
-    s.add_dependency(%q<yard>, [">= 0"])
-    s.add_dependency(%q<rake>, [">= 0"])
-    s.add_dependency(%q<versionomy>, [">= 0"])
-    s.add_dependency(%q<mysql2>, [">= 0"])
-    s.add_dependency(%q<pry>, [">= 0"])
-    s.add_dependency(%q<rdiscount>, [">= 0"])
-    s.add_dependency(%q<guard-test>, [">= 0"])
-    s.add_dependency(%q<guard-yard>, [">= 0"])
-  end
 end
-