aether/gosick
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix an issue reported by rubocop that wasn't ignored in the todo config

Browse Source 
Issue text: Favor modifier if/unless usage when you have a single-line body.
This commit is contained in:
Nicolas McCurdy
2014-01-04 20:39:44 -05:00
parent e202b7eae7
commit f03e7670cf
3 changed files with 4 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
lib/homesick.rb
View File

@@ -31,9 +31,7 @@ class Homesick < Thor
destination = nil
if File.exist?(uri)
uri = Pathname.new(uri).expand_path
if uri.to_s.start_with?(repos_dir.to_s)
raise "Castle already cloned to #{uri}"
end
raise "Castle already cloned to #{uri}" if uri.to_s.start_with?(repos_dir.to_s)
destination = uri.basename

8
lib/homesick/actions.rb
View File

@@ -93,9 +93,7 @@ class Homesick
if destination.exist?
say_status :conflict, "#{destination} exists", :red unless options[:quiet]
if options[:force] || shell.file_collision(destination) { source }
system "mv '#{source}' '#{destination}'" unless options[:pretend]
end
system "mv '#{source}' '#{destination}'" if (options[:force] || shell.file_collision(destination) { source }) && !options[:pretend]
else
# this needs some sort of message here.
system "mv '#{source}' '#{destination}'" unless options[:pretend]
@@ -155,9 +153,7 @@ class Homesick
else
say_status :conflict, "#{destination} exists and points to #{destination.readlink}", :red unless options[:quiet]
if options[:force] || shell.file_collision(destination) { source }
system "ln -nsf '#{source}' '#{destination}'" unless options[:pretend]
end
system "ln -nsf '#{source}' '#{destination}'" if (options[:force] || shell.file_collision(destination) { source }) && !options[:pretend]
end
elsif destination.exist?
say_status :conflict, "#{destination} exists", :red unless options[:quiet]