istox 0.1.152.1 → 0.1.152.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 747b9e284b653c5ec060ef2f97cd7cd868f2561334557eff4d847f669f1f8851
-  data.tar.gz: f3475aed8b8f13c8b06572d67b2914f7828fde78cf58240981bb88e3cee8d623
+  metadata.gz: 98405f323d3016566581224e870b8ea1d1056d60087152b5006057c80a27887d
+  data.tar.gz: c8671f124d402c4b8ecae516e993d34f3e0ab7a1e8085cd1144671ff83ef2211
 SHA512:
-  metadata.gz: a75a9a8ad205ae3c8f9e6ecbbeff41acc8cbcde4bbbf8fde457c8eb2139993240964e06c94d756444e4398758c750d9ee4ade74138d66b44d4567724cbc17590
-  data.tar.gz: 19cfccb0159c8587c49ee8158e965142b48ce7ae94fcdf970dc811d0a7a4d088cb969d3b896d5f54b0cdb1035d854cfd28a0df3a9356b5ba7207824a69976187
+  metadata.gz: a481fab47d1c5a40edd99f43eda4a4273b02c92f1908338a5e8c81e00cc9e3ea39df4b8213b6a896dc60d69f961ad38f2cdb54ab89efbfb3260d7cc9bdc85e11
+  data.tar.gz: c5fbb241ab645cd2e7ca70ff9ba8a12e2a6c27166ec192c5d15b1be513f59d7d0111e1cd5744470825746dc25de7cbde15f90bb65de2eb44a12c5e203bbdd9e3

data/bulk-update-version.py

@@ -0,0 +1,93 @@
+import sys
+import re
+from tempfile import mkstemp
+from shutil import move, copymode
+from os import fdopen, remove
+import os
+
+# HOW TO RUN: python bulk-update-version.py <version updating to, eg. 0.1.150.2>
+
+SERVICES = ["client-api", "admin-api", "message-api", "auth", "admin-auth"]
+
+
+def replace(file_path, pattern, subst):
+    # Create temp file
+    fh, abs_path = mkstemp()
+    with fdopen(fh, 'w') as new_file:
+        dirname = os.path.dirname(__file__)
+        file_path = os.path.join(dirname, file_path)
+        if os.path.exists(file_path) == False:
+            return
+        with open(file_path) as old_file:
+            for line in old_file:
+                new_file.write(re.sub(pattern, subst, line))
+    # Copy the file permissions from the old file to the new file
+    copymode(file_path, abs_path)
+    # Remove original file
+    remove(file_path)
+    # Move new file
+    move(abs_path, file_path)
+
+
+def push_service(file_path, version, hotfix):
+    dirname = os.path.dirname(__file__)
+    file_path = os.path.join(dirname, file_path)
+
+    if os.path.exists(file_path) == False:
+        return
+
+    if hotfix == True:
+        branch_name = "hotfix"
+    else:
+        branch_name = "FIX/update-istox-gem-" + version
+
+    os.chdir(file_path)
+    os.system(
+        "git branch -D %s &>/dev/null" % (branch_name))
+    os.system("echo 'Deleted local branch'")
+    os.system(
+        "git push origin --delete %s &>/dev/null" % (branch_name))
+    os.system("echo 'Deleted remote branch'")
+    os.system("git fetch -a")
+    os.system("git checkout -b %s" % (branch_name))
+    os.system("git add Gemfile")
+    os.system("git commit -m 'Update istox-gem version to %s'" % (version))
+    os.system("git push --set-upstream origin %s" % (branch_name))
+#     os.system("cd " + file_path + " && git branch -D " +
+#               branch_name + " &>/dev/null || echo 'Deleted local branch' || git push origin --delete hotfix &>/dev/null || echo 'Deleted remote branch' || git fetch -a || git checkout -b " +
+#               branch_name + " && git add Gemfile && git commit -m 'Update istox-gem version to "
+#               + version + "' && git push --set-upstream origin " + branch_name)
+
+
+arguments = sys.argv
+arguments.pop(0)
+
+new_version = arguments[0]
+
+hotfix = False
+
+while True:
+    result = raw_input("Is this a hotix? Y/N \n")
+
+    if result.lower() == 'y':
+        hotfix = True
+        break
+    elif result.lower() == 'n':
+        hotfix = False
+        break
+    else:
+        print("Please input only Y or N.")
+
+
+print("Updating services " + str(SERVICES) +
+      " to istox-gem version " + new_version)
+
+for service in SERVICES:
+    replace("../" + service + "/Gemfile", r"gem 'istox'.+",
+            "gem 'istox', '" + new_version + "'")
+
+for service in SERVICES:
+    push_service("../" + service, new_version, hotfix)
+
+print("Services " + str(SERVICES) +
+      " has been updated to istox-gem version " + new_version)

data/lib/istox/helpers/publisher.rb

@@ -78,6 +78,9 @@ module Istox
                     @channel[t]['confirm-1'].close
                     @channel[t]['noconfirm'].close
                     @channel.delete t
+
+                    # Remove exchange from @exchange
+                    @exchanges.delete t
                   end
                 end
               end.join
@@ -233,7 +236,16 @@ module Istox
         sleep 1
         do_publish(ex,options,message)
       rescue => e
-        log.debug "Error happens: #{e}"
+        log.debug "Error happens: #{e.message}"
+
+        # If the error indicates that the channel is already closed
+        # then clear hash @channel and @exchange
+        if e.message.include? "cannot use a closed channel"
+          @channel.delete Thread.current.object_id
+          @exchanges.delete Thread.current.object_id
+          ex = exchange(eid)
+          do_publish(ex, options, message)
+        end
       end
     end
   end

data/lib/istox/version.rb

@@ -1,3 +1,3 @@
 module Istox
-  VERSION = '0.1.152.1'.freeze
+  VERSION = '0.1.152.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: istox
 version: !ruby/object:Gem::Version
-  version: 0.1.152.1
+  version: 0.1.152.2
 platform: ruby
 authors:
 - Siong Leng
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2020-06-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: awesome_print
@@ -427,6 +427,7 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
+- bulk-update-version.py
 - istox.gemspec
 - lib/istox.rb
 - lib/istox/constants/error.rb