20 files changed, 21 insertions, 1 deletions
diff --git a/lib/bundler/cli/binstubs.rb b/lib/bundler/cli/binstubs.rb
index cf9ce02c4d..8452ca3bfe 100644
--- a/lib/bundler/cli/binstubs.rb
+++ b/lib/bundler/cli/binstubs.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/cli/common"
 
 module Bundler
diff --git a/lib/bundler/cli/cache.rb b/lib/bundler/cli/cache.rb
index 8bc876baea..c8c63e926c 100644
--- a/lib/bundler/cli/cache.rb
+++ b/lib/bundler/cli/cache.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class CLI::Cache
     attr_reader :options
diff --git a/lib/bundler/cli/check.rb b/lib/bundler/cli/check.rb
index fd09425e4a..f6a1022306 100644
--- a/lib/bundler/cli/check.rb
+++ b/lib/bundler/cli/check.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class CLI::Check
     attr_reader :options
diff --git a/lib/bundler/cli/clean.rb b/lib/bundler/cli/clean.rb
index d70a5b9b89..895b6567fa 100644
--- a/lib/bundler/cli/clean.rb
+++ b/lib/bundler/cli/clean.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class CLI::Clean
     attr_reader :options
diff --git a/lib/bundler/cli/common.rb b/lib/bundler/cli/common.rb
index b90544ba3a..491ea04a11 100644
--- a/lib/bundler/cli/common.rb
+++ b/lib/bundler/cli/common.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   module CLI::Common
     def self.without_groups_message
diff --git a/lib/bundler/cli/config.rb b/lib/bundler/cli/config.rb
index ce1be5eb4f..32724f687d 100644
--- a/lib/bundler/cli/config.rb
+++ b/lib/bundler/cli/config.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class CLI::Config
     attr_reader :name, :options, :scope, :thor
@@ -11,7 +12,7 @@ module Bundler
       @scope = "global"
       return unless peek && peek.start_with?("--")
       @name = args.shift
-      @scope = $'
+      @scope = peek[2..-1]
     end
 
     def run
diff --git a/lib/bundler/cli/console.rb b/lib/bundler/cli/console.rb
index 6e4e1b6686..5e72cdbf0f 100644
--- a/lib/bundler/cli/console.rb
+++ b/lib/bundler/cli/console.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class CLI::Console
     attr_reader :options, :group
diff --git a/lib/bundler/cli/exec.rb b/lib/bundler/cli/exec.rb
index 8b828edf87..4ccc4ba55a 100644
--- a/lib/bundler/cli/exec.rb
+++ b/lib/bundler/cli/exec.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/current_ruby"
 
 module Bundler
diff --git a/lib/bundler/cli/gem.rb b/lib/bundler/cli/gem.rb
index 343a458719..72a1880c52 100644
--- a/lib/bundler/cli/gem.rb
+++ b/lib/bundler/cli/gem.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "pathname"
 
 module Bundler
diff --git a/lib/bundler/cli/init.rb b/lib/bundler/cli/init.rb
index 1d201a90f5..4bbdee1f48 100644
--- a/lib/bundler/cli/init.rb
+++ b/lib/bundler/cli/init.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class CLI::Init
     attr_reader :options
diff --git a/lib/bundler/cli/inject.rb b/lib/bundler/cli/inject.rb
index a17bce036f..e319feb201 100644
--- a/lib/bundler/cli/inject.rb
+++ b/lib/bundler/cli/inject.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class CLI::Inject
     attr_reader :options, :name, :version, :gems
diff --git a/lib/bundler/cli/install.rb b/lib/bundler/cli/install.rb
index 559189b314..0e8599963b 100644
--- a/lib/bundler/cli/install.rb
+++ b/lib/bundler/cli/install.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class CLI::Install
     attr_reader :options
diff --git a/lib/bundler/cli/lock.rb b/lib/bundler/cli/lock.rb
index 457826dfb5..e95e9ff636 100644
--- a/lib/bundler/cli/lock.rb
+++ b/lib/bundler/cli/lock.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class CLI::Lock
     attr_reader :options
diff --git a/lib/bundler/cli/open.rb b/lib/bundler/cli/open.rb
index 0bf42038d9..d4dba703cd 100644
--- a/lib/bundler/cli/open.rb
+++ b/lib/bundler/cli/open.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/cli/common"
 require "shellwords"
 
diff --git a/lib/bundler/cli/outdated.rb b/lib/bundler/cli/outdated.rb
index 179635b803..3c85d0bdcd 100644
--- a/lib/bundler/cli/outdated.rb
+++ b/lib/bundler/cli/outdated.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/cli/common"
 
 module Bundler
diff --git a/lib/bundler/cli/package.rb b/lib/bundler/cli/package.rb
index de53cb6d8d..cf65e8a68c 100644
--- a/lib/bundler/cli/package.rb
+++ b/lib/bundler/cli/package.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class CLI::Package
     attr_reader :options
diff --git a/lib/bundler/cli/platform.rb b/lib/bundler/cli/platform.rb
index 28641a4c8b..aec08789a9 100644
--- a/lib/bundler/cli/platform.rb
+++ b/lib/bundler/cli/platform.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class CLI::Platform
     attr_reader :options
diff --git a/lib/bundler/cli/show.rb b/lib/bundler/cli/show.rb
index 50cf0a97d5..d67b086dd1 100644
--- a/lib/bundler/cli/show.rb
+++ b/lib/bundler/cli/show.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 require "bundler/cli/common"
 
 module Bundler
diff --git a/lib/bundler/cli/update.rb b/lib/bundler/cli/update.rb
index 0102bf0e1a..1a76a88c3d 100644
--- a/lib/bundler/cli/update.rb
+++ b/lib/bundler/cli/update.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class CLI::Update
     attr_reader :options, :gems
diff --git a/lib/bundler/cli/viz.rb b/lib/bundler/cli/viz.rb
index 8fbc64d5fa..7ccd306d63 100644
--- a/lib/bundler/cli/viz.rb
+++ b/lib/bundler/cli/viz.rb
@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module Bundler
   class CLI::Viz
     attr_reader :options, :gem_name