phraseapp_updater 2.0.0 → 2.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a9a01be297b026f1bcf98b8337306f7dd5340f15bd21dc7264ccf78aff82d242
-  data.tar.gz: 6c8cd2024db62795d678b148621dd3556e5a7771daa33076e004a00d68bde88e
+  metadata.gz: f3d610d44e8c13cac7b5a663375c4c505782824abe3d6998cdc22ddb0a5222c6
+  data.tar.gz: b0147ba60c0181035c7e55fecbd3ab33d77b0e7b9be1f98ca645cc99d51698a6
 SHA512:
-  metadata.gz: aab7ed4136379375aa89531722ce00af0d7027f0433ad0d77f2793a855966f59f286ad3f154f71c4bfe48a604275f72805e615f3be65e4abf58390f025f7f058
-  data.tar.gz: 83aae79c39f421c21deed218e8c0bfa0dcfbbe663ec49520cda9dbd675268728877ce665aae5150d45438ccb5d241cfb23995d8c3168eb237c28689e5b37639c
+  metadata.gz: 93ef8934510ffef345f2a888f3fd0afaee91669922fc808ed7d945de4b70c6f9bcc3acc17a2a8dfba28152e5109644c28b85d46290244b184905530b590cca78
+  data.tar.gz: 6795589ad887442ffd31dfbec8513c42960899b4683a17e708c1421630b52ff85d69e890aa5f969ce015dca2804e9f447b55aebca6f6ecb1e78f9057b70c5b1c

data/bin/phraseapp_updater

@@ -48,7 +48,7 @@ class PhraseAppUpdaterCLI < Thor
     ENV['FILE_FORMAT'] = options[:file_format]
     ENV['NO_COMMIT']   = options[:no_commit] ? 't' : 'f'
     ENV['PREFIX']      = options[:prefix]
-    ENV['BRANCH']      = options.fetch(:branch) { sh('git name-rev --name-only HEAD').chomp }
+    ENV['BRANCH']      = options.fetch(:branch) { sh('git rev-parse --abbrev-ref HEAD').chomp }
     ENV['REMOTE']      = options.fetch(:remote) { sh("git config branch.#{ENV['BRANCH']}.remote").chomp }
 
     shell_script_path = File.join(__dir__, 'synchronize_phraseapp.sh')

data/bin/synchronize_phraseapp.sh

@@ -78,9 +78,11 @@ if [ "${phraseapp_changed}" = 't' ] && [ "${branch_changed}" = 't' ]; then
 
     if [ "$NO_COMMIT" != 't' ]; then
         # Create a commit to record the pre-merge state of PhraseApp
-        phraseapp_commit=$(git commit-tree "${current_phraseapp_tree}" \
+        phraseapp_commit_tree=$(replace_nested_tree "${common_ancestor}^{tree}" "${PREFIX}" "${current_phraseapp_tree}")
+        phraseapp_commit=$(git commit-tree "${phraseapp_commit_tree}" \
                                -p "${common_ancestor}" \
-                               -m "Remote locale changes made on PhraseApp (drop when rebasing)")
+                               -m "Remote locale changes made on PhraseApp" \
+                               -m "These changes may be safely flattened into their merge commit when rebasing.")
 
         # Commit merge result to PREFIX in BRANCH
         merge_resolution_tree=$(make_tree_from_directory "${merge_resolution_path}")
@@ -89,7 +91,8 @@ if [ "${phraseapp_changed}" = 't' ] && [ "${branch_changed}" = 't' ]; then
         merge_commit=$(git commit-tree "${merged_branch_tree}" \
                            -p "${current_branch}" \
                            -p "${phraseapp_commit}" \
-                           -m "Merged locale changes from PhraseApp")
+                           -m "Merged locale changes from PhraseApp" \
+                           -m "X-PhraseApp-Merge: ${phraseapp_commit}")
 
         # Push to BRANCH
         git push "${REMOTE}" "${merge_commit}:refs/heads/${BRANCH}"

data/lib/phraseapp_updater/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class PhraseAppUpdater
-  VERSION = "2.0.0"
+  VERSION = "2.0.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phraseapp_updater
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.0.1
 platform: ruby
 authors:
 - Kevin Griffin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-10-23 00:00:00.000000000 Z
+date: 2018-10-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor