sunspot_rails 2.0.0.pre.120415 → 2.0.0.pre.120417

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.
Files changed (2) hide show
  1. data/lib/sunspot/rails/tasks.rb +12 -11
  2. metadata +7 -7
@@ -59,16 +59,15 @@ namespace :sunspot do
59
59
  end
60
60
  end
61
61
 
62
- # Assume that if the sunspot_solr gem is in the load path that this deprication warning is
63
- # redundant.
64
- def sunspot_solr_in_load_path
65
- $:.any? { |path| path =~ %r{sunspot_solr/lib$} }
62
+ def sunspot_solr_in_load_path?
63
+ # http://www.rubular.com/r/rJGDh7eOSc
64
+ $:.any? { |path| path =~ %r{sunspot_solr(-[^/]+)?/lib$} }
66
65
  end
67
66
 
68
- unless sunspot_solr_in_load_path
67
+ unless sunspot_solr_in_load_path?
69
68
  namespace :solr do
70
- task :moved_to_sunspot_solr do
71
- abort %(
69
+ task :moved_to_sunspot_solr do
70
+ abort %(
72
71
  Note: This task has been moved to the sunspot_solr gem. To install, start and
73
72
  stop a local Solr instance, please add sunspot_solr to your Gemfile:
74
73
 
@@ -77,17 +76,19 @@ namespace :sunspot do
77
76
  end
78
77
 
79
78
  )
80
- end
81
-
79
+ end
80
+
82
81
  desc 'Start the Solr instance'
83
82
  task :start => :moved_to_sunspot_solr
83
+
84
84
  desc 'Run the Solr instance in the foreground'
85
85
  task :run => :moved_to_sunspot_solr
86
+
86
87
  desc 'Stop the Solr instance'
87
88
  task :stop => :moved_to_sunspot_solr
88
- # for backwards compatibility
89
+
90
+ # for backwards compatibility
89
91
  task :reindex => :"sunspot:reindex"
90
92
  end
91
93
  end
92
-
93
94
  end
metadata CHANGED
@@ -1,15 +1,15 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sunspot_rails
3
3
  version: !ruby/object:Gem::Version
4
- hash: 2889093829
4
+ hash: 1734687471
5
5
  prerelease: 6
6
6
  segments:
7
7
  - 2
8
8
  - 0
9
9
  - 0
10
10
  - pre
11
- - 120415
12
- version: 2.0.0.pre.120415
11
+ - 120417
12
+ version: 2.0.0.pre.120417
13
13
  platform: ruby
14
14
  authors:
15
15
  - Mat Brown
@@ -35,7 +35,7 @@ autorequire:
35
35
  bindir: bin
36
36
  cert_chain: []
37
37
 
38
- date: 2012-04-15 00:00:00 Z
38
+ date: 2012-04-17 00:00:00 Z
39
39
  dependencies:
40
40
  - !ruby/object:Gem::Dependency
41
41
  name: sunspot
@@ -45,14 +45,14 @@ dependencies:
45
45
  requirements:
46
46
  - - "="
47
47
  - !ruby/object:Gem::Version
48
- hash: 2889093829
48
+ hash: 1734687471
49
49
  segments:
50
50
  - 2
51
51
  - 0
52
52
  - 0
53
53
  - pre
54
- - 120415
55
- version: 2.0.0.pre.120415
54
+ - 120417
55
+ version: 2.0.0.pre.120417
56
56
  type: :runtime
57
57
  version_requirements: *id001
58
58
  - !ruby/object:Gem::Dependency