Merge pull request #152 from singular0/master

Thanks for taking care of this.
This commit is contained in:
Jeremy Cook
2016-12-24 12:13:55 -05:00
committed by GitHub
3 changed files with 14 additions and 5 deletions

3
.gitignore vendored
View File

@@ -48,3 +48,6 @@ Gemfile.lock
vendor/ vendor/
homesick*.gem homesick*.gem
# rbenv configuration
.ruby-version

10
Gemfile
View File

@@ -12,8 +12,6 @@ group :development do
gem "guard" gem "guard"
gem "guard-rspec" gem "guard-rspec"
gem "rb-readline", "~> 0.5.0" gem "rb-readline", "~> 0.5.0"
gem "jeweler", ">= 1.6.2"
gem 'coveralls', require: false
gem "test_construct" gem "test_construct"
gem "capture-output", "~> 1.0.0" gem "capture-output", "~> 1.0.0"
if RbConfig::CONFIG['host_os'] =~ /linux|freebsd|openbsd|sunos|solaris/ if RbConfig::CONFIG['host_os'] =~ /linux|freebsd|openbsd|sunos|solaris/
@@ -22,7 +20,13 @@ group :development do
if RbConfig::CONFIG['host_os'] =~ /darwin|mac os/ if RbConfig::CONFIG['host_os'] =~ /darwin|mac os/
gem 'terminal-notifier-guard', '~> 1.6.1' gem 'terminal-notifier-guard', '~> 1.6.1'
end end
if RUBY_VERSION >= '1.9.2' gem "coveralls", require: false
gem "rubocop" gem "rubocop"
if RUBY_VERSION < '2.3.0'
gem "rack", "< 2"
gem "listen", "< 3"
gem "jeweler", ">= 1.6.2", "< 2.2"
else
gem "jeweler", ">= 1.6.2"
end end
end end

View File

@@ -66,6 +66,7 @@ module Homesick
desc 'rc CASTLE', 'Run the .homesickrc for the specified castle' desc 'rc CASTLE', 'Run the .homesickrc for the specified castle'
method_option :force, method_option :force,
type: :boolean,
default: false, default: false,
desc: 'Evaluate .homesickrc without prompting.' desc: 'Evaluate .homesickrc without prompting.'
def rc(name = DEFAULT_CASTLE_NAME) def rc(name = DEFAULT_CASTLE_NAME)
@@ -128,6 +129,7 @@ module Homesick
desc 'link CASTLE', 'Symlinks all dotfiles from the specified castle' desc 'link CASTLE', 'Symlinks all dotfiles from the specified castle'
method_option :force, method_option :force,
type: :boolean,
default: false, default: false,
desc: 'Overwrite existing conflicting symlinks without prompting.' desc: 'Overwrite existing conflicting symlinks without prompting.'
def link(name = DEFAULT_CASTLE_NAME) def link(name = DEFAULT_CASTLE_NAME)