From 4bfd1c60c2a7c59784c289c667e79c04cea921e9 Mon Sep 17 00:00:00 2001 From: Denis Yantarev Date: Sat, 3 Dec 2016 15:56:22 +0300 Subject: [PATCH 1/4] Fix default option value type warning --- lib/homesick/cli.rb | 2 ++ 1 file changed, 2 insertions(+) diff --git a/lib/homesick/cli.rb b/lib/homesick/cli.rb index c82f34a..159d470 100644 --- a/lib/homesick/cli.rb +++ b/lib/homesick/cli.rb @@ -66,6 +66,7 @@ module Homesick 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) @@ -128,6 +129,7 @@ module Homesick 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) From a62039da503cc970b1c0329c8b845222985bef7c Mon Sep 17 00:00:00 2001 From: Denis Yantarev Date: Mon, 5 Dec 2016 03:34:14 +0300 Subject: [PATCH 2/4] Ignore rbenv configuration files --- .gitignore | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/.gitignore b/.gitignore index 8291ff5..bee7964 100644 --- a/.gitignore +++ b/.gitignore @@ -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 @@ -48,3 +48,6 @@ Gemfile.lock vendor/ homesick*.gem + +# rbenv configuration +.ruby-version From b1bb0c996c8c96362ded40d7fb6b51adc46df8e2 Mon Sep 17 00:00:00 2001 From: Denis Yantarev Date: Mon, 5 Dec 2016 03:34:57 +0300 Subject: [PATCH 3/4] Add Ruby 2.2 & 2.3 to Travis config and fix GEM dependencies --- .travis.yml | 2 ++ Gemfile | 22 +++++++++++++++++++--- 2 files changed, 21 insertions(+), 3 deletions(-) diff --git a/.travis.yml b/.travis.yml index 5e21473..9c9846d 100644 --- a/.travis.yml +++ b/.travis.yml @@ -1,5 +1,7 @@ language: ruby rvm: + - 2.3.0 + - 2.2.0 - 2.1.0 - 2.0.0 - 1.9.3 diff --git a/Gemfile b/Gemfile index 07c3d7b..2f97435 100644 --- a/Gemfile +++ b/Gemfile @@ -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/ @@ -22,7 +20,25 @@ 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' + if RUBY_VERSION < '2.0.0' + gem "addressable", "< 2.5" + gem "json", "< 2" + gem "coveralls", "< 0.8.6", require: false + gem "tins", "< 1.3.5" + gem "term-ansicolor", "< 1.3.2" + gem "rubocop", "< 0.42" + else + gem "coveralls", require: false gem "rubocop" end + if RUBY_VERSION < '2.1.0' + gem "rdoc", "< 5" + end + 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 From 1d398587d081f64163ceb8f758706c6f74fbd8ce Mon Sep 17 00:00:00 2001 From: Jeremy Cook Date: Sat, 24 Dec 2016 12:11:01 -0500 Subject: [PATCH 4/4] Remove config for removed ruby versions. Deleted config for unused ruby versions. --- Gemfile | 16 ++-------------- 1 file changed, 2 insertions(+), 14 deletions(-) diff --git a/Gemfile b/Gemfile index 891887f..86e1dff 100644 --- a/Gemfile +++ b/Gemfile @@ -20,20 +20,8 @@ group :development do if RbConfig::CONFIG['host_os'] =~ /darwin|mac os/ gem 'terminal-notifier-guard', '~> 1.6.1' end - if RUBY_VERSION < '2.0.0' - gem "addressable", "< 2.5" - gem "json", "< 2" - gem "coveralls", "< 0.8.6", require: false - gem "tins", "< 1.3.5" - gem "term-ansicolor", "< 1.3.2" - gem "rubocop", "< 0.42" - else - gem "coveralls", require: false - gem "rubocop" - end - if RUBY_VERSION < '2.1.0' - gem "rdoc", "< 5" - end + gem "coveralls", require: false + gem "rubocop" if RUBY_VERSION < '2.3.0' gem "rack", "< 2" gem "listen", "< 3"