Merge pull request #929 from cucumber/freeze-string-literals

Freeze string literals by default

.rubocop.yml

@@ -72,11 +72,6 @@ Style/StringLiterals:
 Style/SymbolArray:
   EnforcedStyle: brackets
 
-# Code is currently broken with frozen string literal comments applied.
-# TODO: Enable and fix build
-Style/FrozenStringLiteralComment:
-  Enabled: false
-
 # Be relatively lenient with line length
 Layout/LineLength:
   Max: 94

.simplecov

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 SimpleCov.configure do
   # Activate branch coverage
   enable_coverage :branch

Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 # Use dependencies from gemspec

Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH << File.expand_path(__dir__)
 
 require "aruba/platform"

aruba.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require_relative "lib/aruba/version"
 
 Gem::Specification.new do |spec|

bin/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 $LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 

exe/aruba

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 $LOAD_PATH << File.expand_path("../lib", __dir__)
 

features/step_definitions/hooks.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "cucumber/platform"
 
 Before "@requires-python" do

features/support/aruba.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "aruba/cucumber"
 
 Aruba.configure do |config|

features/support/env.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift File.expand_path("../../lib", __dir__)
 
 # Has to be the first file required so that all other files show coverage information

features/support/jruby.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 if RUBY_PLATFORM == "java"
   Before do
     @aruba_timeout_seconds = 15

features/support/simplecov_setup.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # @note this file is loaded in env.rb to setup simplecov using RUBYOPTs for
 # child processes and @in-process
 unless RUBY_PLATFORM.include?("java")

features/support/timing.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # From https://itshouldbeuseful.wordpress.com/2010/11/10/find-your-slowest-running-cucumber-features/
 
 scenario_times = {}

fixtures/cli-app/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 # Use dependencies from gemspec

fixtures/cli-app/Rakefile

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"

fixtures/cli-app/bin/aruba-test-cli

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 $LOAD_PATH << File.expand_path("../lib", __dir__)
 require "cli/app"

fixtures/cli-app/cli-app.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "cli/app/version"

fixtures/cli-app/features/support/aruba.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require "aruba/cucumber"

fixtures/cli-app/features/support/env.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require_relative "aruba"

fixtures/cli-app/lib/cli/app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "cli/app/version"
 
 Dir.glob(File.expand_path("**/*.rb", __dir__)).each { |f| require_relative f }

fixtures/cli-app/lib/cli/app/suppress_simple_cov_output.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module SimpleCov
   module Formatter
     class HTMLFormatter

fixtures/cli-app/lib/cli/app/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Cli
   module App
-    VERSION = "0.1.0".freeze
+    VERSION = "0.1.0"
   end
 end

fixtures/cli-app/script/console

@@ -1,4 +1,5 @@
 #!/usr/bin/env ruby
+# frozen_string_literal: true
 
 require "bundler/setup"
 require "cli/app"

fixtures/cli-app/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 $LOAD_PATH.unshift File.expand_path("../lib", __dir__)
 
 require "cli/app"

fixtures/cli-app/spec/support/aruba.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require "aruba/rspec"

fixtures/empty-app/Rakefile

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require "bundler/gem_tasks"

fixtures/empty-app/cli-app.gemspec

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 lib = File.expand_path("lib", __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require "cli/app/version"

fixtures/empty-app/lib/cli/app.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "cli/app/version"
 
 module Cli

fixtures/empty-app/lib/cli/app/version.rb

@@ -1,5 +1,7 @@
+# frozen_string_literal: true
+
 module Cli
   module App
-    VERSION = "0.1.0".freeze
+    VERSION = "0.1.0"
   end
 end

fixtures/getting-started-app/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source "https://rubygems.org"
 
 gem "aruba", path: File.expand_path("../../..", __dir__)

fixtures/getting-started-app/features/support/env.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require "aruba/cucumber"

gemfiles/cucumber_8.gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
 source "https://rubygems.org"

gemfiles/cucumber_9.gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # This file was generated by Appraisal
 
 source "https://rubygems.org"

lib/aruba.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require "aruba/api"

lib/aruba/api.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rspec/expectations"
 require "shellwords"
 

lib/aruba/api/bundler.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "aruba/api/environment"
 require "bundler"
 

lib/aruba/api/commands.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "pathname"
 
 require "aruba/platform"

lib/aruba/api/core.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rspec/expectations"
 require "aruba/runtime"
 require "aruba/errors"

lib/aruba/api/environment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "aruba/platform"
 
 # Aruba

lib/aruba/api/filesystem.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "pathname"
 
 require "aruba/platform"

lib/aruba/api/text.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Aruba
 module Aruba
   # Api

lib/aruba/aruba_logger.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "logger"
 
 # Aruba

lib/aruba/aruba_path.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "pathname"
 
 # Aruba

lib/aruba/basic_configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "contracts"
 require "aruba/basic_configuration/option"
 require "aruba/in_config_wrapper"

lib/aruba/basic_configuration/option.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Aruba
 module Aruba
   # Basic Configuration

lib/aruba/cli.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "thor"
 require "aruba/console"
 require "aruba/initializer"

lib/aruba/colorizer.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Aruba
 module Aruba
   # Simple colorizer class. Only supports the color cyan

lib/aruba/command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "delegate"
 require "aruba/processes/spawn_process"
 require "aruba/processes/in_process"

lib/aruba/command_monitor.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "aruba/errors"
 
 # Aruba
@@ -96,7 +98,7 @@ def clear
     def all_stdout
       registered_commands.each(&:stop)
 
-      registered_commands.each_with_object("") { |e, a| a << e.stdout }
+      registered_commands.map(&:stdout).join
     end
 
     # Get stderr of all commands
@@ -106,7 +108,7 @@ def all_stdout
     def all_stderr
       registered_commands.each(&:stop)
 
-      registered_commands.each_with_object("") { |e, a| a << e.stderr }
+      registered_commands.map(&:stderr).join
     end
 
     # Get stderr and stdout of all commands

lib/aruba/config/jruby.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "rbconfig"
 
 # ideas taken from: http://blog.headius.com/2010/03/jruby-startup-time-tips.html

lib/aruba/config_wrapper.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module Aruba
   # This wraps the current runtime configuration of aruba.
   # If an option is changed, it notifies the event queue.

lib/aruba/configuration.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "contracts"
 
 require "aruba/version"

lib/aruba/console.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "irb"
 
 require "aruba/api"

lib/aruba/console/help.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "aruba/api"
 
 # Aruba

lib/aruba/contracts/absolute_path.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "aruba/platform"
 
 # Aruba

lib/aruba/contracts/enum.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "contracts"
 
 # Aruba

lib/aruba/contracts/is_power_of_two.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "aruba/aruba_path"
 
 # Aruba

lib/aruba/contracts/relative_path.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "aruba/platform"
 
 # Aruba

lib/aruba/cucumber.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "aruba/version"
 
 require "aruba/api"

lib/aruba/cucumber/command.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "aruba/generators/script_file"
 
 When(/^I run `([^`]*)`$/) do |cmd|
@@ -88,7 +90,7 @@
 When "I wait for output/stdout to contain:" do |expected|
   Timeout.timeout(aruba.config.exit_timeout) do
     loop do
-      output = last_command_started.public_send :stdout, wait_for_io: 0
+      output = last_command_started.stdout wait_for_io: 0
 
       output   = sanitize_text(output)
       expected = sanitize_text(expected)
@@ -103,7 +105,7 @@
 When "I wait for output/stdout to contain {string}" do |expected|
   Timeout.timeout(aruba.config.exit_timeout) do
     loop do
-      output = last_command_started.public_send :stdout, wait_for_io: 0
+      output = last_command_started.stdout wait_for_io: 0
 
       output   = sanitize_text(output)
       expected = sanitize_text(expected)

lib/aruba/cucumber/environment.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 Given(/^a mocked home directory$/) do
   set_environment_variable "HOME", expand_path(".")
 end