aboutsummaryrefslogtreecommitdiffstats
path: root/lib/bundler/cli
diff options
context:
space:
mode:
authorSamuel E. Giddins <segiddins@segiddins.me>2015-05-27 21:31:17 -0700
committerSamuel E. Giddins <segiddins@segiddins.me>2015-05-28 10:03:37 -0700
commit7d31c4366d81e9ed5c2cede17f4cdafe2a23fb22 (patch)
tree4a3cf57f50a569d392d64402672546572b07373a /lib/bundler/cli
parent8f7d9442cce3dd3460119d81963eacc3ad5c3018 (diff)
downloadbundler-7d31c4366d81e9ed5c2cede17f4cdafe2a23fb22.tar.gz
Use synchronized pwd everywhere
Diffstat (limited to 'lib/bundler/cli')
-rw-r--r--lib/bundler/cli/gem.rb4
-rw-r--r--lib/bundler/cli/init.rb6
2 files changed, 5 insertions, 5 deletions
diff --git a/lib/bundler/cli/gem.rb b/lib/bundler/cli/gem.rb
index cbbaa277..89058ca6 100644
--- a/lib/bundler/cli/gem.rb
+++ b/lib/bundler/cli/gem.rb
@@ -10,7 +10,7 @@ module Bundler
@thor = thor
@name = @gem_name
- @target = Pathname.pwd.join(gem_name)
+ @target = SharedHelpers.pwd.join(gem_name)
validate_ext_name if options[:ext]
end
@@ -134,7 +134,7 @@ module Bundler
private
def resolve_name(name)
- Pathname.pwd.join(name).basename.to_s
+ SharedHelpers.pwd.join(name).basename.to_s
end
def ask_and_set(key, header, message)
diff --git a/lib/bundler/cli/init.rb b/lib/bundler/cli/init.rb
index d6b2e742..fbf17424 100644
--- a/lib/bundler/cli/init.rb
+++ b/lib/bundler/cli/init.rb
@@ -7,7 +7,7 @@ module Bundler
def run
if File.exist?("Gemfile")
- Bundler.ui.error "Gemfile already exists at #{Dir.pwd}/Gemfile"
+ Bundler.ui.error "Gemfile already exists at #{SharedHelpers.pwd}/Gemfile"
exit 1
end
@@ -18,13 +18,13 @@ module Bundler
exit 1
end
spec = Gem::Specification.load(gemspec)
- puts "Writing new Gemfile to #{Dir.pwd}/Gemfile"
+ puts "Writing new Gemfile to #{SharedHelpers.pwd}/Gemfile"
File.open('Gemfile', 'wb') do |file|
file << "# Generated from #{gemspec}\n"
file << spec.to_gemfile
end
else
- puts "Writing new Gemfile to #{Dir.pwd}/Gemfile"
+ puts "Writing new Gemfile to #{SharedHelpers.pwd}/Gemfile"
FileUtils.cp(File.expand_path('../../templates/Gemfile', __FILE__), 'Gemfile')
end
end