souls 0.31.0 → 0.32.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 378a3ef40cd5cbc43e093f65d122236ea79c69a26fb823a7666296f87b36221e
-  data.tar.gz: 4396ee4d17f3c1dfeeaf68ba394cfa8252da1269cb8423438242387f4399dd93
+  metadata.gz: 68f41cff617dc31b7d1fa9b8765fd3700f8a7873f6f609e4186ed29fd67772ce
+  data.tar.gz: deac03ec2ebfee4ef9215e4bebdf0548f23021190b8d2347d378f9cc0272deec
 SHA512:
-  metadata.gz: 2686058accaf16fd46e5e54acd294f33296340812417af70c8c2a5730f05082e1bfa6837b60521b4f322b8352f7121094585007b360006ec997a5189958c3046
-  data.tar.gz: e9730f1a4824de288bdb98385cfbb43e05ecd0353a9a49fd6079f5130bb958a238960ee73518e2dc0eaf424e9457ea111e945fa80567314fc93292fc20f8cfda
+  metadata.gz: 364fb27cfd50812f11019bcb9f2e6582e0faa5c41a4540046faa8c912176bca7b404a941e3956ef88470cca92f13b118649fb4ca3c02be63717a12f710d00a21
+  data.tar.gz: 3d8be9698b076e795000a8c114ff2007d63c601e9388d44be933478a5facd4f013d2accccbad57e47cb6f662fd9d9c87e6b08150bdb74fe0326f50a5db0b9a3f

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"
@@ -96,7 +119,7 @@ begin
       status = Paint["Checking for updates...", :yellow]
       Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
         Whirly.status = status
-        Souls.update_gemfile
+        Souls::Upgrade.update_gemfile
         Whirly.status = "Done!"
       end
     else

data/lib/souls.rb

@@ -32,108 +32,6 @@ module Souls
   class << self
     attr_accessor :configuration
 
-    def gemfile_latest_version
-      file_path = "./Gemfile"
-      updated_gems = []
-      updated_gem_versions = []
-      updated_lines = []
-      from_dev = false
-      File.open(file_path, "r") do |f|
-        f.each_line do |line|
-          from_dev = true if line.include?("group")
-          next unless line.include?("gem ")
-
-          gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
-          url = URI("https://rubygems.org/api/v1/versions/#{gem[0]}/latest.json")
-          res = Net::HTTP.get_response(url)
-          data = JSON.parse(res.body)
-          next if Souls.configuration.fixed_gems.include?(gem[0].to_s)
-          next if data["version"].to_s == gem[1].to_s
-
-          updated_lines << if from_dev
-                             "  gem \"#{gem[0]}\", \"#{data['version']}\""
-                           else
-                             "gem \"#{gem[0]}\", \"#{data['version']}\""
-                           end
-          updated_gems << (gem[0]).to_s
-          updated_gem_versions << data["version"]
-          system("gem update #{gem[0]}")
-        end
-      end
-      {
-        gems: updated_gems,
-        lines: updated_lines,
-        updated_gem_versions: updated_gem_versions
-      }
-    end
-
-    def update_gemfile
-      file_path = "./Gemfile"
-      tmp_file = "./tmp/Gemfile"
-      new_gems = gemfile_latest_version
-      logs = []
-      message = Paint["\nAlready Up to date!", :green]
-      return "Already Up to date!" && puts(message) if new_gems[:gems].blank?
-
-      @i = 0
-      File.open(file_path, "r") do |f|
-        File.open(tmp_file, "w") do |new_line|
-          f.each_line do |line|
-            gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
-            if new_gems[:gems].include?(gem[0])
-              old_ver = gem[1].split(".")
-              new_ver = new_gems[:updated_gem_versions][@i].split(".")
-              if old_ver[0] < new_ver[0]
-                logs << Paint % [
-                  "#{gem[0]} v#{gem[1]} → %{red_text}",
-                  :white,
-                  {
-                    red_text: ["v#{new_gems[:updated_gem_versions][@i]}", :red]
-                  }
-                ]
-              elsif old_ver[1] < new_ver[1]
-                logs << Paint % [
-                  "#{gem[0]} v#{gem[1]} → v#{new_ver[0]}.%{yellow_text}",
-                  :white,
-                  {
-                    yellow_text: ["#{new_ver[1]}.#{new_ver[2]}", :yellow]
-                  }
-                ]
-              elsif old_ver[2] < new_ver[2]
-                logs << Paint % [
-                  "#{gem[0]} v#{gem[1]} → v#{new_ver[0]}.#{new_ver[1]}.%{green_text}",
-                  :white,
-                  {
-                    green_text: [(new_ver[2]).to_s, :green]
-                  }
-                ]
-              end
-              if gem[0] == "souls"
-                logs << Paint % [
-                  "\nSOULs Doc: %{cyan_text}",
-                  :white,
-                  { cyan_text: ["https://souls.elsoul.nl\n", :cyan] }
-                ]
-              end
-              new_line.write("#{new_gems[:lines][@i]}\n")
-              @i += 1
-            else
-              new_line.write(line)
-            end
-          end
-        end
-      end
-      FileUtils.rm("./Gemfile")
-      FileUtils.rm("./Gemfile.lock")
-      FileUtils.mv("./tmp/Gemfile", "./Gemfile")
-      system("bundle update")
-      success = Paint["\n\nSuccessfully Updated These Gems!\n", :green]
-      puts(success)
-      logs.each do |line|
-        puts(line)
-      end
-    end
-
     def update_repo(service_name: "api", update_kind: "patch")
       current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
       current_ver = get_latest_version_txt(service_name: service_name)
@@ -249,24 +147,6 @@ module Souls
       puts(Paint["\nSuccessfully Updated #{service_name} Gemfile!", :green])
     end
 
-    def file_diff(paths = [])
-      paths.map do |path|
-        stat(path)[:last_update]
-      end
-    end
-
-    def stat(path)
-      s = File::Stat.new(path)
-      last_update = s.mtime.to_s
-      last_status_change = s.ctime.to_s
-      last_access = s.atime.to_s
-      {
-        last_update: last_update,
-        last_status_change: last_status_change,
-        last_access: last_access
-      }
-    end
-
     def check_schema(class_name: "user")
       schema_data = get_columns_num(class_name: class_name)
       create_migration_data = get_create_migration_type(class_name: class_name)

data/lib/souls/cli.rb

@@ -2,6 +2,7 @@ require_relative "./cli/docker"
 require_relative "./cli/gcloud"
 require_relative "./cli/release"
 require_relative "./cli/sync"
+require_relative "./cli/upgrade"
 
 module Souls
 end

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.admin",
+            "roles/containerregistry.ServiceAgent",
+            "roles/pubsub.editor",
+            "roles/firestore.editor",
+            "roles/iam.serviceAccountUser",
+            "roles/storage.objectAdmin",
+            "roles/run.editor"
+          ]
+          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/cli/sync/model.rb

@@ -16,6 +16,24 @@ module Souls
 
       private
 
+      def file_diff(paths = [])
+        paths.map do |path|
+          stat(path)[:last_update]
+        end
+      end
+
+      def stat(path)
+        s = File::Stat.new(path)
+        last_update = s.mtime.to_s
+        last_status_change = s.ctime.to_s
+        last_access = s.atime.to_s
+        {
+          last_update: last_update,
+          last_status_change: last_status_change,
+          last_access: last_access
+        }
+      end
+
       def cp_and_dl_files(api_dir: "", worker_dir: "")
         if Dir["#{worker_dir}/*.rb"].blank?
 

data/lib/souls/cli/upgrade.rb

@@ -0,0 +1,5 @@
+require_relative "./upgrade/gem_update"
+module Souls
+  module Upgrade
+  end
+end

data/lib/souls/cli/upgrade/gem_update.rb

@@ -0,0 +1,107 @@
+module Souls
+  module Upgrade
+    class << self
+      def gemfile_latest_version
+        file_path = "./Gemfile"
+        updated_gems = []
+        updated_gem_versions = []
+        updated_lines = []
+        from_dev = false
+        File.open(file_path, "r") do |f|
+          f.each_line do |line|
+            from_dev = true if line.include?("group")
+            next unless line.include?("gem ")
+
+            gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
+            url = URI("https://rubygems.org/api/v1/versions/#{gem[0]}/latest.json")
+            res = Net::HTTP.get_response(url)
+            data = JSON.parse(res.body)
+            next if Souls.configuration.fixed_gems.include?(gem[0].to_s)
+            next if data["version"].to_s == gem[1].to_s
+
+            updated_lines << if from_dev
+                               "  gem \"#{gem[0]}\", \"#{data['version']}\""
+                             else
+                               "gem \"#{gem[0]}\", \"#{data['version']}\""
+                             end
+            updated_gems << (gem[0]).to_s
+            updated_gem_versions << data["version"]
+            system("gem update #{gem[0]}")
+          end
+        end
+        {
+          gems: updated_gems,
+          lines: updated_lines,
+          updated_gem_versions: updated_gem_versions
+        }
+      end
+
+      def update_gemfile
+        file_path = "./Gemfile"
+        tmp_file = "./tmp/Gemfile"
+        new_gems = gemfile_latest_version
+        logs = []
+        message = Paint["\nAlready Up to date!", :green]
+        return "Already Up to date!" && puts(message) if new_gems[:gems].blank?
+
+        @i = 0
+        File.open(file_path, "r") do |f|
+          File.open(tmp_file, "w") do |new_line|
+            f.each_line do |line|
+              gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
+              if new_gems[:gems].include?(gem[0])
+                old_ver = gem[1].split(".")
+                new_ver = new_gems[:updated_gem_versions][@i].split(".")
+                if old_ver[0] < new_ver[0]
+                  logs << Paint % [
+                    "#{gem[0]} v#{gem[1]} → %{red_text}",
+                    :white,
+                    {
+                      red_text: ["v#{new_gems[:updated_gem_versions][@i]}", :red]
+                    }
+                  ]
+                elsif old_ver[1] < new_ver[1]
+                  logs << Paint % [
+                    "#{gem[0]} v#{gem[1]} → v#{new_ver[0]}.%{yellow_text}",
+                    :white,
+                    {
+                      yellow_text: ["#{new_ver[1]}.#{new_ver[2]}", :yellow]
+                    }
+                  ]
+                elsif old_ver[2] < new_ver[2]
+                  logs << Paint % [
+                    "#{gem[0]} v#{gem[1]} → v#{new_ver[0]}.#{new_ver[1]}.%{green_text}",
+                    :white,
+                    {
+                      green_text: [(new_ver[2]).to_s, :green]
+                    }
+                  ]
+                end
+                if gem[0] == "souls"
+                  logs << Paint % [
+                    "\nSOULs Doc: %{cyan_text}",
+                    :white,
+                    { cyan_text: ["https://souls.elsoul.nl\n", :cyan] }
+                  ]
+                end
+                new_line.write("#{new_gems[:lines][@i]}\n")
+                @i += 1
+              else
+                new_line.write(line)
+              end
+            end
+          end
+        end
+        FileUtils.rm("./Gemfile")
+        FileUtils.rm("./Gemfile.lock")
+        FileUtils.mv("./tmp/Gemfile", "./Gemfile")
+        system("bundle update")
+        success = Paint["\n\nSuccessfully Updated These Gems!\n", :green]
+        puts(success)
+        logs.each do |line|
+          puts(line)
+        end
+      end
+    end
+  end
+end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.10.0
+0.11.2

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.10.0
+0.11.2

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.31.0
+  version: 0.32.2
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-18 00:00:00.000000000 Z
+date: 2021-08-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -129,15 +129,22 @@ 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
 - lib/souls/cli/sync/model.rb
+- lib/souls/cli/upgrade.rb
+- lib/souls/cli/upgrade/gem_update.rb
 - lib/souls/init.rb
 - lib/souls/version.rb
 - lib/souls/versions/.souls_api_version

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