Merge pull request #237 from rubytoolbox/co-maintenance

Maintenance

.github/workflows/ruby.yml

@@ -12,7 +12,8 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-        - '2.7'
+        - '3.3'
+        - '3.2'
 
     steps:
     - uses: actions/checkout@v2
@@ -43,10 +44,8 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-        - '3.0'
-        - '2.7'
-        - '2.6'
-        - '2.5'
+        - '3.3'
+        - '3.2'
         - jruby
 
     steps:
@@ -83,9 +82,8 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-        - '2.7'
-        - '2.6'
-        - '2.5'
+        - '3.3'
+        - '3.2'
 
     steps:
     - uses: actions/checkout@v2

.gitignore

@@ -7,5 +7,7 @@
 /spec/reports/
 /tmp/
 
+Gemfile.lock
+
 # rspec failure tracking
 .rspec_status

Gemfile

@@ -6,4 +6,21 @@ source "https://rubygems.org"
 gemspec
 
 gem "rake", "~> 12.0"
-gem "rspec", "~> 3.0"
+
+gem "rubocop"
+gem "rubocop-performance"
+gem "rubocop-rake"
+gem "rubocop-rspec"
+
+gem "aruba"
+gem "cucumber"
+
+gem "guard-bundler"
+gem "guard-cucumber"
+gem "guard-rspec"
+gem "guard-rubocop"
+
+gem "pry"
+
+gem "rspec", ">= 3.9"
+gem "simplecov", ">= 0.18.5"

bundler-toolbox.gemspec

@@ -30,22 +30,5 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "dry-cli", "~> 0.6.0"
   spec.add_dependency "rubytoolbox-api", ">= 0.2.0"
-
-  spec.add_development_dependency "rubocop"
-  spec.add_development_dependency "rubocop-performance"
-  spec.add_development_dependency "rubocop-rake"
-  spec.add_development_dependency "rubocop-rspec"
-
-  spec.add_development_dependency "aruba"
-  spec.add_development_dependency "cucumber"
-
-  spec.add_development_dependency "guard-bundler"
-  spec.add_development_dependency "guard-cucumber"
-  spec.add_development_dependency "guard-rspec"
-  spec.add_development_dependency "guard-rubocop"
-
-  spec.add_development_dependency "pry"
-
-  spec.add_development_dependency "rspec", ">= 3.9"
-  spec.add_development_dependency "simplecov", ">= 0.18.5"
+  spec.metadata["rubygems_mfa_required"] = "true"
 end

lib/bundler/toolbox/cli.rb

@@ -23,7 +23,7 @@ def with_environment(new_environment)
             raise ArgumentError, "Unknown environment #{new_environment}! Known: #{KNOWN_ENVIRONMENTS.inspect}"
           end
 
-          old_environment = ENV["BUNDLER_TOOLBOX_ENVIRONMENT"]
+          old_environment = ENV.fetch("BUNDLER_TOOLBOX_ENVIRONMENT", nil)
           ENV["BUNDLER_TOOLBOX_ENVIRONMENT"] = new_environment
 
           begin

lib/bundler/toolbox/plugins/rubygems.rb

@@ -4,7 +4,7 @@
 
 class Gem::Commands::ToolboxCommand < Gem::Command
   def initialize
-    super "toolbox", "Hello World"
+    super("toolbox", "Hello World")
   end
 
   def execute

spec/bundler/toolbox/cli_spec.rb

@@ -4,7 +4,7 @@
 
 RSpec.describe Bundler::Toolbox::CLI do
   around do |example|
-    original = ENV["BUNDLER_TOOLBOX_ENVIRONMENT"]
+    original = ENV.fetch("BUNDLER_TOOLBOX_ENVIRONMENT", nil)
     begin
       example.run
     ensure
@@ -21,15 +21,15 @@ def invoke(*args)
       it "returns #{environment} when BUNDLER_TOOLBOX_ENVIRONMENT is #{environment}" do
         ENV["BUNDLER_TOOLBOX_ENVIRONMENT"] = environment
 
-        expect(described_class.execution_environment).to be == environment
+        expect(described_class.execution_environment).to eq environment
       end
     end
 
     [nil, "foo", true, 42].each do |environment|
       it "returns 'unknown' when BUNDLER_TOOLBOX_ENVIRONMENT is #{environment.inspect}" do
         ENV["BUNDLER_TOOLBOX_ENVIRONMENT"] = environment.to_s
 
-        expect(described_class.execution_environment).to be == "unknown"
+        expect(described_class.execution_environment).to eq "unknown"
       end
     end
   end
@@ -49,15 +49,15 @@ def invoke(*args)
         block_env = described_class.execution_environment
       end
 
-      expect(block_env).to be == chosen_env
+      expect(block_env).to eq chosen_env
     end
 
     it "changes environment back to the previous after block has run" do
       ENV["BUNDLER_TOOLBOX_ENVIRONMENT"] = "bundler"
 
       described_class.with_environment("rubygems") { "do nothing" }
 
-      expect(described_class.execution_environment).to be == "bundler"
+      expect(described_class.execution_environment).to eq "bundler"
     end
   end
 

spec/bundler/toolbox_spec.rb

@@ -2,7 +2,7 @@
 
 RSpec.describe Bundler::Toolbox do
   it "has a version number" do
-    expect(Bundler::Toolbox::VERSION).not_to be nil
+    expect(Bundler::Toolbox::VERSION).not_to be_nil
   end
 
   describe Bundler::Toolbox::FixtureAdapter do