souls 0.24.2 → 0.24.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8305b1df5cacb1a4ec1e331666f60fe43fdb4c29b20d29caa2815ed8ae7e18f1
-  data.tar.gz: '08130c02290519c844dac657f9a5b4f3663a13e0931ad96a326e276d9a3e696d'
+  metadata.gz: a6af152affdf91e5263ce39f794b559b7057d60343cc5b03fa3f115664a33d1f
+  data.tar.gz: 2c212cf830bce52b67b090c6ea247b6aaf5bb918e7b0a548b9e7919e9b9350fa
 SHA512:
-  metadata.gz: ff64c773e7b4e7b8050e6626c49ed0a11734e9c6688ddc364899c186b51f60a9e2e2eadb4d85f5be34b86cec3b7a38bdad600425eb02b27075ace03820f809cf
-  data.tar.gz: c527bc6749ad24f8827c4e68459cd5d7c945c156b66fceb224703804d168be3987f58df5988f8ed30d6ee93e704c12b04b034d5e1764356efada87c985395e91
+  metadata.gz: c7ad5c88cc03bb7389977ddaba1c7d54198cecb2b0509ff237f8d805405e179a0e390ec9706cb8dfdcc7d3dbdb1817f1fdde050bea577404b018d638234538e2
+  data.tar.gz: 653a44bf451a2195df4c706b992be74f5ccb97d5ab434afcb87402d961e445571e2e96d586e9d796f91d61167156d087839ae8488d56842f1a72301d58feb771

data/exe/souls

@@ -32,7 +32,7 @@ begin
     strain = $stdin.gets.chomp.to_i
     case strain
     when 1, 2
-      Souls::Init.download_souls(app_name: app_name, repository_name: "souls_#{STRAINS[strain.to_i - 1]}")
+      Souls::Init.download_souls(app_name: app_name, service_name: (STRAINS[strain.to_i - 1]).to_s)
       Souls::Init.initial_config_init(app_name: app_name, strain: STRAINS[strain.to_i - 1])
     else
       puts(Paint["Coming Soon...", :blue])
@@ -94,6 +94,17 @@ begin
       Souls.update_gemfile
       Whirly.status = "Done!"
     end
+  when "update"
+    service_name = ARGV[1]
+    permit_services = %w[api worker console admin media]
+    raise(StandardError, "Wrong Service Name!") unless permit_services.include?(service_name)
+
+    status = Paint["Saving Repo...", :yellow]
+    Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
+      Whirly.status = status
+      result = Paint[Souls.update_repo(service_name: service_name), :green]
+      Whirly.status = result
+    end
   when "add"
     graphql_class = ARGV[1]
     case graphql_class

data/lib/souls.rb

@@ -3,11 +3,13 @@ require "active_support/core_ext/string/inflections"
 require_relative "souls/init"
 require_relative "souls/generate"
 require_relative "souls/gcloud"
+require "dotenv/load"
 require "json"
 require "fileutils"
 require "net/http"
 require "paint"
 require "whirly"
+require "google/cloud/firestore"
 
 module Souls
   SOULS_METHODS = %w[
@@ -165,6 +167,58 @@ module Souls
       end
     end
 
+    def update_repo(service_name: "api")
+      current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
+      latest_gem = get_latest_version(service_name: service_name)
+      new_ver = latest_gem[:version_counter] + 1
+      bucket_url = "gs://souls-bucket/boilerplates"
+      file_name = "#{service_name}-v#{new_ver}.tgz"
+
+      case current_dir_name
+      when "souls"
+        system("echo 'v#{new_ver}' > apps/#{service_name}/.souls_version")
+        system("cd apps/ && tar -czf ../#{service_name}.tgz #{service_name}/ && cd ..")
+      when "api", "worker", "console", "admin", "media"
+        system("echo 'v#{new_ver}' > .souls_version")
+        system("cd .. && tar -czf ../#{service_name}.tgz #{service_name}/ && cd #{service_name}")
+      else
+        raise(StandardError, "You are at wrong directory!")
+      end
+
+      system("gsutil cp #{service_name}.tgz #{bucket_url}/#{service_name.pluralize}/#{file_name}")
+      file_url = "https://storage.googleapis.com/souls-bucket/boilerplates/#{service_name.pluralize}/#{file_name}"
+      version_log(service_name: service_name, version_counter: new_ver, file_url: file_url)
+      FileUtils.rm("#{service_name}.tgz")
+      "#{service_name}-v#{new_ver} Succefully Stored to GCS! "
+    end
+
+    def version_log(service_name: "api", version_counter: 1, file_url: "")
+      version = "v#{version_counter}"
+      time = Time.now.strftime("%F-%H-%M-%S")
+      firestore = Google::Cloud::Firestore.new(project_id: ENV["FIRESTORE_PID"])
+      doc_ref = firestore.doc("#{service_name}/#{version_counter}")
+      doc_ref.set({ version: version, version_counter: version_counter, file_url: file_url, created_at: time })
+    end
+
+    def get_latest_version(service_name: "api")
+      firestore = Google::Cloud::Firestore.new(project_id: ENV["FIRESTORE_PID"])
+      versions = firestore.doc("#{service_name}/1")
+      if versions.get.exists?
+        versions = firestore.col(service_name.to_s)
+        query = versions.order("version_counter", "desc").limit(1)
+        query.get do |v|
+          return {
+            version_counter: v.data[:version_counter],
+            version: v.data[:version],
+            file_url: v.data[:file_url],
+            create_at: v.data[:create_at]
+          }
+        end
+      else
+        { version_counter: 0 }
+      end
+    end
+
     def configure
       self.configuration ||= Configuration.new
       yield(configuration)

data/lib/souls/init.rb

@@ -9,33 +9,54 @@ module Souls
       data[0]["tag_name"]
     end
 
-    def self.download_souls(app_name: "souls", repository_name: "souls_api ")
-      version = get_version(repository_name: repository_name)
-      system("curl -OL https://github.com/elsoul/#{repository_name}/archive/#{version}.tar.gz")
-      system("tar -zxvf ./#{version}.tar.gz")
-      system("mkdir #{app_name}")
-      folder = version.delete("v")
-      `cp -r #{repository_name}-#{folder}/. #{app_name}/`
-      `rm -rf #{version}.tar.gz && rm -rf #{repository_name}-#{folder}`
+    def self.initial_config_init(app_name: "souls", strain: "api")
+      FileUtils.touch("./#{app_name}/config/souls.rb")
+      file_path = "./#{app_name}/config/souls.rb"
+      File.open(file_path, "w") do |f|
+        f.write(<<~TEXT)
+          Souls.configure do |config|
+            config.app = "#{app_name}"
+            config.project_id = "souls-api"
+            config.strain = "#{strain}"
+            config.worker_endpoint = "https://worker.com"
+            config.fixed_gems = ["excluded_gem"]
+          end
+        TEXT
+      end
+    rescue StandardError => e
+      puts(e)
+    end
+
+    def self.download_souls(app_name: "souls", service_name: "api")
+      latest_gem = Souls.get_latest_version(service_name: service_name)
+      file_name = latest_gem[:file_url].to_s.match(%r{/([^/]+)/?$})[1]
+      system("curl -OL #{latest_gem[:file_url]}")
+      system("mkdir -p #{app_name}/#{service_name}")
+      system("tar -zxvf ./#{file_name} -C #{app_name}/")
+      FileUtils.rm(file_name)
       line = Paint["====================================", :yellow]
       puts("\n")
       puts(line)
-      txt = <<~TEXT
+      txt2 = <<~TEXT
            _____ ____  __  ____#{'        '}
-          / ___// __ \\/ / / / /   _____
-          \\__ \\/ / / / / / / /   / ___/
-         ___/ / /_/ / /_/ / /___(__  )#{' '}
-        /____/\\____/\\____/_____/____/#{'  '}
+          / ___// __ \\/ / / / /   %{red1}
+          \\__ \\/ / / / / / / /   %{red2}
+         ___/ / /_/ / /_/ / /___%{red3}#{' '}
+        /____/\\____/\\____/_____%{red4}#{'  '}
       TEXT
-      message = Paint[txt, :cyan]
-      puts(message)
+      red1 = ["_____", :red]
+      red2 = ["/ ___/", :red]
+      red3 = ["(__  )", :red]
+      red4 = ["/____/", :red]
+      ms = Paint % [txt2, :cyan, { red1: red1, red2: red2, red3: red3, red4: red4 }]
+      puts(ms)
       puts(line)
       welcome = Paint["Welcome to SOULs!", :white]
       puts(welcome)
       souls_ver = Paint["SOULs Version: #{Souls::VERSION}", :white]
       puts(souls_ver)
       puts(line)
-      cd = Paint["Easy to Run\n$ cd #{app_name}\n$ bundle\n$ souls s\nGo To : http://localhost:3000\n\nDoc: https://souls.elsoul.nl",
+      cd = Paint["Easy to Run\n$ cd #{app_name}/#{service_name}\n$ bundle\n$ souls s\nGo To : http://localhost:3000\n\nDoc: https://souls.elsoul.nl",
                  :white]
       puts(cd)
       puts(line)

data/lib/souls/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.24.2
+  version: 0.24.6
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,8 +10,22 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2021-07-22 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: google-cloud-firestore
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.6.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 2.6.1
 - !ruby/object:Gem::Dependency
   name: paint
   requirement: !ruby/object:Gem::Requirement
@@ -53,196 +67,9 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".irbrc"
-- ".rspec"
-- ".rubocop.yml"
-- ".ruby-version"
-- ".travis.yml"
 - CODE_OF_CONDUCT.md
-- Gemfile
-- Gemfile.lock
 - LICENSE.txt
 - README.md
-- Rakefile
-- Steepfile
-- apps/api/.env.sample
-- apps/api/.gitignore
-- apps/api/.irbrc
-- apps/api/.rspec
-- apps/api/.rubocop.yml
-- apps/api/.ruby-version
-- apps/api/CODE_OF_CONDUCT.md
-- apps/api/Dockerfile
-- apps/api/Dockerfile.dev
-- apps/api/Gemfile
-- apps/api/Gemfile.lock
-- apps/api/LICENSE.txt
-- apps/api/Procfile
-- apps/api/Procfile.dev
-- apps/api/README.md
-- apps/api/Rakefile
-- apps/api/app.rb
-- apps/api/app/engines/notification_engine.rb
-- apps/api/app/graphql/mutations/.keep
-- apps/api/app/graphql/mutations/base/article/create_article.rb
-- apps/api/app/graphql/mutations/base/article/delete_article.rb
-- apps/api/app/graphql/mutations/base/article/destroy_delete_article.rb
-- apps/api/app/graphql/mutations/base/article/update_article.rb
-- apps/api/app/graphql/mutations/base/article_category/create_article_category.rb
-- apps/api/app/graphql/mutations/base/article_category/delete_article_category.rb
-- apps/api/app/graphql/mutations/base/article_category/destroy_delete_article_category.rb
-- apps/api/app/graphql/mutations/base/article_category/update_article_category.rb
-- apps/api/app/graphql/mutations/base/user/create_user.rb
-- apps/api/app/graphql/mutations/base/user/delete_user.rb
-- apps/api/app/graphql/mutations/base/user/destroy_delete_user.rb
-- apps/api/app/graphql/mutations/base/user/update_user.rb
-- apps/api/app/graphql/mutations/base_mutation.rb
-- apps/api/app/graphql/mutations/managers/user_manager/add_user_role.rb
-- apps/api/app/graphql/mutations/managers/user_manager/remove_user_role.rb
-- apps/api/app/graphql/mutations/managers/user_manager/sign_in_user.rb
-- apps/api/app/graphql/queries/article.rb
-- apps/api/app/graphql/queries/article_categories.rb
-- apps/api/app/graphql/queries/article_category.rb
-- apps/api/app/graphql/queries/articles.rb
-- apps/api/app/graphql/queries/base_query.rb
-- apps/api/app/graphql/queries/me.rb
-- apps/api/app/graphql/queries/user.rb
-- apps/api/app/graphql/queries/users.rb
-- apps/api/app/graphql/resolvers/article_category_search.rb
-- apps/api/app/graphql/resolvers/article_search.rb
-- apps/api/app/graphql/resolvers/base.rb
-- apps/api/app/graphql/resolvers/user_search.rb
-- apps/api/app/graphql/souls_api_schema.rb
-- apps/api/app/graphql/types/.keep
-- apps/api/app/graphql/types/article_category_type.rb
-- apps/api/app/graphql/types/article_type.rb
-- apps/api/app/graphql/types/base/base_argument.rb
-- apps/api/app/graphql/types/base/base_enum.rb
-- apps/api/app/graphql/types/base/base_field.rb
-- apps/api/app/graphql/types/base/base_input_object.rb
-- apps/api/app/graphql/types/base/base_interface.rb
-- apps/api/app/graphql/types/base/base_object.rb
-- apps/api/app/graphql/types/base/base_scalar.rb
-- apps/api/app/graphql/types/base/base_union.rb
-- apps/api/app/graphql/types/base/mutation_type.rb
-- apps/api/app/graphql/types/base/query_type.rb
-- apps/api/app/graphql/types/connections/article_category_connection.rb
-- apps/api/app/graphql/types/connections/article_connection.rb
-- apps/api/app/graphql/types/connections/base_connection.rb
-- apps/api/app/graphql/types/connections/user_connection.rb
-- apps/api/app/graphql/types/edges/article_category_edge.rb
-- apps/api/app/graphql/types/edges/article_edge.rb
-- apps/api/app/graphql/types/edges/base_edge.rb
-- apps/api/app/graphql/types/edges/user_edge.rb
-- apps/api/app/graphql/types/user_type.rb
-- apps/api/app/models/article.rb
-- apps/api/app/models/article_category.rb
-- apps/api/app/models/user.rb
-- apps/api/app/policies/application_policy.rb
-- apps/api/app/policies/article_category_policy.rb
-- apps/api/app/policies/article_policy.rb
-- apps/api/app/policies/user_policy.rb
-- apps/api/app/utils/association_loader.rb
-- apps/api/app/utils/fire_store.rb
-- apps/api/app/utils/firebase_id_token.rb
-- apps/api/app/utils/json_web_token.rb
-- apps/api/app/utils/record_loader.rb
-- apps/api/app/utils/souls_helper.rb
-- apps/api/cloudbuild.yml
-- apps/api/config.ru
-- apps/api/config/database.yml
-- apps/api/config/souls.rb
-- apps/api/constants/areas.rb
-- apps/api/constants/column_name_ja.rb
-- apps/api/db/migrate/20200006095538_create_users.rb
-- apps/api/db/migrate/20200712180236_create_article_categories.rb
-- apps/api/db/migrate/20200714215521_create_articles.rb
-- apps/api/db/schema.rb
-- apps/api/db/seeds.rb
-- apps/api/github/workflows/delivery.yml
-- apps/api/log/.keep
-- apps/api/spec/factories/article_categories.rb
-- apps/api/spec/factories/articles.rb
-- apps/api/spec/factories/users.rb
-- apps/api/spec/models/article_category_spec.rb
-- apps/api/spec/models/article_spec.rb
-- apps/api/spec/models/user_spec.rb
-- apps/api/spec/mutations/base/article_category_spec.rb
-- apps/api/spec/mutations/base/article_spec.rb
-- apps/api/spec/mutations/base/user_spec.rb
-- apps/api/spec/policies/article_category_policy_spec.rb
-- apps/api/spec/policies/article_policy_spec.rb
-- apps/api/spec/policies/user_policy_spec.rb
-- apps/api/spec/queries/article_category_spec.rb
-- apps/api/spec/queries/article_spec.rb
-- apps/api/spec/queries/user_spec.rb
-- apps/api/spec/resolvers/article_category_search_spec.rb
-- apps/api/spec/resolvers/article_search_spec.rb
-- apps/api/spec/resolvers/user_search_spec.rb
-- apps/api/spec/spec_helper.rb
-- apps/api/tmp/.keep
-- apps/worker/.env.sample
-- apps/worker/.gitignore
-- apps/worker/.irbrc
-- apps/worker/.rspec
-- apps/worker/.rubocop.yml
-- apps/worker/.ruby-version
-- apps/worker/CODE_OF_CONDUCT.md
-- apps/worker/Dockerfile
-- apps/worker/Dockerfile.dev
-- apps/worker/Gemfile
-- apps/worker/Gemfile.lock
-- apps/worker/LICENSE.txt
-- apps/worker/Procfile
-- apps/worker/Procfile.dev
-- apps/worker/README.md
-- apps/worker/Rakefile
-- apps/worker/app.rb
-- apps/worker/app/engines/notification_engine.rb
-- apps/worker/app/graphql/mutations/.keep
-- apps/worker/app/graphql/mutations/base_mutation.rb
-- apps/worker/app/graphql/mutations/workers/send_user_mail_job.rb
-- apps/worker/app/graphql/souls_api_schema.rb
-- apps/worker/app/graphql/types/.keep
-- apps/worker/app/graphql/types/base/base_argument.rb
-- apps/worker/app/graphql/types/base/base_enum.rb
-- apps/worker/app/graphql/types/base/base_field.rb
-- apps/worker/app/graphql/types/base/base_input_object.rb
-- apps/worker/app/graphql/types/base/base_interface.rb
-- apps/worker/app/graphql/types/base/base_object.rb
-- apps/worker/app/graphql/types/base/base_scalar.rb
-- apps/worker/app/graphql/types/base/base_union.rb
-- apps/worker/app/graphql/types/base/mutation_type.rb
-- apps/worker/app/graphql/types/base/query_type.rb
-- apps/worker/app/models/article.rb
-- apps/worker/app/models/article_category.rb
-- apps/worker/app/models/user.rb
-- apps/worker/app/utils/fire_store.rb
-- apps/worker/app/utils/souls_helper.rb
-- apps/worker/cloudbuild.yml
-- apps/worker/config.ru
-- apps/worker/config/database.yml
-- apps/worker/config/souls.rb
-- apps/worker/db/migrate/20200006095538_create_users.rb
-- apps/worker/db/migrate/20200712180236_create_article_categories.rb
-- apps/worker/db/migrate/20200714215521_create_articles.rb
-- apps/worker/db/schema.rb
-- apps/worker/db/seeds.rb
-- apps/worker/github/workflows/delivery.yml
-- apps/worker/log/.keep
-- apps/worker/spec/factories/article_categories.rb
-- apps/worker/spec/factories/articles.rb
-- apps/worker/spec/factories/users.rb
-- apps/worker/spec/models/article_category_spec.rb
-- apps/worker/spec/models/article_spec.rb
-- apps/worker/spec/models/user_spec.rb
-- apps/worker/spec/spec_helper.rb
-- apps/worker/tmp/.keep
-- bin/console
-- bin/setup
-- config/souls.rb
-- db/schema.rb
 - exe/souls
 - lib/souls.rb
 - lib/souls/gcloud.rb
@@ -267,8 +94,6 @@ files:
 - lib/souls/generate/type.rb
 - lib/souls/init.rb
 - lib/souls/version.rb
-- rbs/init.rbs
-- souls.gemspec
 homepage: https://souls.elsoul.nl
 licenses:
 - Apache-2.0

data/.gitignore

@@ -1,15 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-# rspec failure tracking
-.rspec_status
-/config/keyfile.json
-.env
-.irb_history
-

data/.irbrc

@@ -1,3 +0,0 @@
-require "./lib/souls"
-require "./config/souls"
-require "souls"