souls 0.25.4 → 0.25.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9c429040652461b21eac33f3209f88e00bdf1894be3174da645a291bbf49a446
-  data.tar.gz: 4aca7c52318f3d1bddd2537eeb6c3bfe2ed63fea1fd38fb237db2ed7fcd10577
+  metadata.gz: 96b1f939b0fbf60c8ff2c91072274a89798066d4fbb36e60d1d6114bf316b1f6
+  data.tar.gz: 4dde839b87723d20ffc0cbc5e273585c2ff7d75a73b2e72122867fbdaf8727d3
 SHA512:
-  metadata.gz: 86cb477c8a8ccfb9824b82b384d6c330b399aa12b47d9f63b2055bdf62bdcdcae33015c14e926978708f25102c253d27515f9bf41dbde8f959e0b552832d60cd
-  data.tar.gz: 5f586bc3a6d90ddc4f71ec8e4662686cced23c25318f2440364647340ebe5a9d56cfe62f549d1ce21a142c026371f6d4edf82ea6d06724449de59f4bde93d3b6
+  metadata.gz: 678ceff976d6b7c93dc8d86787b63949eea97c43d262b839b14720d62721281963a09818160982e80e28cfc94791bb32c4b0b07de251220fd7761d7e3ddd8ba2
+  data.tar.gz: 3dea6712b0561a33e6ef5e11f18f8b4e1dcef06f017df566b259fcbbb74384407152b23e8658f2c38a9d62013a936e4dc0eae8ac533ed5dddfdd52b7711bb0e2

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,6 +78,10 @@ begin
       Whirly.status = "Done!"
     end
   when "release"
+    `gem uninstall -x --force`
+    sleep(1)
+    system("gem install souls")
+    sleep(1)
     current_souls_ver = Souls::VERSION.strip.split(".").map(&:to_i)
     prompt = TTY::Prompt.new
     choices = [

data/lib/souls.rb

@@ -245,7 +245,7 @@ module Souls
       when "gem"
         return Souls::VERSION.split(".").map(&:to_i)
       when "api", "worker", "console", "admin", "media"
-        file_path = "#{Gem.path[0]}/gems/souls-#{Souls::VERSION}/lib/souls/versions/.souls_#{service_name}_version"
+        file_path = "#{Gem.dir}/gems/souls-#{Souls::VERSION}/lib/souls/versions/.souls_#{service_name}_version"
       else
         raise(StandardError, "You are at wrong directory!")
       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,10 @@ 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/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.4.7
+0.4.11

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.4.7
+0.4.11

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.25.4
+  version: 0.25.8
 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-23 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