Permalink
Browse files

switched from mainline camping to zuk-camping until reloader issues a…

…re fixed in mainline
  • Loading branch information...
1 parent 1aed47f commit 54ab785b0c9aac8b7a0a9e54ec66d824cb9a4c65 @zuk committed Apr 29, 2009
Showing with 34 additions and 30 deletions.
  1. +26 −26 Manifest.txt
  2. +1 −1 Rakefile
  3. +1 −1 lib/picnic.rb
  4. 0 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/CHANGELOG
  5. 0 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/COPYING
  6. 0 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/README
  7. 0 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/Rakefile
  8. 0 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/bin/camping
  9. BIN vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/doc/camping.1.gz
  10. 0 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/examples/README
  11. 0 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/examples/blog.rb
  12. 0 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/examples/campsh.rb
  13. 0 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/examples/tepee.rb
  14. BIN vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/extras/Camping.gif
  15. 0 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/extras/flipbook.rb
  16. BIN vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/extras/permalink.gif
  17. 0 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/lib/camping-unabridged.rb
  18. 0 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/lib/camping.rb
  19. 0 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/lib/camping/ar.rb
  20. 0 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/lib/camping/ar/session.rb
  21. 0 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/lib/camping/mab.rb
  22. +6 −2 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/lib/camping/reloader.rb
  23. 0 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/lib/camping/server.rb
  24. 0 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/lib/camping/session.rb
  25. 0 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/setup.rb
  26. 0 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/test/apps/env_debug.rb
  27. 0 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/test/apps/forms.rb
  28. 0 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/test/apps/misc.rb
  29. 0 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/test/apps/sessions.rb
  30. 0 vendor/{camping-2.0.20090421 → zuk-camping-2.0.20090429}/test/test_camping.rb
View
@@ -17,29 +17,29 @@ picnic.gemspec
setup.rb
test/picnic_test.rb
test/test_helper.rb
-vendor/camping-2.0.20090421/CHANGELOG
-vendor/camping-2.0.20090421/COPYING
-vendor/camping-2.0.20090421/README
-vendor/camping-2.0.20090421/Rakefile
-vendor/camping-2.0.20090421/bin/camping
-vendor/camping-2.0.20090421/doc/camping.1.gz
-vendor/camping-2.0.20090421/examples/README
-vendor/camping-2.0.20090421/examples/blog.rb
-vendor/camping-2.0.20090421/examples/campsh.rb
-vendor/camping-2.0.20090421/examples/tepee.rb
-vendor/camping-2.0.20090421/extras/Camping.gif
-vendor/camping-2.0.20090421/extras/permalink.gif
-vendor/camping-2.0.20090421/lib/camping-unabridged.rb
-vendor/camping-2.0.20090421/lib/camping.rb
-vendor/camping-2.0.20090421/lib/camping/ar.rb
-vendor/camping-2.0.20090421/lib/camping/ar/session.rb
-vendor/camping-2.0.20090421/lib/camping/mab.rb
-vendor/camping-2.0.20090421/lib/camping/reloader.rb
-vendor/camping-2.0.20090421/lib/camping/server.rb
-vendor/camping-2.0.20090421/lib/camping/session.rb
-vendor/camping-2.0.20090421/setup.rb
-vendor/camping-2.0.20090421/test/apps/env_debug.rb
-vendor/camping-2.0.20090421/test/apps/forms.rb
-vendor/camping-2.0.20090421/test/apps/misc.rb
-vendor/camping-2.0.20090421/test/apps/sessions.rb
-vendor/camping-2.0.20090421/test/test_camping.rb
+vendor/zuk-camping-2.0.20090429/CHANGELOG
+vendor/zuk-camping-2.0.20090429/COPYING
+vendor/zuk-camping-2.0.20090429/README
+vendor/zuk-camping-2.0.20090429/Rakefile
+vendor/zuk-camping-2.0.20090429/bin/camping
+vendor/zuk-camping-2.0.20090429/doc/camping.1.gz
+vendor/zuk-camping-2.0.20090429/examples/README
+vendor/zuk-camping-2.0.20090429/examples/blog.rb
+vendor/zuk-camping-2.0.20090429/examples/campsh.rb
+vendor/zuk-camping-2.0.20090429/examples/tepee.rb
+vendor/zuk-camping-2.0.20090429/extras/Camping.gif
+vendor/zuk-camping-2.0.20090429/extras/permalink.gif
+vendor/zuk-camping-2.0.20090429/lib/camping-unabridged.rb
+vendor/zuk-camping-2.0.20090429/lib/camping.rb
+vendor/zuk-camping-2.0.20090429/lib/camping/ar.rb
+vendor/zuk-camping-2.0.20090429/lib/camping/ar/session.rb
+vendor/zuk-camping-2.0.20090429/lib/camping/mab.rb
+vendor/zuk-camping-2.0.20090429/lib/camping/reloader.rb
+vendor/zuk-camping-2.0.20090429/lib/camping/server.rb
+vendor/zuk-camping-2.0.20090429/lib/camping/session.rb
+vendor/zuk-camping-2.0.20090429/setup.rb
+vendor/zuk-camping-2.0.20090429/test/apps/env_debug.rb
+vendor/zuk-camping-2.0.20090429/test/apps/forms.rb
+vendor/zuk-camping-2.0.20090429/test/apps/misc.rb
+vendor/zuk-camping-2.0.20090429/test/apps/sessions.rb
+vendor/zuk-camping-2.0.20090429/test/test_camping.rb
View
@@ -22,7 +22,7 @@ ENV['NODOT'] = '1'
NAME = "picnic"
REV = nil
-#REV = Time.now.strftime('%Y%m%d%H%M')
+REV = Time.now.strftime('%Y%m%d%H%M')
#REV = `svn info`[/Revision: (\d+)/, 1] rescue nil
VERS = ENV['VERSION'] || (Picnic::VERSION::STRING + (REV ? ".#{REV}" : ""))
CLEAN.include ['**/.*.sw?', '*.gem', '.config']
View
@@ -2,7 +2,7 @@
require 'activesupport'
$: << File.dirname(__FILE__)
-$: << File.dirname(__FILE__) + "/../vendor/camping-2.0.20090421/lib"
+$: << File.dirname(__FILE__) + "/../vendor/zuk-camping-2.0.20090429/lib"
require "camping"
@@ -132,8 +132,12 @@ def mtime
# Figures out the full path of a required file.
def full_path(req)
- dir = File.expand_path($LOAD_PATH.detect { |l| File.exists?(File.join(l, req)) })
- File.join(dir, req)
+ dir = $LOAD_PATH.detect { |l| File.exists?(File.join(l, req)) }
+ if dir
+ File.join(File.expand_path(dir), req)
+ else
+ req
+ end
end
end

0 comments on commit 54ab785

Please sign in to comment.