summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndre Arko <andre@arko.net>2012-12-19 14:08:14 -0800
committerAndre Arko <andre@arko.net>2012-12-19 23:37:07 -0800
commitaa47b9a0f3269d43b7a3a047881ceab50ede546f (patch)
tree930aacb606c0409a5fcab87f807a2b4321eb38eb
parent29b7c3cd378a76e9654286b1634dbc389dc12caa (diff)
downloadbundler-aa47b9a0f3269d43b7a3a047881ceab50ede546f.tar.gz
Revert "Better meaning for slashless :github arg."
I am so sad that this breaks backwards compat. :( It will ship in 2.0. This reverts commit 7c8c58e0a59123177a086d66d65d9e9f2bf50105. Conflicts: spec/bundler/dsl_spec.rb
-rw-r--r--lib/bundler/dsl.rb2
-rw-r--r--spec/bundler/dsl_spec.rb7
2 files changed, 1 insertions, 8 deletions
diff --git a/lib/bundler/dsl.rb b/lib/bundler/dsl.rb
index a274113ba0..cc35cf4d5e 100644
--- a/lib/bundler/dsl.rb
+++ b/lib/bundler/dsl.rb
@@ -231,7 +231,7 @@ module Bundler
end
if github = opts.delete("github")
- github = "#{github}/#{name}" unless github.include?("/")
+ github = "#{github}/#{github}" unless github.include?("/")
opts["git"] = "git://github.com/#{github}.git"
end
diff --git a/spec/bundler/dsl_spec.rb b/spec/bundler/dsl_spec.rb
index 12cf308165..17ce5246fb 100644
--- a/spec/bundler/dsl_spec.rb
+++ b/spec/bundler/dsl_spec.rb
@@ -30,13 +30,6 @@ describe Bundler::Dsl do
github_uri = "git://github.com/rails/rails.git"
expect(subject.dependencies.first.source.uri).to eq(github_uri)
end
-
- it "interprets slashless 'github:' value as account name" do
- subject.gem("bundler", :github => "carlhuda")
- github_uri = "git://github.com/carlhuda/bundler.git"
- expect(subject.dependencies.first.source.uri).to eq(github_uri)
- end
-
end
describe '#method_missing' do