Skip to content

Commit 14caaaf

Browse files
committed
Change to use bundler style gem files.
1 parent e6b6d58 commit 14caaaf

File tree

8 files changed

+36
-147
lines changed

8 files changed

+36
-147
lines changed

.document

-5
This file was deleted.

.gitignore

+3-6
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,4 @@
1-
coverage
2-
rdoc
3-
doc
4-
.yardoc
1+
*.gem
52
.bundle
6-
pkg
7-
*.lock
3+
Gemfile.lock
4+
pkg/*

Gemfile

+3-12
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,4 @@
1-
source 'http://rubygems.org'
2-
3-
gem 'activesupport', '~> 3.0'
4-
gem 'activerecord', '~> 3.0'
5-
6-
group :development do
7-
gem 'sqlite3'
8-
gem 'rspec'
9-
gem 'rdoc'
10-
gem 'bundler'
11-
gem 'jeweler'
12-
end
1+
source "http://rubygems.org"
132

3+
# Specify your gem's dependencies in sakuramochi.gemspec
4+
gemspec

Rakefile

+2-46
Original file line numberDiff line numberDiff line change
@@ -1,49 +1,5 @@
1-
# encoding: utf-8
1+
require "bundler/gem_tasks"
22

3-
require 'rubygems'
4-
require 'bundler'
5-
begin
6-
Bundler.setup(:default, :development)
7-
rescue Bundler::BundlerError => e
8-
$stderr.puts e.message
9-
$stderr.puts "Run `bundle install` to install missing gems"
10-
exit e.status_code
11-
end
12-
require 'rake'
13-
14-
require 'jeweler'
15-
Jeweler::Tasks.new do |gem|
16-
# gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
17-
gem.name = "sakuramochi"
18-
gem.homepage = "https://github.com/mashiro/sakuramochi"
19-
gem.license = "MIT"
20-
gem.summary = %Q{Minimal extensions for active record 3}
21-
gem.description = %Q{Minimal extensions for active record 3}
22-
gem.email = "[email protected]"
23-
gem.authors = ["mashiro"]
24-
# dependencies defined in Gemfile
25-
end
26-
Jeweler::RubygemsDotOrgTasks.new
27-
28-
require 'rspec/core'
293
require 'rspec/core/rake_task'
30-
RSpec::Core::RakeTask.new(:spec) do |spec|
31-
spec.pattern = FileList['spec/**/*_spec.rb']
32-
end
33-
34-
RSpec::Core::RakeTask.new(:rcov) do |spec|
35-
spec.pattern = 'spec/**/*_spec.rb'
36-
spec.rcov = true
37-
end
38-
4+
RSpec::Core::RakeTask.new(:spec)
395
task :default => :spec
40-
41-
require 'rdoc/task'
42-
RDoc::Task.new do |rdoc|
43-
version = File.exist?('VERSION') ? File.read('VERSION') : ""
44-
45-
rdoc.rdoc_dir = 'rdoc'
46-
rdoc.title = "sakuramochi #{version}"
47-
rdoc.rdoc_files.include('README*')
48-
rdoc.rdoc_files.include('lib/**/*.rb')
49-
end

VERSION

-1
This file was deleted.

lib/sakuramochi.rb

+7-4
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,16 @@
1-
require 'active_support/core_ext'
1+
require 'active_support/core_ext/hash'
22
require 'active_support'
33
require 'active_record'
4+
require "sakuramochi/version"
45
require 'sakuramochi/config'
56
require 'sakuramochi/predicate'
67
require 'sakuramochi/predicate_builder'
78
require 'sakuramochi/condition'
89
require 'sakuramochi/relation'
910

10-
ActiveSupport.on_load(:active_record) do
11-
ActiveRecord::Relation.send(:include, Sakuramochi::Relation)
12-
ActiveRecord::PredicateBuilder.send(:include, Sakuramochi::PredicateBuilder)
11+
module Sakuramochi
12+
ActiveSupport.on_load(:active_record) do
13+
ActiveRecord::Relation.send(:include, Sakuramochi::Relation)
14+
ActiveRecord::PredicateBuilder.send(:include, Sakuramochi::PredicateBuilder)
15+
end
1316
end

lib/sakuramochi/version.rb

+3
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
module Sakuramochi
2+
VERSION = "0.5.4"
3+
end

sakuramochi.gemspec

+18-73
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,25 @@
1-
# Generated by jeweler
2-
# DO NOT EDIT THIS FILE DIRECTLY
3-
# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
41
# -*- encoding: utf-8 -*-
2+
$:.push File.expand_path("../lib", __FILE__)
3+
require "sakuramochi/version"
54

65
Gem::Specification.new do |s|
7-
s.name = "sakuramochi"
8-
s.version = "0.5.3"
6+
s.name = "sakuramochi"
7+
s.version = Sakuramochi::VERSION
8+
s.authors = ["mashiro"]
9+
s.email = ["[email protected]"]
10+
s.homepage = ""
11+
s.summary = %q{Minimal extensions for ActiveRecord 3}
12+
s.description = %q{Predicates and conditions that extends to the ActiveRecord 3}
913

10-
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11-
s.authors = ["mashiro"]
12-
s.date = "2011-12-07"
13-
s.description = "Minimal extensions for active record 3"
14-
s.email = "[email protected]"
15-
s.extra_rdoc_files = [
16-
"LICENSE.txt",
17-
"README.md"
18-
]
19-
s.files = [
20-
".document",
21-
".rspec",
22-
".travis.yml",
23-
"Gemfile",
24-
"LICENSE.txt",
25-
"README.md",
26-
"Rakefile",
27-
"VERSION",
28-
"lib/sakuramochi.rb",
29-
"lib/sakuramochi/condition.rb",
30-
"lib/sakuramochi/config.rb",
31-
"lib/sakuramochi/predicate.rb",
32-
"lib/sakuramochi/predicate_builder.rb",
33-
"lib/sakuramochi/relation.rb",
34-
"sakuramochi.gemspec",
35-
"spec/sakuramochi/condition_spec.rb",
36-
"spec/sakuramochi/config_spec.rb",
37-
"spec/sakuramochi/predicate_builder_spec.rb",
38-
"spec/sakuramochi/predicate_spec.rb",
39-
"spec/sakuramochi/relation_spec.rb",
40-
"spec/spec_helper.rb",
41-
"spec/support/matcher.rb",
42-
"spec/support/schema.rb"
43-
]
44-
s.homepage = "https://github.com/mashiro/sakuramochi"
45-
s.licenses = ["MIT"]
46-
s.require_paths = ["lib"]
47-
s.rubygems_version = "1.8.10"
48-
s.summary = "Minimal extensions for active record 3"
14+
s.rubyforge_project = "sakuramochi"
4915

50-
if s.respond_to? :specification_version then
51-
s.specification_version = 3
16+
s.files = `git ls-files`.split("\n")
17+
s.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
18+
s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
19+
s.require_paths = ["lib"]
5220

53-
if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
54-
s.add_runtime_dependency(%q<activesupport>, ["~> 3.0"])
55-
s.add_runtime_dependency(%q<activerecord>, ["~> 3.0"])
56-
s.add_development_dependency(%q<sqlite3>, [">= 0"])
57-
s.add_development_dependency(%q<rspec>, [">= 0"])
58-
s.add_development_dependency(%q<rdoc>, [">= 0"])
59-
s.add_development_dependency(%q<bundler>, [">= 0"])
60-
s.add_development_dependency(%q<jeweler>, [">= 0"])
61-
else
62-
s.add_dependency(%q<activesupport>, ["~> 3.0"])
63-
s.add_dependency(%q<activerecord>, ["~> 3.0"])
64-
s.add_dependency(%q<sqlite3>, [">= 0"])
65-
s.add_dependency(%q<rspec>, [">= 0"])
66-
s.add_dependency(%q<rdoc>, [">= 0"])
67-
s.add_dependency(%q<bundler>, [">= 0"])
68-
s.add_dependency(%q<jeweler>, [">= 0"])
69-
end
70-
else
71-
s.add_dependency(%q<activesupport>, ["~> 3.0"])
72-
s.add_dependency(%q<activerecord>, ["~> 3.0"])
73-
s.add_dependency(%q<sqlite3>, [">= 0"])
74-
s.add_dependency(%q<rspec>, [">= 0"])
75-
s.add_dependency(%q<rdoc>, [">= 0"])
76-
s.add_dependency(%q<bundler>, [">= 0"])
77-
s.add_dependency(%q<jeweler>, [">= 0"])
78-
end
21+
s.add_dependency "activesupport", "~> 3.0"
22+
s.add_dependency "activerecord", "~> 3.0"
23+
s.add_development_dependency "rspec"
24+
s.add_development_dependency "sqlite3"
7925
end
80-

0 commit comments

Comments
 (0)