souls 0.25.7 → 0.25.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 39ab25820e905bd7de5599a2999c0626ae6e4fba3339422ace80dc2f73463dae
-  data.tar.gz: '0114896c2677c6159a7f08e6e5f7ca3e018b3e0ecaa8a1cfb724c2eb9b14c67b'
+  metadata.gz: a221f361ce49b70801f14ae68c5fa7013031c9b198e20f24df08903ad865db02
+  data.tar.gz: bb493dae0b44d01adcd96675619bdba96d878ff3a4a5501ef0f080ab9c56d2aa
 SHA512:
-  metadata.gz: 051ea023c447b555155bd7c1af5be6fdb6d31337d677f94658d816747735ddcc00491b30cdd45c4ee56f5cf5b254633bfae0b8d0fd9b18b92b0acdeab0fb6e7f
-  data.tar.gz: 12bd68ddb00bee64da2667d3ec1592f4ef3ac4d6574c7045fac0b28c7fca3c2d058a62d26d59a5a10e0928fa7144ad05c614ec74e82ac69839479c57dc247e05
+  metadata.gz: ce44a5e5515c343cc6900c2e88510a0f9d09928dbd2296ba1415592a638c8ed01544a66c87c44c9fbd5ab87d70f4b48c086d56243caa309dce340e4dc24f7f94
+  data.tar.gz: 2a6ef85f8aba382f8a4246cebf6336b15445fec56c26389cd7f6ca2113b220db2f42b7de15971fae22a79bb61835f7491e7541d7a30a88a1ff60ebff31dded54

data/exe/souls

@@ -61,26 +61,11 @@ begin
     send_method = ARGV[1]
     Souls.public_send(send_method)
   when "gcloud"
+    args = ARGV
     status = Paint["Running Gcloud Commands...", :yellow]
     Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
       Whirly.status = status
-      send_method = ARGV[1]
-
-      case send_method
-      when "create_pubsub_topic"
-        topic_name = ARGV[2]
-        args = { topic_name: topic_name }
-        Souls::Gcloud.public_send(send_method, args)
-      when "create_pubsub_subscription"
-        project_id = Souls.configuration.project_id
-        topic_name = ARGV[2]
-        service_account = "#{Souls.configuration.app}@#{project_id}iam.gserviceaccount.com"
-        endpoint = Souls.configuration.endpoint
-        args = { project_id: project_id, topic_name: topic_name, service_account: service_account, endpoint: endpoint }
-        Souls::Gcloud.public_send(send_method, args)
-      else
-        Souls::Gcloud.public_send(send_method)
-      end
+      Souls::Gcloud.return_method(args)
       Whirly.status = "Done!"
     end
   when "-v", "--version"
@@ -93,8 +78,8 @@ begin
       Whirly.status = "Done!"
     end
   when "release"
-    system("gem uninstall -x --force")
     system("gem install souls")
+    sleep(3)
     current_souls_ver = Souls::VERSION.strip.split(".").map(&:to_i)
     prompt = TTY::Prompt.new
     choices = [
@@ -254,5 +239,4 @@ begin
   end
 rescue StandardError => e
   puts(Paint[e, :red])
-  puts(e.backtrace)
 end

data/lib/souls.rb

@@ -178,9 +178,11 @@ module Souls
       case current_dir_name
       when "souls"
         system("echo '#{new_ver}' > lib/souls/versions/.souls_#{service_name}_version")
+        system("echo '#{new_ver}' > apps/#{service_name}/.souls_#{service_name}_version")
         system("cd apps/ && tar -czf ../#{service_name}.tgz #{service_name}/ && cd ..")
       when "api", "worker", "console", "admin", "media"
         system("echo '#{new_ver}' > lib/souls/versions/.souls_#{service_name}_version")
+        system("echo '#{new_ver}' > .souls_#{service_name}_version")
         system("cd .. && tar -czf ../#{service_name}.tgz #{service_name}/ && cd #{service_name}")
       else
         raise(StandardError, "You are at wrong directory!")
@@ -258,11 +260,9 @@ module Souls
       git_status = `git status`
       result =
         %w[api worker].map do |service_name|
-          if git_status.include?("apps/#{service_name}/")
-            service_name
-          else
-            next
-          end
+          next unless git_status.include?("apps/#{service_name}/")
+
+          service_name
         end
       result.compact
     end

data/lib/souls/gcloud.rb

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

data/lib/souls/gcloud/compute.rb

@@ -1,8 +1,7 @@
 module Souls
   module Gcloud
     class << self
-      def auth_login
-        project_id = Souls.configuration.project_id
+      def auth_login(project_id: "souls-app")
         system("gcloud config set project #{project_id}")
         system("gcloud auth login")
       end
@@ -26,44 +25,9 @@ module Souls
         puts("Operating permission to run.googleapis.com")
       end
 
-      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
-
-      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 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_sql_instance(root_pass: "Postgre123!", zone: "asia-northeast1-b")
-        app = "#{Souls.configuration.app}-db"
+      def create_sql_instance(instance_name: "souls-db", root_pass: "Postgre123!", zone: "asia-northeast1-b")
         system(
-          "gcloud sql instances create #{app}
+          "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"
         )

data/lib/souls/gcloud/iam.rb

@@ -1,8 +1,7 @@
 module Souls
   module Gcloud
     class << self
-      def create_service_account(args)
-        service_account = args[:service_account] || "souls-app"
+      def create_service_account(service_account: "souls-app")
         system(
           "gcloud iam service-accounts create #{service_account} \
         --description='Souls Service Account' \
@@ -10,26 +9,22 @@ module Souls
         )
       end
 
-      def create_service_account_key(args)
-        service_account = args[:service_account] || "souls-app"
-        project_id = args[:project_id] || "souls-app"
+      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 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}"`
+      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(args)
-        service_account = args[:service_account] || "souls-app"
+      def add_permissions(service_account: "souls-app")
         roles = [
           "roles/cloudsql.serviceAgent",
           "roles/containerregistry.ServiceAgent",

data/lib/souls/gcloud/methods.rb

@@ -0,0 +1,52 @@
+module Souls
+  module Gcloud
+    class << self
+      def return_method(args)
+        method = args[1]
+        case method
+        when "auth_login"
+          project_id = Souls.configuration.project_id
+          Souls::Gcloud.auth_login(project_id: project_id)
+        when "enable_permissions"
+          Souls::Gcloud.enable_permissions
+        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
+          Souls::Gcloud.add_permissions(service_account: service_account)
+        else
+          raise(StandardError, "Wrong Method!")
+        end
+      end
+    end
+  end
+end

data/lib/souls/gcloud/pubsub.rb

@@ -1,17 +1,22 @@
 module Souls
   module Gcloud
     class << self
-      def create_pubsub_topic(args)
-        system("gcloud pubsub topics create #{args[:topic_name]}")
+      def create_pubsub_topic(topic_name: "send-user-mail")
+        system("gcloud pubsub topics create #{topic_name}")
       end
 
-      def create_pubsub_subscription(args)
+      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 #{args[:topic_name]}-sub \
-          --topic #{args[:topic_name]} \
-          --topic-project #{args[:project_id]} \
-          --push-auth-service-account #{args[:service_account]} \
-          --push-endpoint #{args[:endpoint]} \
+          "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
            "
         )

data/lib/souls/generate/resolver.rb

@@ -136,7 +136,7 @@ module Souls
     def self.resolver(class_name: "souls")
       singularized_class_name = class_name.singularize.underscore
       file_path = "./app/graphql/resolvers/#{singularized_class_name}_search.rb"
-      return "Resolver already exist! #{file_path}" if File.exist?(file_path)
+      raise(StandardError, "Resolver already exist! #{file_path}") if File.exist?(file_path)
 
       resolver_head(class_name: singularized_class_name)
       resolver_params(class_name: singularized_class_name)

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.4.10
+0.4.14

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.4.10
+0.4.14

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.25.7
+  version: 0.25.11
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-22 00:00:00.000000000 Z
+date: 2021-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: paint
@@ -75,6 +75,7 @@ files:
 - lib/souls/gcloud.rb
 - lib/souls/gcloud/compute.rb
 - lib/souls/gcloud/iam.rb
+- lib/souls/gcloud/methods.rb
 - lib/souls/gcloud/pubsub.rb
 - lib/souls/generate.rb
 - lib/souls/generate/application.rb
@@ -118,7 +119,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.2.22
 signing_key: 
 specification_version: 4
 summary: SOULs is a Serverless Application Framework. SOULs has four strains, API,