phraseapp_updater 2.0.6 → 2.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a6e74f3bf7f3ffcb08b72dc6daf7aecb474ceeac2a97ee39050d3ec1319f1406
-  data.tar.gz: c03e16ce0823c0f183a518813098b6287217923aae53276c7567d2627b84165b
+  metadata.gz: cd13cd155e4d1489c4eadba7a8fc5def83bfc86a28f43646a9ef1924706f85a5
+  data.tar.gz: 341169c0beb43396cbf1b404a888ebc8ecae66a5acb57c2eb164e89d6cef856d
 SHA512:
-  metadata.gz: 0a4e72d05dd43ce5a7f52b190b38eb996bc01e23a75bd53113d2eead8fc6ebd8f6fc72633e966228a6545ac199f5150be6acfc7588870e179dfb633793728032
-  data.tar.gz: c70d493a8ee12ca69a97e91e8ad54ed16754c2a696ca2e347e0886b66508b9e5c1acba9ffa0d58f0f60d41e63e287f6dbf420b3ae046575f99e6a1fde283e017
+  metadata.gz: 830206a333355912b6ade08d4c73e1526d22c65fbde8c6674429071e3a12e9db5f9706c8fb5d7ddf29437af78b965db268635e1efa2fc3f9546ea4ed90f72aa9
+  data.tar.gz: 8b80b6341dd8ae25edb861ddf67a8a86788179893204c46255c02686f7e0bc09428b3f9d5fe991892a05a4c9f97850b76d235b0a1e06d7d8555d65072972f668

data/.circleci/config.yml

@@ -0,0 +1,98 @@
+version: 2.1
+
+executors:
+  ruby:
+    parameters:
+      ruby-version:
+        type: string
+        default: "2.6"
+      gemfile:
+        type: string
+        default: "Gemfile"
+    docker:
+      - image: circleci/ruby:<< parameters.ruby-version >>
+        environment:
+          BUNDLE_JOBS: 3
+          BUNDLE_RETRY: 3
+          BUNDLE_PATH: vendor/bundle
+          RAILS_ENV: test
+          BUNDLE_GEMFILE: << parameters.gemfile >>
+
+jobs:
+  test:
+    parameters:
+      ruby-version:
+        type: string
+    executor:
+      name: ruby
+      ruby-version: << parameters.ruby-version >>
+    parallelism: 1
+    steps:
+      - checkout
+
+      - run:
+          # Remove the non-appraisal gemfile for safety: we never want to use it.
+          name: Prepare bundler
+          command: bundle -v
+
+      - run:
+          name: Compute a gemfile lock
+          command: bundle lock && cp "${BUNDLE_GEMFILE}.lock" /tmp/gem-lock
+
+      - restore_cache:
+          keys:
+            - phraseapp_updater-<< parameters.ruby-version >>-{{ checksum "/tmp/gem-lock" }}
+            - phraseapp_updater-
+
+      - run:
+          name: Bundle Install
+          command: bundle check || bundle install
+
+      - save_cache:
+          key: phraseapp_updater-<< parameters.ruby-version >>-{{ checksum "/tmp/gem-lock" }}
+          paths:
+            - vendor/bundle
+
+      - run:
+          name: Run rspec
+          command: bundle exec rspec --profile 10 --format RspecJunitFormatter --out test_results/rspec.xml --format progress
+
+      - store_test_results:
+          path: test_results
+
+  publish:
+    executor: ruby
+    steps:
+       - checkout
+       - run:
+           name: Setup Rubygems
+           command: |
+             mkdir ~/.gem &&
+             echo -e "---\r\n:rubygems_api_key: $RUBYGEMS_API_KEY" > ~/.gem/credentials &&
+             chmod 0600 ~/.gem/credentials
+       - run:
+           name: Publish to Rubygems
+           command: |
+             gem build phraseapp_updater.gemspec
+             gem push phraseapp_updater-*.gem
+
+
+workflows:
+  version: 2.1
+  build:
+    jobs:
+      - test:
+          name: 'ruby 2.5'
+          ruby-version: "2.5"
+      - test:
+          name: 'ruby 2.6'
+          ruby-version: "2.6"
+      - publish:
+          requires:
+            - 'ruby 2.5'
+            - 'ruby 2.6'
+          filters:
+            branches:
+              only: master
+            tags:
+              ignore: /.*/

data/Gemfile

@@ -3,4 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in phraseapp_updater.gemspec
 gemspec
 gem 'byebug'
-
+gem 'rspec_junit_formatter'

data/bin/synchronize_phraseapp.sh

@@ -46,12 +46,19 @@ common_ancestor=$(phraseapp_updater download "${current_phraseapp_path}" \
 # afterwards. If it's not available, we lose: the best we can do is manually
 # perform a 2-way diff and force upload to phraseapp. If it's still available
 # but not reachable, we can still try and perform a 3 way merge, but the results
-# will not be as accurate: warn the user.
+# will not be as accurate and we can't record it as a merge: warn the user.
 if ! git cat-file -e "${common_ancestor}^{commit}"; then
     echo "Common ancestor commit could not be found: was '${BRANCH}' rebased without updating PhraseApp?" >&2
     exit 1
 elif ! git merge-base --is-ancestor "${common_ancestor}" "${current_branch}"; then
-    echo "Warning: ancestor commit was not reachable from '${BRANCH}': 3-way merge may be inaccurate" >&2
+    echo "Warning: ancestor commit was not reachable from '${BRANCH}': "\
+         "3-way merge may be inaccurate, and PhraseApp parent commit will not be recorded" >&2
+
+    # If the merge base isn't an ancestor, then creating a merge commit from it
+    # will create a really misleading git history, as it will appear to be
+    # merging extra commits but in fact not take any contents from them. Avoid
+    # doing this.
+    skip_ancestor_merge=t
 fi
 
 current_branch_path=$(extract_commit "${current_branch}")
@@ -87,20 +94,29 @@ if [ "${phraseapp_changed}" = 't' ] && [ "${branch_changed}" = 't' ]; then
                       --file_format="${FILE_FORMAT}"
 
     if [ "$NO_COMMIT" != 't' ]; then
-        # Create a commit to record the pre-merge state of PhraseApp
-        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" \
-                               -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}")
         merged_branch_tree=$(replace_nested_tree "${current_branch}^{tree}" "${PREFIX}" "${merge_resolution_tree}")
 
+
+        if [ "$skip_ancestor_merge" = 't' ]; then
+            merge_args=()
+        else
+            # Create a commit to record the pre-merge state of PhraseApp
+            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" \
+                                   -m "These changes may be safely flattened into their merge commit when rebasing.")
+
+            merge_args=("-p" "${phraseapp_commit}")
+        fi
+
+
+
         merge_commit=$(git commit-tree "${merged_branch_tree}" \
                            -p "${current_branch}" \
-                           -p "${phraseapp_commit}" \
+                           "${merge_args[@]}" \
                            -m "Merged locale changes from PhraseApp" \
                            -m "Since common ancestor ${common_ancestor}" \
                            -m "X-PhraseApp-Merge: ${phraseapp_commit}")

data/lib/phraseapp_updater/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 class PhraseAppUpdater
-  VERSION = '2.0.6'
+  VERSION = '2.0.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phraseapp_updater
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 2.0.7
 platform: ruby
 authors:
 - Kevin Griffin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-26 00:00:00.000000000 Z
+date: 2019-04-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -173,6 +173,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -215,8 +216,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: A three-way differ for PhraseApp projects.