From 3678d52883d27e22640cfea55164d14592b9082b Mon Sep 17 00:00:00 2001 From: "Randall Reed, Jr" Date: Wed, 6 Feb 2019 03:59:53 -0500 Subject: [PATCH 1/3] Update bundler --- .circleci/config.yml | 6 ++++-- .ruby-gemset | 1 + .ruby-version | 1 + git_switch.gemspec | 2 +- 4 files changed, 7 insertions(+), 3 deletions(-) create mode 100644 .ruby-gemset create mode 100644 .ruby-version diff --git a/.circleci/config.yml b/.circleci/config.yml index 56e5bb2..67737ff 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -7,7 +7,9 @@ jobs: build: docker: # specify the version you desire here - - image: circleci/ruby:2.4.1-node-browsers + - image: circleci/ruby:2.4.1-node-browsers + environment: + BUNDLER_VERSION: 2.0.1 # Specify service dependencies here if necessary # CircleCI maintains a library of pre-built images @@ -29,7 +31,7 @@ jobs: - run: name: install dependencies command: | - gem install bundler -v '~> 1.17' + gem install bundler -v '~> 2.0.1' bundle install --jobs=4 --retry=3 --path vendor/bundle # - save_cache: diff --git a/.ruby-gemset b/.ruby-gemset new file mode 100644 index 0000000..6702902 --- /dev/null +++ b/.ruby-gemset @@ -0,0 +1 @@ +git_switch diff --git a/.ruby-version b/.ruby-version new file mode 100644 index 0000000..73462a5 --- /dev/null +++ b/.ruby-version @@ -0,0 +1 @@ +2.5.1 diff --git a/git_switch.gemspec b/git_switch.gemspec index 1bb146b..4f9c200 100644 --- a/git_switch.gemspec +++ b/git_switch.gemspec @@ -30,7 +30,7 @@ Gem::Specification.new do |spec| spec.add_runtime_dependency "activesupport", "~> 5.2" - spec.add_development_dependency "bundler", "~> 1.17" + spec.add_development_dependency "bundler", "~> 2.0.1" spec.add_development_dependency "rake", "~> 10.0" spec.add_development_dependency "rspec", "~> 3.0" spec.add_development_dependency "rspec_junit_formatter", "~> 0.4.1" From 1339af20b7560ddbb6be6b198fcad19e303f9fb2 Mon Sep 17 00:00:00 2001 From: "Randall Reed, Jr" Date: Wed, 6 Feb 2019 04:01:16 -0500 Subject: [PATCH 2/3] Bump version --- lib/git_switch/version.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/git_switch/version.rb b/lib/git_switch/version.rb index ecc4a46..433d9d9 100644 --- a/lib/git_switch/version.rb +++ b/lib/git_switch/version.rb @@ -1,3 +1,3 @@ module GitSwitch - VERSION = "0.4.2" + VERSION = "0.4.3" end From 8d21aec3620aabbec241e10f7e64754a63455dee Mon Sep 17 00:00:00 2001 From: "Randall Reed, Jr" Date: Wed, 6 Feb 2019 04:02:59 -0500 Subject: [PATCH 3/3] Redirect ssh output if non-verbose If run without --verbose flag, send output from ssh-add command to dev/null --- lib/git_switch/switcher.rb | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/lib/git_switch/switcher.rb b/lib/git_switch/switcher.rb index 5b20229..56429cb 100644 --- a/lib/git_switch/switcher.rb +++ b/lib/git_switch/switcher.rb @@ -78,7 +78,11 @@ def set_git_config def set_ssh `git config #{git_config_flag} core.sshCommand "#{ssh_command}"` - `ssh-add #{ssh}` + if options.verbose? + `ssh-add #{ssh}` + else + `ssh-add #{ssh} 2>/dev/null` + end end def usage