souls 0.26.9 → 0.27.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abb403a2afdcb6e2de2502a8f22ef0977224dbc17cd2145fd8ae6fd1b690595d
-  data.tar.gz: bdaa332725d41ec2e2c267544d17805cf278d908524309acc8c52724593a0b0e
+  metadata.gz: 1cf1ae4a3de56f9fde7d3c7200ba4e7eba448e0a6fe09d577ba7f550aa5e9618
+  data.tar.gz: 0bfface843f917a3ec74627e272622524b7887f1597b0782e32b26974391fef5
 SHA512:
-  metadata.gz: bc0bd6eb6dffcafdb444b41bd68d93822c366280af9c2a9da59e8e5d2eb402041b51765d3e346590e8c0999ec6161081b75733d04b83641d88787e8f147f1e4e
-  data.tar.gz: d55eaa383f6107f409c8c2df0192db434ac6307ba578f36be8d20879ba0ec13b4aee54b14fc020d3a05e3fb6d10fa4ce36324ff5b9c616df67e208c09a702609
+  metadata.gz: 5f3057f60c46593bee1a501fa0c53e9849afdbe8ee58b23c83e81d44d6bbb82cceea8a6942b00c75bdb24417da511f245156bd6f44507340fd51bf632c68cb10
+  data.tar.gz: c83202c8309d651a1c430e4b88a8ac5cd7f91aefcb8fe843d23a5d0e41a0b16e2c49d5cb8f1659f9d61c503c85f51e8ec2282f0e99b040ca129840c2fb64aa30

data/lib/souls.rb

@@ -192,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
@@ -297,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
@@ -367,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.9".freeze
+  VERSION = "0.27.2".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.5.9
+0.6.2

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.5.9
+0.6.2

metadata

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