From 69f7fea8c797c1ab86a38934207cf50659e1898a Mon Sep 17 00:00:00 2001 From: Jan Piotrowski Date: Mon, 11 Dec 2017 22:18:35 +0100 Subject: [PATCH] Fix line endings and make rubocop happy --- fastlane_core/spec/analytics/analytics_session_spec.rb | 2 +- match/lib/match/encrypt.rb | 8 +++----- spec_helper.rb | 2 +- 3 files changed, 5 insertions(+), 7 deletions(-) diff --git a/fastlane_core/spec/analytics/analytics_session_spec.rb b/fastlane_core/spec/analytics/analytics_session_spec.rb index e92df8f59cf..cfc7e0f3943 100644 --- a/fastlane_core/spec/analytics/analytics_session_spec.rb +++ b/fastlane_core/spec/analytics/analytics_session_spec.rb @@ -186,7 +186,7 @@ expected_final_array[2]['primary_target']['detail'] = `uname`.strip expected_final_array[11]['primary_target']['detail'] = `uname`.strip end - + parsed_events.zip(expected_final_array).each do |parsed, fixture| expect(parsed).to eq(fixture) end diff --git a/match/lib/match/encrypt.rb b/match/lib/match/encrypt.rb index 2924a0c52ba..128a2bdfd8b 100644 --- a/match/lib/match/encrypt.rb +++ b/match/lib/match/encrypt.rb @@ -90,8 +90,8 @@ def crypt(path: nil, password: nil, encrypt: true) command << "-a" command << "-d" unless encrypt command << "&> /dev/null" unless FastlaneCore::Globals.verbose? # to show show an error message if something goes wrong - - out, err, st = Open3.capture3(command.join(' ')) + + _out, err, _st = Open3.capture3(command.join(' ')) if err.to_s == '' success = true else @@ -99,9 +99,7 @@ def crypt(path: nil, password: nil, encrypt: true) end UI.crash!("Error decrypting '#{path}'") unless success - until File.exist?(tmpfile) - sleep 0.1 - end + sleep 0.1 until File.exist?(tmpfile) FileUtils.mv(tmpfile, path) end end diff --git a/spec_helper.rb b/spec_helper.rb index a8fb945d23d..d9ec47bba89 100644 --- a/spec_helper.rb +++ b/spec_helper.rb @@ -70,7 +70,7 @@ module SpecHelper config.filter_run_excluding requires_xcodebuild: true config.filter_run_excluding requires_plistbuddy: true config.filter_run_excluding requires_keychain: true - config.filter_run_excluding requires_security: true + config.filter_run_excluding requires_security: true end end