Merge pull request #722 from freerange/freeze-string-literals

Freeze string literals

.circleci/config.yml

@@ -9,6 +9,8 @@ jobs:
         type: string
     docker:
       - image: << parameters.docker-image >>
+    environment:
+      RUBYOPT=--enable-frozen-string-literal
     steps:
       - checkout
       - run: ruby --version

lib/mocha.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require 'mocha/version'

lib/mocha/any_instance_method.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/stubbed_method'
 
 module Mocha

lib/mocha/api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/ruby_version'
 require 'mocha/parameter_matchers'
 require 'mocha/hooks'

lib/mocha/argument_iterator.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   class ArgumentIterator
     def initialize(argument)

lib/mocha/backtrace_filter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   class BacktraceFilter
     LIB_DIRECTORY = File.expand_path(File.join(File.dirname(__FILE__), '..')) + File::SEPARATOR

lib/mocha/block_matcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   module BlockMatchers
     class OptionalBlock

lib/mocha/cardinality.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   class Cardinality
     INFINITY = 1 / 0.0

lib/mocha/central.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   class Central
     class Null < self

lib/mocha/change_state_side_effect.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   class ChangeStateSideEffect
     def initialize(state)

lib/mocha/class_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/mockery'
 require 'mocha/any_instance_method'
 

lib/mocha/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/ruby_version'
 require 'mocha/deprecation'
 

lib/mocha/deprecation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/backtrace_filter'
 
 module Mocha

lib/mocha/detection/minitest.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   module Detection
     module Minitest

lib/mocha/detection/test_unit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   module Detection
     module TestUnit

lib/mocha/error_with_filtered_backtrace.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/backtrace_filter'
 
 module Mocha

lib/mocha/exception_raiser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   class ExceptionRaiser
     def initialize(exception, message)

lib/mocha/expectation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ruby2_keywords'
 require 'mocha/method_matcher'
 require 'mocha/parameters_matcher'
@@ -744,19 +746,19 @@ def inspect
 
     # @private
     def mocha_inspect
-      message = "#{@cardinality.anticipated_times}, #{@cardinality.invoked_times}: #{method_signature}"
-      message << "; #{@ordering_constraints.map(&:mocha_inspect).join('; ')}" unless @ordering_constraints.empty?
+      strings = ["#{@cardinality.anticipated_times}, #{@cardinality.invoked_times}: #{method_signature}"]
+      strings << "; #{@ordering_constraints.map(&:mocha_inspect).join('; ')}" unless @ordering_constraints.empty?
       if Mocha.configuration.display_matching_invocations_on_failure?
-        message << @cardinality.actual_invocations
+        strings << @cardinality.actual_invocations
       end
-      message
+      strings.join
     end
 
     # @private
     def method_signature
-      signature = "#{@mock.mocha_inspect}.#{@method_matcher.mocha_inspect}#{@parameters_matcher.mocha_inspect}"
-      signature << " #{@block_matcher.mocha_inspect}" if @block_matcher.mocha_inspect
-      signature
+      strings = ["#{@mock.mocha_inspect}.#{@method_matcher.mocha_inspect}#{@parameters_matcher.mocha_inspect}"]
+      strings << " #{@block_matcher.mocha_inspect}" if @block_matcher.mocha_inspect
+      strings.join
     end
 
     # @private

lib/mocha/expectation_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   # Default exception class raised when an unexpected invocation or an unsatisfied expectation occurs.
   #

lib/mocha/expectation_error_factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/backtrace_filter'
 require 'mocha/expectation_error'
 

lib/mocha/expectation_list.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   class ExpectationList
     def initialize(expectations = [])

lib/mocha/hooks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/mockery'
 
 module Mocha

lib/mocha/in_state_ordering_constraint.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   class InStateOrderingConstraint
     def initialize(state_predicate)

lib/mocha/inspect.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'date'
 
 module Mocha

lib/mocha/instance_method.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/stubbed_method'
 
 module Mocha

lib/mocha/integration/assertion_counter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   module Integration
     class AssertionCounter

lib/mocha/integration/minitest.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/detection/minitest'
 require 'mocha/integration/minitest/adapter'
 

lib/mocha/integration/minitest/adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/api'
 require 'mocha/integration/assertion_counter'
 require 'mocha/expectation_error_factory'

lib/mocha/integration/minitest/exception_translation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/expectation_error'
 
 module Mocha

lib/mocha/integration/monkey_patcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/api'
 
 module Mocha

lib/mocha/integration/test_unit.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/detection/test_unit'
 require 'mocha/integration/test_unit/adapter'
 

lib/mocha/integration/test_unit/adapter.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/api'
 require 'mocha/integration/assertion_counter'
 require 'mocha/expectation_error'

lib/mocha/invocation.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameters_matcher'
 require 'mocha/raised_exception'
 require 'mocha/return_values'
@@ -44,19 +46,19 @@ def arguments
     end
 
     def call_description
-      description = "#{@mock.mocha_inspect}.#{@method_name}#{argument_description}"
-      description << ' { ... }' unless @block.nil?
-      description
+      strings = ["#{@mock.mocha_inspect}.#{@method_name}#{argument_description}"]
+      strings << ' { ... }' unless @block.nil?
+      strings.join
     end
 
     def short_call_description
       "#{@method_name}(#{@arguments.join(', ')})"
     end
 
     def result_description
-      desc = "# => #{@result.mocha_inspect}"
-      desc << " after yielding #{@yields.map(&:mocha_inspect).join(', then ')}" if @yields.any?
-      desc
+      strings = ["# => #{@result.mocha_inspect}"]
+      strings << " after yielding #{@yields.map(&:mocha_inspect).join(', then ')}" if @yields.any?
+      strings.join
     end
 
     def full_description

lib/mocha/is_a.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Object
   # :stopdoc:
 

lib/mocha/logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   class Logger
     def initialize(io)

lib/mocha/macos_version.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   MACOS = /darwin/.match(RUBY_PLATFORM)
   MACOS_VERSION = MACOS && /darwin(\d+)/.match(RUBY_PLATFORM)[1].to_i

lib/mocha/method_matcher.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   class MethodMatcher
     attr_reader :expected_method_name

lib/mocha/minitest.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/ruby_version'
 require 'mocha/integration/minitest'
 

lib/mocha/mock.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'ruby2_keywords'
 require 'mocha/expectation'
 require 'mocha/expectation_list'

lib/mocha/mockery.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/central'
 require 'mocha/mock'
 require 'mocha/names'

lib/mocha/names.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   class ImpersonatingName
     def initialize(object)

lib/mocha/not_initialized_error.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/error_with_filtered_backtrace'
 
 module Mocha

lib/mocha/object_methods.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/mockery'
 require 'mocha/instance_method'
 require 'mocha/argument_iterator'

lib/mocha/parameter_matchers.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   # Used as parameters for {Expectation#with} to restrict the parameter values which will match the expectation. Can be nested.
   module ParameterMatchers; end

lib/mocha/parameter_matchers/all_of.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 
 module Mocha

lib/mocha/parameter_matchers/any_of.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 
 module Mocha

lib/mocha/parameter_matchers/any_parameters.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 
 module Mocha

lib/mocha/parameter_matchers/anything.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 
 module Mocha

lib/mocha/parameter_matchers/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Mocha
   module ParameterMatchers
     # @abstract Subclass and implement +#matches?+ and +#mocha_inspect+ to define a custom matcher. Also add a suitably named instance method to {ParameterMatchers} to build an instance of the new matcher c.f. {#equals}.

lib/mocha/parameter_matchers/equals.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 
 module Mocha

lib/mocha/parameter_matchers/equivalent_uri.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 require 'uri'
 require 'cgi'

lib/mocha/parameter_matchers/has_entries.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 require 'mocha/parameter_matchers/all_of'
 require 'mocha/parameter_matchers/has_entry'

lib/mocha/parameter_matchers/has_entry.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 
 module Mocha

lib/mocha/parameter_matchers/has_key.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 
 module Mocha

lib/mocha/parameter_matchers/has_keys.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 
 module Mocha

lib/mocha/parameter_matchers/has_value.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/base'
 
 module Mocha

lib/mocha/parameter_matchers/includes.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'mocha/parameter_matchers/all_of'
 require 'mocha/parameter_matchers/base'