Permalink
Browse files

Add xpath gem as submodule and run from submodule

This way it's far easier to develop against the
most recent version of the gem.
  • Loading branch information...
1 parent 6a1a109 commit 9b7e6c72e3389922d1cac2cc670ac11e0ade0254 @jnicklas jnicklas committed Jan 9, 2011
Showing with 15 additions and 5 deletions.
  1. +3 −0 .gitmodules
  2. +3 −1 Gemfile
  3. +7 −3 Gemfile.lock
  4. +1 −1 capybara.gemspec
  5. +1 −0 xpath
View
@@ -0,0 +1,3 @@
+[submodule "xpath"]
+ path = xpath
+ url = git://github.com/jnicklas/xpath.git
View
@@ -1,5 +1,7 @@
source :rubygems
gem 'bundler', '~> 1.0'
-gem 'xpath', :path => '../xpath' if ENV['XPATH_LOCAL']
gemspec
+
+@dependencies.delete_if {|d| d.name == "xpath" }
+gem 'xpath', :path => 'xpath'
View
@@ -11,6 +11,12 @@ PATH
selenium-webdriver (>= 0.0.27)
xpath (~> 0.1.2)
+PATH
+ remote: xpath
+ specs:
+ xpath (0.1.2)
+ nokogiri (~> 1.3)
+
GEM
remote: http://rubygems.org/
specs:
@@ -58,8 +64,6 @@ GEM
sinatra (1.0)
rack (>= 1.0)
weakling (0.0.4-java)
- xpath (0.1.2)
- nokogiri (~> 1.3)
yard (0.6.1)
PLATFORMS
@@ -80,5 +84,5 @@ DEPENDENCIES
rspec (>= 2.0.0)
selenium-webdriver (>= 0.0.27)
sinatra (>= 0.9.4)
- xpath (~> 0.1.2)
+ xpath!
yard (>= 0.5.8)
View
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
s.add_runtime_dependency("selenium-webdriver", [">= 0.0.27"])
s.add_runtime_dependency("rack", [">= 1.0.0"])
s.add_runtime_dependency("rack-test", [">= 0.5.4"])
- s.add_runtime_dependency("xpath", ["~> 0.1.2"]) unless ENV['XPATH_LOCAL']
+ s.add_runtime_dependency("xpath", ["~> 0.1.2"])
s.add_development_dependency("sinatra", [">= 0.9.4"])
s.add_development_dependency("rspec", [">= 2.0.0"])
1 xpath
Submodule xpath added at 94c46f

0 comments on commit 9b7e6c7

Please sign in to comment.