souls 0.27.8 → 0.28.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: af97bcebd4feabe61b2f9f32d8c67d33f2d3e0bb0cf452cda426adc4e3ef0b28
-  data.tar.gz: 4482a622136b54b2a4bb687e64e111394cff422a8488e0136f59b67b9f942f43
+  metadata.gz: 8de6aeb5238dbcaf510b31d4b38ce82e86a14b216b03b4a54470db6a7bbcd272
+  data.tar.gz: 024bf3a280cf6717688202a79faee0d6a1b9e617a2224d9860a4cf045dc8de00
 SHA512:
-  metadata.gz: 3c8d198143dc0220551d1a240b9053ca9eb41e6038e3c123ff073c03681b6413ec669d9e8c94204f00624223c7e885a1d2da5f35a50adf47d43a9717af7ae8c4
-  data.tar.gz: 8fc506abe042515b6d539e81698e094102524b90075d47ac18d89f95e27f31f2a7997900ba4e9800e47dd794d3110bf0602e0e4bb1375a11486f98b43948fb21
+  metadata.gz: 905ebb4d4765e733bbe0a3fc604b765d06e26c9bf7e4b6dad351b57d18552ec6862c86354bdccf9e2a936bccf17d1ef57a39d6f87bcfc9022d7bfaae3efbc8df
+  data.tar.gz: d42d81b343f068515f865cb252d9585a348db70f5d044afa3ff702febcf01aea687dd20ea77b147857dab58de04134bd824c6c4ef4c9812a7ac9087a67a96eba

data/exe/souls

@@ -12,13 +12,7 @@ begin
     args = ARGV
     Souls::Init.return_method(args)
   when "s", "server"
-    strain = Souls.configuration.strain
-    case strain
-    when "media", "admin", "console", "doc"
-      system("yarn dev")
-    else
-      system("foreman start -f Procfile.dev")
-    end
+    system("foreman start -f Procfile.dev")
   when "c", "console"
     strain = Souls.configuration.strain
     case strain
@@ -44,7 +38,7 @@ begin
       Souls::Gcloud.return_method(args)
       Whirly.status = "Done!"
     end
-  when "-v", "--version"
+  when "-v", "--version", "v", "version", "-version", "--v"
     puts(Paint[Souls::VERSION, :white])
   when "gem:update", "gemfile:update"
     status = Paint["Checking for updates...", :yellow]
@@ -56,11 +50,11 @@ begin
   when "release"
     Souls::Release.return_method
   when "model:update"
-    status = Paint["Updating Models...", :yellow]
+    status = Paint["Syncing Models...", :yellow]
     Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
       Whirly.status = status
       Souls.update_models
-      Whirly.status = "Done!"
+      Whirly.status = "API and Worker Both Models Synced!"
     end
   when "add"
     graphql_class = ARGV[1]
@@ -122,18 +116,6 @@ begin
     else
       system("rake db:migrate:reset && rake db:migrate:reset RACK_ENV=test")
     end
-  when "db:update"
-    strain = Souls.configuration.strain
-    case strain
-    when "api"
-      other_app = Souls.configuration.worker_name
-    when "worker"
-      other_app = Souls.configuration.api_name
-    else
-      raise(StandardError, "Unknown app name!")
-    end
-    system("rm -rf ../#{other_app}/db/*")
-    system("cp -r ./db/* ../#{other_app}/db/*")
   when "t", "test"
     system("rubocop -A")
     system("bundle exec rspec")

data/lib/souls/gcloud/iam.rb

@@ -59,16 +59,18 @@ module Souls
         )
       end
 
-      def add_permissions(service_account: "souls-app")
+      def add_permissions(service_account: "souls-app", project_id: "souls-app")
         roles = [
-          "roles/cloudsql.serviceAgent",
+          "roles/cloudsql.instanceUser",
           "roles/containerregistry.ServiceAgent",
           "roles/pubsub.serviceAgent",
           "roles/firestore.serviceAgent",
-          "roles/iam.serviceAccountUser"
+          "roles/iam.serviceAccountUser",
+          "roles/storage.objectAdmin",
+          "roles/run.admin"
         ]
         roles.each do |role|
-          add_service_account_role(service_account: service_account, role: role)
+          add_service_account_role(service_account: service_account, project_id: project_id, role: role)
         end
       end
     end

data/lib/souls/gcloud/methods.rb

@@ -49,7 +49,8 @@ module Souls
           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)
+          project_id = Souls.configuration.project_id
+          Souls::Gcloud.add_permissions(service_account: service_account, project_id: project_id)
         else
           raise(StandardError, "Wrong Method!")
         end

data/lib/souls/init.rb

@@ -19,7 +19,7 @@ module Souls
           Souls.configure do |config|
             config.app = "#{app_name}"
             config.project_id = "souls-app"
-            config.strain = "#{service_name}"
+            config.strain = "#{app_name}"
             config.github_repo = "elsoul/souls"
             config.worker_endpoint = "https://worker.test.com"
             config.fixed_gems = ["excluded_gem"]
@@ -48,7 +48,7 @@ module Souls
         f.write(<<~TEXT)
           Souls.configure do |config|
             config.app = "#{app_name}"
-            config.project_id = "souls-app"
+            config.project_id = "#{app_name}"
             config.strain = "mother"
             config.github_repo = "elsoul/souls"
             config.worker_endpoint = "https://worker.test.com"
@@ -61,7 +61,6 @@ module Souls
     end
 
     def self.return_method(args)
-      strains = %w[api worker console admin media doc].freeze
       app_name = args[1]
       if app_name.nil?
         puts(Paint["you need to specify your app name", :red])
@@ -69,20 +68,12 @@ module Souls
         exit
       end
 
-      prompt = TTY::Prompt.new
-      choices = ["1. SOULs GraphQL API", "2. SOULs Pub/Sub Worker", "3. SOULs Frontend Web"]
-      choice_num = prompt.select(Paint["Select Strain: ", :cyan], choices)[0].to_i
-      case choice_num
-      when 1
-        service_name = (strains[choice_num.to_i - 1]).to_s
-        Souls::Init.download_souls(app_name: app_name, service_name: service_name)
-        Souls::Init.mother_config_init(app_name: app_name)
-        Souls::Init.download_github_actions(app_name: app_name)
-        Souls::Init.initial_config_init(app_name: app_name, service_name: service_name)
-        Souls::Init.souls_api_credit(app_name: app_name, service_name: service_name)
-      else
-        puts(Paint["Coming Soon...", :blue])
-      end
+      service_name = "api"
+      Souls::Init.download_souls(app_name: app_name, service_name: service_name)
+      Souls::Init.mother_config_init(app_name: app_name)
+      Souls::Init.download_github_actions(app_name: app_name)
+      Souls::Init.initial_config_init(app_name: app_name, service_name: service_name)
+      Souls::Init.souls_api_credit(app_name: app_name, service_name: service_name)
     end
 
     def self.download_souls(app_name: "souls", service_name: "api")
@@ -92,7 +83,10 @@ module Souls
       system("curl -OL #{url}")
       system("mkdir -p #{app_name}/apps/#{service_name}")
       system("tar -zxvf ./#{file_name} -C #{app_name}/apps/")
-      system("curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/.rubocop.yml #{app_name}")
+      system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/.rubocop.yml")
+      system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/Gemfile")
+      system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/Procfile.dev")
+      system("cd #{app_name} && curl -OL https://storage.googleapis.com/souls-bucket/boilerplates/Procfile")
       FileUtils.rm(file_name)
     end
 

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.6.8
+0.7.3

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.6.8
+0.7.3

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.27.8
+  version: 0.28.3
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-07 00:00:00.000000000 Z
+date: 2021-08-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport