souls 0.26.8 → 0.27.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a5e58498e4d755e83b5b9244c9eebdfa08e9c9bbd2f6d006cbea2e87be99a463
-  data.tar.gz: 3148268dccdb03f49bd29105867ac5dcca44fdef43ed85855e93b0d9f30199d4
+  metadata.gz: 9a6217d4f7de4eb318ea7b8ab7c68091b285749e82b9ed49b98eebb848e2e4c7
+  data.tar.gz: c7d3444c03e7f788b14d52b7d5f9558fecf87013c06f82aba7a66672f259f59d
 SHA512:
-  metadata.gz: 2ab89d13dc49261853b81780a105e672830410b3dc836e8a605e37f5359bffb82abfe4bb8ff8abcf813a0089efea78536cd6c113663bf7d033584f2f8da2611d
-  data.tar.gz: 9aa074b6bb0d4ff2c2f50808abcc4b6750d88c55ec6f7d2381535001e73c6c813e34a84cda7d87a173619c26a1f61aa9193d44bafe5a21af707f19b57b01b168
+  metadata.gz: 16c2bcae747194927bfa913663d2646a17b924163dda87002b445d5d4069e229011caeb319eeed5014dd7888b1f98c063798f2fdc805ed91f7b206431944997f
+  data.tar.gz: 9a69b61b4b3359b93466c1e1aa103470417d6013eba2a8190928b59474a3b0adb5512ad83d42463c779f11867d73e3fc85770fcebe6ff04a52baae590754208b

data/lib/souls.rb

@@ -4,6 +4,7 @@ require_relative "souls/init"
 require_relative "souls/generate"
 require_relative "souls/gcloud"
 require_relative "souls/release"
+require "date"
 require "dotenv/load"
 require "json"
 require "fileutils"
@@ -191,6 +192,7 @@ module Souls
 
       system("gsutil cp #{service_name}.tgz #{bucket_url}/#{service_name.pluralize}/#{file_name}")
       system("gsutil cp #{service_name}.tgz #{bucket_url}/#{service_name.pluralize}/#{release_name}")
+      system("gsutil cp .rubocop.yml #{bucket_url}/.rubocop.yml")
       FileUtils.rm("#{service_name}.tgz")
       "#{service_name}-v#{new_ver} Succefully Stored to GCS! "
     end
@@ -296,36 +298,50 @@ module Souls
     end
 
     def cp_and_dl_files(api_dir: "", worker_dir: "")
-      api_file_data = file_diff(Dir["#{api_dir}/*.rb"])
-      worker_file_data = file_diff(Dir["#{worker_dir}/*.rb"])
+      if Dir["#{worker_dir}/*.rb"].blank?
 
-      api_latest_date = Date.parse(api_file_data.max)
-      worker_latest_date = Date.parse(worker_file_data.max)
+        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 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)
+        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: "../#{service_name}/db",
-          worker: "./db"
+          api: "#{api_path}/db",
+          worker: "#{worker_path}/db"
         },
         {
-          api: "../#{service_name}/app/models",
-          worker: "./app/models"
+          api: "#{api_path}/app/models",
+          worker: "#{worker_path}/app/models"
         },
         {
-          api: "../#{service_name}/spec/factories",
-          worker: "./spec/factories"
+          api: "#{api_path}/spec/factories",
+          worker: "#{worker_path}/spec/factories"
         }
       ]
     end
@@ -366,14 +382,13 @@ module Souls
   end
 
   class Configuration
-    attr_accessor :app, :strain, :project_id, :worker_repo, :api_repo, :worker_endpoint, :fixed_gems
+    attr_accessor :app, :strain, :project_id, :github_repo, :worker_endpoint, :fixed_gems
 
     def initialize
       @app = nil
       @project_id = nil
       @strain = nil
-      @worker_repo = nil
-      @api_repo = nil
+      @github_repo = nil
       @worker_endpoint = nil
       @fixed_gems = nil
     end

data/lib/souls/gcloud/iam.rb

@@ -16,6 +16,41 @@ module Souls
         )
       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}/#{app_name}/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} \

data/lib/souls/gcloud/methods.rb

@@ -4,6 +4,13 @@ module Souls
       def return_method(args)
         method = args[1]
         case method
+        when "get_iam_key"
+          app_name = Souls.configuration.app
+          project_id = Souls.configuration.project_id
+          Souls::Gcloud.create_service_account(service_account: app_name)
+          Souls::Gcloud.create_service_account_key(service_account: app_name, project_id: project_id)
+          Souls::Gcloud.export_key_to_console
+          Souls::Gcloud.enable_permissions
         when "auth_login"
           project_id = Souls.configuration.project_id
           Souls::Gcloud.auth_login(project_id: project_id)

data/lib/souls/init.rb

@@ -20,7 +20,8 @@ module Souls
             config.app = "#{app_name}"
             config.project_id = "souls-app"
             config.strain = "#{service_name}"
-            config.worker_endpoint = "https://worker.com"
+            config.github_repo = "elsoul/souls"
+            config.worker_endpoint = "https://worker.test.com"
             config.fixed_gems = ["excluded_gem"]
           end
         TEXT
@@ -49,10 +50,8 @@ module Souls
             config.app = "#{app_name}"
             config.project_id = "souls-app"
             config.strain = "mother"
-            config.api = true
-            config.worker = false
-            config.frontend = false
-            config.worker_endpoint = ""
+            config.github_repo = "elsoul/souls"
+            config.worker_endpoint = "https://worker.test.com"
             config.fixed_gems = ["excluded_gem"]
           end
         TEXT
@@ -93,6 +92,7 @@ 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}")
       FileUtils.rm(file_name)
     end
 

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.5.8
+0.6.1

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.5.8
+0.6.1

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.26.8
+  version: 0.27.1
 platform: ruby
 authors:
 - POPPIN-FUMI