Skip to content
This repository
Browse code

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...
commit 9b7e6c72e3389922d1cac2cc670ac11e0ade0254 1 parent 6a1a109
Jonas Nicklas authored January 09, 2011
3  .gitmodules
... ...
@@ -0,0 +1,3 @@
  1
+[submodule "xpath"]
  2
+	path = xpath
  3
+	url = git://github.com/jnicklas/xpath.git
4  Gemfile
... ...
@@ -1,5 +1,7 @@
1 1
 source :rubygems
2 2
 
3 3
 gem 'bundler', '~> 1.0'
4  
-gem 'xpath', :path => '../xpath' if ENV['XPATH_LOCAL']
5 4
 gemspec
  5
+
  6
+@dependencies.delete_if {|d| d.name == "xpath" }
  7
+gem 'xpath', :path => 'xpath'
10  Gemfile.lock
@@ -11,6 +11,12 @@ PATH
11 11
       selenium-webdriver (>= 0.0.27)
12 12
       xpath (~> 0.1.2)
13 13
 
  14
+PATH
  15
+  remote: xpath
  16
+  specs:
  17
+    xpath (0.1.2)
  18
+      nokogiri (~> 1.3)
  19
+
14 20
 GEM
15 21
   remote: http://rubygems.org/
16 22
   specs:
@@ -58,8 +64,6 @@ GEM
58 64
     sinatra (1.0)
59 65
       rack (>= 1.0)
60 66
     weakling (0.0.4-java)
61  
-    xpath (0.1.2)
62  
-      nokogiri (~> 1.3)
63 67
     yard (0.6.1)
64 68
 
65 69
 PLATFORMS
@@ -80,5 +84,5 @@ DEPENDENCIES
80 84
   rspec (>= 2.0.0)
81 85
   selenium-webdriver (>= 0.0.27)
82 86
   sinatra (>= 0.9.4)
83  
-  xpath (~> 0.1.2)
  87
+  xpath!
84 88
   yard (>= 0.5.8)
2  capybara.gemspec
@@ -29,7 +29,7 @@ Gem::Specification.new do |s|
29 29
   s.add_runtime_dependency("selenium-webdriver", [">= 0.0.27"])
30 30
   s.add_runtime_dependency("rack", [">= 1.0.0"])
31 31
   s.add_runtime_dependency("rack-test", [">= 0.5.4"])
32  
-  s.add_runtime_dependency("xpath", ["~> 0.1.2"]) unless ENV['XPATH_LOCAL']
  32
+  s.add_runtime_dependency("xpath", ["~> 0.1.2"])
33 33
 
34 34
   s.add_development_dependency("sinatra", [">= 0.9.4"])
35 35
   s.add_development_dependency("rspec", [">= 2.0.0"])
1  xpath
... ...
@@ -0,0 +1 @@
  1
+Subproject commit 94c46fb3a2b3f7761e4f7c379a469986cb1a6bc9

0 notes on commit 9b7e6c7

Please sign in to comment.
Something went wrong with that request. Please try again.