Commit 32aaaf83 authored by Fabio Pelosin's avatar Fabio Pelosin

Merge branch 'master', remote-tracking branch 'origin'

* origin:
  Removed unrelated experimental changes to local_pod.rb
  [#153] Relaxed run if needed
  [#153] Hide pod setup
  [#179] Support for :local pods outside the sanbox

* master:
parents 8da01377 7349d6b7
...@@ -51,15 +51,18 @@ module Pod ...@@ -51,15 +51,18 @@ module Pod
end end
def self.run(*argv) def self.run(*argv)
parse(*argv).run begin
rescue Exception => e Setup.new(ARGV.new()).run_if_needed
if e.is_a?(Informative) parse(*argv).run
puts e.message rescue Exception => e
puts *e.backtrace if Config.instance.verbose if e.is_a?(Informative)
else puts e.message
puts ErrorReport.report(e) puts *e.backtrace if Config.instance.verbose
else
puts ErrorReport.report(e)
end
exit 1
end end
exit 1
end end
def self.parse(*argv) def self.parse(*argv)
......
...@@ -47,17 +47,24 @@ module Pod ...@@ -47,17 +47,24 @@ module Pod
end end
end end
def origin_url_read_only?
read_master_repo_url.chomp == read_only_url
end
def origin_url_push? def origin_url_push?
Dir.chdir(dir) do read_master_repo_url.chomp == read_write_url
origin_url = git('config --get remote.origin.url')
origin_url.chomp == read_write_url
end
end end
def push? def push?
@push_option || (dir.exist? && origin_url_push?) @push_option || (dir.exist? && origin_url_push?)
end end
def read_master_repo_url
Dir.chdir(dir) do
origin_url = git('config --get remote.origin.url')
end
end
def set_master_repo_url def set_master_repo_url
Dir.chdir(dir) do Dir.chdir(dir) do
git("remote set-url origin '#{url}'") git("remote set-url origin '#{url}'")
...@@ -72,6 +79,10 @@ module Pod ...@@ -72,6 +79,10 @@ module Pod
Repo.new(ARGV.new(['update', 'master'])) Repo.new(ARGV.new(['update', 'master']))
end end
def run_if_needed
run if !dir.exist?
end
def run def run
puts "Using push access" if push? && !config.silent puts "Using push access" if push? && !config.silent
if dir.exist? if dir.exist?
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment