From 3c5eb12f8848f9f4d19be3c3f37c84ffe74d534c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jacek=20=C5=81yp?= Date: Tue, 3 Sep 2024 13:37:24 +0200 Subject: [PATCH] Clean code --- .../actions/asana_add_comment_action.rb | 6 +++--- .../helper/ddg_apple_automation_helper.rb | 3 +++ spec/asana_add_comment_spec.rb | 2 +- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/fastlane/plugin/ddg_apple_automation/actions/asana_add_comment_action.rb b/lib/fastlane/plugin/ddg_apple_automation/actions/asana_add_comment_action.rb index 8f9b98b..8cecc22 100644 --- a/lib/fastlane/plugin/ddg_apple_automation/actions/asana_add_comment_action.rb +++ b/lib/fastlane/plugin/ddg_apple_automation/actions/asana_add_comment_action.rb @@ -38,7 +38,7 @@ def self.run(params) end if template_name - template_file = File.expand_path("../assets/asana_add_comment/templates/#{template_name}.yml", __dir__) + template_file = Helper::DdgAppleAutomationHelper.load_asset_file("asana_add_comment/templates/#{template_name}.yml") begin template_content = File.read(template_file) rescue StandardError @@ -50,7 +50,7 @@ def self.run(params) processed_content = process_comment(comment, workflow_url) end - base64_encoded_payload = convert_to_json_and_encode_Base64(processed_content) + base64_encoded_payload = convert_to_json_and_encode_base64(processed_content) response = HTTParty.post( url, @@ -127,7 +127,7 @@ def self.process_comment(comment, workflow_url) } end - def self.convert_to_json_and_encode_Base64(data) + def self.convert_to_json_and_encode_base64(data) json_payload = data.to_json payload_base64 = Base64.strict_encode64(json_payload) end diff --git a/lib/fastlane/plugin/ddg_apple_automation/helper/ddg_apple_automation_helper.rb b/lib/fastlane/plugin/ddg_apple_automation/helper/ddg_apple_automation_helper.rb index 0e047f0..603602a 100644 --- a/lib/fastlane/plugin/ddg_apple_automation/helper/ddg_apple_automation_helper.rb +++ b/lib/fastlane/plugin/ddg_apple_automation/helper/ddg_apple_automation_helper.rb @@ -8,6 +8,9 @@ module Helper class DdgAppleAutomationHelper ASANA_API_URL = "https://app.asana.com/api/1.0" ERROR_ASANA_ACCESS_TOKEN_NOT_SET = "ASANA_ACCESS_TOKEN is not set" + def self.load_asset_file(file) + File.expand_path("../assets/#{file}", __dir__) + end end end end diff --git a/spec/asana_add_comment_spec.rb b/spec/asana_add_comment_spec.rb index bb97d28..3a5c614 100644 --- a/spec/asana_add_comment_spec.rb +++ b/spec/asana_add_comment_spec.rb @@ -61,7 +61,7 @@ end it "converts to json and encodes with base64" do - result = Fastlane::Actions::AsanaAddCommentAction.convert_to_json_and_encode_Base64("Hello world!") + result = Fastlane::Actions::AsanaAddCommentAction.convert_to_json_and_encode_base64("Hello world!") expect(result).to eq("IkhlbGxvIHdvcmxkISI=") end