[RAILS] Changed the dependency on "elasticsearch-model" from local to…

… Rubygems Otherwise, Bundler is stuck in endless "Resolving dependencies" loop.
elastic · May 27, 2014 · 67ea513 · 67ea513
1 parent 91814b3
commit 67ea513
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 3 deletions.
diff --git a/elasticsearch-rails/Gemfile b/elasticsearch-rails/Gemfile
@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in elasticsearch-rails.gemspec
 gemspec
 
-if File.exists? File.expand_path("../../elasticsearch-model", __FILE__)
-  gem 'elasticsearch-model', :path => File.expand_path("../../elasticsearch-model", __FILE__), :require => true
-end
+# TODO: Figure out how to specify dependency on local elasticsearch-model without endless "Resolving dependencies"
+# if File.exists? File.expand_path("../../elasticsearch-model", __FILE__)
+#   gem 'elasticsearch-model', :path => File.expand_path("../../elasticsearch-model", __FILE__), :require => true
+# end
diff --git a/elasticsearch-rails/elasticsearch-rails.gemspec b/elasticsearch-rails/elasticsearch-rails.gemspec
@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   s.add_development_dependency "rake"
 
   s.add_development_dependency "elasticsearch-extensions"
+  s.add_development_dependency "elasticsearch-model"
 
   s.add_development_dependency "oj"
   s.add_development_dependency "rails",  "> 3.0"