souls 0.31.1 → 0.32.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6efcfd5a262a33c5d1323e9e2e423a8abf4d4e8f86783ce13bd1332bfe4c7fa7
-  data.tar.gz: 1553a17298b0c55dc273f6b18eacd3165868346501c2431f85ecc7e4444519b1
+  metadata.gz: 3132263bcdd5298bcb85c331b84ff6e710d2da0b242980d98c16a00346cd6a57
+  data.tar.gz: 3f8505756b2b9c2920a6c16a59431033a6367d44b252a548aa81896970a85cf4
 SHA512:
-  metadata.gz: 7e3b02ca9c947f4a9784ee07500fc2ed470e7d77f8a47e6d6ffe846860f8a769aa7a27d4ad84d735029445cd80e8e1f697959039049f771c00061948825d52ac
-  data.tar.gz: 6f4649ee64d7ccb0300a51ed87c0107ed12b696e4f212a4fac088b588766c709fe660f88fb6b3dc1b23452b0cedb8218e7e2f675ec62aee6065164e0a8ca0ab6
+  metadata.gz: ca33516f16eca98178a0d001c6cbd1fcce2f4fc958d3fd8301aab68f641d42014206f95abb064567c670c7eeb328e35365dbde506500182bd85cdc13a78a5207
+  data.tar.gz: 2a7469b646ba9f67053f508957b68729d9f69e1343444c5decb8d1328b772309cec11a5767238601364a1afe133255461724e3e30d6ef01a70479861c4904e27

data/exe/souls

@@ -2,7 +2,7 @@
 require "souls"
 begin
   souls_command = ARGV[0]
-  require("./config/souls") unless ["new", "i", "-v", "deploy"].include?(souls_command)
+  require("./config/souls") unless ["new", "docker", "-v", "deploy"].include?(souls_command)
 rescue StandardError
   puts("Make sure you are at SOULs APP directory!")
 end
@@ -80,11 +80,34 @@ begin
     send_method = ARGV[1]
     Souls::Docker.public_send(send_method)
   when "gcloud"
-    args = ARGV
+    command = ARGV[1]
     status = Paint["Running Gcloud Commands...", :yellow]
     Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
       Whirly.status = status
-      Souls::Gcloud.return_method(args)
+      case command
+      when "get_iam_key"
+        app_name = Souls.configuration.app
+        project_id = Souls.configuration.project_id
+        Souls::Gcloud::Iam.create_service_account(service_account: app_name)
+        Souls::Gcloud::Iam.create_service_account_key(service_account: app_name, project_id: project_id)
+        Souls::Gcloud.enable_permissions
+        Souls::Gcloud::Iam.add_permissions(service_account: app_name, project_id: project_id)
+        Souls::Gcloud::Iam.export_key_to_console
+      when "auth_login"
+        project_id = Souls.configuration.project_id
+        Souls::Gcloud.auth_login(project_id: project_id)
+      else
+        module_name = ARGV[1]
+        method_name = ARGV[2]
+        ARGV.shift(3)
+        key_strings = []
+        keys = []
+        ARGV.each { |n| n.include?(":") ? keys << n.gsub(":", "").to_sym : key_strings << n }
+        raise(StandardError, "wrong arguments!") unless keys.size == key_strings.size
+
+        args = keys.zip(key_strings).to_h
+        Object.const_get("Souls::Gcloud::#{module_name.camelize}").public_send(method_name.to_sym, **args)
+      end
       Whirly.status = "Done!"
     end
   when "-v", "--version", "v", "version", "-version", "--v"

data/lib/souls/cli/gcloud.rb

@@ -1,8 +1,8 @@
-require_relative "./gcloud/compute"
 require_relative "./gcloud/iam"
 require_relative "./gcloud/pubsub"
-require_relative "./gcloud/methods"
 require_relative "./gcloud/run"
+require_relative "./gcloud/sql"
+require_relative "./gcloud/gcloud"
 
 module Souls
   module Gcloud

data/lib/souls/cli/gcloud/{compute.rb → gcloud.rb}

@@ -24,14 +24,6 @@ module Souls
         system("gcloud services enable run.googleapis.com")
         puts("Operating permission to run.googleapis.com")
       end
-
-      def create_sql_instance(instance_name: "souls-db", root_pass: "Postgre123!", zone: "asia-northeast1-b")
-        system(
-          "gcloud sql instances create #{instance_name}
-            --database-version=POSTGRES_13 --cpu=2 --memory=7680MB --zone=#{zone}
-            --root-password='#{root_pass}' --database-flags cloudsql.iam_authentication=on"
-        )
-      end
     end
   end
 end

data/lib/souls/cli/gcloud/iam.rb

@@ -1,78 +1,8 @@
+require_relative "./iam/iam"
+
 module Souls
   module Gcloud
-    class << self
-      def create_service_account(service_account: "souls-app")
-        system(
-          "gcloud iam service-accounts create #{service_account} \
-        --description='Souls Service Account' \
-        --display-name=#{service_account}"
-        )
-      end
-
-      def create_service_account_key(service_account: "souls-app", project_id: "souls-app")
-        system(
-          "gcloud iam service-accounts keys create ./config/keyfile.json \
-          --iam-account #{service_account}@#{project_id}.iam.gserviceaccount.com"
-        )
-      end
-
-      def export_key_to_console
-        github_repo = Souls.configuration.github_repo || "elsoul/souls"
-        file_path = "config/keyfile.json"
-        puts(Paint["======= below（ここから）=======", :cyan])
-        text = []
-        File.open(file_path, "r") do |line|
-          line.each_line do |l|
-            text << l
-          end
-        end
-        key = text.join(",").gsub(/^,/, "").chomp!
-        puts(Paint[key, :white])
-        puts(Paint["======= above（ここまで）=======", :cyan])
-        github_secret_url = "https://github.com/#{github_repo}/settings/secrets/actions"
-        souls_doc_url = "https://souls.elsoul.nl/docs/chapter2/#43-github-シークレットキーの登録"
-        txt1 = <<~TEXT
-
-          ⬆⬆⬆　Copy the service account key above　⬆⬆⬆⬆
-
-                          And
-
-          Go to %{yellow_text}
-
-          Reference: %{yellow_text2}
-        TEXT
-        puts(
-          Paint % [
-            txt1,
-            :white,
-            { yellow_text: [github_secret_url, :yellow], yellow_text2: [souls_doc_url, :yellow] }
-          ]
-        )
-        FileUtils.rm(file_path)
-      end
-
-      def add_service_account_role(service_account: "souls-app", project_id: "souls-app", role: "roles/firebase.admin")
-        system(
-          "gcloud projects add-iam-policy-binding #{project_id} \
-        --member='serviceAccount:#{service_account}@#{project_id}.iam.gserviceaccount.com' \
-        --role=#{role}"
-        )
-      end
-
-      def add_permissions(service_account: "souls-app", project_id: "souls-app")
-        roles = [
-          "roles/cloudsql.instanceUser",
-          "roles/containerregistry.ServiceAgent",
-          "roles/pubsub.serviceAdmin",
-          "roles/firestore.serviceAdmin",
-          "roles/iam.serviceAccountUser",
-          "roles/storage.objectAdmin",
-          "roles/run.admin"
-        ]
-        roles.each do |role|
-          add_service_account_role(service_account: service_account, project_id: project_id, role: role)
-        end
-      end
+    module Iam
     end
   end
 end

data/lib/souls/cli/gcloud/iam/iam.rb

@@ -0,0 +1,80 @@
+module Souls
+  module Gcloud
+    module Iam
+      class << self
+        def create_service_account(service_account: "souls-app")
+          system(
+            "gcloud iam service-accounts create #{service_account} \
+          --description='Souls Service Account' \
+          --display-name=#{service_account}"
+          )
+        end
+
+        def create_service_account_key(service_account: "souls-app", project_id: "souls-app")
+          system(
+            "gcloud iam service-accounts keys create ./config/keyfile.json \
+            --iam-account #{service_account}@#{project_id}.iam.gserviceaccount.com"
+          )
+        end
+
+        def export_key_to_console
+          github_repo = Souls.configuration.github_repo || "elsoul/souls"
+          file_path = "config/keyfile.json"
+          puts(Paint["======= below（ここから）=======", :cyan])
+          text = []
+          File.open(file_path, "r") do |line|
+            line.each_line do |l|
+              text << l
+            end
+          end
+          key = text.join(",").gsub(/^,/, "").chomp!
+          puts(Paint[key, :white])
+          puts(Paint["======= above（ここまで）=======", :cyan])
+          github_secret_url = "https://github.com/#{github_repo}/settings/secrets/actions"
+          souls_doc_url = "https://souls.elsoul.nl/docs/tutorial/zero-to-deploy/#43-github-シークレットキーの登録"
+          txt1 = <<~TEXT
+
+            ⬆⬆⬆　Copy the service account key above　⬆⬆⬆⬆
+
+                            And
+
+            Go to %{yellow_text}
+
+            Reference: %{yellow_text2}
+          TEXT
+          puts(
+            Paint % [
+              txt1,
+              :white,
+              { yellow_text: [github_secret_url, :yellow], yellow_text2: [souls_doc_url, :yellow] }
+            ]
+          )
+          FileUtils.rm(file_path)
+        end
+
+        def add_service_account_role(service_account: "souls-app", project_id: "souls-app", role: "roles/firebase.admin")
+          system(
+            "gcloud projects add-iam-policy-binding #{project_id} \
+          --member='serviceAccount:#{service_account}@#{project_id}.iam.gserviceaccount.com' \
+          --role=#{role}"
+          )
+        end
+
+        def add_permissions(service_account: "souls-app", project_id: "souls-app")
+          roles = [
+            "roles/cloudsql.editor",
+            "roles/containerregistry.ServiceAgent",
+            "roles/pubsub.editor",
+            "roles/datastore.user",
+            "roles/iam.serviceAccountUser",
+            "roles/storage.objectAdmin",
+            "roles/run.admin"
+          ]
+          roles.each do |role|
+            add_service_account_role(service_account: service_account, project_id: project_id, role: role)
+          end
+        end
+      end
+    end
+  end
+end

data/lib/souls/cli/gcloud/pubsub.rb

@@ -1,33 +1,9 @@
+require_relative "./pubsub/topics"
+require_relative "./pubsub/subscriptions"
+
 module Souls
   module Gcloud
-    class << self
-      def create_pubsub_topic(topic_name: "send-user-mail")
-        system("gcloud pubsub topics create #{topic_name}")
-      end
-
-      def create_pubsub_subscription(
-        topic_name: "send-user-mail",
-        project_id: "souls-app",
-        service_account: "souls-app",
-        endpoint: "https:://test.com"
-      )
-        system(
-          "gcloud pubsub subscriptions create #{topic_name}-sub \
-          --topic #{topic_name} \
-          --topic-project #{project_id} \
-          --push-auth-service-account #{service_account} \
-          --push-endpoint #{endpoint} \
-          --expiration-period never
-           "
-        )
-      end
-
-      def update_pubsub_subscription(
-        topic_name: "send-user-mail",
-        endpoint: "https:://test.com"
-      )
-        system("gcloud pubsub subscriptions update #{topic_name}-sub --push-endpoint #{endpoint} ")
-      end
+    module Pubsub
     end
   end
 end

data/lib/souls/cli/gcloud/pubsub/subscriptions.rb

@@ -0,0 +1,31 @@
+module Souls
+  module Gcloud
+    module Pubsub
+      class << self
+        def create_subscription(
+          topic_name: "send-user-mail",
+          project_id: "souls-app",
+          service_account: "souls-app",
+          endpoint: "https:://test.com"
+        )
+          system(
+            "gcloud pubsub subscriptions create #{topic_name}-sub \
+            --topic #{topic_name} \
+            --topic-project #{project_id} \
+            --push-auth-service-account #{service_account} \
+            --push-endpoint #{endpoint} \
+            --expiration-period never
+            "
+          )
+        end
+
+        def update_subscription(
+          topic_name: "send-user-mail",
+          endpoint: "https:://test.com"
+        )
+          system("gcloud pubsub subscriptions update #{topic_name}-sub --push-endpoint #{endpoint} ")
+        end
+      end
+    end
+  end
+end

data/lib/souls/cli/gcloud/pubsub/topics.rb

@@ -0,0 +1,11 @@
+module Souls
+  module Gcloud
+    module Pubsub
+      class << self
+        def create_topic(topic_name: "send-user-mail")
+          system("gcloud pubsub topics create #{topic_name}")
+        end
+      end
+    end
+  end
+end

data/lib/souls/cli/gcloud/run.rb

@@ -1,16 +1,9 @@
+require_relative "./run/run"
+
 module Souls
   module Gcloud
-    class << self
-      def run_awake(app_name: "souls-app", url: "")
-        system(
-          "gcloud scheduler jobs create http #{app_name}-awake
-          --schedule '0,10,20,30,40,50 * * * *' --uri #{url} --http-method GET"
-        )
-      end
-
-      def run_list(project_id: "souls-app")
-        system("gcloud run services list --project #{project_id}")
-      end
+    module Run
     end
   end
 end
+

data/lib/souls/cli/gcloud/run/run.rb

@@ -0,0 +1,18 @@
+module Souls
+  module Gcloud
+    module Run
+      class << self
+        def awake(app_name: "souls-app", url: "")
+          system(
+            "gcloud scheduler jobs create http #{app_name}-awake
+            --schedule '0,10,20,30,40,50 * * * *' --uri #{url} --http-method GET"
+          )
+        end
+
+        def list(project_id: "souls-app")
+          system("gcloud run services list --project #{project_id}")
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,9 @@
+require_relative "./sql/sql"
+
+module Souls
+  module Gcloud
+    module Sql
+    end
+  end
+end
+

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

@@ -0,0 +1,15 @@
+module Souls
+  module Gcloud
+    module Sql
+      class << self
+        def create_instance(instance_name: "souls-db", root_pass: "Postgre123!", zone: "asia-northeast1-b")
+          system(
+            "gcloud sql instances create #{instance_name}
+              --database-version=POSTGRES_13 --cpu=2 --memory=7680MB --zone=#{zone}
+              --root-password='#{root_pass}' --database-flags cloudsql.iam_authentication=on"
+          )
+        end
+      end
+    end
+  end
+end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.10.1
+0.11.3

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.10.1
+0.11.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.31.1
+  version: 0.32.3
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -129,11 +129,16 @@ files:
 - lib/souls/cli/docker.rb
 - lib/souls/cli/docker/docker.rb
 - lib/souls/cli/gcloud.rb
-- lib/souls/cli/gcloud/compute.rb
+- lib/souls/cli/gcloud/gcloud.rb
 - lib/souls/cli/gcloud/iam.rb
-- lib/souls/cli/gcloud/methods.rb
+- lib/souls/cli/gcloud/iam/iam.rb
 - lib/souls/cli/gcloud/pubsub.rb
+- lib/souls/cli/gcloud/pubsub/subscriptions.rb
+- lib/souls/cli/gcloud/pubsub/topics.rb
 - lib/souls/cli/gcloud/run.rb
+- lib/souls/cli/gcloud/run/run.rb
+- lib/souls/cli/gcloud/sql.rb
+- lib/souls/cli/gcloud/sql/sql.rb
 - lib/souls/cli/release.rb
 - lib/souls/cli/release/release.rb
 - lib/souls/cli/sync.rb

data/lib/souls/cli/gcloud/methods.rb

@@ -1,69 +0,0 @@
-module Souls
-  module Gcloud
-    class << self
-      def return_method(args)
-        method = args[1]
-        case method
-        when "get_iam_key"
-          app_name = Souls.configuration.app
-          project_id = Souls.configuration.project_id
-          Souls::Gcloud.create_service_account(service_account: app_name)
-          Souls::Gcloud.create_service_account_key(service_account: app_name, project_id: project_id)
-          Souls::Gcloud.export_key_to_console
-          Souls::Gcloud.enable_permissions
-        when "auth_login"
-          project_id = Souls.configuration.project_id
-          Souls::Gcloud.auth_login(project_id: project_id)
-        when "enable_permissions"
-          service_account = Souls.configuration.app
-          project_id = Souls.configuration.project_id
-          Souls::Gcloud.enable_permissions
-          Souls::Gcloud.add_permissions(service_account: service_account, project_id: project_id)
-        when "create_pubsub_topic"
-          topic_name = args[2] || "send-user-mail"
-          Souls::Gcloud.create_pubsub_topic(topic_name: topic_name)
-        when "create_pubsub_subscription"
-          project_id = Souls.configuration.project_id
-          topic_name = args[2] || "send-user-mail"
-          service_account = "#{Souls.configuration.app}@#{project_id}.iam.gserviceaccount.com"
-          endpoint = Souls.configuration.worker_endpoint
-          Souls::Gcloud.create_pubsub_subscription(
-            topic_name: topic_name,
-            project_id: project_id,
-            service_account: service_account,
-            endpoint: endpoint
-          )
-        when "create_sql_instance"
-          instance_name = "#{Souls.configuration.app}-db"
-          root_pass = args[2] || "password"
-          zone = args[3] || "asia-northeast1-b"
-          Souls::Gcloud.create_sql_instance(instance_name: instance_name, root_pass: root_pass, zone: zone)
-        when "create_service_account"
-          service_account = Souls.configuration.app
-          Souls::Gcloud.create_service_account(service_account: service_account)
-        when "create_service_account_key"
-          service_account = Souls.configuration.app
-          project_id = Souls.configuration.project_id
-          Souls::Gcloud.create_service_account_key(service_account: service_account, project_id: project_id)
-        when "add_service_account_role"
-          service_account = Souls.configuration.app
-          project_id = Souls.configuration.project_id
-          role = args[2] || "roles/firebase.admin"
-          Souls::Gcloud.add_service_account_role(service_account: service_account, project_id: project_id, role: role)
-        when "add_permissions"
-          service_account = Souls.configuration.app
-          project_id = Souls.configuration.project_id
-          Souls::Gcloud.add_permissions(service_account: service_account, project_id: project_id)
-        when "run_list"
-          project_id = Souls.configuration.project_id
-          Souls::Gcloud.run_list(project_id: project_id)
-        when "run_awake"
-          app_name = Souls.configuration.app
-          Souls::Gcloud.run_awake(app_name: app_name)
-        else
-          raise(StandardError, "Wrong Method!")
-        end
-      end
-    end
-  end
-end