Switch from Jeweler to bundler/gem_tasks. Remove ruby-debug19 depende…

…ncy.
johndouthat · Mar 22, 2012 · 0c0f0172c7dff5e5be2941eb0382c7b6d4b10b53 · 0c0f017
1 parent 55877b1
commit 0c0f0172c7dff5e5be2941eb0382c7b6d4b10b53
Unified Split

Showing with 39 additions and 126 deletions.

+1 −8 Gemfile

+7 −16 Gemfile.lock

+2 −20 Rakefile

+1 −0 lib/searchlogic.rb

+3 −0 lib/searchlogic/version.rb

+23 −78 searchlogic.gemspec

+2 −4 spec/spec_helper.rb
diff --git a/Gemfile b/Gemfile
@@ -1,10 +1,3 @@
 source :rubygems
 
-gem 'activerecord', '~> 2.3.12'
-
-group :test do
-  gem 'jeweler'
-  gem 'ruby-debug19'
-  gem 'rspec', '1.3.1'
-  gem 'sqlite3'
-end
+gemspec
diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,38 +1,29 @@
+PATH
+  remote: .
+  specs:
+    searchlogic (2.5.8)
+      activerecord (~> 2.3.12)
+
 GEM
   remote: http://rubygems.org/
   specs:
     activerecord (2.3.12)
       activesupport (= 2.3.12)
     activesupport (2.3.12)
-    archive-tar-minitar (0.5.2)
-    columnize (0.3.4)
     git (1.2.5)
     jeweler (1.6.4)
       bundler (~> 1.0)
       git (>= 1.2.5)
       rake
-    linecache19 (0.5.12)
-      ruby_core_source (>= 0.1.4)
     rake (0.9.2)
     rspec (1.3.1)
-    ruby-debug-base19 (0.11.25)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby_core_source (>= 0.1.4)
-    ruby-debug19 (0.11.6)
-      columnize (>= 0.3.1)
-      linecache19 (>= 0.5.11)
-      ruby-debug-base19 (>= 0.11.19)
-    ruby_core_source (0.1.5)
-      archive-tar-minitar (>= 0.5.2)
     sqlite3 (1.3.4)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
-  activerecord (~> 2.3.12)
   jeweler
   rspec (= 1.3.1)
-  ruby-debug19
+  searchlogic!
   sqlite3
diff --git a/Rakefile b/Rakefile
@@ -1,25 +1,7 @@
-require 'rubygems'
-require 'rake'
-require 'bundler'
-
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
 Bundler.setup
 
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "searchlogic"
-    gem.summary = "Searchlogic makes using ActiveRecord named scopes easier and less repetitive."
-    gem.description = "Searchlogic makes using ActiveRecord named scopes easier and less repetitive."
-    gem.email = "bjohnson@binarylogic.com"
-    gem.homepage = "http://github.com/binarylogic/searchlogic"
-    gem.authors = ["Ben Johnson of Binary Logic"]
-    gem.add_bundler_dependencies
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"
-end
-
 require 'spec/rake/spectask'
 Spec::Rake::SpecTask.new(:spec) do |spec|
   spec.libs << 'lib' << 'spec'
diff --git a/lib/searchlogic.rb b/lib/searchlogic.rb
@@ -1,3 +1,4 @@
+require "searchlogic/version"
 require "searchlogic/core_ext/proc"
 require "searchlogic/core_ext/object"
 require "searchlogic/active_record/consistency"
diff --git a/lib/searchlogic/version.rb b/lib/searchlogic/version.rb
@@ -0,0 +1,3 @@
+module Searchlogic
+  VERSION = "2.5.8"
+end
diff --git a/searchlogic.gemspec b/searchlogic.gemspec
@@ -1,86 +1,31 @@
-# 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/searchlogic/version', __FILE__)
 
-Gem::Specification.new do |s|
-  s.name = %q{searchlogic}
-  s.version = "2.5.8"
+Gem::Specification.new do |gem|
+  gem.authors       = ["Ben Johnson of Binary Logic"]
+  gem.email         = ["bjohnson@binarylogic.com"]
+  gem.description   = "Searchlogic makes using ActiveRecord named scopes easier and less repetitive."
+  gem.summary       = gem.description
+  gem.homepage      = "http://github.com/binarylogic/searchlogic"
 
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = [%q{Ben Johnson of Binary Logic}]
-  s.date = %q{2011-08-15}
-  s.description = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
-  s.email = %q{bjohnson@binarylogic.com}
-  s.extra_rdoc_files = [
+  gem.files         = `git ls-files`.split($\)
+  # gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
+  gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
+  gem.name          = "searchlogic"
+  gem.require_paths = ["lib"]
+  gem.version       = Searchlogic::VERSION
+  
+  gem.extra_rdoc_files = [
     "LICENSE",
     "README.rdoc"
   ]
-  s.files = [
-    "Gemfile",
-    "Gemfile.lock",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "VERSION.yml",
-    "init.rb",
-    "lib/searchlogic.rb",
-    "lib/searchlogic/active_record/consistency.rb",
-    "lib/searchlogic/active_record/named_scope_tools.rb",
-    "lib/searchlogic/active_record/scope.rb",
-    "lib/searchlogic/core_ext/object.rb",
-    "lib/searchlogic/core_ext/proc.rb",
-    "lib/searchlogic/named_scopes/alias_scope.rb",
-    "lib/searchlogic/named_scopes/association_conditions.rb",
-    "lib/searchlogic/named_scopes/association_ordering.rb",
-    "lib/searchlogic/named_scopes/base.rb",
-    "lib/searchlogic/named_scopes/column_conditions.rb",
-    "lib/searchlogic/named_scopes/or_conditions.rb",
-    "lib/searchlogic/named_scopes/ordering.rb",
-    "lib/searchlogic/rails_helpers.rb",
-    "lib/searchlogic/search.rb",
-    "lib/searchlogic/search/base.rb",
-    "lib/searchlogic/search/conditions.rb",
-    "lib/searchlogic/search/date_parts.rb",
-    "lib/searchlogic/search/implementation.rb",
-    "lib/searchlogic/search/method_missing.rb",
-    "lib/searchlogic/search/ordering.rb",
-    "lib/searchlogic/search/scopes.rb",
-    "lib/searchlogic/search/to_yaml.rb",
-    "lib/searchlogic/search/unknown_condition_error.rb",
-    "rails/init.rb",
-    "searchlogic.gemspec",
-    "spec/searchlogic/active_record/association_proxy_spec.rb",
-    "spec/searchlogic/active_record/consistency_spec.rb",
-    "spec/searchlogic/core_ext/object_spec.rb",
-    "spec/searchlogic/core_ext/proc_spec.rb",
-    "spec/searchlogic/named_scopes/alias_scope_spec.rb",
-    "spec/searchlogic/named_scopes/association_conditions_spec.rb",
-    "spec/searchlogic/named_scopes/association_ordering_spec.rb",
-    "spec/searchlogic/named_scopes/column_conditions_spec.rb",
-    "spec/searchlogic/named_scopes/or_conditions_spec.rb",
-    "spec/searchlogic/named_scopes/ordering_spec.rb",
-    "spec/searchlogic/search_spec.rb",
-    "spec/spec_helper.rb"
-  ]
-  s.homepage = %q{http://github.com/binarylogic/searchlogic}
-  s.require_paths = [%q{lib}]
-  s.rubygems_version = %q{1.8.6}
-  s.summary = %q{Searchlogic makes using ActiveRecord named scopes easier and less repetitive.}
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 3
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<activerecord>, ["~> 2.3.12"])
-      s.add_runtime_dependency(%q<activerecord>, ["~> 2.3.12"])
-    else
-      s.add_dependency(%q<activerecord>, ["~> 2.3.12"])
-      s.add_dependency(%q<activerecord>, ["~> 2.3.12"])
-    end
-  else
-    s.add_dependency(%q<activerecord>, ["~> 2.3.12"])
-    s.add_dependency(%q<activerecord>, ["~> 2.3.12"])
-  end
+  # gem.date = %q{2011-08-15}
+  
+  
+  gem.add_runtime_dependency 'activerecord', '~> 2.3.12'
+  gem.add_development_dependency 'jeweler'
+  # gem.add_development_dependency 'ruby-debug19'
+  gem.add_development_dependency 'rspec', '1.3.1'
+  gem.add_development_dependency 'sqlite3'
 end
 
diff --git a/spec/spec_helper.rb b/spec/spec_helper.rb
@@ -1,7 +1,5 @@
-require 'spec'
-require 'rubygems'
-require 'ruby-debug'
-require "active_record"
+Bundler.setup
+require 'active_record'
 
 ENV['TZ'] = 'UTC'
 Time.zone = 'Eastern Time (US & Canada)'