phraseapp_updater 2.1.0 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d37e141557fd9cc010451768633fad76cdcf752e73fa36264128cfc7131a90e4
-  data.tar.gz: 0b153e2ef2467716126121bb3a489123797769ac10e64bf39490c6ba1d7957d5
+  metadata.gz: 0cb9f8e20f3b078b508e5e427e98d9c62153e02e88542ecf43fc774bef05125f
+  data.tar.gz: e5110c0c2534f4e5819007aa0209ab2efec954a6ce461c404d01ff177b6cfd91
 SHA512:
-  metadata.gz: 616889fb72e2e7a0a02f1bb40c44f86d686d9832541bd1711c2d44631d3fd4dcc9fbd97967ec1995227f8213f6e67da3443320ffeb54ba5bad1d157a25ae303c
-  data.tar.gz: 450c888b0c7e88b6bfb6356ac1d8bf0daf73abd9444f20705a1516307b44e3a603bfc0632035fcc96cb476e1fc42f30664fc6f48b1a4521e287e6277717f07fa
+  metadata.gz: 1a650fd825eb3f37e55388509b23f57b0cfb2a8e5a7235d275ce4b8259f8fc82c955ac54ad701bbfa1fcd7f2689ae16c796133b35a95417536d0632c1cde22a2
+  data.tar.gz: 6108be4a1d29345d3063dd4cf94972aae52de8f67088cd70ff6fcccd4907128f587fbfe721d90f4856bf07707b7271be28ddb81c4b55162fcdc8d944580d6704

data/.github/workflows/gem-push.yml

@@ -0,0 +1,31 @@
+name: Publish Ruby Gem
+
+on:
+  push:
+    branches: [ "master" ]
+
+jobs:
+  build:
+    name: Build + Publish
+    runs-on: ubuntu-latest
+    permissions:
+      contents: read
+      packages: write
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby 2.7
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: 2.7
+
+    - name: Publish to RubyGems
+      run: |
+        mkdir -p $HOME/.gem
+        touch $HOME/.gem/credentials
+        chmod 0600 $HOME/.gem/credentials
+        printf -- "---\n:rubygems_api_key: ${GEM_HOST_API_KEY}\n" > $HOME/.gem/credentials
+        gem build *.gemspec
+        gem push *.gem
+      env:
+        GEM_HOST_API_KEY: "${{secrets.RUBYGEMS_AUTH_TOKEN}}"

data/.github/workflows/test.yml

@@ -0,0 +1,41 @@
+name: Run Tests
+
+on:
+  pull_request:
+    branches: "**"
+
+permissions:
+  contents: read
+  checks: write
+  pull-requests: write
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    strategy:
+      matrix:
+        ruby-version: ['2.7', '3.0', '3.1']
+
+    steps:
+    - uses: actions/checkout@v3
+    - name: Set up Ruby
+      uses: ruby/setup-ruby@v1
+      with:
+        ruby-version: ${{ matrix.ruby-version }}
+        bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+    - name: Run tests
+      run: bundle exec rspec --profile 10 --format RspecJunitFormatter --out test_results/rspec.xml --format progress
+    - name: Upload result
+      uses: actions/upload-artifact@v3
+      if: always()
+      with:
+        name: rspec.xml
+        path: test_results/rspec.xml
+    - name: Test Report
+      uses: dorny/test-reporter@v1
+      if: always()
+      with:
+        name: Rspec Tests - ${{ matrix.ruby-version }}
+        path: test_results/rspec.xml
+        reporter: java-junit

data/bin/phraseapp_common.sh

@@ -4,13 +4,19 @@
 working_directory=$(mktemp -d -t phraseapp.XXXXXX)
 
 function cleanup_working_directory(){
-    rm -rf "${working_directory}"
+  local now archive
+  now="$(date "+%Y%m%d%H%M%S")"
+  archive="/tmp/phraseapp-updater-$now.tar.gz"
+  tar czf "$archive" "${working_directory}"
+  rm -rf "${working_directory}"
+  echo "Working files saved to $archive"
 }
 
 trap "cleanup_working_directory" EXIT SIGINT
 
 function make_temporary_directory() {
-    mktemp -d "${working_directory}/XXXXXXXX"
+    name="${1:-tmp}"
+    mktemp -d "${working_directory}/$name.XXXXXXXX"
 }
 
 function make_tree_from_directory() {
@@ -41,7 +47,7 @@ function extract_commit() {
 
 function extract_files() {
     local path
-    path=$(make_temporary_directory)
+    path=$(make_temporary_directory "git.${1%%:*}")
 
     git archive --format=tar "$1" | tar -x -C "${path}"
 

data/bin/synchronize_phraseapp.sh

@@ -34,7 +34,7 @@ if [ "$local_branch" ] && [ "$current_branch" != "$local_branch" ]; then
 fi
 
 # First, fetch the current contents of PhraseApp's staged ("verified") state.
-current_phraseapp_path=$(make_temporary_directory)
+current_phraseapp_path=$(make_temporary_directory phraseapp_download)
 common_ancestor=$(phraseapp_updater download "${current_phraseapp_path}" \
                       --phraseapp_api_key="${PHRASEAPP_API_KEY}" \
                       --phraseapp_project_id="${PHRASEAPP_PROJECT_ID}" \
@@ -87,7 +87,7 @@ if [ "${phraseapp_changed}" = 't' ] && [ "${branch_changed}" = 't' ]; then
     echo "$BRANCH branch and PhraseApp both changed: 3-way merging" >&2
 
     # 3-way merge
-    merge_resolution_path=$(make_temporary_directory)
+    merge_resolution_path=$(make_temporary_directory merge_resolution)
     phraseapp_updater merge "${common_ancestor_path}" "${current_branch_path}" "${current_phraseapp_path}" \
                       --to "${merge_resolution_path}" \
                       --verbose="${VERBOSE}"          \

data/lib/phraseapp_updater/locale_file/json_file.rb

@@ -22,7 +22,10 @@ class PhraseAppUpdater
 
         def dump(hash)
           # Add indentation for better diffs
-          Oj.dump(hash, indent: 2, mode: :strict)
+          json = Oj.dump(hash, indent: '  ', space:  ' ', object_nl: "\n", array_nl: "\n", mode: :strict)
+          # Oj omits end of file newline unless using the integer form of :indent
+          json << "\n"
+          json
         end
 
         def extension

data/lib/phraseapp_updater/version.rb

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

data/phraseapp_updater.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "deep_merge", "~> 1.1"
   spec.add_dependency "parallel", "~> 1.12"
 
-  spec.add_development_dependency "bundler", "~> 1.12"
+  spec.add_development_dependency "bundler", "~> 2.2"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "pry", "~> 0.10"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phraseapp_updater
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.1.2
 platform: ruby
 authors:
 - Kevin Griffin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-10 00:00:00.000000000 Z
+date: 2023-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.12'
+        version: '2.2'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -173,8 +173,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".circleci/config.yml"
 - ".envrc"
+- ".github/workflows/gem-push.yml"
+- ".github/workflows/test.yml"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -222,7 +223,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: A three-way differ for PhraseApp projects.

data/.circleci/config.yml

@@ -1,98 +0,0 @@
-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-v2-<< parameters.ruby-version >>-{{ checksum "/tmp/gem-lock" }}
-            - phraseapp_updater-v2
-
-      - run:
-          name: Bundle Install
-          command: bundle check || bundle install
-
-      - save_cache:
-          key: phraseapp_updater-v2-<< 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: /.*/