Skip to content

Commit

Permalink
Merge pull request #152 from singular0/master
Browse files Browse the repository at this point in the history
Thanks for taking care of this.
  • Loading branch information
JCook21 committed Dec 24, 2016
2 parents 21b4e34 + 1d39858 commit 570b063
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
5 changes: 4 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ pkg

.bundle

# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore:
# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore:
#
# * Create a file at ~/.gitignore
# * Include files you want ignored
Expand Down Expand Up @@ -48,3 +48,6 @@ Gemfile.lock
vendor/

homesick*.gem

# rbenv configuration
.ruby-version
12 changes: 8 additions & 4 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,6 @@ group :development do
gem "guard"
gem "guard-rspec"
gem "rb-readline", "~> 0.5.0"
gem "jeweler", ">= 1.6.2"
gem 'coveralls', require: false
gem "test_construct"
gem "capture-output", "~> 1.0.0"
if RbConfig::CONFIG['host_os'] =~ /linux|freebsd|openbsd|sunos|solaris/
Expand All @@ -22,7 +20,13 @@ group :development do
if RbConfig::CONFIG['host_os'] =~ /darwin|mac os/
gem 'terminal-notifier-guard', '~> 1.6.1'
end
if RUBY_VERSION >= '1.9.2'
gem "rubocop"
gem "coveralls", require: false
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
2 changes: 2 additions & 0 deletions lib/homesick/cli.rb
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ def clone(uri, destination=nil)

desc 'rc CASTLE', 'Run the .homesickrc for the specified castle'
method_option :force,
type: :boolean,
default: false,
desc: 'Evaluate .homesickrc without prompting.'
def rc(name = DEFAULT_CASTLE_NAME)
Expand Down Expand Up @@ -128,6 +129,7 @@ def unlink(name = DEFAULT_CASTLE_NAME)

desc 'link CASTLE', 'Symlinks all dotfiles from the specified castle'
method_option :force,
type: :boolean,
default: false,
desc: 'Overwrite existing conflicting symlinks without prompting.'
def link(name = DEFAULT_CASTLE_NAME)
Expand Down

0 comments on commit 570b063

Please sign in to comment.