Skip to content
This repository has been archived by the owner on Apr 14, 2021. It is now read-only.

Fixed a bug that was not properly caching gems from all git repositories. #1253

Merged
merged 6 commits into from
Jun 28, 2011
Merged

Fixed a bug that was not properly caching gems from all git repositories. #1253

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
08e0880
Fixed a bug that was not properly caching gems from all git repositor…
mtscout6 Jun 17, 2011
43fa713
Added test for git uri as a network share.
mtscout6 Jun 20, 2011
ea23c4f
Fixed tabs in source.rb and added test in git_spec.rb
mtscout6 Jun 21, 2011
cd336f4
Updated regex for network share paths
mtscout6 Jun 21, 2011
448c1d4
Fixed regex error in base_name and added test.
mtscout6 Jun 21, 2011
332a17c
Merge branch '1-0-stable' of git://github.com/carlhuda/bundler into 1…
mtscout6 Jun 24, 2011
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion lib/bundler/source.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -585,7 +585,7 @@ def git(command)
end

def base_name
File.basename(uri.sub(%r{^(\w+://)?([^/:]+:)},''), ".git")
File.basename(uri.sub(%r{^(\w+://)?([^/:]+:)?(//\w*/)?(\w*/)*},''),".git")
end

def shortref_for_display(ref)
Expand Down
7 changes: 5 additions & 2 deletions spec/cache/git_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,9 @@
source = Bundler::Source::Git.new("uri" => "[email protected]:bundler.git")
source.send(:base_name).should == "bundler"
end
end


it "base_name should strip network share paths" do
source = Bundler::Source::Git.new("uri" => "//MachineName/ShareFolder")
source.send(:base_name).should == "ShareFolder"
end
end