fastlane-plugin-csv_translation 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0f16b7ee0ca379dd5ea0519771ff45f609c567715fc10e6245175a9dde17571
-  data.tar.gz: 4735dd08f4a574bf92d820937a51131a7ea73525801e507ae67bf20f37e01b48
+  metadata.gz: 7189ea70602d3f9110b9275ccff1d796c1ada3e1169217a4c6ed58df5d73ac18
+  data.tar.gz: d459fb0ed36b20e1fb453dd91bcab49d3af60e345d7027326c02d4b0e68a50f1
 SHA512:
-  metadata.gz: 82be092d741b44d89dbbc1bf0b476575f4a0decb18c3f12583c87904c0de618f18a3d61af94a033099e516fee67ef55d9e06945446c1ed62adfba86acf122e65
-  data.tar.gz: 423d5e8a753a5aeb1ccd4a80ecab0e71ed98f2a9b45696c69ab43bf530ff619ffc973bcfe06e24df0a58151efb0e7652f715970a1a15bc812591ffad3ce20f79
+  metadata.gz: bb5b1e92b389a06f1d0f7a88483092e82489efe6450fec63b42bbe11746f653619b092340bdb6e8dffc67f395ec34fa7ba7918d22aa4ac9c812b0034465662dd
+  data.tar.gz: 2230a17886dc5485dea6aef9858513d3ec8906aa0d6b41180055f104b91c153bfcb2c6ebb3d68d8947e76da932b28774788ea222492b4dfb06365aecfbabdb9b

data/README.md

@@ -55,7 +55,7 @@ get_csv_translation_requests(
 Add a new translation request entry inside the CSV file. It will append a new row in CSV file and then git commit the CSV file changes.
 
 ``` ruby
-example_csv_payload = {Ticket: "PRJ-3030", Timeline: "30 April"}
+example_csv_payload = { "Ticket" => "PRJ-3030", "Timeline" => "30 April" }
 
 create_csv_translation_request(
   repository_name: "crazymanish/example-csv-repo", # Specify the CSV git file repo
@@ -65,7 +65,7 @@ create_csv_translation_request(
 ```
 
 ### 🔝rebase_csv_translation_request
-Rebase a translation request entry inside the CSV file. It will append a new row top of target branch in CSV file and then git commit the CSV file changes.
+Rebase a translation request entry inside the CSV file. It will append a new row top of target branch in CSV file and then git commit the CSV file changes. Very useful in case of resolving conflicts. 
 
 ``` ruby
 rebase_csv_translation_request(

data/lib/fastlane/plugin/csv_translation/actions/create_csv_translation_request.rb

@@ -20,14 +20,7 @@ module Fastlane
         csv_payload = params[:payload]
 
         # add missing newline if not present, at the end of the file
-        File.open(csv_file_path, "r+") do |csv|
-          csv.seek(-1, 2)
-
-          if csv.read(1) != "\n"
-            csv.write("\n")
-            csv.seek(0)
-          end
-        end
+        Helper::CsvTranslationHelper.append_missing_eof(csv_file_path)
 
         # adding new entry into csv file
         require 'csv'

data/lib/fastlane/plugin/csv_translation/actions/rebase_csv_translation_request.rb

@@ -31,32 +31,15 @@ module Fastlane
           sh("git fetch --all")
           sh("git checkout #{params[:branch_name]} -- #{params[:file_path]}")
 
-          # Step2: Commit csv file so rebase can be performed
-          git_message = "Rebase translation request: identifier:\n#{csv_row_identifier}"
-          GitCommitAction.run(path: ".", message: git_message)
-
-          # Step3: Perfoms rebasing, take all changes from target branch
-          sh("git rebase -X theirs " + params[:branch_name])
-
-          # Step4: Add missing newline if not present, at the end of the file
-          Helper::CsvTranslationHelper.append_missing_eof(csv_file_path)
-
-          # Step5: Append back feature branch translation_requests
-          all_translation_requests = CSV.table(csv_file_path, headers: true)
-          all_translation_requests.delete_if { |row| row.map { |value| value.to_s }.join("").include?(csv_row_identifier) }
-
-          headers = CSV.open(csv_file_path, &:readline)
-          CSV.open(csv_file_path, "w", write_headers: true, headers: headers, force_quotes: true) do |csv|
-            all_translation_requests.each { |translation_request| csv << translation_request }
-            feature_branch_translation_requests.each { |translation_request| csv << translation_request }
+          # Validate: Do we really need to perfoem `rebase` ?
+          repo_status = Actions::sh("git status --porcelain")
+          repo_clean = repo_status.empty?
+
+          if repo_clean
+            UI.important("Rebase is not required, CSV file is up to date! 💪")
+          else
+            git_commit_info = self.perform_rebase(params, csv_file_path, feature_branch_translation_requests)
           end
-
-          # Step6: Commit and push to remote
-          GitCommitAction.run(path: ".", message: git_message)
-          PushToGitRemoteAction.run(remote: "origin", force: true)
-
-          git_commit_info = Actions.last_git_commit_dict
-          UI.success("Successfully #{git_message} 🚀")
         end
 
         # building deleted translation request info
@@ -68,6 +51,37 @@ module Fastlane
         return rebase_translation_request_info
       end
 
+      def self.perform_rebase(params, csv_file_path, feature_branch_translation_requests)
+        csv_row_identifier = params[:identifier]
+
+        # Step2: Commit csv file so rebase can be performed
+        git_message = "Rebase translation request: identifier:\n#{csv_row_identifier}"
+        GitCommitAction.run(path: ".", message: git_message)
+
+        # Step3: Perfoms rebasing, take all changes from target branch
+        sh("git rebase -X theirs " + params[:branch_name])
+
+        # Step4: Add missing newline if not present, at the end of the file
+        Helper::CsvTranslationHelper.append_missing_eof(csv_file_path)
+
+        # Step5: Append back feature branch translation_requests
+        all_translation_requests = CSV.table(csv_file_path, headers: true)
+        all_translation_requests.delete_if { |row| row.map { |value| value.to_s }.join("").include?(csv_row_identifier) }
+
+        headers = CSV.open(csv_file_path, &:readline)
+        CSV.open(csv_file_path, "w", write_headers: true, headers: headers, force_quotes: true) do |csv|
+          all_translation_requests.each { |translation_request| csv << translation_request }
+          feature_branch_translation_requests.each { |translation_request| csv << translation_request }
+        end
+
+        # Step6: Commit and push to remote
+        GitCommitAction.run(path: ".", message: git_message)
+        PushToGitRemoteAction.run(remote: "origin", force: true)
+
+        UI.success("Successfully #{git_message} 🚀")
+        Actions.last_git_commit_dict
+      end
+
       def self.description
         "Rebase a translation request based on identifier value."
       end

data/lib/fastlane/plugin/csv_translation/version.rb

@@ -1,5 +1,5 @@
 module Fastlane
   module CsvTranslation
-    VERSION = "0.4.0"
+    VERSION = "0.4.1"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fastlane-plugin-csv_translation
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Manish Rathi
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-21 00:00:00.000000000 Z
+date: 2020-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry