rtyler
/
blimpy
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Fixed a system/local conflict problem 

If blimpy gem is already installed, this ends up picking blimpy from the installed gem, as opposed to the local workspace.
This commit is contained in:
Kohsuke Kawaguchi 2013-03-29 15:49:21 -07:00
parent cd1ebc211d
commit 2edd265e92
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
bin/blimpy
View File

@ -10,12 +10,8 @@ rescue NameError
# I don't think we have YAML::ENGINE until Ruby 1.9
end
begin
require 'blimpy/cli'
rescue LoadError
$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib/')
require 'blimpy/cli'
end
$:.unshift File.expand_path(File.dirname(__FILE__) + '/../lib/')
require 'blimpy/cli'
# allow monkey-patching of Blimpy by the project (mainly to add more commands)
blimprc = File.join(Dir.pwd,"Blimprc")