souls 1.8.8 → 1.8.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3008e8f3c693f08dceed2d39e068fded99cd451028fb16cb682dc37ae091727a
-  data.tar.gz: d1f43ed9ace0909791ccb69021f0416ff2918ba61f99bc63fd964cf10a96570e
+  metadata.gz: e8ff92925b8c92d38138539701be39b497a78752fcae8395fbc5c4975c011eaf
+  data.tar.gz: a2b901a382bc62498a3ae613a696503dd5c27eea7faa243b418b2cf18013e36c
 SHA512:
-  metadata.gz: fcd880cbd079096b8f083cc999379d1a5582a6d626bd27b8fcd74bc83a985625cbedae16afb5c153e639a8deb56e0ea49874d268df7c553ab442913b0ee008f7
-  data.tar.gz: cf54ecf40cf18dda9203aa54a17b975d4fe570eeff85029305663813e0a11d3575c0c7340c923e5f110fd6e4514b39f538645d21278e32209af9ea7aa6689c9b
+  metadata.gz: 5928d3c61c8304ad2a5abfa30c63d730ff5c48838fc040a59014949d49e6babc5717326d42f2648ebe3d287b614bdf295094526ecf136da4865bedd861f554c2
+  data.tar.gz: ff2a2fbe41b58720b533f1ede4910f55d92e5461846bd3ae0608e4b8dbba762ab55de7f28fef8951ccfa51cb0e5d133ae3514d1b3896b99fd12d1d597a9a372a

data/lib/souls/cli/create/index.rb

@@ -195,6 +195,7 @@ end
                       --set-env-vars="SOULS_DB_USER=${{ secrets.SOULS_DB_USER }}" \\
                       --set-env-vars="SOULS_DB_PW=${{ secrets.SOULS_DB_PW }}" \\
                       --set-env-vars="SOULS_DB_HOST=${{ secrets.SOULS_DB_HOST }}" \\
+                      --set-env-vars="GITHUB_REPOSITORY=$GITHUB_REPOSITORY" \\
                       --set-env-vars="SOULS_TZ=${{ secrets.SOULS_TZ }}" \\
                       --set-env-vars="SOULS_SECRET_KEY_BASE=${{ secrets.SOULS_SECRET_KEY_BASE }}" \\
                       --set-env-vars="SOULS_PROJECT_ID=${{ secrets.SOULS_GCP_PROJECT_ID }}"

data/lib/souls/cli/gcloud/sql/index.rb

@@ -30,6 +30,7 @@ module Souls
             SOULS_DB_USER=postgres
             SOULS_GCP_PROJECT_ID=#{project_id}
             SOULS_SECRET_KEY_BASE='#{SecureRandom.base64(64)}'
+            GITHUB_REPOSITORY='elsoul/souls'
             TZ="#{region_to_timezone(region: region)}"
           TEXT
         end
@@ -46,6 +47,7 @@ module Souls
             SOULS_GCP_REGION=#{region}
             SOULS_GCLOUDSQL_INSTANCE="#{project_id}:#{region}:#{instance_name}"
             SOULS_SECRET_KEY_BASE='#{SecureRandom.base64(64)}'
+            GITHUB_REPOSITORY='elsoul/souls'
             TZ="#{region_to_timezone(region: region)}"
           TEXT
         end

data/lib/souls/cli/github/index.rb

@@ -30,17 +30,28 @@ module Souls
 
     desc "watch", "Watch GitHub Actions Workflow"
     def watch
-      workflows = JSON.parse(`gh api -X GET 'repos/#{ENV["GITHUB_REPOSITORY"]}/actions/runs'`)
+      remote_url = `git remote get-url origin`
+      split_url = %r{\A(git@github.com:)(.+/.+)(\.git)}.match(remote_url)
+      if split_url.nil? || split_url.size != 4
+        raise(CLIException, "Cannot access Github, please check your credentials")
+      end
+
+      api_request = "gh api -X GET 'repos/#{split_url[2]}/actions/runs'"
+      workflows = JSON.parse(`#{api_request}`)
+
+      if workflows.nil? || !workflows.key?("workflow_runs")
+        raise(CLIException, "Failed to parse JSON response from Github")
+      end
 
       wf_info =
         workflows["workflow_runs"].filter_map do |wf|
-          { wf["name"].to_sym => wf["id"] } if wf["state"] == "in_progress"
+          { wf["name"].to_sym => wf["id"] } if wf["status"] == "in_progress"
         end
 
       wf_id =
         case wf_info.size
         when 0
-          raise(CLIException, "No workflow is running.")
+          raise(CLIException, "No workflow is running")
         when 1
           wf_info[0].values[0]
         else

data/lib/souls/version.rb

@@ -1,4 +1,4 @@
 module Souls
-  VERSION = "1.8.8".freeze
+  VERSION = "1.8.13".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.8.8
+1.8.13

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.8.8
+1.8.13

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.8.8
+  version: 1.8.13
 platform: ruby
 authors:
 - POPPIN-FUMI