souls 0.30.10 → 0.32.0

data/lib/souls/api/update/rspec_mutation.rb

@@ -49,8 +49,6 @@ module Souls
                     type = Souls::Api::Generate.type_check(col[:type])
                     text =
                       case type
-                      when "String"
-                        col[:array] ? "be_all(String)" : "be_a(String)"
                       when "Integer", "Float"
                         col[:array] ? "be_all(Integer)" : "be_a(Integer)"
                       when "Boolean"
@@ -59,7 +57,7 @@ module Souls
                         col[:array] ? "be_all(String)" : "be_a(String)"
                       end
                     unless test_args.include?(col[:column_name])
-                      new_line.write("         \"#{col[:column_name].camelize(:lower)}\" => #{text},\n")
+                      new_line.write("        \"#{col[:column_name].camelize(:lower)}\" => #{text},\n")
                     end
                   end
                   test_res = false

data/lib/souls/api/update/rspec_resolver.rb

@@ -33,8 +33,6 @@ module Souls
                     type = Souls::Api::Generate.type_check(col[:type])
                     text =
                       case type
-                      when "String"
-                        col[:array] ? "be_all(String)" : "be_a(String)"
                       when "Integer", "Float"
                         col[:array] ? "be_all(Integer)" : "be_a(Integer)"
                       when "Boolean"

data/lib/souls/cli.rb

@@ -1,6 +1,8 @@
 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/docker/docker.rb

@@ -26,6 +26,18 @@ module Souls
         )
         system("docker ps")
       end
+
+      def run
+        current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
+        port =
+          if current_dir_name == "api"
+            "4000:4000"
+          else
+            "3000:3000"
+          end
+        system("docker build . -t souls-app -f Dockerfile.dev")
+        system("docker run --name souls-app --rm --env-file .env -p #{port} souls-app:latest")
+      end
     end
   end
 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.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
+      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.rb

@@ -0,0 +1,6 @@
+require_relative "./sync/model"
+
+module Souls
+  module Sync
+  end
+end

data/lib/souls/cli/sync/model.rb

@@ -0,0 +1,87 @@
+module Souls
+  module Sync
+    class << self
+      def model
+        current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
+        permitted_dirs = %w[worker api]
+        unless permitted_dirs.include?(current_dir_name)
+          raise(StandardError, "You are at wrong directory!Go to API or Worker Directory!")
+        end
+
+        cp_dir = get_models_path(service_name: current_dir_name)
+        cp_dir.each do |path|
+          cp_and_dl_files(api_dir: path[:api], worker_dir: path[:worker])
+        end
+      end
+
+      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?
+
+          api_latest_date = 1
+          worker_latest_date = 0
+        else
+          api_file_data = file_diff(Dir["#{api_dir}/*.rb"])
+          worker_file_data = file_diff(Dir["#{worker_dir}/*.rb"])
+
+          api_latest_date = Date.parse(api_file_data.max)
+          worker_latest_date = Date.parse(worker_file_data.max)
+        end
+
+        if api_latest_date < worker_latest_date
+          FileUtils.rm_rf(api_dir) if Dir.exist?(api_dir)
+          FileUtils.mkdir(api_dir) unless Dir.exist?(api_dir)
+          system("cp -r #{worker_dir}/* #{api_dir}")
+        else
+          FileUtils.rm_rf(worker_dir) if Dir.exist?(worker_dir)
+          FileUtils.mkdir(worker_dir) unless Dir.exist?(worker_dir)
+          system("cp -r #{api_dir}/* #{worker_dir}")
+        end
+      end
+
+      def get_models_path(service_name: "api")
+        case service_name
+        when "api"
+          api_path = "."
+          worker_path = "../worker"
+        when "worker"
+          api_path = "../api"
+          worker_path = "."
+        end
+        [
+          {
+            api: "#{api_path}/db",
+            worker: "#{worker_path}/db"
+          },
+          {
+            api: "#{api_path}/app/models",
+            worker: "#{worker_path}/app/models"
+          },
+          {
+            api: "#{api_path}/spec/factories",
+            worker: "#{worker_path}/spec/factories"
+          }
+        ]
+      end
+    end
+  end
+end