souls 0.26.7 → 0.27.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07a268eb135f4ca4ea45eb8249231c9fc816695012de869aeb4b1df50fa2b25f
-  data.tar.gz: 994e784b8ecf513a97df0c2227a96b26c115d1dacc85c989d002e9f714deb204
+  metadata.gz: 0c9fa990d327564396a323f48715af865bfdd1e825cbf2538dbb3318675c08aa
+  data.tar.gz: b403de454c2c6bc8619201a36af1e7d80ece07e6561fc149e32cd4821e20b021
 SHA512:
-  metadata.gz: 27f41b2976489276d4597fce40e333f2bb314c34a6aa89178d4a74bc3ea9a45d74d635583a82c62ab8e6b2e11a836172d71afbb7edbb3cf01ba48d50d47d05b6
-  data.tar.gz: 2a2c09c4df16367eebd6144f2955d12782d3d6add3f7d37ebfa404ef02bd7e449775c54cc2698466ab7b1b9ff3559d9a2f8d84f08f7e7f27c4d6502f46e7ce57
+  metadata.gz: c395c5b01a546475640257ac32f05fe3f59f4a8a4c42a040f1ef3cf9543b082fe9b9b5e2f9ba094dd683e9f30d59c15b7e1e73ac27231c56b65f1814cf052b9a
+  data.tar.gz: 50edef7da97873ec4a2521051f3bcb77e8bef07bd63e25ef53052379eacc83bf8adc96eb6dcf4167ad1a243e7fb2a2f78512828d3d5620ebe22b208a39a65976

data/exe/souls

@@ -55,8 +55,13 @@ begin
     end
   when "release"
     Souls::Release.return_method
-  when "update"
-    puts(Paint["Coming soon..", :cyan])
+  when "model:update"
+    status = Paint["Updating Models...", :yellow]
+    Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
+      Whirly.status = status
+      Souls.update_models
+      Whirly.status = "Done!"
+    end
   when "add"
     graphql_class = ARGV[1]
     case graphql_class

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
@@ -282,6 +284,86 @@ module Souls
       puts(Paint["\nSuccessfully Updated #{service_name} Gemfile!", :green])
     end
 
+    def update_models
+      current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
+      permitted_dirs = %w[worker api]
+      unless permitted_dirs.include?(current_dir_name)
+        raise(StandardError, "You are at wrong directory!Go to API or Worker Directory!")
+      end
+
+      cp_dir = get_models_path(service_name: current_dir_name)
+      cp_dir.each do |path|
+        cp_and_dl_files(api_dir: path[:api], worker_dir: path[:worker])
+      end
+    end
+
+    def cp_and_dl_files(api_dir: "", worker_dir: "")
+      if Dir["#{worker_dir}/*.rb"].blank?
+
+        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 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) 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: "#{api_path}/db",
+          worker: "#{worker_path}/db"
+        },
+        {
+          api: "#{api_path}/app/models",
+          worker: "#{worker_path}/app/models"
+        },
+        {
+          api: "#{api_path}/spec/factories",
+          worker: "#{worker_path}/spec/factories"
+        }
+      ]
+    end
+
+    def file_diff(paths = [])
+      paths.map do |path|
+        stat(path)[:last_update]
+      end
+    end
+
+    def stat(path)
+      s = File::Stat.new(path)
+      last_update = s.mtime.to_s
+      last_status_change = s.ctime.to_s
+      last_access = s.atime.to_s
+      {
+        last_update: last_update,
+        last_status_change: last_status_change,
+        last_access: last_access
+      }
+    end
+
     def detect_change
       git_status = `git status`
       result =
@@ -300,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

@@ -93,6 +93,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
 
@@ -135,6 +136,9 @@ module Souls
 
     def self.download_worker
       current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
+      wrong_dir = %w[apps api worker]
+      raise(StandardError, "You are at wrong directory!Go to Mother Directory!") if wrong_dir.include?(current_dir_name)
+
       version = Souls.get_latest_version_txt(service_name: "worker").join(".")
       file_name = "worker-v#{version}.tgz"
       url = "https://storage.googleapis.com/souls-bucket/boilerplates/workers/#{file_name}"

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.5.7
+0.6.0

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.5.7
+0.6.0

metadata

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