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

34
lib/homesick.rb
View File

@@ -32,8 +32,7 @@ class Homesick < Thor
destination = nil
if File.exist?(uri)
uri = Pathname.new(uri).expand_path
fail "Castle already cloned to #{uri}" \
if uri.to_s.start_with?(repos_dir.to_s)
fail "Castle already cloned to #{uri}" if uri.to_s.start_with?(repos_dir.to_s)
destination = uri.basename
@@ -59,17 +58,16 @@ class Homesick < Thor
destination = Pathname.new(name)
homesickrc = destination.join('.homesickrc').expand_path
if homesickrc.exist?
proceed = shell.yes?("#{name} has a .homesickrc. Proceed with "\
"evaling it? (This could be destructive)")
proceed = shell.yes?("#{name} has a .homesickrc. Proceed with evaling it? (This could be destructive)")
if proceed
shell.say_status 'eval', homesickrc
inside destination do
eval homesickrc.read, binding, homesickrc.expand_path.to_s
end
else
shell.say_status 'eval skip', "not evaling #{homesickrc}, " \
"#{destination} may need manual " \
"configuration", :blue
shell.say_status 'eval skip',
"not evaling #{homesickrc}, #{destination} may need manual configuration",
:blue
end
end
end
@@ -122,8 +120,7 @@ class Homesick < Thor
desc 'symlink CASTLE', 'Symlinks all dotfiles from the specified castle'
method_option :force,
default: false,
desc: 'Overwrite existing conflicting symlinks without ' \
'prompting.'
desc: 'Overwrite existing conflicting symlinks without prompting.'
def symlink(name = DEFAULT_CASTLE_NAME)
check_castle_existance(name, 'symlink')
@@ -164,9 +161,7 @@ class Homesick < Thor
mv absolute_path, castle_path
else
shell.say_status(:track,
"#{target} already exists, and is more recent " \
"than #{file}. Run 'homesick SYMLINK CASTLE' " \
"to create symlinks.",
"#{target} already exists, and is more recent than #{file}. Run 'homesick SYMLINK CASTLE' to create symlinks.",
:blue) unless options[:quiet]
end
else
@@ -184,8 +179,7 @@ class Homesick < Thor
end
# are we tracking something nested? Add the parent dir to the manifest
subdir_add(castle, relative_dir) \
unless relative_dir.eql?(Pathname.new('.'))
subdir_add(castle, relative_dir) unless relative_dir.eql?(Pathname.new('.'))
end
desc 'list', 'List cloned castles'
@@ -254,8 +248,7 @@ class Homesick < Thor
check_castle_existance castle, 'cd'
castle_dir = repos_dir.join(castle)
say_status "cd #{castle_dir.realpath}",
"Opening a new shell in castle '#{castle}'. To return to the " \
"original one exit from the new shell.",
"Opening a new shell in castle '#{castle}'. To return to the original one exit from the new shell.",
:green
inside castle_dir do
system(ENV['SHELL'])
@@ -267,8 +260,7 @@ class Homesick < Thor
def open(castle = DEFAULT_CASTLE_NAME)
unless ENV['EDITOR']
say_status :error,
'The $EDITOR environment variable must be set to use ' \
'this command',
'The $EDITOR environment variable must be set to use this command',
:red
exit(1)
@@ -276,8 +268,7 @@ class Homesick < Thor
check_castle_existance castle, 'open'
castle_dir = repos_dir.join(castle)
say_status "#{ENV['EDITOR']} #{castle_dir.realpath}",
"Opening the root directory of castle '#{castle}' in editor " \
"'#{ENV['EDITOR']}'.",
"Opening the root directory of castle '#{castle}' in editor '#{ENV['EDITOR']}'.",
:green
inside castle_dir do
system(ENV['EDITOR'])
@@ -306,8 +297,7 @@ class Homesick < Thor
def check_castle_existance(name, action)
unless castle_dir(name).exist?
say_status :error,
"Could not #{action} #{name}, expected " \
"#{castle_dir(name)} exist and contain dotfiles",
"Could not #{action} #{name}, expected #{castle_dir(name)} exist and contain dotfiles",
:red
exit(1)

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]