souls 0.24.1 → 0.24.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a177fdad1d5e6df31a9a51e12ab059d583ae4aa6fc97a529809aeaeb0fb5d85
-  data.tar.gz: ab2e23cc111ce0a07e61f98c9755ce6faef4533c9a581632d4ef72b15a652f9a
+  metadata.gz: 67f7e7198ec3b50441d76d83f17500df4a1f92f7c49e23143626a6229279aaae
+  data.tar.gz: c20d8e26c040f6132a06e854f30c9c5ea2f15c87945407df1e0d8effac427c88
 SHA512:
-  metadata.gz: 28c46f5c4491a210d98ef5385840f334d47c4e57925a34478344ba843b037cf0390873710f5d49dea63e96fd920cae18bd3033af90ad3cecfacdbbb2b37abacf
-  data.tar.gz: c6fd132c48e96fa2897b649181ab6b3ee442d5b92c1557ce27f3c6a69307319a5758be8cc9346c3a4aacba0a7d146d43ff8ed6f992e585bb30b38891b887ca65
+  metadata.gz: e5790b5cde1a9f507df76250ec89896b43b747eaaffdf17c3a7c8533bdca27a50afe2185585f37fbdca34cdfc48a1add8a4b42f0069f41ab867352ed836d7c74
+  data.tar.gz: 63d1cb575a722d2e045039bf6e7f091c48dfff4a57b76cbf3752009250c87d090ec31c48fa17607c3782aabc148ac12c0509b365cd1d7c27fb424ede32541c62

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[
@@ -28,143 +30,199 @@ module Souls
   class Error < StandardError; end
   class << self
     attr_accessor :configuration
-  end
-
-  def self.run_psql
-    system(
-      "docker run --rm -d \
-        -p 5433:5432 \
-        -v postgres-tmp:/var/lib/postgresql/data \
-        -e POSTGRES_USER=postgres \
-        -e POSTGRES_PASSWORD=postgres \
-        -e POSTGRES_DB=souls_test \
-        postgres:13-alpine"
-    )
-    system("docker ps")
-  end
 
-  def self.run_mysql
-    system(
-      "docker run --rm -d \
-        -p 3306:3306 \
-        -v mysql-tmp:/var/lib/mysql \
-        -e MYSQL_USER=mysql \
-        -e MYSQL_ROOT_PASSWORD=mysql \
-        -e MYSQL_DB=souls_test \
-        mysql:latest"
-    )
-    system("docker ps")
-  end
+    def run_psql
+      system(
+        "docker run --rm -d \
+          -p 5433:5432 \
+          -v postgres-tmp:/var/lib/postgresql/data \
+          -e POSTGRES_USER=postgres \
+          -e POSTGRES_PASSWORD=postgres \
+          -e POSTGRES_DB=souls_test \
+          postgres:13-alpine"
+      )
+      system("docker ps")
+    end
 
-  def self.run_awake(url)
-    app = Souls.configuration.app
-    system(
-      "gcloud scheduler jobs create http #{app}-awake
-      --schedule '0,10,20,30,40,50 * * * *' --uri #{url} --http-method GET"
-    )
-  end
+    def run_mysql
+      system(
+        "docker run --rm -d \
+          -p 3306:3306 \
+          -v mysql-tmp:/var/lib/mysql \
+          -e MYSQL_USER=mysql \
+          -e MYSQL_ROOT_PASSWORD=mysql \
+          -e MYSQL_DB=souls_test \
+          mysql:latest"
+      )
+      system("docker ps")
+    end
 
-  def self.gemfile_latest_version
-    file_path = "./Gemfile"
-    updated_gems = []
-    updated_gem_versions = []
-    updated_lines = []
-    from_dev = false
-    File.open(file_path, "r") do |f|
-      f.each_line do |line|
-        from_dev = true if line.include?("group")
-        next unless line.include?("gem ")
-
-        gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
-        url = URI("https://rubygems.org/api/v1/versions/#{gem[0]}/latest.json")
-        res = Net::HTTP.get_response(url)
-        data = JSON.parse(res.body)
-        next if Souls.configuration.fixed_gems.include?(gem[0].to_s)
-        next if data["version"].to_s == gem[1].to_s
-
-        updated_lines << if from_dev
-                           "  gem \"#{gem[0]}\", \"#{data['version']}\""
-                         else
-                           "gem \"#{gem[0]}\", \"#{data['version']}\""
-                         end
-        updated_gems << (gem[0]).to_s
-        updated_gem_versions << data["version"]
-        system("gem update #{gem[0]}")
-      end
+    def run_awake(url)
+      app = Souls.configuration.app
+      system(
+        "gcloud scheduler jobs create http #{app}-awake
+        --schedule '0,10,20,30,40,50 * * * *' --uri #{url} --http-method GET"
+      )
     end
-    {
-      gems: updated_gems,
-      lines: updated_lines,
-      updated_gem_versions: updated_gem_versions
-    }
-  end
 
-  def self.update_gemfile
-    file_path = "./Gemfile"
-    tmp_file = "./tmp/Gemfile"
-    new_gems = gemfile_latest_version
-    logs = []
-    message = Paint["\nAlready Up to date!", :green]
-    return "Already Up to date!" && puts(message) if new_gems[:gems].blank?
-
-    @i = 0
-    File.open(file_path, "r") do |f|
-      File.open(tmp_file, "w") do |new_line|
+    def gemfile_latest_version
+      file_path = "./Gemfile"
+      updated_gems = []
+      updated_gem_versions = []
+      updated_lines = []
+      from_dev = false
+      File.open(file_path, "r") do |f|
         f.each_line do |line|
+          from_dev = true if line.include?("group")
+          next unless line.include?("gem ")
+
           gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
-          if new_gems[:gems].include?(gem[0])
-            old_ver = gem[1].split(".")
-            new_ver = new_gems[:updated_gem_versions][@i].split(".")
-            if old_ver[0] < new_ver[0]
-              logs << Paint % [
-                "#{gem[0]} v#{gem[1]} → %{red_text}",
-                :white,
-                {
-                  red_text: ["v#{new_gems[:updated_gem_versions][@i]}", :red]
-                }
-              ]
-            elsif old_ver[1] < new_ver[1]
-              logs << Paint % [
-                "#{gem[0]} v#{gem[1]} → v#{new_ver[0]}.%{yellow_text}",
-                :white,
-                {
-                  yellow_text: ["#{new_ver[1]}.#{new_ver[2]}", :yellow]
-                }
-              ]
-            elsif old_ver[2] < new_ver[2]
-              logs << Paint % [
-                "#{gem[0]} v#{gem[1]} → v#{new_ver[0]}.#{new_ver[1]}.%{green_text}",
-                :white,
-                {
-                  green_text: [(new_ver[2]).to_s, :green]
-                }
-              ]
-            end
-            if gem[0] == "souls"
-              logs << Paint % ["\nSOULs Doc: %{cyan_text}", :white, { cyan_text: ["https://souls.elsoul.nl\n", :cyan] }]
+          url = URI("https://rubygems.org/api/v1/versions/#{gem[0]}/latest.json")
+          res = Net::HTTP.get_response(url)
+          data = JSON.parse(res.body)
+          next if Souls.configuration.fixed_gems.include?(gem[0].to_s)
+          next if data["version"].to_s == gem[1].to_s
+
+          updated_lines << if from_dev
+                             "  gem \"#{gem[0]}\", \"#{data['version']}\""
+                           else
+                             "gem \"#{gem[0]}\", \"#{data['version']}\""
+                           end
+          updated_gems << (gem[0]).to_s
+          updated_gem_versions << data["version"]
+          system("gem update #{gem[0]}")
+        end
+      end
+      {
+        gems: updated_gems,
+        lines: updated_lines,
+        updated_gem_versions: updated_gem_versions
+      }
+    end
+
+    def update_gemfile
+      file_path = "./Gemfile"
+      tmp_file = "./tmp/Gemfile"
+      new_gems = gemfile_latest_version
+      logs = []
+      message = Paint["\nAlready Up to date!", :green]
+      return "Already Up to date!" && puts(message) if new_gems[:gems].blank?
+
+      @i = 0
+      File.open(file_path, "r") do |f|
+        File.open(tmp_file, "w") do |new_line|
+          f.each_line do |line|
+            gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
+            if new_gems[:gems].include?(gem[0])
+              old_ver = gem[1].split(".")
+              new_ver = new_gems[:updated_gem_versions][@i].split(".")
+              if old_ver[0] < new_ver[0]
+                logs << Paint % [
+                  "#{gem[0]} v#{gem[1]} → %{red_text}",
+                  :white,
+                  {
+                    red_text: ["v#{new_gems[:updated_gem_versions][@i]}", :red]
+                  }
+                ]
+              elsif old_ver[1] < new_ver[1]
+                logs << Paint % [
+                  "#{gem[0]} v#{gem[1]} → v#{new_ver[0]}.%{yellow_text}",
+                  :white,
+                  {
+                    yellow_text: ["#{new_ver[1]}.#{new_ver[2]}", :yellow]
+                  }
+                ]
+              elsif old_ver[2] < new_ver[2]
+                logs << Paint % [
+                  "#{gem[0]} v#{gem[1]} → v#{new_ver[0]}.#{new_ver[1]}.%{green_text}",
+                  :white,
+                  {
+                    green_text: [(new_ver[2]).to_s, :green]
+                  }
+                ]
+              end
+              if gem[0] == "souls"
+                logs << Paint % [
+                  "\nSOULs Doc: %{cyan_text}",
+                  :white,
+                  { cyan_text: ["https://souls.elsoul.nl\n", :cyan] }
+                ]
+              end
+              new_line.write("#{new_gems[:lines][@i]}\n")
+              @i += 1
+            else
+              new_line.write(line)
             end
-            new_line.write("#{new_gems[:lines][@i]}\n")
-            @i += 1
-          else
-            new_line.write(line)
           end
         end
       end
+      FileUtils.rm("./Gemfile")
+      FileUtils.rm("./Gemfile.lock")
+      FileUtils.mv("./tmp/Gemfile", "./Gemfile")
+      system("bundle update")
+      success = Paint["\n\nSuccessfully Updated These Gems!\n", :green]
+      puts(success)
+      logs.each do |line|
+        puts(line)
+      end
     end
-    FileUtils.rm("./Gemfile")
-    FileUtils.rm("./Gemfile.lock")
-    FileUtils.mv("./tmp/Gemfile", "./Gemfile")
-    system("bundle update")
-    success = Paint["\n\nSuccessfully Updated These Gems!\n", :green]
-    puts(success)
-    logs.each do |line|
-      puts(line)
+
+    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
-  end
 
-  def self.configure
-    self.configuration ||= Configuration.new
-    yield(configuration)
+    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)
+    end
   end
 
   class Configuration

data/lib/souls/gcloud/iam.rb

@@ -1,31 +1,45 @@
 module Souls
   module Gcloud
     class << self
-      def create_service_account(service_account: "souls-app")
-        `gcloud iam service-accounts create #{service_account} \
-        --description="Souls Service Account" \
-        --display-name="#{service_account}"`
+      def create_service_account(args)
+        service_account = args[:service_account] || "souls-app"
+        system(
+          "gcloud iam service-accounts create #{service_account} \
+        --description='Souls Service Account' \
+        --display-name=#{service_account}"
+        )
       end
 
-      def create_service_account_key(service_account: "souls-app")
-        project_id = Souls.configuration.project_id
-        `gcloud iam service-accounts keys create ./config/keyfile.json \
-          --iam-account #{service_account}@#{project_id}.iam.gserviceaccount.com`
+      def create_service_account_key(args)
+        service_account = args[:service_account] || "souls-app"
+        project_id = args[:project_id] || "souls-app"
+        system(
+          "gcloud iam service-accounts keys create ./config/keyfile.json \
+          --iam-account #{service_account}@#{project_id}.iam.gserviceaccount.com"
+        )
       end
 
-      def add_service_account_role(service_account: "souls-app", role: "roles/firebase.admin")
-        project_id = Souls.configuration.project_id
+      def add_service_account_role(args)
+        service_account = args[:service_account] || "souls-app"
+        project_id = args[:project_id] || "souls-app"
+        role = args[:role] || "roles/firebase.admin"
         `gcloud projects add-iam-policy-binding #{project_id} \
         --member="serviceAccount:#{service_account}@#{project_id}.iam.gserviceaccount.com" \
         --role="#{role}"`
       end
 
-      def add_permissions(service_account: "souls-app")
-        add_service_account_role(service_account: service_account, role: "roles/cloudsql.serviceAgent")
-        add_service_account_role(service_account: service_account, role: "roles/containerregistry.ServiceAgent")
-        add_service_account_role(service_account: service_account, role: "roles/pubsub.serviceAgent")
-        add_service_account_role(service_account: service_account, role: "roles/firestore.serviceAgent")
-        add_service_account_role(service_account: service_account, role: "roles/iam.serviceAccountUser")
+      def add_permissions(args)
+        service_account = args[:service_account] || "souls-app"
+        roles = [
+          "roles/cloudsql.serviceAgent",
+          "roles/containerregistry.ServiceAgent",
+          "roles/pubsub.serviceAgent",
+          "roles/firestore.serviceAgent",
+          "roles/iam.serviceAccountUser"
+        ]
+        roles.each do |role|
+          add_service_account_role(service_account: service_account, role: role)
+        end
       end
     end
   end

data/lib/souls/init.rb

@@ -16,7 +16,10 @@ module Souls
         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
@@ -24,33 +27,36 @@ module Souls
       puts(e)
     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.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)