Fix rubocop issues for some recently merged code

This commit is contained in:
Nicolas McCurdy
2014-01-15 23:13:48 -05:00
parent bb735763c6
commit 82be04ad8a
3 changed files with 67 additions and 30 deletions

View File

@@ -12,7 +12,8 @@ class Homesick
FileUtils.mkdir_p destination.dirname
if destination.directory?
say_status :exist, destination.expand_path, :blue unless options[:quiet]
say_status :exist, destination.expand_path, :blue \
unless options[:quiet]
else
say_status 'git clone',
"#{repo} to #{destination.expand_path}",
@@ -27,7 +28,8 @@ class Homesick
inside path do
if path.join('.git').exist?
say_status 'git init', 'already initialized', :blue unless options[:quiet]
say_status 'git init', 'already initialized', :blue \
unless options[:quiet]
else
say_status 'git init', '' unless options[:quiet]
system 'git init >/dev/null' unless options[:pretend]
@@ -40,7 +42,8 @@ class Homesick
existing_remote = nil if existing_remote == ''
if existing_remote
say_status 'git remote', "#{name} already exists", :blue unless options[:quiet]
say_status 'git remote', "#{name} already exists", :blue \
unless options[:quiet]
else
say_status 'git remote', "add #{name} #{url}" unless options[:quiet]
system "git remote add #{name} #{url}" unless options[:pretend]
@@ -71,7 +74,8 @@ class Homesick
def git_commit_all(config = {})
say_status 'git commit all', '', :green unless options[:quiet]
if config[:message]
system "git commit -a -m '#{config[:message]}'" unless options[:pretend]
system "git commit -a -m '#{config[:message]}'" \
unless options[:pretend]
else
system 'git commit -v -a' unless options[:pretend]
end
@@ -97,7 +101,8 @@ class Homesick
destination = Pathname.new(destination + source.basename)
if destination.exist?
say_status :conflict, "#{destination} exists", :red unless options[:quiet]
say_status :conflict, "#{destination} exists", :red \
unless options[:quiet]
system "mv '#{source}' '#{destination}'" \
if (options[:force] ||
@@ -113,10 +118,12 @@ class Homesick
target = Pathname.new(target)
if target.symlink?
say_status :unlink, "#{target.expand_path}", :green unless options[:quiet]
say_status :unlink, "#{target.expand_path}", :green \
unless options[:quiet]
FileUtils.rm_rf target
else
say_status :conflict, "#{target} is not a symlink", :red unless options[:quiet]
say_status :conflict, "#{target} is not a symlink", :red \
unless options[:quiet]
end
end
@@ -134,10 +141,12 @@ class Homesick
target = Pathname.new(target)
if target.symlink?
say_status :unlink, "#{target.expand_path}", :green unless options[:quiet]
say_status :unlink, "#{target.expand_path}", :green \
unless options[:quiet]
FileUtils.rm_rf target
else
say_status :conflict, "#{target} is not a symlink", :red unless options[:quiet]
say_status :conflict, "#{target} is not a symlink", :red \
unless options[:quiet]
end
end
@@ -172,7 +181,8 @@ class Homesick
def handle_symlink_action(action, source, destination)
case action
when :identical
say_status :identical, destination.expand_path, :blue unless options[:quiet]
say_status :identical, destination.expand_path, :blue \
unless options[:quiet]
when :symlink_conflict
say_status :conflict,
"#{destination} exists and points to " \
@@ -181,7 +191,8 @@ class Homesick
system "ln -nsf '#{source}' '#{destination}'" if collision_accepted?
when :conflict
say_status :conflict, "#{destination} exists", :red unless options[:quiet]
say_status :conflict, "#{destination} exists", :red \
unless options[:quiet]
if collision_accepted?
system "rm -rf '#{destination}'" unless options[:pretend]