sunspot_solr 1.3.0.rc6 → 1.3.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
@@ -1,6 +1,5 @@
1
1
  namespace :sunspot do
2
2
  namespace :solr do
3
-
4
3
  desc 'Start the Solr instance'
5
4
  task :start => :environment do
6
5
  case RUBY_PLATFORM
@@ -8,14 +7,23 @@ namespace :sunspot do
8
7
  abort("This command is not supported on #{RUBY_PLATFORM}. " +
9
8
  "Use rake sunspot:solr:run to run Solr in the foreground.")
10
9
  end
11
- Sunspot::Rails::Server.new.start
10
+
11
+ if defined?(Sunspot::Rails::Server)
12
+ Sunspot::Rails::Server.new.start
13
+ else
14
+ Sunspot::Solr::Server.new.start
15
+ end
12
16
 
13
17
  puts "Successfully started Solr ..."
14
18
  end
15
19
 
16
20
  desc 'Run the Solr instance in the foreground'
17
21
  task :run => :environment do
18
- Sunspot::Rails::Server.new.run
22
+ if defined?(Sunspot::Rails::Server)
23
+ Sunspot::Rails::Server.new.run
24
+ else
25
+ Sunspot::Solr::Server.new.run
26
+ end
19
27
  end
20
28
 
21
29
  desc 'Stop the Solr instance'
@@ -25,7 +33,12 @@ namespace :sunspot do
25
33
  abort("This command is not supported on #{RUBY_PLATFORM}. " +
26
34
  "Use rake sunspot:solr:run to run Solr in the foreground.")
27
35
  end
28
- Sunspot::Rails::Server.new.stop
36
+
37
+ if defined?(Sunspot::Rails::Server)
38
+ Sunspot::Rails::Server.new.stop
39
+ else
40
+ Sunspot::Solr::Server.new.stop
41
+ end
29
42
 
30
43
  puts "Successfully stopped Solr ..."
31
44
  end
data/sunspot_solr.gemspec CHANGED
@@ -28,6 +28,8 @@ Gem::Specification.new do |s|
28
28
  s.executables = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
29
29
  s.require_paths = ["lib"]
30
30
 
31
+ s.add_dependency 'escape', '~>0.0.4'
32
+
31
33
  s.add_development_dependency 'rspec', '~> 1.1'
32
34
  s.add_development_dependency 'hanna'
33
35
 
metadata CHANGED
@@ -1,15 +1,13 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sunspot_solr
3
3
  version: !ruby/object:Gem::Version
4
- hash: 15424009
5
- prerelease: 6
4
+ hash: 27
5
+ prerelease:
6
6
  segments:
7
7
  - 1
8
8
  - 3
9
9
  - 0
10
- - rc
11
- - 6
12
- version: 1.3.0.rc6
10
+ version: 1.3.0
13
11
  platform: ruby
14
12
  authors:
15
13
  - Mat Brown
@@ -35,12 +33,28 @@ autorequire:
35
33
  bindir: bin
36
34
  cert_chain: []
37
35
 
38
- date: 2011-11-03 00:00:00 Z
36
+ date: 2011-11-26 00:00:00 Z
39
37
  dependencies:
40
38
  - !ruby/object:Gem::Dependency
41
- name: rspec
39
+ name: escape
42
40
  prerelease: false
43
41
  requirement: &id001 !ruby/object:Gem::Requirement
42
+ none: false
43
+ requirements:
44
+ - - ~>
45
+ - !ruby/object:Gem::Version
46
+ hash: 23
47
+ segments:
48
+ - 0
49
+ - 0
50
+ - 4
51
+ version: 0.0.4
52
+ type: :runtime
53
+ version_requirements: *id001
54
+ - !ruby/object:Gem::Dependency
55
+ name: rspec
56
+ prerelease: false
57
+ requirement: &id002 !ruby/object:Gem::Requirement
44
58
  none: false
45
59
  requirements:
46
60
  - - ~>
@@ -51,11 +65,11 @@ dependencies:
51
65
  - 1
52
66
  version: "1.1"
53
67
  type: :development
54
- version_requirements: *id001
68
+ version_requirements: *id002
55
69
  - !ruby/object:Gem::Dependency
56
70
  name: hanna
57
71
  prerelease: false
58
- requirement: &id002 !ruby/object:Gem::Requirement
72
+ requirement: &id003 !ruby/object:Gem::Requirement
59
73
  none: false
60
74
  requirements:
61
75
  - - ">="
@@ -65,7 +79,7 @@ dependencies:
65
79
  - 0
66
80
  version: "0"
67
81
  type: :development
68
- version_requirements: *id002
82
+ version_requirements: *id003
69
83
  description: " Sunspot::Solr provides a bundled Solr distribution for use with Sunspot.\n Typical deployment environments will require more configuration, but this\n distribution is well suited to development and testing.\n"
70
84
  email:
71
85
  - mat@patch.com
@@ -144,14 +158,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
144
158
  required_rubygems_version: !ruby/object:Gem::Requirement
145
159
  none: false
146
160
  requirements:
147
- - - ">"
161
+ - - ">="
148
162
  - !ruby/object:Gem::Version
149
- hash: 25
163
+ hash: 3
150
164
  segments:
151
- - 1
152
- - 3
153
- - 1
154
- version: 1.3.1
165
+ - 0
166
+ version: "0"
155
167
  requirements: []
156
168
 
157
169
  rubyforge_project: sunspot