souls 1.15.3 → 1.16.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9426e9e79a7a5bf882620e9461b98eb81ad37a6be05b82b0c2e1835aa18cc2b2
-  data.tar.gz: 13d2e0a39a080a25fd46ea062e53729467d0a728b0008ca2ee1fe0858543a733
+  metadata.gz: 519f43da77592c6ab41222c6d6360c4714956a798eadc81ca366348728671bad
+  data.tar.gz: 112fba381d121ee4d6ea7cc553135ac3a75e99d2599b394c193c7eff24491f03
 SHA512:
-  metadata.gz: 794e8d507e9b99ffab00a394378a622c66b80eaa65ec8f34c7971125cf69201388a613e068b42141d30888c6cb3010e5bfaba371ab0bfa2fa9fabd6849d5cb4e
-  data.tar.gz: 07cd0a2b67d421a339f1fafec23d68a6d67ae35b79e4ddd36448eb0c77df40204b6a72f6fe738e38c983ca28def1df8005ac43df0d45443f5c73338a75c58210
+  metadata.gz: 4b87c00166c78b696858f3d1f5fee6a9efa9cf04423d8468b7a6f19e28a312170de538770b06655c747674b3792adf4b2f5040593cf153f2f76683a31f02d4ce
+  data.tar.gz: 615cb63fb293900589e113d418d5af710a9e34cf55494f76b287b2b597e64ff769c61af03582a63b58ed1315caa4e1192f5cb4d704bbc25daa545129cd898a45

data/lib/souls/cli/create/functions.rb

@@ -1,41 +1,57 @@
-require_relative "./template/functions_app"
-require_relative "./template/functions_gemfile"
-require_relative "./template/functions_env_yaml"
+require_relative "./templates/functions_env_yaml"
+
+Dir["#{Souls::SOULS_PATH}/lib/souls/cli/create/templates/*/*.rb"].map do |f|
+  require f
+end
+
 module Souls
   class Create < Thor
     desc "functions", "Create SOULs functions"
-    def functions
-      create_app_file
-      create_gemfile
-      create_env_yaml
-    end
+    def functions(function_name)
+      supported_languages = {
+        ruby: %w[2.6 2.7],
+        nodejs: %w[16 14 12 10],
+        python: %w[3.9 3.8 3.7],
+        go: ["1.16", "1.13"]
+      }
 
-    private
-
-    def create_app_file
-      file_dir = "./apps/functions"
+      prompt = TTY::Prompt.new
+      runtime = prompt.select("Select Runtime?", supported_languages.keys.map(&:to_s).map(&:camelize))
+      runtime_downcased = runtime.downcase
+      version = prompt.select("Select Version?", supported_languages[runtime.downcase.to_sym].sort.reverse)
+      version_string = "#{runtime_downcased}#{version.gsub('.', '')}"
+      runtime_methods = get_runtime_create_method(runtime: runtime_downcased)
+      file_dir = "./apps/cf_#{version_string}_#{function_name}"
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
-      file_path = "#{file_dir}/app.rb"
-      raise(StandardError, "Already Exist!") if File.exist?(file_path)
 
-      File.write(file_path, Template.functions_app)
-      Souls::Painter.create_file(file_path)
-      file_path
+      runtime_methods.each do |method|
+        file_extension =
+          case runtime_downcased
+          when "nodejs"
+            method == "package" ? "json" : "js"
+          when "python"
+            method == "requirements" ? "txt" : "py"
+          when "go"
+            method == "go" ? "mod" : "go"
+          else
+            "rb"
+          end
+        file_path =
+          if method == "gemfile"
+            "#{file_dir}/Gemfile"
+          else
+            "#{file_dir}/#{method}.#{file_extension}"
+          end
+        file_name = file_dir.gsub("./apps/", "")
+        File.write(file_path, Object.const_get("Template::#{runtime}").__send__(method, file_name))
+        Souls::Painter.create_file(file_path)
+      end
+      create_env_yaml(file_dir: file_dir)
     end
 
-    def create_gemfile
-      file_dir = "./apps/functions"
-      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
-      file_path = "#{file_dir}/Gemfile"
-      raise(StandardError, "Already Exist!") if File.exist?(file_path)
-
-      File.write(file_path, Template.functions_gemfile)
-      Souls::Painter.create_file(file_path)
-      file_path
-    end
+    private
 
-    def create_env_yaml
-      file_dir = "./apps/functions"
+    def create_env_yaml(file_dir:)
       FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
       file_path = "#{file_dir}/.env.yaml"
       raise(StandardError, "Already Exist!") if File.exist?(file_path)
@@ -44,5 +60,11 @@ module Souls
       Souls::Painter.create_file(file_path)
       file_path
     end
+
+    def get_runtime_create_method(runtime:)
+      Dir["#{Souls::SOULS_PATH}/lib/souls/cli/create/templates/#{runtime}/*"].map do |n|
+        n.split("/").last.gsub(".rb", "")
+      end
+    end
   end
 end

data/lib/souls/cli/create/templates/go/function.rb

@@ -0,0 +1,46 @@
+module Template
+  module Go
+    def self.function(file_name)
+      <<~APP
+        // Package p contains an HTTP Cloud Function.
+        package p
+
+        import (
+          "encoding/json"
+          "fmt"
+          "html"
+          "io"
+          "log"
+          "net/http"
+        )
+
+        // HelloWorld prints the JSON encoded "message" field in the body
+        // of the request or "Hello, World!" if there isn't one.
+        func #{file_name}(w http.ResponseWriter, r *http.Request) {
+          var d struct {
+            Message string `json:"message"`
+          }
+
+          if err := json.NewDecoder(r.Body).Decode(&d); err != nil {
+            switch err {
+            case io.EOF:
+              fmt.Fprint(w, "Hello World!")
+              return
+            default:
+              log.Printf("json.NewDecoder: %v", err)
+              http.Error(w, http.StatusText(http.StatusBadRequest), http.StatusBadRequest)
+              return
+            }
+          }
+
+          if d.Message == "" {
+            fmt.Fprint(w, "Hello World!")
+            return
+          }
+          fmt.Fprint(w, html.EscapeString(d.Message))
+        }
+
+      APP
+    end
+  end
+end

data/lib/souls/cli/create/templates/go/go.rb

@@ -0,0 +1,9 @@
+module Template
+  module Go
+    def self.go(_args)
+      <<~APP
+        module example.com/cloudfunction
+      APP
+    end
+  end
+end

data/lib/souls/cli/create/templates/nodejs/index.rb

@@ -0,0 +1,26 @@
+module Template
+  module Nodejs
+    def self.index(file_name)
+      <<~APP
+        const express = require('express');
+        const bodyParser = require('body-parser');
+
+        const app = express();
+        app.use(bodyParser.urlencoded({ extended: true }));
+
+        app.get('/souls-functions-get', (req, res)=>{
+          res.json(req.query)
+        });
+
+        app.get('/souls-functions-get/:id', (req, res)=>{
+          res.json(req.params)
+        });
+
+        app.post('/souls-functions-post', (req, res)=>{
+          res.json(req.body)
+        });
+        exports.#{file_name} = app;
+      APP
+    end
+  end
+end

data/lib/souls/cli/create/templates/nodejs/package.rb

@@ -0,0 +1,16 @@
+module Template
+  module Nodejs
+    def self.package(_args)
+      <<~PACKAGEJSON
+        {
+          "name": "souls-cf-node16",
+          "version": "0.0.1",
+          "dependencies": {
+            "express": "4.17.2",
+            "body-parser": "1.19.1"
+          }
+        }
+      PACKAGEJSON
+    end
+  end
+end

data/lib/souls/cli/create/templates/python/main.rb

@@ -0,0 +1,24 @@
+module Template
+  module Python
+    def self.main(file_name)
+      <<~APP
+        def #{file_name}(request):
+          """Responds to any HTTP request.
+          Args:
+              request (flask.Request): HTTP request object.
+          Returns:
+              The response text or any set of values that can be turned into a
+              Response object using
+              `make_response <http://flask.pocoo.org/docs/1.0/api/#flask.Flask.make_response>`.
+          """
+          request_json = request.get_json()
+          if request.args and 'message' in request.args:
+              return request.args.get('message')
+          elif request_json and 'message' in request_json:
+              return request_json['message']
+          else:
+              return f'Hello World!'
+      APP
+    end
+  end
+end

data/lib/souls/cli/create/templates/python/requirements.rb

@@ -0,0 +1,11 @@
+module Template
+  module Python
+    def self.requirements(_args)
+      <<~PACKAGEJSON
+        # Function dependencies, for example:
+        # package>=version
+
+      PACKAGEJSON
+    end
+  end
+end

data/lib/souls/cli/create/templates/ruby/gemfile.rb

@@ -0,0 +1,14 @@
+module Template
+  module Ruby
+    def self.gemfile(_args)
+      <<~GEMFILE
+        source "https://rubygems.org"
+
+        gem "dotenv", "2.7.6"
+        gem "functions_framework", "~> 0.7"
+        gem "sinatra", "2.1.0"
+
+      GEMFILE
+    end
+  end
+end

data/lib/souls/cli/create/templates/ruby/index.rb

@@ -0,0 +1,26 @@
+module Template
+  module Ruby
+    def self.index(file_name)
+      <<~APP
+        require "functions_framework"
+        require "sinatra/base"
+        require "dotenv/load"
+
+        class App < Sinatra::Base
+          get "/souls-functions-get/:name" do
+            "SOULs Functions Job Done! - \#{params['name']}"
+          end
+
+          post "/souls-functions-post" do
+            params = JSON.parse(request.body.read)
+            "SOULs Functions Job Done! - \#{params['name']}"
+          end
+        end
+
+        FunctionsFramework.http(\"#{file_name}\") do |request|
+          App.call(request.env)
+        end
+      APP
+    end
+  end
+end

data/lib/souls/cli/delete/connection.rb

@@ -6,7 +6,7 @@ module Souls
       singularized_class_name = class_name.underscore.singularize
       file_path = "#{file_dir}#{singularized_class_name}_connection.rb"
       FileUtils.rm_f(file_path)
-      puts(Paint % ["Delete file! : %{white_text}", :yellow, { white_text: [file_path.to_s, :white] }])
+      Souls::Painter.delete_file(file_path)
       file_path
     end
   end

data/lib/souls/cli/delete/edge_rbs.rb

@@ -7,7 +7,7 @@ module Souls
         singularized_class_name = class_name.underscore.singularize
         file_path = "#{file_dir}#{singularized_class_name}_edge.rbs"
         FileUtils.rm_f(file_path)
-        puts(Paint % ["Delete file! : %{white_text}", :yellow, { white_text: [file_path.to_s, :white] }])
+        Souls::Painter.delete_file(file_path)
         file_path
       end
     end

data/lib/souls/cli/gcloud/functions/index.rb

@@ -3,15 +3,19 @@ module Souls
     desc "deploy", "Deploy Cloud Functions"
     def deploy
       require(Souls.get_mother_path.to_s + "/config/souls")
-      project_id = Souls.configuration.project_id
-      Dir.chdir(Souls.get_functions_path.to_s) do
-        system(
-          "
-          gcloud functions deploy souls_functions --project=#{project_id} \
-          --runtime ruby27 --trigger-http --allow-unauthenticated --env-vars-file .env.yaml
-          "
-        )
+      current_dir = FileUtils.pwd.split("/").last
+      unless current_dir.match?(/^cf_/)
+        Souls::Painter.error("You are at wrong dir!\nPlease go to `apps/functions` dir!")
+        return false
       end
+
+      runtime = current_dir.match(/cf_(\D+\d+)_/)[1]
+      system(
+        "
+          gcloud functions deploy #{current_dir} --project=#{project_id} \
+          --runtime #{runtime} --trigger-http --allow-unauthenticated --env-vars-file .env.yaml
+          "
+      )
     end
 
     desc "describe", "Describe SOULs Functions"
@@ -25,13 +29,28 @@ module Souls
     def url
       require(Souls.get_mother_path.to_s + "/config/souls")
       project_id = Souls.configuration.project_id
-      system("gcloud functions describe souls_functions --project=#{project_id}| grep url")
+      current_dir = FileUtils.pwd.split("/").last
+      Souls::Painter.success(`gcloud functions describe #{current_dir} --project=#{project_id}| grep url`)
+    end
+
+    desc "all_url", "Get SOULs Functions All URL"
+    def all_url
+      require(Souls.get_mother_path.to_s + "/config/souls")
+      project_id = Souls.configuration.project_id
+      Dir.chdir(Souls.get_mother_path.to_s) do
+        souls_functions = Dir["apps/cf_*"]
+        cf_dir = souls_functions.map { |n| n.split("/").last }
+        cf_dir.each do |dir|
+          Souls::Painter.success(`gcloud functions describe #{dir} --project=#{project_id}| grep url`)
+        end
+      end
     end
 
     desc "dev", "Check SOULs Functions dev"
     def dev
       Dir.chdir(Souls.get_functions_path.to_s) do
-        system("bundle exec functions-framework-ruby --target souls_functions")
+        current_dir = FileUtils.pwd.split("/").last
+        system("bundle exec functions-framework-ruby --target #{current_dir}")
       end
     end
   end

data/lib/souls/cli/init/index.rb

@@ -73,7 +73,7 @@ module Souls
             config.region = "asia-northeast1"
             config.endpoint = "/endpoint"
             config.strain = "api"
-            config.fixed_gems = ["spring"]
+            config.fixed_gems = ["spring", "grpc"]
             config.workers = []
           end
         TEXT
@@ -121,7 +121,7 @@ module Souls
         f.write(<<~TEXT)
           source "https://rubygems.org"
 
-          gem "activesupport", "6.1.4.1"
+          gem "activesupport", "7.0.0"
           gem "foreman", "0.87.2"
           gem "google-cloud-pubsub", "2.9.0"
           gem "paint", "2.2.1"
@@ -129,11 +129,11 @@ module Souls
           gem "pg", "1.2.3"
           gem "rake", "13.0.6"
           gem "rspec", "3.10.0"
-          gem "rubocop", "1.22.3"
+          gem "rubocop", "1.24.1"
           gem "sinatra-activerecord", "2.0.25"
           gem "solargraph", "0.44.0"
           #{souls_gem}
-          gem "steep", "0.46.0"
+          gem "steep", "0.47.0"
           gem "thor", "1.1.0"
           gem "tty-prompt", "0.23.1"
           gem "whirly", "0.3.0"

data/lib/souls/cli/upgrade/gemfile.rb

@@ -17,8 +17,8 @@ module Souls
       tmp_file = "./config/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?
+      message = "Already Up to date!"
+      return "Already Up to date!" && Souls::Painter.warning(message) if new_gems[:gems].blank?
 
       @i = 0
       File.open(file_path, "r") do |f|
@@ -72,8 +72,7 @@ module Souls
       FileUtils.rm("./Gemfile.lock")
       FileUtils.mv("./config/Gemfile", "./Gemfile")
       system("bundle update")
-      success = Paint["\n\nSuccessfully Updated These Gems!\n", :green]
-      puts(success)
+      Souls::Painter.success("\n\nSuccessfully Updated These Gems!\n")
       logs.each do |line|
         puts(line)
       end
@@ -89,6 +88,7 @@ module Souls
         f.each_line do |line|
           from_dev = true if line.include?("group")
           next unless line.include?("gem ")
+          next if line.include?("require: ")
 
           gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
           url = URI("https://rubygems.org/api/v1/versions/#{gem[0]}/latest.json")

data/lib/souls/index.rb

@@ -1,4 +1,5 @@
 require_relative "./version"
+require_relative "./souls_path"
 require "thor"
 require "graphql"
 require "firebase_id_token"

data/lib/souls/souls_path.rb

@@ -0,0 +1,10 @@
+require "fileutils"
+module Souls
+  SOULS_PATH =
+    if FileUtils.pwd.split("/").last == "souls"
+      ".".freeze
+    else
+      "#{Gem.dir}/gems/souls-#{Souls::VERSION}".freeze
+    end
+  public_constant :SOULS_PATH
+end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.15.3
+1.16.1

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.15.3
+1.16.1

data/lib/souls.rb

@@ -3,7 +3,6 @@ require_relative "souls/cli"
 require "active_support/core_ext/string/inflections"
 require "date"
 require "json"
-require "fileutils"
 require "net/http"
 require "paint"
 require "whirly"
@@ -13,19 +12,6 @@ require "resolv"
 
 module Souls
   extend Souls::Utils
-  SOULS_METHODS = %w[
-    model
-    query
-    mutation
-    type
-    resolver
-    rspec_factory
-    rspec_model
-    rspec_query
-    rspec_mutation
-    rspec_resolver
-  ].freeze
-  public_constant :SOULS_METHODS
   class Error < StandardError; end
   class << self
     attr_accessor :configuration

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.15.3
+  version: 1.16.1
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-12-30 00:00:00.000000000 Z
+date: 2022-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -176,9 +176,15 @@ files:
 - lib/souls/cli/console/index.rb
 - lib/souls/cli/create/functions.rb
 - lib/souls/cli/create/index.rb
-- lib/souls/cli/create/template/functions_app.rb
-- lib/souls/cli/create/template/functions_env_yaml.rb
-- lib/souls/cli/create/template/functions_gemfile.rb
+- lib/souls/cli/create/templates/functions_env_yaml.rb
+- lib/souls/cli/create/templates/go/function.rb
+- lib/souls/cli/create/templates/go/go.rb
+- lib/souls/cli/create/templates/nodejs/index.rb
+- lib/souls/cli/create/templates/nodejs/package.rb
+- lib/souls/cli/create/templates/python/main.rb
+- lib/souls/cli/create/templates/python/requirements.rb
+- lib/souls/cli/create/templates/ruby/gemfile.rb
+- lib/souls/cli/create/templates/ruby/index.rb
 - lib/souls/cli/db/create_migration.rb
 - lib/souls/cli/db/create_migration_rbs.rb
 - lib/souls/cli/db/index.rb
@@ -269,6 +275,7 @@ files:
 - lib/souls/cli/upgrade/index.rb
 - lib/souls/cli/upgrade/submodule.rb
 - lib/souls/index.rb
+- lib/souls/souls_path.rb
 - lib/souls/utils/index.rb
 - lib/souls/version.rb
 - lib/souls/versions/.souls_api_version

data/lib/souls/cli/create/template/functions_app.rb

@@ -1,24 +0,0 @@
-module Template
-  def self.functions_app
-    <<~APP
-      require "functions_framework"
-      require "sinatra/base"
-      require "dotenv/load"
-
-      class App < Sinatra::Base
-        get "/souls-functions-get/:name" do
-          "SOULs Functions Job Done! - \#{params['name']}"
-        end
-
-        post "/souls-functions-post" do
-          params = JSON.parse(request.body.read)
-          "SOULs Functions Job Done! - \#{params['name']}"
-        end
-      end
-
-      FunctionsFramework.http("souls_functions") do |request|
-        App.call(request.env)
-      end
-    APP
-  end
-end

data/lib/souls/cli/create/template/functions_gemfile.rb

@@ -1,12 +0,0 @@
-module Template
-  def self.functions_gemfile
-    <<~GEMFILE
-      source "https://rubygems.org"
-
-      gem "dotenv", "2.7.6"
-      gem "functions_framework", "~> 0.7"
-      gem "sinatra", "2.1.0"
-
-    GEMFILE
-  end
-end