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

Revert changes that use "\" and disable the line length cop

Browse Source
This commit is contained in:
Nicolas McCurdy
2014-01-20 21:03:21 -05:00
parent 08a71f657f
commit 95943deb82
5 changed files with 52 additions and 98 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
lib/homesick/actions.rb
View File

@@ -7,19 +7,16 @@ class Homesick
config ||= {}
destination = config[:destination] || File.basename(repo, '.git')
destination = Pathname.new(destination) \
unless destination.kind_of?(Pathname)
destination = Pathname.new(destination) unless destination.kind_of?(Pathname)
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}",
:green unless options[:quiet]
system "git clone -q --config push.default=upstream " \
"--recursive #{repo} #{destination}" unless options[:pretend]
system "git clone -q --config push.default=upstream --recursive #{repo} #{destination}" unless options[:pretend]
end
end
@@ -28,8 +25,7 @@ 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]
@@ -42,8 +38,7 @@ 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]
@@ -57,8 +52,7 @@ class Homesick
def git_submodule_update(config = {})
say_status 'git submodule', 'update', :green unless options[:quiet]
system 'git submodule --quiet update --init --recursive ' \
'>/dev/null 2>&1' unless options[:pretend]
system 'git submodule --quiet update --init --recursive >/dev/null 2>&1' unless options[:pretend]
end
def git_pull(config = {})
@@ -74,8 +68,7 @@ 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
@@ -101,13 +94,9 @@ 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] ||
shell.file_collision(destination) { source }) &&
!options[:pretend]
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]
@@ -118,12 +107,10 @@ 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
@@ -141,12 +128,10 @@ 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
@@ -181,18 +166,15 @@ 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 " \
"#{destination.readlink}",
"#{destination} exists and points to #{destination.readlink}",
:red unless options[:quiet]
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]