From c8851993e6f0f2e268a04bb8d206f868699efcca Mon Sep 17 00:00:00 2001 From: Tom Milewski Date: Thu, 30 Jul 2020 15:40:01 -0400 Subject: [PATCH 1/4] Update circle config --- .circleci/config.yml | 7 ------- 1 file changed, 7 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 9f62ce2..3a664f2 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,13 +10,6 @@ jobs: steps: - checkout - - run: - name: Force Bundler Version - command: | - sudo gem update --system - echo 'export BUNDLER_VERSION=$(cat Gemfile.lock | tail -1 | tr -d " ")' >> $BASH_ENV - source $BASH_ENV - - run: name: Install Dependencies command: | From 9850de30ea4c5854cf6c39f45b17df66010272ce Mon Sep 17 00:00:00 2001 From: Tom Milewski Date: Fri, 31 Jul 2020 11:46:11 -0400 Subject: [PATCH 2/4] Remove bundler as a dependency --- .circleci/config.yml | 8 ++++++++ learn-test.gemspec | 1 - 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3a664f2..b8a75f8 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -10,6 +10,14 @@ jobs: steps: - checkout + - run: + name: Force Bundler Version + command: | + sudo gem update --system + echo 'export BUNDLER_VERSION="~> 2.1.4"' >> $BASH_ENV + source $BASH_ENV + gem install bundler + - run: name: Install Dependencies command: | diff --git a/learn-test.gemspec b/learn-test.gemspec index e6e3db3..5ff537b 100644 --- a/learn-test.gemspec +++ b/learn-test.gemspec @@ -18,7 +18,6 @@ Gem::Specification.new do |spec| spec.require_paths = ["lib", "bin"] spec.required_ruby_version = '>= 2.5.0' - spec.add_development_dependency "bundler", "~> 2.1.4" spec.add_development_dependency "rake", "~> 13.0.1" spec.add_development_dependency "rspec", "~> 3.8" From e321a0c331eb38263453a078ff2141dda089a592 Mon Sep 17 00:00:00 2001 From: Tom Milewski Date: Fri, 31 Jul 2020 11:49:06 -0400 Subject: [PATCH 3/4] Move gems to Gemfile; Update bundler independently --- .circleci/config.yml | 2 -- Gemfile | 15 ++++++++++++++- learn-test.gemspec | 11 ----------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index b8a75f8..60ca884 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -14,8 +14,6 @@ jobs: name: Force Bundler Version command: | sudo gem update --system - echo 'export BUNDLER_VERSION="~> 2.1.4"' >> $BASH_ENV - source $BASH_ENV gem install bundler - run: diff --git a/Gemfile b/Gemfile index 1294c6c..76e3b91 100644 --- a/Gemfile +++ b/Gemfile @@ -1,7 +1,20 @@ source 'https://rubygems.org' -gemspec +gem 'rspec', '~> 3.0' +gem 'netrc', '~> 0.11.0' +gem 'git', '~> 1.7' +gem 'oj', '~> 3.10' +gem 'faraday', '~> 1.0' +gem 'crack', '~> 0.4.3' +gem 'colorize', '~> 0.8.1' + +group :development do + gem 'rake', '~> 13.0.1' + gem 'rspec', '~> 3.8' +end group :test do gem 'rspec_junit_formatter', '~> 0.4.1' end + +gemspec diff --git a/learn-test.gemspec b/learn-test.gemspec index 5ff537b..4dd03d5 100644 --- a/learn-test.gemspec +++ b/learn-test.gemspec @@ -17,15 +17,4 @@ Gem::Specification.new do |spec| spec.test_files = spec.files.grep(%r{^(test|spec|features)/}) spec.require_paths = ["lib", "bin"] spec.required_ruby_version = '>= 2.5.0' - - spec.add_development_dependency "rake", "~> 13.0.1" - spec.add_development_dependency "rspec", "~> 3.8" - - spec.add_runtime_dependency "rspec", "~> 3.0" - spec.add_runtime_dependency "netrc", "~> 0.11.0" - spec.add_runtime_dependency "git", "~> 1.7" - spec.add_runtime_dependency "oj", "~> 3.10" - spec.add_runtime_dependency "faraday", "~> 1.0" - spec.add_runtime_dependency "crack", "~> 0.4.3" - spec.add_runtime_dependency "colorize", "~> 0.8.1" end From 27df37dea63cd3cbc4266a8851cd56b79bfa44bc Mon Sep 17 00:00:00 2001 From: Tom Milewski Date: Fri, 31 Jul 2020 11:51:45 -0400 Subject: [PATCH 4/4] Update RSpec version requirements --- Gemfile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Gemfile b/Gemfile index 76e3b91..0376ee4 100644 --- a/Gemfile +++ b/Gemfile @@ -1,6 +1,6 @@ source 'https://rubygems.org' -gem 'rspec', '~> 3.0' +gem 'rspec', '~> 3.7' gem 'netrc', '~> 0.11.0' gem 'git', '~> 1.7' gem 'oj', '~> 3.10' @@ -10,7 +10,6 @@ gem 'colorize', '~> 0.8.1' group :development do gem 'rake', '~> 13.0.1' - gem 'rspec', '~> 3.8' end group :test do