souls 0.34.0 → 0.35.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 57d030af03262c0c43a17ca994c3d9c8749c86b82559cc6ab8671e116dd4d2cb
-  data.tar.gz: b811181cd1a1d8403c5d8b4891b2ef53a1f0ca3afaaa872267aa5e427a85f40c
+  metadata.gz: b8625ab69f5ec380190e85dab85d3f009bad3491fdd918bfa8a005638ef6ddf6
+  data.tar.gz: e5cc98017cf840f7949ed4d874e034873003037b14a55404c8a2b371bbca2ae0
 SHA512:
-  metadata.gz: a0a1e0d953f4f11e1b9ab492b1fd87eab1f9f2626b6a86ef76976af41c1954e41d9e2c8e005ec414f891beab88cc3ad340e8d7b48a4485383f23193549c9866f
-  data.tar.gz: 3e6a4f9cf9ab8921505e8afb7aa69eac5d5f2cacd1ea1cbc29cf65310d1ee92d80d64f7af8163970b6ac0b1ce2116b80b189d619965fe3b07942aa39f2c34648
+  metadata.gz: 9fddd29570fb4b28f582a2b7cae62526937ffc6d62317b88a3557c13745894127175974a6a67b6fe605947afaf48c97122c7c892e4999a374c5c792a0e030e97
+  data.tar.gz: 7b77d8ce7a9a246f3559de23c140898a4eb28c61904063eec0a4b5afb2ebeea83460d84053ffece3dcfc863f3bd1bcc48fe0f1f03f18c983a1f25116b3666406

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

@@ -0,0 +1,67 @@
+module Souls
+  module Gcloud
+    module Compute
+      class << self
+        def create_network(app_name: "")
+          app_name = Souls.configuration.app if app_name.blank?
+          system("gcloud compute networks create #{app_name}")
+        end
+
+        def create_firewall_tcp(app_name: "", range: "10.124.0.0/28")
+          app_name = Souls.configuration.app if app_name.blank?
+          system(
+            "gcloud compute firewall-rules create #{app_name} \
+                  --network #{app_name} --allow tcp,udp,icmp --source-ranges #{range}"
+          )
+        end
+
+        def create_firewall_ssh(app_name: "")
+          app_name = Souls.configuration.app if app_name.blank?
+          system(
+            "gcloud compute firewall-rules create #{app_name}-ssh --network #{app_name} \
+            --allow tcp:22,tcp:3389,icmp"
+          )
+        end
+
+        def create_subnet(app_name: "", region: "asia-northeast1", range: "10.124.0.0/28")
+          app_name = Souls.configuration.app if app_name.blank?
+          system(
+            "gcloud compute networks subnets create #{app_name}-subnet
+            --range=#{range} --network=#{app_name} --region=#{region}"
+          )
+        end
+
+        def create_connector(app_name: "", region: "asia-northeast1")
+          app_name = Souls.configuration.app if app_name.blank?
+          project_id = Souls.configuration.app if project_id.blank?
+          system(
+            "gcloud compute networks vpc-access connectors create #{app_name}-connector \
+              --region=#{region} \
+              --subnet-project=#{project_id} \
+              --subnet=#{app_name}-subnet"
+          )
+        end
+
+        def create_external_ip(app_name: "", region: "asia-northeast1")
+          app_name = Souls.configuration.app if app_name.blank?
+          system("gcloud compute addresses create #{app_name}-worker-ip --region=#{region}")
+        end
+
+        def create_nat(app_name: "", region: "asia-northeast1")
+          app_name = Souls.configuration.app if app_name.blank?
+          system(
+            "gcloud compute routers nats create #{app_name}-worker-nat \
+                  --router=#{app_name}-router \
+                  --region=#{region} \
+                  --nat-custom-subnet-ip-ranges=#{app_name}-subnet \
+                  --nat-external-ip-pool=#{app_name}-worker-ip"
+          )
+        end
+
+        def network_list
+          system("gcloud compute network list")
+        end
+      end
+    end
+  end
+end

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

@@ -28,7 +28,7 @@ module Souls
           end
           key = text.join(",").gsub(/^,/, "").chomp!
           github_repo = `git remote show origin -n | grep 'Fetch URL:' | awk '{print $3}'`.strip
-          github_repo = "https://github.com/#{github_repo.match(/\:(.+).git/)[1]}" if github_repo.include?("git@github")
+          github_repo = "https://github.com/#{github_repo.match(/:(.+).git/)[1]}" if github_repo.include?("git@github")
           puts(Paint[key, :white])
           puts(Paint["======= above（ここまで）=======", :cyan])
           github_secret_url = "#{github_repo}/settings/secrets/actions"
@@ -53,7 +53,9 @@ module Souls
           FileUtils.rm(file_path)
         end
 
-        def add_service_account_role(service_account: "souls-app", project_id: "souls-app", role: "roles/firebase.admin")
+        def add_service_account_role(
+          service_account: "souls-app", project_id: "souls-app", role: "roles/firebase.admin"
+        )
           system(
             "gcloud projects add-iam-policy-binding #{project_id} \
           --member='serviceAccount:#{service_account}@#{project_id}.iam.gserviceaccount.com' \

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

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

data/lib/souls/cli/sync/model.rb

@@ -42,9 +42,10 @@ module Souls
         else
           api_file_data = file_diff(Dir["#{api_dir}/*.rb"])
           worker_file_data = file_diff(Dir["#{worker_dir}/*.rb"])
-
-          api_latest_date = Time.parse(api_file_data.max)
-          worker_latest_date = Time.parse(worker_file_data.max)
+          # rubocop:disable Style/DateTime
+          api_latest_date = DateTime.parse(api_file_data.max)
+          worker_latest_date = DateTime.parse(worker_file_data.max)
+          # rubocop:enable Style/DateTime
         end
 
         if api_latest_date < worker_latest_date
@@ -57,7 +58,7 @@ module Souls
           system("cp -r #{api_dir}/* #{worker_dir}")
         end
       rescue StandardError => e
-        puts(Paint["`souls api g scaffold $model` at `api` dir first!", :red])
+        puts(Paint[e, :red])
       end
 
       def get_models_path(service_name: "api")

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.13.0
+0.14.1

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.13.0
+0.14.1

data/lib/souls/worker/generate/index.rb

@@ -1,2 +1,2 @@
 require_relative "./mailer"
-require_relative "./mutation"
+require_relative "./mutation"

metadata

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.34.0
+  version: 0.35.1
 platform: ruby
 authors:
 - POPPIN-FUMI
 - KishiTheMechanic
 - James Neve
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-08-29 00:00:00.000000000 Z
+date: 2021-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -126,6 +126,7 @@ files:
 - lib/souls/api/update/rspec_resolver.rb
 - lib/souls/api/update/type.rb
 - lib/souls/cli/docker/index.rb
+- lib/souls/cli/gcloud/compute/index.rb
 - lib/souls/cli/gcloud/iam/index.rb
 - lib/souls/cli/gcloud/index.rb
 - lib/souls/cli/gcloud/pubsub/index.rb
@@ -145,7 +146,6 @@ files:
 - lib/souls/version.rb
 - lib/souls/versions/.souls_api_version
 - lib/souls/versions/.souls_worker_version
-- lib/souls/worker/generate.rb
 - lib/souls/worker/generate/index.rb
 - lib/souls/worker/generate/mailer.rb
 - lib/souls/worker/generate/mutation.rb
@@ -157,7 +157,7 @@ metadata:
   homepage_uri: https://souls.elsoul.nl
   source_code_uri: https://github.com/elsoul/souls
   changelog_uri: https://github.com/elsoul/souls
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -173,7 +173,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.2.22
-signing_key:
+signing_key: 
 specification_version: 4
 summary: SOULs はサーバーレスフルスタックフレームワークです。柔軟な Ruby GraphQL API と Worker はルーティングの必要がありません。
   クラウド環境への自動デプロイ、CI/CD ワークフローを標準装備。開発者がビジネスロジックに集中し、楽しくコードが書けるような環境を目指しています。