Skip to content

Commit 406090e

Browse files
author
Mat Brown
committed
Fix Sunspot dependency
1 parent d2a773c commit 406090e

File tree

2 files changed

+50
-23
lines changed

2 files changed

+50
-23
lines changed

dev_tasks/gemspec.rake

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ TEXT
2626
'spec/mock_app/{app,lib,db,vendor,config}/**/*',
2727
'spec/mock_app/{tmp,log,solr}']
2828
s.add_dependency 'escape', '>= 0.0.4'
29-
s.add_dependency 'sunspot', '= 0.10.5'
29+
s.add_dependency 'sunspot', '= 0.11.0'
3030
s.add_development_dependency 'rspec', '~> 1.2'
3131
s.add_development_dependency 'rspec-rails', '~> 1.2'
3232
s.add_development_dependency 'ruby-debug', '~> 0.10'

sunspot_rails.gemspec

Lines changed: 49 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -5,40 +5,55 @@
55

66
Gem::Specification.new do |s|
77
s.name = %q{sunspot_rails}
8-
s.version = "0.10.8"
8+
s.version = "0.11.0"
99

1010
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
1111
s.authors = ["Mat Brown", "Peer Allan", "Michael Moen", "Benjamin Krause"]
12-
s.date = %q{2009-10-17}
13-
s.description = %q{Sunspot::Rails is an extension to the Sunspot library for Solr search. Sunspot::Rails adds integration between Sunspot and ActiveRecord, including defining search and indexing related methods on ActiveRecord models themselves, running a Sunspot-compatible Solr instance for development and test environments, and automatically commit Solr index changes at the end of each Rails request.}
12+
s.date = %q{2009-11-06}
13+
s.description = %q{Sunspot::Rails is an extension to the Sunspot library for Solr search.
14+
Sunspot::Rails adds integration between Sunspot and ActiveRecord, including
15+
defining search and indexing related methods on ActiveRecord models themselves,
16+
running a Sunspot-compatible Solr instance for development and test
17+
environments, and automatically commit Solr index changes at the end of each
18+
Rails request.
19+
}
1420
s.email = %q{[email protected]}
1521
s.extra_rdoc_files = [
1622
"LICENSE",
1723
"README.rdoc"
1824
]
1925
s.files = [
20-
"LICENSE",
26+
"History.txt",
27+
"LICENSE",
2128
"MIT-LICENSE",
2229
"MIT-LICENSE",
2330
"README.rdoc",
2431
"Rakefile",
32+
"TODO",
2533
"VERSION.yml",
2634
"dev_tasks/gemspec.rake",
2735
"dev_tasks/rdoc.rake",
2836
"dev_tasks/release.rake",
2937
"dev_tasks/todo.rake",
38+
"generators/sunspot/sunspot_generator.rb",
39+
"generators/sunspot/templates/sunspot.yml",
3040
"install.rb",
3141
"lib/sunspot/rails.rb",
3242
"lib/sunspot/rails/adapters.rb",
3343
"lib/sunspot/rails/configuration.rb",
3444
"lib/sunspot/rails/request_lifecycle.rb",
3545
"lib/sunspot/rails/searchable.rb",
46+
"lib/sunspot/rails/server.rb",
47+
"lib/sunspot/rails/session_proxy.rb",
3648
"lib/sunspot/rails/tasks.rb",
49+
"lib/sunspot/rails/util.rb",
50+
"lib/sunspot/spec/extension.rb",
3751
"rails/init.rb",
3852
"spec/configuration_spec.rb",
3953
"spec/mock_app/app/controllers/application.rb",
4054
"spec/mock_app/app/controllers/application_controller.rb",
4155
"spec/mock_app/app/controllers/posts_controller.rb",
56+
"spec/mock_app/app/models/author.rb",
4257
"spec/mock_app/app/models/blog.rb",
4358
"spec/mock_app/app/models/post.rb",
4459
"spec/mock_app/app/models/post_with_auto.rb",
@@ -51,63 +66,75 @@ Gem::Specification.new do |s|
5166
"spec/mock_app/config/initializers/session_store.rb",
5267
"spec/mock_app/config/routes.rb",
5368
"spec/mock_app/config/sunspot.yml",
69+
"spec/mock_app/db/schema.rb",
70+
"spec/mock_app/db/test.db",
5471
"spec/model_lifecycle_spec.rb",
5572
"spec/model_spec.rb",
5673
"spec/request_lifecycle_spec.rb",
5774
"spec/schema.rb",
58-
"spec/spec_helper.rb"
75+
"spec/server_spec.rb",
76+
"spec/session_spec.rb",
77+
"spec/spec_helper.rb",
78+
"spec/sunspot_mocking_spec.rb",
79+
"spec/util_spec.rb"
5980
]
6081
s.has_rdoc = true
6182
s.homepage = %q{http://github.com/outoftime/sunspot_rails}
6283
s.rdoc_options = ["--charset=UTF-8"]
6384
s.require_paths = ["lib"]
6485
s.rubyforge_project = %q{sunspot}
65-
s.rubygems_version = %q{1.3.1}
86+
s.rubygems_version = %q{1.3.2}
6687
s.summary = %q{Rails integration for the Sunspot Solr search library}
6788
s.test_files = [
68-
"spec/configuration_spec.rb",
69-
"spec/mock_app/app/controllers/application.rb",
70-
"spec/mock_app/app/controllers/application_controller.rb",
89+
"spec/spec_helper.rb",
90+
"spec/session_spec.rb",
91+
"spec/server_spec.rb",
92+
"spec/configuration_spec.rb",
93+
"spec/model_lifecycle_spec.rb",
94+
"spec/schema.rb",
95+
"spec/model_spec.rb",
96+
"spec/sunspot_mocking_spec.rb",
97+
"spec/util_spec.rb",
7198
"spec/mock_app/app/controllers/posts_controller.rb",
99+
"spec/mock_app/app/controllers/application_controller.rb",
100+
"spec/mock_app/app/controllers/application.rb",
72101
"spec/mock_app/app/models/blog.rb",
73-
"spec/mock_app/app/models/post.rb",
74102
"spec/mock_app/app/models/post_with_auto.rb",
75-
"spec/mock_app/config/boot.rb",
103+
"spec/mock_app/app/models/author.rb",
104+
"spec/mock_app/app/models/post.rb",
105+
"spec/mock_app/db/schema.rb",
76106
"spec/mock_app/config/environment.rb",
107+
"spec/mock_app/config/initializers/session_store.rb",
108+
"spec/mock_app/config/initializers/new_rails_defaults.rb",
77109
"spec/mock_app/config/environments/development.rb",
78110
"spec/mock_app/config/environments/test.rb",
79-
"spec/mock_app/config/initializers/new_rails_defaults.rb",
80-
"spec/mock_app/config/initializers/session_store.rb",
81111
"spec/mock_app/config/routes.rb",
82-
"spec/model_lifecycle_spec.rb",
83-
"spec/model_spec.rb",
84-
"spec/request_lifecycle_spec.rb",
85-
"spec/schema.rb",
86-
"spec/spec_helper.rb"
112+
"spec/mock_app/config/boot.rb",
113+
"spec/request_lifecycle_spec.rb"
87114
]
88115

89116
if s.respond_to? :specification_version then
90117
current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
91-
s.specification_version = 2
118+
s.specification_version = 3
92119

93120
if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
94121
s.add_runtime_dependency(%q<escape>, [">= 0.0.4"])
95-
s.add_runtime_dependency(%q<sunspot>, ["~> 0.10.0"])
122+
s.add_runtime_dependency(%q<sunspot>, ["= 0.10.5"])
96123
s.add_development_dependency(%q<rspec>, ["~> 1.2"])
97124
s.add_development_dependency(%q<rspec-rails>, ["~> 1.2"])
98125
s.add_development_dependency(%q<ruby-debug>, ["~> 0.10"])
99126
s.add_development_dependency(%q<technicalpickles-jeweler>, ["~> 1.0"])
100127
else
101128
s.add_dependency(%q<escape>, [">= 0.0.4"])
102-
s.add_dependency(%q<sunspot>, ["~> 0.10.0"])
129+
s.add_dependency(%q<sunspot>, ["= 0.10.5"])
103130
s.add_dependency(%q<rspec>, ["~> 1.2"])
104131
s.add_dependency(%q<rspec-rails>, ["~> 1.2"])
105132
s.add_dependency(%q<ruby-debug>, ["~> 0.10"])
106133
s.add_dependency(%q<technicalpickles-jeweler>, ["~> 1.0"])
107134
end
108135
else
109136
s.add_dependency(%q<escape>, [">= 0.0.4"])
110-
s.add_dependency(%q<sunspot>, ["~> 0.10.0"])
137+
s.add_dependency(%q<sunspot>, ["= 0.10.5"])
111138
s.add_dependency(%q<rspec>, ["~> 1.2"])
112139
s.add_dependency(%q<rspec-rails>, ["~> 1.2"])
113140
s.add_dependency(%q<ruby-debug>, ["~> 0.10"])

0 commit comments

Comments
 (0)