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

Merge pull request #87 from JCook21/Consistent

Browse Source 
Rename "symlink" command to "link" (with backward compatibility)
This commit is contained in:
Christian Bundy
2014-01-21 16:17:12 -08:00
parent 2b48544e32 59f6239ea0
commit 9b780ffac6
2 changed files with 19 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/homesick.rb
View File

@@ -19,6 +19,8 @@ class Homesick < Thor
map '-v' => :version map '-v' => :version
map '--version' => :version map '--version' => :version
# Retain a mapped version of the symlink command for compatibility.
map 'symlink' => :link
def initialize(args = [], options = {}, config = {}) def initialize(args = [], options = {}, config = {})
super super
@@ -123,9 +125,9 @@ class Homesick < Thor
end end
end end
desc 'symlink CASTLE', 'Symlinks all dotfiles from the specified castle' desc 'link CASTLE', 'Symlinks all dotfiles from the specified castle'
method_option :force, :default => false, :desc => 'Overwrite existing conflicting symlinks without prompting.' method_option :force, :default => false, :desc => 'Overwrite existing conflicting symlinks without prompting.'
def symlink(name = DEFAULT_CASTLE_NAME) def link(name = DEFAULT_CASTLE_NAME)
check_castle_existance(name, 'symlink') check_castle_existance(name, 'symlink')
inside castle_dir(name) do inside castle_dir(name) do

30
spec/homesick_spec.rb
View File

@@ -145,13 +145,13 @@ describe 'homesick' do
end end
end end
describe 'symlink' do describe 'link' do
let(:castle) { given_castle('glencairn') } let(:castle) { given_castle('glencairn') }
it 'links dotfiles from a castle to the home folder' do it 'links dotfiles from a castle to the home folder' do
dotfile = castle.file('.some_dotfile') dotfile = castle.file('.some_dotfile')
homesick.symlink('glencairn') homesick.link('glencairn')
home.join('.some_dotfile').readlink.should == dotfile home.join('.some_dotfile').readlink.should == dotfile
end end
@@ -159,7 +159,7 @@ describe 'homesick' do
it 'links non-dotfiles from a castle to the home folder' do it 'links non-dotfiles from a castle to the home folder' do
dotfile = castle.file('bin') dotfile = castle.file('bin')
homesick.symlink('glencairn') homesick.link('glencairn')
home.join('bin').readlink.should == dotfile home.join('bin').readlink.should == dotfile
end end
@@ -174,7 +174,7 @@ describe 'homesick' do
dotdir = castle.directory('.vim') dotdir = castle.directory('.vim')
homesick.symlink('glencairn') homesick.link('glencairn')
existing_dotdir_link.readlink.should == dotdir existing_dotdir_link.readlink.should == dotdir
end end
@@ -184,7 +184,7 @@ describe 'homesick' do
dotdir = castle.directory('.vim') dotdir = castle.directory('.vim')
homesick.symlink('glencairn') homesick.link('glencairn')
existing_dotdir.readlink.should == dotdir existing_dotdir.readlink.should == dotdir
end end
@@ -196,7 +196,7 @@ describe 'homesick' do
dotdir = castle.directory('.config') dotdir = castle.directory('.config')
dotfile = dotdir.file('.some_dotfile') dotfile = dotdir.file('.some_dotfile')
homesick.symlink('glencairn') homesick.link('glencairn')
home_dotdir = home.join('.config') home_dotdir = home.join('.config')
home_dotdir.symlink?.should be == false home_dotdir.symlink?.should be == false
@@ -210,7 +210,7 @@ describe 'homesick' do
dotdir = castle.directory('.config').directory('appA') dotdir = castle.directory('.config').directory('appA')
dotfile = dotdir.file('.some_dotfile') dotfile = dotdir.file('.some_dotfile')
homesick.symlink('glencairn') homesick.link('glencairn')
home_dotdir = home.join('.config').join('appA') home_dotdir = home.join('.config').join('appA')
home_dotdir.symlink?.should be == false home_dotdir.symlink?.should be == false
@@ -226,7 +226,7 @@ describe 'homesick' do
someapp_dir = config_dir.directory('someapp') someapp_dir = config_dir.directory('someapp')
someapp_dotfile = someapp_dir.file('.some_appfile') someapp_dotfile = someapp_dir.file('.some_appfile')
homesick.symlink('glencairn') homesick.link('glencairn')
home_config_dir = home.join('.config') home_config_dir = home.join('.config')
home_someapp_dir = home_config_dir.join('someapp') home_someapp_dir = home_config_dir.join('someapp')
@@ -242,7 +242,7 @@ describe 'homesick' do
it 'using default castle name: "dotfiles"' do it 'using default castle name: "dotfiles"' do
dotfile = castle.file('.some_dotfile') dotfile = castle.file('.some_dotfile')
homesick.symlink homesick.link
home.join('.some_dotfile').readlink.should == dotfile home.join('.some_dotfile').readlink.should == dotfile
end end
@@ -255,7 +255,7 @@ describe 'homesick' do
it 'unlinks dotfiles in the home folder' do it 'unlinks dotfiles in the home folder' do
castle.file('.some_dotfile') castle.file('.some_dotfile')
homesick.symlink('glencairn') homesick.link('glencairn')
homesick.unlink('glencairn') homesick.unlink('glencairn')
home.join('.some_dotfile').should_not exist home.join('.some_dotfile').should_not exist
@@ -264,7 +264,7 @@ describe 'homesick' do
it 'unlinks non-dotfiles from the home folder' do it 'unlinks non-dotfiles from the home folder' do
castle.file('bin') castle.file('bin')
homesick.symlink('glencairn') homesick.link('glencairn')
homesick.unlink('glencairn') homesick.unlink('glencairn')
home.join('bin').should_not exist home.join('bin').should_not exist
@@ -276,7 +276,7 @@ describe 'homesick' do
it 'can unlink sub directories' do it 'can unlink sub directories' do
castle.directory('.config').file('.some_dotfile') castle.directory('.config').file('.some_dotfile')
homesick.symlink('glencairn') homesick.link('glencairn')
homesick.unlink('glencairn') homesick.unlink('glencairn')
home_dotdir = home.join('.config') home_dotdir = home.join('.config')
@@ -291,7 +291,7 @@ describe 'homesick' do
it 'can unsymlink in nested sub directory' do it 'can unsymlink in nested sub directory' do
castle.directory('.config').directory('appA').file('.some_dotfile') castle.directory('.config').directory('appA').file('.some_dotfile')
homesick.symlink('glencairn') homesick.link('glencairn')
homesick.unlink('glencairn') homesick.unlink('glencairn')
home_dotdir = home.join('.config').join('appA') home_dotdir = home.join('.config').join('appA')
@@ -308,7 +308,7 @@ describe 'homesick' do
config_dir.file('.some_dotfile') config_dir.file('.some_dotfile')
config_dir.directory('someapp').file('.some_appfile') config_dir.directory('someapp').file('.some_appfile')
homesick.symlink('glencairn') homesick.link('glencairn')
homesick.unlink('glencairn') homesick.unlink('glencairn')
home_config_dir = home.join('.config') home_config_dir = home.join('.config')
@@ -326,7 +326,7 @@ describe 'homesick' do
it 'using default castle name: "dotfiles"' do it 'using default castle name: "dotfiles"' do
castle.file('.some_dotfile') castle.file('.some_dotfile')
homesick.symlink homesick.link
homesick.unlink homesick.unlink
home.join('.some_dotfile').should_not exist home.join('.some_dotfile').should_not exist