Fix Rubocop violations

Author: spencertransier

Gemfile

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gem 'cocoapods', '~> 1.14'
 gem 'fastlane', '~> 2.219'
+gem 'fastlane-plugin-appcenter', '~> 1.11'
+gem 'fastlane-plugin-sentry', '~> 1.14'
+gem 'fastlane-plugin-wpmreleasetoolkit', '~> 9.2'
 gem 'rake', '~> 12.3'
 gem 'rubocop', '~> 1.18'
 gem 'xcpretty-travis-formatter', '~> 1.0'
-gem 'fastlane-plugin-wpmreleasetoolkit', '~> 9.2'
-gem 'fastlane-plugin-sentry', '~> 1.14'
-gem 'fastlane-plugin-appcenter', '~> 1.11'

Podfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://cdn.cocoapods.org/'
 
 inhibit_all_warnings!
@@ -32,9 +34,7 @@ post_install do |installer|
     target.build_configurations.each do |configuration|
       macos_deployment_key = 'MACOSX_DEPLOYMENT_TARGET'
       pod_macos_deployment_target = Gem::Version.new(configuration.build_settings[macos_deployment_key])
-      if pod_macos_deployment_target <= APP_MACOS_DEPLOYMENT_TARGET
-        configuration.build_settings.delete macos_deployment_key
-      end
+      configuration.build_settings.delete macos_deployment_key if pod_macos_deployment_target <= APP_MACOS_DEPLOYMENT_TARGET
     end
   end
 end

Rakefile

@@ -1,91 +1,92 @@
-SWIFTLINT_VERSION="0.41.0"
-XCODE_WORKSPACE="Simplenote.xcworkspace"
-XCODE_SCHEME="Simplenote"
-XCODE_CONFIGURATION="Debug"
+# frozen_string_literal: true
+
+require 'English'
+SWIFTLINT_VERSION = '0.41.0'
+XCODE_WORKSPACE = 'Simplenote.xcworkspace'
+XCODE_SCHEME = 'Simplenote'
+XCODE_CONFIGURATION = 'Debug'
 
 require 'fileutils'
 require 'tmpdir'
 require 'rake/clean'
 require 'yaml'
 require 'digest'
-PROJECT_DIR = File.expand_path(File.dirname(__FILE__))
+PROJECT_DIR = __dir__
 
 task default: %w[test]
 
-desc "Install required dependencies"
-task :dependencies => %w[dependencies:check]
+desc 'Install required dependencies'
+task dependencies: %w[dependencies:check]
 
 namespace :dependencies do
-  task :check => %w[bundler:check bundle:check pod:check lint:check]
+  task check: %w[bundler:check bundle:check pod:check lint:check]
 
   namespace :bundler do
     task :check do
-      unless command?("bundler")
-        Rake::Task["dependencies:bundler:install"].invoke
-      end
+      Rake::Task['dependencies:bundler:install'].invoke unless command?('bundler')
     end
 
     task :install do
-      puts "Bundler not found in PATH, installing to vendor"
+      puts 'Bundler not found in PATH, installing to vendor'
       ENV['GEM_HOME'] = File.join(PROJECT_DIR, 'vendor', 'gems')
-      ENV['PATH'] = File.join(PROJECT_DIR, 'vendor', 'gems', 'bin') + ":#{ENV['PATH']}"
-      sh "gem install bundler" unless command?("bundler")
+      ENV['PATH'] = File.join(PROJECT_DIR, 'vendor', 'gems', 'bin') + ":#{ENV.fetch('PATH', nil)}"
+      sh 'gem install bundler' unless command?('bundler')
     end
-    CLOBBER << "vendor/gems"
+    CLOBBER << 'vendor/gems'
   end
 
   namespace :bundle do
     task :check do
-      sh "bundle check --path=${BUNDLE_PATH:-vendor/bundle} > /dev/null", verbose: false do |ok, res|
+      sh 'bundle check --path=${BUNDLE_PATH:-vendor/bundle} > /dev/null', verbose: false do |ok, _res|
         next if ok
+
         # bundle check exits with a non zero code if install is needed
-        dependency_failed("Bundler")
-        Rake::Task["dependencies:bundle:install"].invoke
+        dependency_failed('Bundler')
+        Rake::Task['dependencies:bundle:install'].invoke
       end
     end
 
     task :install do
-      fold("install.bundler") do
-        sh "bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}"
+      fold('install.bundler') do
+        sh 'bundle install --jobs=3 --retry=3 --path=${BUNDLE_PATH:-vendor/bundle}'
       end
     end
-    CLOBBER << "vendor/bundle"
-    CLOBBER << ".bundle"
+    CLOBBER << 'vendor/bundle'
+    CLOBBER << '.bundle'
   end
 
   namespace :pod do
     task :check do
       unless podfile_locked? && lockfiles_match?
-        dependency_failed("CocoaPods")
-        Rake::Task["dependencies:pod:install"].invoke
+        dependency_failed('CocoaPods')
+        Rake::Task['dependencies:pod:install'].invoke
       end
     end
 
     task :install do
-      fold("install.cocoapds") do
+      fold('install.cocoapds') do
         pod %w[install]
       end
     end
 
     task :clean do
-      fold("clean.cocoapds") do
+      fold('clean.cocoapds') do
         FileUtils.rm_rf('Pods')
       end
     end
-    CLOBBER << "Pods"
+    CLOBBER << 'Pods'
   end
 
   namespace :lint do
-
     task :check do
       if swiftlint_needs_install
-        dependency_failed("SwiftLint")
-        Rake::Task["dependencies:lint:install"].invoke
+        dependency_failed('SwiftLint')
+        Rake::Task['dependencies:lint:install'].invoke
       end
     end
 
     task :install do
-      fold("install.swiftlint") do
+      fold('install.swiftlint') do
         puts "Installing SwiftLint #{SWIFTLINT_VERSION} into #{swiftlint_path}"
         Dir.mktmpdir do |tmpdir|
           # Try first using a binary release
@@ -100,93 +101,94 @@ namespace :dependencies do
             sh "git clone --quiet https://github.com/realm/SwiftLint.git #{tmpdir}"
             Dir.chdir(tmpdir) do
               sh "git checkout --quiet #{SWIFTLINT_VERSION}"
-              sh "git submodule --quiet update --init --recursive"
-              FileUtils.remove_entry_secure(swiftlint_path) if Dir.exist?(swiftlint_path)
+              sh 'git submodule --quiet update --init --recursive'
+              FileUtils.rm_rf(swiftlint_path)
               FileUtils.mkdir_p(swiftlint_path)
               sh "make prefix_install PREFIX='#{swiftlint_path}'"
             end
           end
         end
       end
     end
-    CLOBBER << "vendor/swiftlint"
+    CLOBBER << 'vendor/swiftlint'
   end
-
 end
 
-CLOBBER << "vendor"
+CLOBBER << 'vendor'
 
 desc "Build #{XCODE_SCHEME}"
-task :build => [:dependencies] do
+task build: [:dependencies] do
   xcodebuild(:build)
 end
 
 desc "Profile build #{XCODE_SCHEME}"
-task :buildprofile => [:dependencies] do
-  ENV["verbose"] = "1"
+task buildprofile: [:dependencies] do
+  ENV['verbose'] = '1'
   xcodebuild(:build, "OTHER_SWIFT_FLAGS='-Xfrontend -debug-time-compilation -Xfrontend -debug-time-expression-type-checking'")
 end
 
-task :timed_build => [:clean] do
+task timed_build: [:clean] do
   require 'benchmark'
   time = Benchmark.measure do
-    Rake::Task["build"].invoke
+    Rake::Task['build'].invoke
   end
   puts "CPU Time: #{time.total}"
   puts "Wall Time: #{time.real}"
 end
 
-desc "Run test suite"
-task :test => [:dependencies] do
+desc 'Run test suite'
+task test: [:dependencies] do
   xcodebuild(:build, :test)
 end
 
-desc "Remove any temporary products"
+desc 'Remove any temporary products'
 task :clean do
   xcodebuild(:clean)
 end
 
-desc "Checks the source for style errors"
-task :lint => %w[dependencies:lint:check] do
+desc 'Checks the source for style errors'
+task lint: %w[dependencies:lint:check] do
   swiftlint %w[lint --quiet]
 end
 
 namespace :lint do
-  desc "Automatically corrects style errors where possible"
-  task :autocorrect => %w[dependencies:lint:check] do
+  desc 'Automatically corrects style errors where possible'
+  task autocorrect: %w[dependencies:lint:check] do
     swiftlint %w[autocorrect]
   end
 end
 
 namespace :git do
   hooks = %w[pre-commit post-checkout post-merge]
 
-  desc "Install git hooks"
+  desc 'Install git hooks'
   task :install_hooks do
     hooks.each do |hook|
       target = hook_target(hook)
       source = hook_source(hook)
       backup = hook_backup(hook)
 
-      next if File.symlink?(target) and File.readlink(target) == source
-      next if File.file?(target) and File.identical?(target, source)
+      next if File.symlink?(target) && (File.readlink(target) == source)
+      next if File.file?(target) && File.identical?(target, source)
+
       if File.exist?(target)
         puts "Existing hook for #{hook}. Creating backup at #{target} -> #{backup}"
-        FileUtils.mv(target, backup, :force => true)
+        FileUtils.mv(target, backup, force: true)
       end
       FileUtils.ln_s(source, target)
       puts "Installed #{hook} hook"
     end
   end
 
-  desc "Uninstall git hooks"
+  desc 'Uninstall git hooks'
   task :uninstall_hooks do
     hooks.each do |hook|
       target = hook_target(hook)
       source = hook_source(hook)
       backup = hook_backup(hook)
 
-      next unless File.symlink?(target) and File.readlink(target) == source
+      next unless File.symlink?(target) && (File.readlink(target) == source)
+
       puts "Removing hook for #{hook}"
       File.unlink(target)
       if File.exist?(backup)
@@ -210,12 +212,10 @@ namespace :git do
 end
 
 namespace :git do
-  task :pre_commit => %[dependencies:lint:check] do
-    begin
-      swiftlint %w[lint --quiet --strict]
-    rescue
-      exit $?.exitstatus
-    end
+  task pre_commit: %(dependencies:lint:check) do
+    swiftlint %w[lint --quiet --strict]
+  rescue StandardError
+    exit $CHILD_STATUS.exitstatus
   end
 
   task :post_merge do
@@ -227,19 +227,14 @@ namespace :git do
   end
 end
 
-desc "Open the project in Xcode"
-task :xcode => [:dependencies] do
+desc 'Open the project in Xcode'
+task xcode: [:dependencies] do
   sh "open #{XCODE_WORKSPACE}"
 end
 
-def fold(label, &block)
-  puts "travis_fold:start:#{label}" if is_travis?
+def fold(label)
+  puts "--- #{label}" if ENV['BUILDKITE']
   yield
-  puts "travis_fold:end:#{label}" if is_travis?
-end
-
-def is_travis?
-  return ENV["TRAVIS"] != nil
 end
 
 def pod(args)
@@ -252,14 +247,14 @@ def lockfiles_match?
 end
 
 def podfile_locked?
-  podfile_checksum = Digest::SHA1.file("Podfile")
-  lockfile_checksum = YAML.load(File.read("Podfile.lock"))["PODFILE CHECKSUM"]
+  podfile_checksum = Digest::SHA1.file('Podfile')
+  lockfile_checksum = YAML.load_file('Podfile.lock')['PODFILE CHECKSUM']
 
   podfile_checksum == lockfile_checksum
 end
 
 def swiftlint_path
-    "#{PROJECT_DIR}/vendor/swiftlint"
+  "#{PROJECT_DIR}/vendor/swiftlint"
 end
 
 def swiftlint(args)
@@ -268,25 +263,26 @@ def swiftlint(args)
 end
 
 def swiftlint_bin
-    "#{swiftlint_path}/bin/swiftlint"
+  "#{swiftlint_path}/bin/swiftlint"
 end
 
 def swiftlint_needs_install
   return true unless File.exist?(swiftlint_bin)
+
   installed_version = `"#{swiftlint_bin}" version`.chomp
-  return (installed_version != SWIFTLINT_VERSION)
+  (installed_version != SWIFTLINT_VERSION)
 end
 
 def xcodebuild(*build_cmds)
-  cmd = "xcodebuild"
+  cmd = 'xcodebuild'
   cmd += " -destination 'platform=iOS Simulator,name=iPhone 6s'"
-  cmd += " -sdk iphonesimulator"
+  cmd += ' -sdk iphonesimulator'
   cmd += " -workspace #{XCODE_WORKSPACE}"
   cmd += " -scheme #{XCODE_SCHEME}"
   cmd += " -configuration #{xcode_configuration}"
-  cmd += " "
-  cmd += build_cmds.map(&:to_s).join(" ")
-  cmd += " | bundle exec xcpretty -f `bundle exec xcpretty-travis-formatter` && exit ${PIPESTATUS[0]}" unless ENV['verbose']
+  cmd += ' '
+  cmd += build_cmds.map(&:to_s).join(' ')
+  cmd += ' | bundle exec xcpretty -f `bundle exec xcpretty-travis-formatter` && exit ${PIPESTATUS[0]}' unless ENV['verbose']
   sh(cmd)
 end
 
@@ -297,22 +293,23 @@ end
 def command?(command)
   system("which #{command} > /dev/null 2>&1")
 end
+
 def dependency_failed(component)
   msg = "#{component} dependencies missing or outdated. "
   if ENV['DRY_RUN']
-    msg += "Run rake dependencies to install them."
-    fail msg
+    msg += 'Run rake dependencies to install them.'
+    raise msg
   else
-    msg += "Installing..."
+    msg += 'Installing...'
     puts msg
   end
 end
 
 def check_dependencies_hook
-  ENV['DRY_RUN'] = "1"
+  ENV['DRY_RUN'] = '1'
   begin
     Rake::Task['dependencies'].invoke
-  rescue Exception => e
+  rescue StandardError => e
     puts e.message
     exit 1
   end