Permalink
Browse files

[#112] Refactoring based on suggestions by @alloy

  • Loading branch information...
1 parent 89f81e1 commit fd1e891f4acb8937ce1cccf681f4c479f31da935 @fabiopelosin fabiopelosin committed Mar 21, 2012
@@ -8,8 +8,6 @@ class Command
autoload :Setup, 'cocoapods/command/setup'
autoload :Spec, 'cocoapods/command/spec'
- attr_accessor :output
-
class Help < Informative
def initialize(command_class, argv)
@command_class, @argv = command_class, argv
@@ -14,23 +14,19 @@ def self.banner
$ pod repo update NAME
Updates the local clone of the spec-repo `NAME'. If `NAME' is omitted
- this will update all spec-repos in `~/.cocoapods'.
-
- $ pod repo set-url NAME URL
-
- Updates the remote `URL' of the spec-repo `NAME'.}
+ this will update all spec-repos in `~/.cocoapods'.}
end
extend Executable
executable :git
def initialize(argv)
case @action = argv.arguments[0]
- when 'add', 'set-url'
+ when 'add'
unless (@name = argv.arguments[1]) && (@url = argv.arguments[2])
raise Informative, "#{@action == 'add' ? 'Adding' : 'Updating the remote of'} a repo needs a `name' and a `url'."
end
- when 'update', 'read-url'
+ when 'update'
@name = argv.arguments[1]
else
super
@@ -58,19 +54,6 @@ def update
Dir.chdir(dir) { git("pull") }
end
end
-
- def set_url
- Dir.chdir(dir) do
- git("remote set-url origin '#{@url}'")
- end
- end
-
- def read_url
- Dir.chdir(dir) do
- @output = git('config --get remote.origin.url')
- end
- end
-
end
end
end
@@ -19,56 +19,63 @@ def self.options
super
end
+ extend Executable
+ executable :git
+
def initialize(argv)
- @push_access = argv.option('--push') || already_push?
- puts "Setup with push access" if @push_access && !config.silent
+ @push_option = argv.option('--push')
super unless argv.empty?
end
- def already_push?
- if master_repo_exists?
- read_master_repo_remote_command.run
- read_master_repo_remote_command.output.chomp == master_repo_url_with_push
- else
- false
- end
+ def dir
+ config.repos_dir + 'master'
end
- def master_repo_exists?
- (config.repos_dir + 'master').exist?
- end
-
- def master_repo_url
+ def read_only_url
'git://github.com/CocoaPods/Specs.git'
end
- def master_repo_url_with_push
+ def read_write_url
'git@github.com:CocoaPods/Specs.git'
end
- def repo_url
- @push_access ? master_repo_url_with_push : master_repo_url
+ def url
+ if push?
+ read_write_url
+ else
+ read_only_url
+ end
end
- def add_master_repo_command
- @command ||= Repo.new(ARGV.new(['add', 'master', repo_url]))
+ def origin_url_push?
+ Dir.chdir(dir) do
+ origin_url = git('config --get remote.origin.url')
+ origin_url.chomp == read_write_url
+ end
+ end
+
+ def push?
+ @push_option || (dir.exist? && origin_url_push?)
end
- def read_master_repo_remote_command
- @read_command ||= Repo.new(ARGV.new(['read-url', 'master']))
+ def set_master_repo_url
+ Dir.chdir(dir) do
+ git("remote set-url origin '#{url}'")
+ end
end
- def update_master_repo_remote_command
- Repo.new(ARGV.new(['set-url', 'master', repo_url]))
+ def add_master_repo_command
+ @command ||= Repo.new(ARGV.new(['add', 'master', url]))
end
def update_master_repo_command
Repo.new(ARGV.new(['update', 'master']))
end
def run
- if master_repo_exists?
- update_master_repo_remote_command.run
+ puts "Using push access" if push? && !config.silent
+ if dir.exist?
+ set_master_repo_url
update_master_repo_command.run
else
add_master_repo_command.run
@@ -6,11 +6,21 @@
it "creates the local spec-repos directory and creates a clone of the `master' repo" do
command = Pod::Command.parse('setup', '--silent')
- def command.master_repo_url; SpecHelper.fixture('spec-repos/master'); end
+ def command.url; SpecHelper.fixture('spec-repos/master'); end
command.run
git_config('master', 'remote.origin.url').should == fixture('spec-repos/master').to_s
end
+ it "preserve push access for the `master' repo" do
+ command = Pod::Command.parse('setup', '--silent')
+ def command.url; SpecHelper.fixture('spec-repos/master'); end
+ command.run
+ command2 = Pod::Command.parse('setup', '--silent')
+ command2.url.should == 'git://github.com/CocoaPods/Specs.git'
+ git('master', 'remote set-url origin git@github.com:CocoaPods/Specs.git')
+ command2.url.should == 'git@github.com:CocoaPods/Specs.git'
+ end
+
it "adds a spec-repo" do
add_repo('private', fixture('spec-repos/master'))
git_config('private', 'remote.origin.url').should == fixture('spec-repos/master').to_s
@@ -2,6 +2,7 @@
describe "Pod::Command" do
it "returns the proper command class" do
+ config.silent.should == true
Pod::Command.parse('setup').should.be.instance_of Pod::Command::Setup
#Pod::Command.parse('spec').should.be.instance_of Pod::Command::Spec
Pod::Command.parse('repo', 'update').should.be.instance_of Pod::Command::Repo
@@ -13,9 +14,15 @@
lambda { Pod::Command::Setup.new(argv('something')) }.should.raise Pod::Command::Help
end
- it "returns the URL of the `master' spec-repo" do
+ it "returns the read only URL of the `master' spec-repo" do
command = Pod::Command::Setup.new(argv)
- command.master_repo_url.should == 'git://github.com/CocoaPods/Specs.git'
+ command.url.should == 'git://github.com/CocoaPods/Specs.git'
+ end
+
+ it "returns the push URL of the `master' spec-repo" do
+ config.silent = true
+ command = Pod::Command::Setup.new(argv('--push'))
+ command.url.should == 'git@github.com:CocoaPods/Specs.git'
end
end

1 comment on commit fd1e891

@alloy
Member
alloy commented on fd1e891 Mar 21, 2012

👍

Please sign in to comment.