phraseapp_updater 2.0.5 → 2.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6279bf1f85138efd48f74dfad8c33bc374c484d763a13864a985b6b7008cb877
-  data.tar.gz: 4d18b2a5b27fed7564625b9ee19b4172a1bfabf976cb889d8f468ac57e3c9a22
+  metadata.gz: a6e74f3bf7f3ffcb08b72dc6daf7aecb474ceeac2a97ee39050d3ec1319f1406
+  data.tar.gz: c03e16ce0823c0f183a518813098b6287217923aae53276c7567d2627b84165b
 SHA512:
-  metadata.gz: 8d31f320c4c72c182f3664f90a9d19fe07a8b5debc4d4253f092c5ab16effa25aa94ac2281a6a3a857da500042f354ad20c5852a943fd311faf5dbbd79bd8f38
-  data.tar.gz: 1ab2a71f775c3eb7ed9c0d8c2d2ca9ee92b5d633de1439e929a096fa9f1b3b7ee66da9e6756ae058804936f37ce1a5c075306853bfd68c2a541cca760bb7a4f5
+  metadata.gz: 0a4e72d05dd43ce5a7f52b190b38eb996bc01e23a75bd53113d2eead8fc6ebd8f6fc72633e966228a6545ac199f5150be6acfc7588870e179dfb633793728032
+  data.tar.gz: c70d493a8ee12ca69a97e91e8ad54ed16754c2a696ca2e347e0886b66508b9e5c1acba9ffa0d58f0f60d41e63e287f6dbf420b3ae046575f99e6a1fde283e017

data/bin/synchronize_phraseapp.sh

@@ -25,6 +25,14 @@ git fetch "${REMOTE}"
 
 current_branch=$(git rev-parse "${REMOTE}/${BRANCH}")
 
+# If there's a local checkout of that branch, for safety's sake make sure that
+# it's up to date with the remote one.
+local_branch=$(git rev-parse "${BRANCH}")
+if [ "$local_branch" ] && [ "$current_branch" != "$local_branch" ]; then
+   echo "Error: local branch '${BRANCH}' exists but does not match '${REMOTE}/${BRANCH}'." >&2
+   exit 1
+fi
+
 # First, fetch the current contents of PhraseApp's staged ("verified") state.
 current_phraseapp_path=$(make_temporary_directory)
 common_ancestor=$(phraseapp_updater download "${current_phraseapp_path}" \

data/lib/phraseapp_updater/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: phraseapp_updater
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Kevin Griffin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-26 00:00:00.000000000 Z
+date: 2019-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor