souls 0.23.8 → 0.24.2

data/lib/souls/gcloud.rb

@@ -1,5 +1,6 @@
 require_relative "./gcloud/compute"
 require_relative "./gcloud/iam"
+require_relative "./gcloud/pubsub"
 
 module Souls
   module Gcloud

data/lib/souls/gcloud/compute.rb

@@ -1,71 +1,73 @@
 module Souls
   module Gcloud
-    def self.auth_login
-      project_id = Souls.configuration.project_id
-      system("gcloud config set project #{project_id}")
-      system("gcloud auth login")
-    end
+    class << self
+      def auth_login
+        project_id = Souls.configuration.project_id
+        system("gcloud config set project #{project_id}")
+        system("gcloud auth login")
+      end
 
-    def self.enable_permissions
-      system("gcloud services enable compute.googleapis.com")
-      puts("Operating permission to compute.googleapis.com ...")
-      system("gcloud services enable iam.googleapis.com")
-      puts("Operating permission to iam.googleapis.com ...")
-      system("gcloud services enable dns.googleapis.com")
-      puts("Operating permission to dns.googleapis.com ...")
-      system("gcloud services enable sqladmin.googleapis.com")
-      puts("Operating permission to sqladmin.googleapis.com ...")
-      system("gcloud services enable sql-component.googleapis.com")
-      puts("Operating permission to sql-component.googleapis.com ...")
-      system("gcloud services enable servicenetworking.googleapis.com")
-      puts("Operating permission to servicenetworking.googleapis.com ...")
-      system("gcloud services enable containerregistry.googleapis.com")
-      puts("Operating permission to containerregistry.googleapis.com")
-      system("gcloud services enable run.googleapis.com")
-      puts("Operating permission to run.googleapis.com")
-    end
+      def enable_permissions
+        system("gcloud services enable compute.googleapis.com")
+        puts("Operating permission to compute.googleapis.com ...")
+        system("gcloud services enable iam.googleapis.com")
+        puts("Operating permission to iam.googleapis.com ...")
+        system("gcloud services enable dns.googleapis.com")
+        puts("Operating permission to dns.googleapis.com ...")
+        system("gcloud services enable sqladmin.googleapis.com")
+        puts("Operating permission to sqladmin.googleapis.com ...")
+        system("gcloud services enable sql-component.googleapis.com")
+        puts("Operating permission to sql-component.googleapis.com ...")
+        system("gcloud services enable servicenetworking.googleapis.com")
+        puts("Operating permission to servicenetworking.googleapis.com ...")
+        system("gcloud services enable containerregistry.googleapis.com")
+        puts("Operating permission to containerregistry.googleapis.com")
+        system("gcloud services enable run.googleapis.com")
+        puts("Operating permission to run.googleapis.com")
+      end
 
-    def self.create_network
-      return "Error: Please Set Souls.configuration" if Souls.configuration.app.nil?
+      def create_network
+        return "Error: Please Set Souls.configuration" if Souls.configuration.app.nil?
 
-      network = Souls.configuration.app
-      system("gcloud compute networks create #{network}")
-    rescue StandardError => e
-      raise(StandardError, e)
-    end
+        network = Souls.configuration.app
+        system("gcloud compute networks create #{network}")
+      rescue StandardError => e
+        raise(StandardError, e)
+      end
 
-    def self.create_firewall(ip_range: "10.140.0.0/20")
-      network = Souls.configuration.app
-      system(
-        "gcloud compute firewall-rules create #{network}
-      --network #{network}
-      --allow tcp,udp,icmp
-      --source-ranges #{ip_range}"
-      )
-      system("gcloud compute firewall-rules create #{network}-ssh --network #{network} --allow tcp:22,tcp:3389,icmp")
-    end
+      def create_firewall(ip_range: "10.140.0.0/20")
+        network = Souls.configuration.app
+        system(
+          "gcloud compute firewall-rules create #{network}
+          --network #{network}
+          --allow tcp,udp,icmp
+          --source-ranges #{ip_range}"
+        )
+        system("gcloud compute firewall-rules create #{network}-ssh --network #{network} --allow tcp:22,tcp:3389,icmp")
+      end
 
-    def self.create_private_access
-      network = Souls.configuration.app
-      project_id = Souls.configuration.project_id
-      system(
-        "gcloud compute addresses create #{network}-my-network \
-      --global \
-      --purpose=VPC_PEERING \
-      --prefix-length=16 \
-      --description='peering range for SOULs' \
-      --network=#{network} \
-      --project=#{project_id}"
-      )
-    end
+      def create_private_access
+        network = Souls.configuration.app
+        project_id = Souls.configuration.project_id
+        system(
+          "gcloud compute addresses create #{network}-my-network \
+          --global \
+          --purpose=VPC_PEERING \
+          --prefix-length=16 \
+          --description='peering range for SOULs' \
+          --network=#{network} \
+          --project=#{project_id}"
+        )
+      end
 
-    def self.create_sql_instance(root_pass: "Postgre123!", zone: "asia-northeast1-b")
-      app = "#{Souls.configuration.app}-db"
-      system(
-        "gcloud sql instances create #{app}
-        --database-version=POSTGRES_13 --cpu=2 --memory=7680MB --zone=#{zone}
-        --root-password='#{root_pass}' --database-flags cloudsql.iam_authentication=on"
-      )
+      def create_sql_instance(root_pass: "Postgre123!", zone: "asia-northeast1-b")
+        app = "#{Souls.configuration.app}-db"
+        system(
+          "gcloud sql instances create #{app}
+            --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/gcloud/iam.rb

@@ -1,30 +1,46 @@
 module Souls
   module Gcloud
-    def self.create_service_account(service_account: "souls-app")
-      `gcloud iam service-accounts create #{service_account} \
-      --description="Souls Service Account" \
-      --display-name="#{service_account}"`
-    end
+    class << self
+      def create_service_account(args)
+        service_account = args[:service_account] || "souls-app"
+        system(
+          "gcloud iam service-accounts create #{service_account} \
+        --description='Souls Service Account' \
+        --display-name=#{service_account}"
+        )
+      end
 
-    def self.create_service_account_key(service_account: "souls-app")
-      project_id = Souls.configuration.project_id
-      `gcloud iam service-accounts keys create ./config/keyfile.json \
-        --iam-account #{service_account}@#{project_id}.iam.gserviceaccount.com`
-    end
+      def create_service_account_key(args)
+        service_account = args[:service_account] || "souls-app"
+        project_id = args[: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 self.add_service_account_role(service_account: "souls-app", role: "roles/firebase.admin")
-      project_id = Souls.configuration.project_id
-      `gcloud projects add-iam-policy-binding #{project_id} \
-      --member="serviceAccount:#{service_account}@#{project_id}.iam.gserviceaccount.com" \
-      --role="#{role}"`
-    end
+      def add_service_account_role(args)
+        service_account = args[:service_account] || "souls-app"
+        project_id = args[:project_id] || "souls-app"
+        role = args[:role] || "roles/firebase.admin"
+        `gcloud projects add-iam-policy-binding #{project_id} \
+        --member="serviceAccount:#{service_account}@#{project_id}.iam.gserviceaccount.com" \
+        --role="#{role}"`
+      end
 
-    def self.add_permissions(service_account: "souls-app")
-      add_service_account_role(service_account: service_account, role: "roles/cloudsql.serviceAgent")
-      add_service_account_role(service_account: service_account, role: "roles/containerregistry.ServiceAgent")
-      add_service_account_role(service_account: service_account, role: "roles/pubsub.serviceAgent")
-      add_service_account_role(service_account: service_account, role: "roles/firestore.serviceAgent")
-      add_service_account_role(service_account: service_account, role: "roles/iam.serviceAccountUser")
+      def add_permissions(args)
+        service_account = args[:service_account] || "souls-app"
+        roles = [
+          "roles/cloudsql.serviceAgent",
+          "roles/containerregistry.ServiceAgent",
+          "roles/pubsub.serviceAgent",
+          "roles/firestore.serviceAgent",
+          "roles/iam.serviceAccountUser"
+        ]
+        roles.each do |role|
+          add_service_account_role(service_account: service_account, role: role)
+        end
+      end
     end
   end
 end

data/lib/souls/gcloud/pubsub.rb

@@ -0,0 +1,21 @@
+module Souls
+  module Gcloud
+    class << self
+      def create_pubsub_topic(args)
+        system("gcloud pubsub topics create #{args[:topic_name]}")
+      end
+
+      def create_pubsub_subscription(args)
+        system(
+          "gcloud pubsub subscriptions create #{args[:topic_name]}-sub \
+          --topic #{args[:topic_name]} \
+          --topic-project #{args[:project_id]} \
+          --push-auth-service-account #{args[:service_account]} \
+          --push-endpoint #{args[:endpoint]} \
+          --expiration-period never
+           "
+        )
+      end
+    end
+  end
+end

data/lib/souls/init.rb

@@ -9,21 +9,6 @@ module Souls
       data[0]["tag_name"]
     end
 
-    def self.initial_config_init(app_name: "souls", strain: "api")
-      FileUtils.touch("./#{app_name}/config/souls.rb")
-      file_path = "./#{app_name}/config/souls.rb"
-      File.open(file_path, "w") do |f|
-        f.write(<<~TEXT)
-          Souls.configure do |config|
-            config.app = "#{app_name}"
-            config.strain = "#{strain}"
-          end
-        TEXT
-      end
-    rescue StandardError => e
-      puts(e)
-    end
-
     def self.download_souls(app_name: "souls", repository_name: "souls_api ")
       version = get_version(repository_name: repository_name)
       system("curl -OL https://github.com/elsoul/#{repository_name}/archive/#{version}.tar.gz")
@@ -42,7 +27,7 @@ module Souls
          ___/ / /_/ / /_/ / /___(__  )#{' '}
         /____/\\____/\\____/_____/____/#{'  '}
       TEXT
-      message = Paint[txt, :blue]
+      message = Paint[txt, :cyan]
       puts(message)
       puts(line)
       welcome = Paint["Welcome to SOULs!", :white]

data/lib/souls/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.23.8
+  version: 0.24.2
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-18 00:00:00.000000000 Z
+date: 2021-07-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paint
@@ -66,6 +66,179 @@ files:
 - README.md
 - Rakefile
 - Steepfile
+- apps/api/.env.sample
+- apps/api/.gitignore
+- apps/api/.irbrc
+- apps/api/.rspec
+- apps/api/.rubocop.yml
+- apps/api/.ruby-version
+- apps/api/CODE_OF_CONDUCT.md
+- apps/api/Dockerfile
+- apps/api/Dockerfile.dev
+- apps/api/Gemfile
+- apps/api/Gemfile.lock
+- apps/api/LICENSE.txt
+- apps/api/Procfile
+- apps/api/Procfile.dev
+- apps/api/README.md
+- apps/api/Rakefile
+- apps/api/app.rb
+- apps/api/app/engines/notification_engine.rb
+- apps/api/app/graphql/mutations/.keep
+- apps/api/app/graphql/mutations/base/article/create_article.rb
+- apps/api/app/graphql/mutations/base/article/delete_article.rb
+- apps/api/app/graphql/mutations/base/article/destroy_delete_article.rb
+- apps/api/app/graphql/mutations/base/article/update_article.rb
+- apps/api/app/graphql/mutations/base/article_category/create_article_category.rb
+- apps/api/app/graphql/mutations/base/article_category/delete_article_category.rb
+- apps/api/app/graphql/mutations/base/article_category/destroy_delete_article_category.rb
+- apps/api/app/graphql/mutations/base/article_category/update_article_category.rb
+- apps/api/app/graphql/mutations/base/user/create_user.rb
+- apps/api/app/graphql/mutations/base/user/delete_user.rb
+- apps/api/app/graphql/mutations/base/user/destroy_delete_user.rb
+- apps/api/app/graphql/mutations/base/user/update_user.rb
+- apps/api/app/graphql/mutations/base_mutation.rb
+- apps/api/app/graphql/mutations/managers/user_manager/add_user_role.rb
+- apps/api/app/graphql/mutations/managers/user_manager/remove_user_role.rb
+- apps/api/app/graphql/mutations/managers/user_manager/sign_in_user.rb
+- apps/api/app/graphql/queries/article.rb
+- apps/api/app/graphql/queries/article_categories.rb
+- apps/api/app/graphql/queries/article_category.rb
+- apps/api/app/graphql/queries/articles.rb
+- apps/api/app/graphql/queries/base_query.rb
+- apps/api/app/graphql/queries/me.rb
+- apps/api/app/graphql/queries/user.rb
+- apps/api/app/graphql/queries/users.rb
+- apps/api/app/graphql/resolvers/article_category_search.rb
+- apps/api/app/graphql/resolvers/article_search.rb
+- apps/api/app/graphql/resolvers/base.rb
+- apps/api/app/graphql/resolvers/user_search.rb
+- apps/api/app/graphql/souls_api_schema.rb
+- apps/api/app/graphql/types/.keep
+- apps/api/app/graphql/types/article_category_type.rb
+- apps/api/app/graphql/types/article_type.rb
+- apps/api/app/graphql/types/base/base_argument.rb
+- apps/api/app/graphql/types/base/base_enum.rb
+- apps/api/app/graphql/types/base/base_field.rb
+- apps/api/app/graphql/types/base/base_input_object.rb
+- apps/api/app/graphql/types/base/base_interface.rb
+- apps/api/app/graphql/types/base/base_object.rb
+- apps/api/app/graphql/types/base/base_scalar.rb
+- apps/api/app/graphql/types/base/base_union.rb
+- apps/api/app/graphql/types/base/mutation_type.rb
+- apps/api/app/graphql/types/base/query_type.rb
+- apps/api/app/graphql/types/connections/article_category_connection.rb
+- apps/api/app/graphql/types/connections/article_connection.rb
+- apps/api/app/graphql/types/connections/base_connection.rb
+- apps/api/app/graphql/types/connections/user_connection.rb
+- apps/api/app/graphql/types/edges/article_category_edge.rb
+- apps/api/app/graphql/types/edges/article_edge.rb
+- apps/api/app/graphql/types/edges/base_edge.rb
+- apps/api/app/graphql/types/edges/user_edge.rb
+- apps/api/app/graphql/types/user_type.rb
+- apps/api/app/models/article.rb
+- apps/api/app/models/article_category.rb
+- apps/api/app/models/user.rb
+- apps/api/app/policies/application_policy.rb
+- apps/api/app/policies/article_category_policy.rb
+- apps/api/app/policies/article_policy.rb
+- apps/api/app/policies/user_policy.rb
+- apps/api/app/utils/association_loader.rb
+- apps/api/app/utils/fire_store.rb
+- apps/api/app/utils/firebase_id_token.rb
+- apps/api/app/utils/json_web_token.rb
+- apps/api/app/utils/record_loader.rb
+- apps/api/app/utils/souls_helper.rb
+- apps/api/cloudbuild.yml
+- apps/api/config.ru
+- apps/api/config/database.yml
+- apps/api/config/souls.rb
+- apps/api/constants/areas.rb
+- apps/api/constants/column_name_ja.rb
+- apps/api/db/migrate/20200006095538_create_users.rb
+- apps/api/db/migrate/20200712180236_create_article_categories.rb
+- apps/api/db/migrate/20200714215521_create_articles.rb
+- apps/api/db/schema.rb
+- apps/api/db/seeds.rb
+- apps/api/github/workflows/delivery.yml
+- apps/api/log/.keep
+- apps/api/spec/factories/article_categories.rb
+- apps/api/spec/factories/articles.rb
+- apps/api/spec/factories/users.rb
+- apps/api/spec/models/article_category_spec.rb
+- apps/api/spec/models/article_spec.rb
+- apps/api/spec/models/user_spec.rb
+- apps/api/spec/mutations/base/article_category_spec.rb
+- apps/api/spec/mutations/base/article_spec.rb
+- apps/api/spec/mutations/base/user_spec.rb
+- apps/api/spec/policies/article_category_policy_spec.rb
+- apps/api/spec/policies/article_policy_spec.rb
+- apps/api/spec/policies/user_policy_spec.rb
+- apps/api/spec/queries/article_category_spec.rb
+- apps/api/spec/queries/article_spec.rb
+- apps/api/spec/queries/user_spec.rb
+- apps/api/spec/resolvers/article_category_search_spec.rb
+- apps/api/spec/resolvers/article_search_spec.rb
+- apps/api/spec/resolvers/user_search_spec.rb
+- apps/api/spec/spec_helper.rb
+- apps/api/tmp/.keep
+- apps/worker/.env.sample
+- apps/worker/.gitignore
+- apps/worker/.irbrc
+- apps/worker/.rspec
+- apps/worker/.rubocop.yml
+- apps/worker/.ruby-version
+- apps/worker/CODE_OF_CONDUCT.md
+- apps/worker/Dockerfile
+- apps/worker/Dockerfile.dev
+- apps/worker/Gemfile
+- apps/worker/Gemfile.lock
+- apps/worker/LICENSE.txt
+- apps/worker/Procfile
+- apps/worker/Procfile.dev
+- apps/worker/README.md
+- apps/worker/Rakefile
+- apps/worker/app.rb
+- apps/worker/app/engines/notification_engine.rb
+- apps/worker/app/graphql/mutations/.keep
+- apps/worker/app/graphql/mutations/base_mutation.rb
+- apps/worker/app/graphql/mutations/workers/send_user_mail_job.rb
+- apps/worker/app/graphql/souls_api_schema.rb
+- apps/worker/app/graphql/types/.keep
+- apps/worker/app/graphql/types/base/base_argument.rb
+- apps/worker/app/graphql/types/base/base_enum.rb
+- apps/worker/app/graphql/types/base/base_field.rb
+- apps/worker/app/graphql/types/base/base_input_object.rb
+- apps/worker/app/graphql/types/base/base_interface.rb
+- apps/worker/app/graphql/types/base/base_object.rb
+- apps/worker/app/graphql/types/base/base_scalar.rb
+- apps/worker/app/graphql/types/base/base_union.rb
+- apps/worker/app/graphql/types/base/mutation_type.rb
+- apps/worker/app/graphql/types/base/query_type.rb
+- apps/worker/app/models/article.rb
+- apps/worker/app/models/article_category.rb
+- apps/worker/app/models/user.rb
+- apps/worker/app/utils/fire_store.rb
+- apps/worker/app/utils/souls_helper.rb
+- apps/worker/cloudbuild.yml
+- apps/worker/config.ru
+- apps/worker/config/database.yml
+- apps/worker/config/souls.rb
+- apps/worker/db/migrate/20200006095538_create_users.rb
+- apps/worker/db/migrate/20200712180236_create_article_categories.rb
+- apps/worker/db/migrate/20200714215521_create_articles.rb
+- apps/worker/db/schema.rb
+- apps/worker/db/seeds.rb
+- apps/worker/github/workflows/delivery.yml
+- apps/worker/log/.keep
+- apps/worker/spec/factories/article_categories.rb
+- apps/worker/spec/factories/articles.rb
+- apps/worker/spec/factories/users.rb
+- apps/worker/spec/models/article_category_spec.rb
+- apps/worker/spec/models/article_spec.rb
+- apps/worker/spec/models/user_spec.rb
+- apps/worker/spec/spec_helper.rb
+- apps/worker/tmp/.keep
 - bin/console
 - bin/setup
 - config/souls.rb
@@ -75,6 +248,7 @@ files:
 - lib/souls/gcloud.rb
 - lib/souls/gcloud/compute.rb
 - lib/souls/gcloud/iam.rb
+- lib/souls/gcloud/pubsub.rb
 - lib/souls/generate.rb
 - lib/souls/generate/application.rb
 - lib/souls/generate/connection.rb