souls 1.14.1 → 1.15.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 86e9a0ba6f61532e0ceb30f68cbf47445b84e53c034366f287cb514be8c50bcb
-  data.tar.gz: 01a9ad3ff6c9d73633041cd4f4befc197adf1bfefb55208cfb6793a27010ef9a
+  metadata.gz: 807459b9a18818a0fb8f2db3a254ac6de39434cffe7b64b99c4518489e3f87f6
+  data.tar.gz: 0f14f0961aa529b3ce62d0dbbe9ab1ebc05274c4938f744f0d64339d8dc36c10
 SHA512:
-  metadata.gz: 5474dc7a392e012288a6db34b0f1a960a0c2452649a1b9146f8515aea9352fa4c67d30fb447fc388bbcb83260d665c2301edf23a608d214643ec970f37af5d12
-  data.tar.gz: 49804c5f3b4b2ce9cf35290e948c8b3663c13a9f0b0b0791d5af1ae73b9966bf6d4675a015521327993bb2770acb35361b3815d74bdff929db7c9f8e20ba6cf7
+  metadata.gz: 6cb682da5011c6621d48bb3e463f0aa376fe4f96194b509b9fccc8d01ba1522749a38e3cb09fdf857f8b8c3ec3b565576ae3f575e3008c9e0fe6c5eae627fa42
+  data.tar.gz: 8716a72aafd55cb84feb4bf18074157cc26e3b59f2e3e8688c488259acecac1ff00b025f3c578351cf4034f99de9266b28e4400034c55c914c049e25953a1b4f

data/README.md

@@ -52,10 +52,11 @@ Powered by Ruby GraphQL, RBS/Steep, Active Record, RSpec, RuboCop, and Google Cl
 
 ![SOULs Architecture](https://souls.elsoul.nl/imgs/docs/SOULs-architecture.jpg)
 
-SOULs creates 2 types of App.
+SOULs creates 3 types of App.
 
 1. API - GraphQL (Ruby) - Simple API - Cloud Run
 2. Worker - Google Pub/Sub Messaging Worker API (Ruby) - Cloud Run
+3. Functions - Google Cloud Functions
 
 ## Ruby type checking
 The SOULs framework uses RBS / Steep, which appeared in Ruby 3.0.
@@ -85,6 +86,7 @@ It is a development environment where you can immediately notice the mistakes th
 ## Cloud Infrastructure
 
 - [Google Cloud Run](https://cloud.google.com/run)
+- [Google Cloud Functions](https://cloud.google.com/functions)
 - [Google Cloud SQL](https://cloud.google.com/sql)
 - [Google Cloud Pub/Sub](https://cloud.google.com/pubsub)
 - [Google Cloud Storage](https://cloud.google.com/run)

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

@@ -1,11 +1,13 @@
 require_relative "./template/functions_app"
 require_relative "./template/functions_gemfile"
+require_relative "./template/functions_env_yaml"
 module Souls
   class Create < Thor
     desc "functions", "Create SOULs functions"
     def functions
       create_app_file
       create_gemfile
+      create_env_yaml
     end
 
     private
@@ -31,5 +33,16 @@ module Souls
       Souls::Painter.create_file(file_path)
       file_path
     end
+
+    def create_env_yaml
+      file_dir = "./apps/functions"
+      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)
+
+      File.write(file_path, Template.functions_env_yaml)
+      Souls::Painter.create_file(file_path)
+      file_path
+    end
   end
 end

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

@@ -4,7 +4,6 @@ module Template
       require "functions_framework"
       require "sinatra/base"
       require "dotenv/load"
-      require "souls"
 
       class App < Sinatra::Base
         get "/souls-functions-get/:name" do

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

@@ -0,0 +1,8 @@
+module Template
+  def self.functions_env_yaml
+    <<~ENV
+      FOO: bar
+      BAZ: boo
+    ENV
+  end
+end

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

@@ -6,7 +6,6 @@ module Template
       gem "dotenv", "2.7.6"
       gem "functions_framework", "~> 0.7"
       gem "sinatra", "2.1.0"
-      gem "souls", "#{Souls::VERSION}"
 
     GEMFILE
   end

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

@@ -8,12 +8,26 @@ module Souls
         system(
           "
           gcloud functions deploy souls_functions --project=#{project_id} \
-          --runtime ruby27 --trigger-http --allow-unauthenticated
+          --runtime ruby27 --trigger-http --allow-unauthenticated --env-vars-file .env.yaml
           "
         )
       end
     end
 
+    desc "describe", "Describe SOULs Functions"
+    def describe
+      require(Souls.get_mother_path.to_s + "/config/souls")
+      project_id = Souls.configuration.project_id
+      system("gcloud functions describe souls_functions --project=#{project_id}")
+    end
+
+    desc "url", "Get SOULs Functions URL"
+    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")
+    end
+
     desc "dev", "Check SOULs Functions dev"
     def dev
       Dir.chdir(Souls.get_functions_path.to_s) do

data/lib/souls/cli/generate/resolver_rbs.rb

@@ -12,22 +12,24 @@ module Souls
 
         File.open(file_path, "w") do |f|
           f.write(<<~TEXT)
-            class BaseResolver
-            end
-            class #{singularized_class_name.camelize}Search < BaseResolver
-              include SearchObject
-              def self.scope: () ?{ () -> nil } -> [Hash[Symbol, untyped]]
-              def self.type: (*untyped) -> String
-              def self.option: (:filter, type: untyped, with: :apply_filter) -> String
-              def self.description: (String) -> String
-              def self.types: (*untyped) -> String
-              def decode_global_key: (String value) -> Integer
-              def apply_filter: (untyped scope, untyped value) -> untyped
+            module Resolvers
+              class BaseResolver
+              end
+              class #{singularized_class_name.camelize}Search < BaseResolver
+                include SearchObject
+                def self.scope: () ?{ () -> nil } -> [Hash[Symbol, untyped]]
+                def self.type: (*untyped) -> String
+                def self.option: (:filter, type: untyped, with: :apply_filter) -> String
+                def self.description: (String) -> String
+                def self.types: (*untyped) -> String
+                def decode_global_key: (String value) -> Integer
+                def apply_filter: (untyped scope, untyped value) -> untyped
 
-              class #{singularized_class_name.camelize}Filter < Souls::Types::BaseInputObject
-                String: String
-                Boolean: Boolean
-                Integer: Integer
+                class #{singularized_class_name.camelize}Filter
+                  String: String
+                  Boolean: Boolean
+                  Integer: Integer
+                end
               end
             end
           TEXT

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

@@ -135,7 +135,7 @@ module Souls
           gem "rake", "13.0.6"
           gem "rspec", "3.10.0"
           gem "rubocop", "1.22.3"
-          gem "sinatra-activerecord", "2.0.23"
+          gem "sinatra-activerecord", "2.0.25"
           gem "solargraph", "0.44.0"
           #{souls_gem}
           gem "steep", "0.46.0"

data/lib/souls/utils/index.rb

@@ -1,9 +1,10 @@
 module Souls
   module Utils
     def get_mother_path
-      file_array = Dir.pwd.split("/")
+      current_dir = Dir.pwd
+      file_array = current_dir.split("/")
       mother_dir_num = file_array.rindex("apps")
-      mother_dir_num ? file_array.slice(mother_dir_num).join("/") : file_array.join("/")
+      mother_dir_num ? file_array.each_slice(mother_dir_num).to_a[0].join("/") : current_dir
     end
 
     def get_functions_path

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-1.14.1
+1.15.1

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-1.14.1
+1.15.1

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 1.14.1
+  version: 1.15.1
 platform: ruby
 authors:
 - POPPIN-FUMI
 - KishiTheMechanic
 - James Neve
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-12-24 00:00:00.000000000 Z
+date: 2021-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -177,6 +177,7 @@ files:
 - 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/db/create_migration.rb
 - lib/souls/cli/db/create_migration_rbs.rb
@@ -277,7 +278,7 @@ licenses:
 - Apache-2.0
 metadata:
   rubygems_mfa_required: 'true'
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -293,7 +294,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.32
-signing_key: 
+signing_key:
 specification_version: 4
 summary: Ruby Serverless Framework 'SOULs' | Ruby サーバーレスフレームワーク SOULs. Powered by
   Ruby GraphQL, RBS/Steep, Active Record, RSpec, RuboCop, and Google Cloud.