Skip to content

Commit

Permalink
Fix line endings and make rubocop happy
Browse files Browse the repository at this point in the history
  • Loading branch information
janpio committed Dec 11, 2017
1 parent 02dba23 commit 69f7fea
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 7 deletions.
2 changes: 1 addition & 1 deletion fastlane_core/spec/analytics/analytics_session_spec.rb
Expand Up @@ -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
Expand Down
8 changes: 3 additions & 5 deletions match/lib/match/encrypt.rb
Expand Up @@ -90,18 +90,16 @@ 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
success = false
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
Expand Down
2 changes: 1 addition & 1 deletion spec_helper.rb
Expand Up @@ -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

Expand Down

0 comments on commit 69f7fea

Please sign in to comment.