souls 0.28.10 → 0.29.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57692fea02d6270aab8751550ff1fa34917526e47577d94cdb6264ee6b1bc056
-  data.tar.gz: 1b758e0c0f554d6eae37062023a826cc13f6f901e75fc3768a08fdf103aa5f5c
+  metadata.gz: 839fce6c4905d3dc922902ad84093c842c952b0ae11e6d179ff9dba0df2d7a54
+  data.tar.gz: 6647e81c9e7e11b4aed1c97a134393a0c7cca081bb2d122a54a06fb50d60f978
 SHA512:
-  metadata.gz: c06c5f1bd4c11839d79e7dafe348f3190261b3a7e15ea72286d73c69b3c4662b37450521fc1ae7f844c98c07018e6862e78f0501905947d9c3f9948014bf635f
-  data.tar.gz: bdb00623ab362142fab74855c5477720a64950bef071d6f2689df4994a2b208c06ddf369f5923f9ea0d04bbdf1e9c0460ebd64cb22052c90c6621f3d50ca7df8
+  metadata.gz: 42c45890bf4e6af520643e2ca8e53b090c2e1ce8ee3a5ad38849af44c08f8e5897b31926a328f77eb6c1cba5ffae6e16ae548cd7e5ec3c94fae24f9d300d0726
+  data.tar.gz: 8b0fa856d5e3e8e9ec4f3a6b284fb089aa0cc2edc8bbef8a66e2899038dac6e12e5dd126dd7d968a47547041e344e5e404957d4949a4efc7a05e3efaa10ffaa6

data/exe/souls

@@ -1,13 +1,30 @@
 #!/usr/bin/env ruby
 require "souls"
 begin
-  require("./config/souls") unless ARGV[0] == "new" || ARGV[0] == "i" || ARGV[0] == "-v" || ARGV[0] == "deploy"
+  souls_command = ARGV[0]
+  require("./config/souls") unless ["new", "i", "-v", "deploy"].include?(souls_command)
 rescue StandardError
   puts("Make sure you are at SOULs APP directory!")
 end
 begin
-  souls_command = ARGV[0]
   case souls_command
+  when "api"
+    api_command = ARGV[1]
+    case api_command
+    when "generate", "g"
+      method_name = ARGV[2]
+      class_name = ARGV[3]
+      status = Paint["Running SOULs Generate Commands...", :yellow]
+      Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
+        Whirly.status = status
+        Souls::Api::Generate.public_send(method_name, class_name: class_name)
+        Whirly.status = "Done!"
+      end
+    else
+      puts(Paint["Comannd doesn't exist.Check you command again!...", :red])
+    end
+  when "worker"
+    puts(Paint["Coming Soon...", :green])
   when "new"
     args = ARGV
     Souls::Init.return_method(args)
@@ -27,9 +44,9 @@ begin
         system("bundle exec irb")
       end
     end
-  when "i", "infra"
+  when "i", "infra", "docker"
     send_method = ARGV[1]
-    Souls.public_send(send_method)
+    Souls::Docker.public_send(send_method)
   when "gcloud"
     args = ARGV
     status = Paint["Running Gcloud Commands...", :yellow]
@@ -73,17 +90,16 @@ begin
       puts(Paint["Wrong Argument!", :red])
     end
   when "g", "generate"
-    args = ARGV
-    status = Paint["Generating Files...", :yellow]
-    done = Paint["You're All Set ☻", :yellow]
-    Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
-      Whirly.status = status
-      Souls::Generate.return_method(args)
-      Whirly.status = done
+    g_command = ARGV[1]
+    case g_command
+    when "worker"
+      Souls::Init.download_worker
+    else
+      puts(Paint["Coming Soon...", :green])
     end
   when "d", "delete"
     class_name = ARGV[1]
-    Souls::Generate.delete_all(class_name: class_name)
+    Souls::Api::Generate.delete_all(class_name: class_name)
   when "db:create"
     rack_env = ARGV[1]
     case rack_env

data/lib/souls.rb

@@ -1,9 +1,10 @@
 require_relative "souls/version"
 require "active_support/core_ext/string/inflections"
 require_relative "souls/init"
-require_relative "souls/generate"
+require_relative "souls/api"
 require_relative "souls/gcloud"
 require_relative "souls/release"
+require_relative "souls/docker"
 require "date"
 require "dotenv/load"
 require "json"
@@ -33,40 +34,6 @@ module Souls
   class << self
     attr_accessor :configuration
 
-    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 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_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 gemfile_latest_version
       file_path = "./Gemfile"
       updated_gems = []

data/lib/souls/api.rb

@@ -0,0 +1,5 @@
+require_relative "./api/generate"
+module Souls
+  module Api
+  end
+end

data/lib/souls/{generate.rb → api/generate.rb}

@@ -15,9 +15,9 @@ require_relative "./generate/type"
 require_relative "./generate/edge"
 require_relative "./generate/connection"
 require_relative "./generate/application"
-require_relative "./generate/methods"
+require_relative "./generate/migration"
 
 module Souls
-  module Generate
+  module Api::Generate
   end
 end

data/lib/souls/{generate → api/generate}/application.rb

@@ -1,5 +1,5 @@
 module Souls
-  module Generate
+  module Api::Generate
     ## Common Methods
     def self.generated_paths(class_name: "user")
       singularized_class_name = class_name.singularize.underscore
@@ -116,6 +116,14 @@ module Souls
       raise(StandardError, e)
     end
 
+    def self.migrate_all
+      puts(Paint["Let's Go SOULs AUTO CRUD Assist!\n", :cyan])
+      Souls::Api::Generate.get_tables.each do |table|
+        Souls::Api::Generate.migrate(class_name: table.singularize)
+        puts(Paint["Generated #{table.camelize} CRUD Files\n", :yellow])
+      end
+    end
+
     def self.delete_all(class_name: "souls")
       singularized_class_name = class_name.singularize.underscore
       pluralized_class_name = class_name.pluralize.underscore

data/lib/souls/{generate → api/generate}/connection.rb

@@ -1,5 +1,5 @@
 module Souls
-  module Generate
+  module Api::Generate
     def self.connection(class_name: "souls")
       file_dir = "./app/graphql/types/connections/"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)

data/lib/souls/{generate → api/generate}/edge.rb

@@ -1,5 +1,5 @@
 module Souls
-  module Generate
+  module Api::Generate
     def self.edge(class_name: "souls")
       file_dir = "./app/graphql/types/edges"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)

data/lib/souls/api/generate/migration.rb

@@ -0,0 +1,10 @@
+module Souls
+  module Api
+    module Migration
+      def self.create_migration(class_name: "user")
+        pluralized_class_name = class_name.underscore.pluralize
+        system("rake db:create_migration NAME=create_#{pluralized_class_name}")
+      end
+    end
+  end
+end

data/lib/souls/api/generate/model.rb

@@ -0,0 +1,24 @@
+module Souls
+  module Api
+    module Generate
+      ## Generate Model
+      def self.model(class_name: "souls")
+        file_dir = "./app/models/"
+        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+        file_path = "#{file_dir}#{class_name.singularize}.rb"
+        return "Model already exist! #{file_path}" if File.exist?(file_path)
+
+        File.open(file_path, "w") do |f|
+          f.write(<<~TEXT)
+            class #{class_name.camelize} < ActiveRecord::Base
+            end
+          TEXT
+        end
+        puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+        file_path
+      rescue StandardError => e
+        raise(StandardError, e)
+      end
+    end
+  end
+end

data/lib/souls/{generate → api/generate}/mutation.rb

@@ -1,5 +1,5 @@
 module Souls
-  module Generate
+  module Api::Generate
     ## Generate 4 Mutations - ["create", "update", "delete", "destroy_delete"]
     ## 1.Mutation - Create
     def self.create_mutation_head(class_name: "user")

data/lib/souls/{generate → api/generate}/policy.rb

@@ -1,5 +1,5 @@
 module Souls
-  module Generate
+  module Api::Generate
     ## Generate Policy
     def self.policy(class_name: "souls")
       dir_name = "./app/policies"

data/lib/souls/{generate → api/generate}/query.rb

@@ -1,5 +1,5 @@
 module Souls
-  module Generate
+  module Api::Generate
     ## Generate Query / Queries
     def self.create_queries(class_name: "souls")
       file_path = "./app/graphql/queries/#{class_name.pluralize}.rb"

data/lib/souls/{generate → api/generate}/resolver.rb

@@ -1,5 +1,5 @@
 module Souls
-  module Generate
+  module Api::Generate
     ## Generate Resolver
     def self.resolver_head(class_name: "souls")
       FileUtils.mkdir_p("./app/graphql/resolvers") unless Dir.exist?("./app/graphql/resolvers")
@@ -35,7 +35,6 @@ module Souls
               field = "[String]" if line.include?("array: true")
               type, name = get_type_and_name(line)
               field ||= type_check(type)
-              puts(line)
               case name
               when "user_id"
                 @user_exist = true
@@ -91,7 +90,9 @@ module Souls
 
               type, name = get_type_and_name(line)
               if line.include?("array: true")
-                new_line.write("      scope = scope.where(\"#{name} @> ARRAY[?]::text[]\", value[:#{name}]) if value[:#{name}]\n")
+                new_line.write(
+                  "      scope = scope.where(\"#{name} @> ARRAY[?]::text[]\", value[:#{name}]) if value[:#{name}]\n"
+                )
                 next
               end
               case name
@@ -99,7 +100,9 @@ module Souls
                 @user_exist = true
               when /$*_id\z/
                 @relation_params << name
-                new_line.write("      scope = scope.where(#{name}: decode_global_key(value[:#{name}])) if value[:#{name}]\n")
+                new_line.write(
+                  "      scope = scope.where(#{name}: decode_global_key(value[:#{name}])) if value[:#{name}]\n"
+                )
               when "created_at", "updated_at"
                 next
               else

data/lib/souls/{generate → api/generate}/rspec_factory.rb

@@ -1,5 +1,5 @@
 module Souls
-  module Generate
+  module Api::Generate
     ## Generate Rspec Factory
     def self.rspec_factory_head(class_name: "souls")
       file_path = "./spec/factories/#{class_name.pluralize}.rb"

data/lib/souls/{generate → api/generate}/rspec_model.rb

@@ -1,5 +1,5 @@
 module Souls
-  module Generate
+  module Api::Generate
     ## Generate Rspec Model
     def self.rspec_model(class_name: "souls")
       file_dir = "./spec/models/"

data/lib/souls/{generate → api/generate}/rspec_mutation.rb

@@ -1,5 +1,5 @@
 module Souls
-  module Generate
+  module Api::Generate
     ## Generate  Rspec Mutation
     def self.rspec_mutation_head(class_name: "souls")
       file_dir = "./spec/mutations/base/"
@@ -73,7 +73,9 @@ module Souls
           f.each_line.with_index do |line, _i|
             if @on
               if line.include?("t.index") || line.strip == "end"
-                new_line.write("        }) {\n            #{class_name.singularize.camelize(:lower)}Edge {\n          node {\n")
+                new_line.write(
+                  "        }) {\n            #{class_name.singularize.camelize(:lower)}Edge {\n          node {\n"
+                )
                 new_line.write("              id\n")
                 break
               end
@@ -85,17 +87,28 @@ module Souls
               when "user_id"
                 @user_exist = true
               when /$*_id\z/
-                new_line.write("          #{name.singularize.camelize(:lower)}: \"\#{#{class_name.singularize}[:#{name.singularize.underscore}]}\"\n")
+                camel = name.singularize.camelize(:lower)
+                new_line.write(
+                  "          #{camel}: \"\#{#{class_name.singularize}[:#{name.singularize.underscore}]}\"\n"
+                )
               else
                 case type
                 when "string", "text", "date", "datetime"
+                  camel = name.singularize.camelize(:lower)
+                  camels = name.pluralize.camelize(:lower)
                   if array_true
-                    new_line.write("          #{name.pluralize.camelize(:lower)}: \#{#{class_name.singularize}[:#{name.pluralize.underscore}]}\n")
+                    new_line.write(
+                      "          #{camels}: \#{#{class_name.singularize}[:#{name.pluralize.underscore}]}\n"
+                    )
                   else
-                    new_line.write("          #{name.singularize.camelize(:lower)}: \"\#{#{class_name.singularize}[:#{name.singularize.underscore}]}\"\n")
+                    new_line.write(
+                      "          #{camel}: \"\#{#{class_name.singularize}[:#{name.singularize.underscore}]}\"\n"
+                    )
                   end
                 when "bigint", "integer", "float", "boolean"
-                  new_line.write("          #{name.singularize.camelize(:lower)}: \#{#{class_name.singularize}[:#{name.singularize.underscore}]}\n")
+                  new_line.write(
+                    "          #{camel}: \#{#{class_name.singularize}[:#{name.singularize.underscore}]}\n"
+                  )
                 end
               end
             end

data/lib/souls/{generate → api/generate}/rspec_policy.rb

@@ -1,5 +1,5 @@
 module Souls
-  module Generate
+  module Api::Generate
     ## Generate Rspec Policy
     def self.rspec_policy(class_name: "souls")
       dir_name = "./spec/policies"

data/lib/souls/{generate → api/generate}/rspec_query.rb

@@ -1,5 +1,5 @@
 module Souls
-  module Generate
+  module Api::Generate
     ## Generate Rspec Query
     def self.rspec_query_head(class_name: "souls")
       file_dir = "./spec/queries/"

data/lib/souls/{generate → api/generate}/rspec_resolver.rb

@@ -1,5 +1,5 @@
 module Souls
-  module Generate
+  module Api::Generate
     ## Generate Rspec Resolver
     def self.rspec_resolver_head(class_name: "souls")
       file_dir = "./spec/resolvers/"

data/lib/souls/docker.rb

@@ -0,0 +1,5 @@
+require_relative "./docker/docker"
+module Souls
+  module Docker
+  end
+end

data/lib/souls/docker/docker.rb

@@ -0,0 +1,31 @@
+module Souls
+  module Docker
+    class << self
+      def 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 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
+    end
+  end
+end

data/lib/souls/gcloud.rb

@@ -2,6 +2,7 @@ require_relative "./gcloud/compute"
 require_relative "./gcloud/iam"
 require_relative "./gcloud/pubsub"
 require_relative "./gcloud/methods"
+require_relative "./gcloud/run"
 
 module Souls
   module Gcloud

data/lib/souls/gcloud/methods.rb

@@ -54,6 +54,12 @@ module Souls
           service_account = Souls.configuration.app
           project_id = Souls.configuration.project_id
           Souls::Gcloud.add_permissions(service_account: service_account, project_id: project_id)
+        when "run_list"
+          project_id = Souls.configuration.project_id
+          Souls::Gcloud.run_list(project_id: project_id)
+        when "run_awake"
+          app_name = Souls.configuration.app
+          Souls::Gcloud.run_awake(app_name: app_name)
         else
           raise(StandardError, "Wrong Method!")
         end

data/lib/souls/gcloud/run.rb

@@ -0,0 +1,16 @@
+module Souls
+  module Gcloud
+    class << self
+      def run_awake(app_name: "souls-app", url: "")
+        system(
+          "gcloud scheduler jobs create http #{app_name}-awake
+          --schedule '0,10,20,30,40,50 * * * *' --uri #{url} --http-method GET"
+        )
+      end
+
+      def run_list(project_id: "souls-app")
+        system("gcloud run services list --project #{project_id}")
+      end
+    end
+  end
+end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.7.10
+0.8.1

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.7.10
+0.8.1

data/lib/souls/worker.rb

@@ -0,0 +1 @@
+# worker

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.28.10
+  version: 0.29.1
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-09 00:00:00.000000000 Z
+date: 2021-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -101,34 +101,39 @@ files:
 - README.md
 - exe/souls
 - lib/souls.rb
+- lib/souls/api.rb
+- lib/souls/api/generate.rb
+- lib/souls/api/generate/application.rb
+- lib/souls/api/generate/connection.rb
+- lib/souls/api/generate/edge.rb
+- lib/souls/api/generate/migration.rb
+- lib/souls/api/generate/model.rb
+- lib/souls/api/generate/mutation.rb
+- lib/souls/api/generate/policy.rb
+- lib/souls/api/generate/query.rb
+- lib/souls/api/generate/resolver.rb
+- lib/souls/api/generate/rspec_factory.rb
+- lib/souls/api/generate/rspec_model.rb
+- lib/souls/api/generate/rspec_mutation.rb
+- lib/souls/api/generate/rspec_policy.rb
+- lib/souls/api/generate/rspec_query.rb
+- lib/souls/api/generate/rspec_resolver.rb
+- lib/souls/api/generate/type.rb
+- lib/souls/docker.rb
+- lib/souls/docker/docker.rb
 - lib/souls/gcloud.rb
 - lib/souls/gcloud/compute.rb
 - lib/souls/gcloud/iam.rb
 - lib/souls/gcloud/methods.rb
 - lib/souls/gcloud/pubsub.rb
-- lib/souls/generate.rb
-- lib/souls/generate/application.rb
-- lib/souls/generate/connection.rb
-- lib/souls/generate/edge.rb
-- lib/souls/generate/methods.rb
-- lib/souls/generate/model.rb
-- lib/souls/generate/mutation.rb
-- lib/souls/generate/policy.rb
-- lib/souls/generate/query.rb
-- lib/souls/generate/resolver.rb
-- lib/souls/generate/rspec_factory.rb
-- lib/souls/generate/rspec_model.rb
-- lib/souls/generate/rspec_mutation.rb
-- lib/souls/generate/rspec_policy.rb
-- lib/souls/generate/rspec_query.rb
-- lib/souls/generate/rspec_resolver.rb
-- lib/souls/generate/type.rb
+- lib/souls/gcloud/run.rb
 - lib/souls/init.rb
 - lib/souls/release.rb
 - lib/souls/release/methods.rb
 - lib/souls/version.rb
 - lib/souls/versions/.souls_api_version
 - lib/souls/versions/.souls_worker_version
+- lib/souls/worker.rb
 homepage: https://souls.elsoul.nl
 licenses:
 - Apache-2.0

data/lib/souls/generate/methods.rb

@@ -1,64 +0,0 @@
-module Souls
-  module Generate
-    class << self
-      def return_method(args)
-        graphql_class = args[1]
-        class_name = args[2]
-        case graphql_class
-        when "test_dir"
-          Souls::Generate.test_dir
-        when "model"
-          Souls::Generate.model(class_name: class_name)
-        when "mutation"
-          Souls::Generate.mutation(class_name: class_name)
-        when "query"
-          Souls::Generate.query(class_name: class_name)
-        when "type"
-          Souls::Generate.type(class_name: class_name)
-        when "edge"
-          Souls::Generate.edge(class_name: class_name)
-        when "connection"
-          Souls::Generate.connection(class_name: class_name)
-        when "resolver"
-          Souls::Generate.resolver(class_name: class_name)
-        when "policy"
-          Souls::Generate.policy(class_name: class_name)
-        when "rspec_factory"
-          Souls::Generate.rspec_factory(class_name: class_name)
-        when "rspec_model"
-          Souls::Generate.rspec_model(class_name: class_name)
-        when "rspec_mutation"
-          Souls::Generate.rspec_mutation(class_name: class_name)
-        when "rspec_query"
-          Souls::Generate.rspec_query(class_name: class_name)
-        when "rspec_resolver"
-          Souls::Generate.rspec_resolver(class_name: class_name)
-        when "rspec_policy"
-          Souls::Generate.rspec_policy(class_name: class_name)
-        when "node_type"
-          Souls::Generate.node_type(class_name: class_name)
-        when "job"
-          Souls::Generate.job(class_name: class_name)
-        when "migrate"
-          Souls::Generate.migrate(class_name: class_name)
-        when "migrate_all"
-          puts(Paint["Let's Go SOULs AUTO CRUD Assist!\n", :cyan])
-          Souls::Generate.get_tables.each do |table|
-            Souls::Generate.migrate(class_name: table.singularize)
-            puts(Paint["Generated #{table.camelize} CRUD Files\n", :yellow])
-          end
-        when "migration"
-          pluralized_class_name = class_name.underscore.pluralize
-          system("rake db:create_migration NAME=create_#{pluralized_class_name}")
-        when "update"
-          Souls::Generate.update_delete(class_name: class_name)
-          Souls::Generate.migrate(class_name: class_name)
-        when "worker"
-          Souls::Init.download_worker
-        else
-          "SOULs!"
-        end
-      end
-    end
-  end
-end

data/lib/souls/generate/model.rb

@@ -1,22 +0,0 @@
-module Souls
-  module Generate
-    ## Generate Model
-    def self.model(class_name: "souls")
-      file_dir = "./app/models/"
-      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
-      file_path = "#{file_dir}#{class_name.singularize}.rb"
-      return "Model already exist! #{file_path}" if File.exist?(file_path)
-
-      File.open(file_path, "w") do |f|
-        f.write(<<~TEXT)
-          class #{class_name.camelize} < ActiveRecord::Base
-          end
-        TEXT
-      end
-      puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
-      file_path
-    rescue StandardError => e
-      raise(StandardError, e)
-    end
-  end
-end