RubyGems - souls - Versions diffs - 0.35.3 → 0.36.2 - Mend

souls 0.35.3 → 0.36.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (13) hide show

checksums.yaml +4 -4
data/exe/souls +2 -1
data/lib/souls/cli/create/index.rb +219 -0
data/lib/souls/cli/gcloud/compute/index.rb +2 -2
data/lib/souls/cli/gcloud/index.rb +2 -0
data/lib/souls/cli/gcloud/run/index.rb +4 -0
data/lib/souls/cli/index.rb +4 -0
data/lib/souls/init.rb +2 -50
data/lib/souls/version.rb +1 -1
data/lib/souls/versions/.souls_api_version +1 -1
data/lib/souls/versions/.souls_worker_version +1 -1
data/lib/souls.rb +2 -1
metadata +6 -5

checksums.yaml CHANGED Viewed

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 45b858d0b8b28252dbc16a47b2a487cb5104904593b492692835eb2c6d12bf09
-  data.tar.gz: 850867fab6be599cacef8124056e95a92a6310724a03d1cdd7e1ce4241bca275
+  metadata.gz: 72bd5b4cded40b625ae03c8fc8a6e6cadb35bc41cd51d1ecbea455fb408b97f4
+  data.tar.gz: 1adce2db13e657ba9f602a65e8bc75742ac9f1200edb449b9f385bd55092a47d
 SHA512:
-  metadata.gz: fa8e7f5b3ea59f60440072b2feb50d194e2d3cc39f5a9f76acc51480b2faafce466f7f4f5654598a309d42be2db3941b57eb1267b019a2e2456cec907f884206
-  data.tar.gz: 38e38aae726f20d4e54a23cd62091e89f47c0a4f0a279f2d58b1b35e9733ca93b903bad50390e3617dda48599cc6a7e1664fbef9e96b5ff6cf1fa2fbb4129e37
+  metadata.gz: b12eafb2701ebfcc26cc0b770d2fe1c0ae93540d49ccffaa5393e0946520e87cfbbb13c110830a89f3d74e3d05f363633762102e7270ffa9f77171d487fcea1c
+  data.tar.gz: 13e8d4c8032e1901189fabec8907cb9425558f8946832570e85842cc92bc67cfd382ce5b35a3026012e1f61d0bdb971cccc40702e260b6c2e3979997aab08444

data/exe/souls CHANGED Viewed

@@ -151,7 +151,8 @@ begin
     service_name = ARGV[1]
     case service_name
     when "worker"
-      Souls::Init.download_worker
+      worker_name = ARGV[2]
+      Souls::Create.worker(worker_name: worker_name)
     else
       puts(Paint["Coming Soon...", :green])
     end

data/lib/souls/cli/create/index.rb ADDED Viewed

@@ -0,0 +1,219 @@
+module Souls
+  module Create
+    class << self
+      def worker(worker_name: "mailer")
+        workers = Souls.configuration.workers
+        port = 3000 + workers.size
+        download_worker(worker_name: worker_name)
+        souls_conf_update(worker_name: worker_name)
+        souls_conf_update(worker_name: worker_name, strain: "api")
+        workflow(worker_name: worker_name)
+        procfile(worker_name: worker_name, port: port)
+        mother_procfile(worker_name: worker_name)
+        souls_config_init(worker_name: worker_name)
+      end
+      def procfile(worker_name: "mailer", port: 3000)
+        file_dir = "apps/#{worker_name}"
+        file_path = "#{file_dir}/Procfile.dev"
+        File.open(file_path, "w") do |f|
+          f.write("web: bundle exec puma -p #{port} -e development")
+        end
+      end
+      def mother_procfile(worker_name: "mailer")
+        file_path = "Procfile.dev"
+        File.open(file_path, "a") do |f|
+          f.write("\n#{worker_name}: foreman start -f ./apps/#{worker_name}/Procfile")
+        end
+      end
+      def souls_conf_update(worker_name: "", strain: "mother")
+        workers = Souls.configuration.workers
+        port = 3000 + workers.size
+        file_path = strain == "mother" ? "config/souls.rb" : "apps/api/config/souls.rb"
+        new_file_path = "souls.rb"
+        worker_switch = false
+        File.open(new_file_path, "w") do |new_line|
+          File.open(file_path, "r") do |f|
+            f.each_line do |line|
+              worker_switch = true if line.include?("config.workers")
+              next if line.strip == "end"
+              new_line.write(line) unless worker_switch
+              next unless worker_switch
+              new_line.write("  config.workers = [\n")
+              workers.each do |worker|
+                new_line.write(<<-TEXT)
+    {
+      name: "#{worker[:name]}",
+      endpoint: "#{worker[:endpoint]}",
+      port: #{worker[:port]}
+    },
+                TEXT
+              end
+              break
+            end
+          end
+          new_line.write(<<-TEXT)
+    {
+      name: "#{worker_name}",
+      endpoint: "",
+      port: #{port}
+    }
+  ]
+end
+          TEXT
+        end
+        FileUtils.rm(file_path)
+        FileUtils.mv(new_file_path, file_path)
+      end
+      def workflow(worker_name: "")
+        file_dir = ".github/workflows"
+        FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+        file_path = "#{file_dir}/#{worker_name}.yml"
+        worker_name = worker_name.underscore
+        worker_name_camelize = worker_name.camelize
+        File.open(file_path, "w") do |f|
+          f.write(<<~TEXT)
+            name: #{worker_name_camelize}
+            on:
+              push:
+                branches:
+                  - master
+                paths:
+                  - "apps/#{worker_name}/**"
+                  - ".github/workflows/#{worker_name}.yml"
+            jobs:
+              build:
+                runs-on: ubuntu-20.04
+                services:
+                  db:
+                    image: postgres:13
+                    ports: ["5433:5432"]
+                    env:
+                      POSTGRES_PASSWORD: postgres
+                    options: >-
+                      --health-cmd pg_isready
+                      --health-interval 10s
+                      --health-timeout 5s
+                      --health-retries 5
+                steps:
+                - uses: actions/checkout@v2
+                - name: Set up Ruby 3.0
+                  uses: actions/setup-ruby@v1
+                  with:
+                    ruby-version: 3.0
+                - name: Build and test with Rake
+                  env:
+                    PGHOST: 127.0.0.1
+                    PGUSER: postgres
+                    RACK_ENV: test
+                  run: |
+                    sudo apt-get -yqq install libpq-dev
+                    cd apps/worker
+                    gem install bundler
+                    bundle install --jobs 4 --retry 3
+                    bundle exec rake db:create RACK_ENV=test
+                    bundle exec rake db:migrate RACK_ENV=test
+                    bundle exec rspec
+                - name: Checkout the repository
+                  uses: actions/checkout@v2
+                - name: GCP Authenticate
+                  uses: google-github-actions/setup-gcloud@master
+                  with:
+                    version: "323.0.0"
+                    project_id: ${{ secrets.GCP_PROJECT_ID }}
+                    service_account_key: ${{ secrets.GCP_SA_KEY }}
+                    export_default_credentials: true
+                - name: Configure Docker
+                  run: gcloud auth configure-docker --quiet
+                - name: Build Docker container
+                  run: docker build -f ./apps/#{worker_name}/Dockerfile ./apps/#{worker_name} -t gcr.io/${{ secrets.GCP_PROJECT_ID }}/${{secrets.APP_NAME}}-#{worker_name}
+                - name: Push to Container Resistory
+                  run: docker push gcr.io/${{ secrets.GCP_PROJECT_ID }}/${{secrets.APP_NAME}}-#{worker_name}
+                - name: Deploy to Cloud Run
+                  run: |
+                      gcloud run deploy ${{ secrets.APP_NAME }}-#{worker_name} \\
+                        --service-account=${{ secrets.APP_NAME }}@${{ secrets.GCP_PROJECT_ID }}.iam.gserviceaccount.com \\
+                        --image=gcr.io/${{ secrets.GCP_PROJECT_ID }}/${{secrets.APP_NAME}}-#{worker_name} \\
+                        --memory=4Gi \\
+                        --region=asia-northeast1 \\
+                        --allow-unauthenticated \\
+                        --platform=managed \\
+                        --quiet \\
+                        --concurrency=80 \\
+                        --port=8080 \\
+                        --set-cloudsql-instances=${{ secrets.GCLOUDSQL_INSTANCE }} \\
+                        --set-env-vars="DB_USER=${{ secrets.DB_USER }}" \\
+                        --set-env-vars="DB_PW=${{ secrets.DB_PW }}" \\
+                        --set-env-vars="DB_HOST=${{ secrets.DB_HOST }}" \\
+                        --set-env-vars="TZ=${{ secrets.TZ }}" \\
+                        --set-env-vars="SLACK=${{ secrets.SLACK }}" \\
+                        --set-env-vars="SECRET_KEY_BASE=${{ secrets.SECRET_KEY_BASE }}" \\
+                        --set-env-vars="PROJECT_ID=${{ secrets.GCP_PROJECT_ID }}"
+          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
+      def souls_config_init(worker_name: "mailer")
+        app_name = Souls.configuration.app_name
+        project_id = Souls.configuration.project_id
+        config_dir = "apps/#{worker_name}/config"
+        FileUtils.mkdir_p(config_dir) unless Dir.exist?(config_dir)
+        FileUtils.touch("#{config_dir}/souls.rb")
+        file_path = "#{config_dir}/souls.rb"
+        File.open(file_path, "w") do |f|
+          f.write(<<~TEXT)
+            Souls.configure do |config|
+              config.app = "#{app_name}"
+              config.project_id = "#{project_id}"
+              config.strain = "worker"
+              config.fixed_gems = ["excluded_gem"]
+              config.workers = []
+            end
+          TEXT
+        end
+      rescue StandardError => e
+        puts(e)
+      end
+      def download_worker(worker_name: "mailer")
+        raise(StandardError, "Can't use `worker` for worker. Change Name.") if worker_name == "worker"
+        current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
+        wrong_dir = %w[apps api worker]
+        if wrong_dir.include?(current_dir_name)
+          raise(StandardError, "You are at wrong directory!Go to Mother Directory!")
+        end
+        version = Souls.get_latest_version_txt(service_name: "worker").join(".")
+        file_name = "worker-v#{version}.tgz"
+        url = "https://storage.googleapis.com/souls-bucket/boilerplates/workers/#{file_name}"
+        system("curl -OL #{url}")
+        system("tar -zxvf ./#{file_name} -C ./apps/")
+        system("mv apps/worker apps/#{worker_name}")
+        system("cp ./apps/api/config/database.yml ./apps/#{worker_name}/config/")
+        FileUtils.rm(file_name)
+      end
+    end
+  end
+end

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

@@ -44,7 +44,7 @@ module Souls
         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?
+          project_id = Souls.configuration.project_id
           system(
             "gcloud compute networks vpc-access connectors create #{app_name}-connector \
               --region=#{region} \
@@ -73,7 +73,7 @@ module Souls
           system("gcloud compute network list")
         end
-        def nat_credit(app_name: "", worker_name: "mailer")
+        def nat_credit(app_name: "")
           app_name = Souls.configuration.app if app_name.blank?
           line = Paint["====================================", :yellow]
           puts("\n")

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

@@ -30,6 +30,8 @@ module Souls
         puts("Operating permission to containerregistry.googleapis.com")
         system("gcloud services enable run.googleapis.com")
         puts("Operating permission to run.googleapis.com")
+        system("gcloud services enable vpcaccess.googleapis.com")
+        puts("Operating permission to vpcaccess.googleapis.com")
       end
     end
     module Iam

data/lib/souls/cli/gcloud/run/index.rb CHANGED Viewed

@@ -14,6 +14,10 @@ module Souls
           project_id = Souls.configuration.project_id if project_id.blank?
           system("gcloud run services list --project #{project_id}")
         end
+        def get_endpoint(worker_name: "")
+          system("gcloud run services list | grep #{worker_name} | awk '{print $4}'")
+        end
       end
     end
   end

data/lib/souls/cli/index.rb CHANGED Viewed

@@ -1,3 +1,4 @@
+require_relative "./create/index"
 require_relative "./docker/index"
 require_relative "./gcloud/index"
 require_relative "./release/index"
@@ -5,6 +6,9 @@ require_relative "./sync/index"
 require_relative "./upgrade/index"
 module Souls
+  module Create
+  end
   module Docker
   end

data/lib/souls/init.rb CHANGED Viewed

@@ -44,6 +44,7 @@ module Souls
             config.project_id = "#{app_name}-project"
             config.strain = "api"
             config.fixed_gems = ["excluded_gem"]
+            config.workers = []
           end
         TEXT
       end
@@ -72,6 +73,7 @@ module Souls
             config.project_id = "#{app_name}-project"
             config.strain = "mother"
             config.fixed_gems = ["excluded_gem"]
+            config.workers = []
           end
         TEXT
       end
@@ -145,55 +147,5 @@ module Souls
       puts(cd)
       puts(line)
     end
-    def self.download_worker
-      current_dir_name = FileUtils.pwd.to_s.match(%r{/([^/]+)/?$})[1]
-      wrong_dir = %w[apps api worker]
-      raise(StandardError, "You are at wrong directory!Go to Mother Directory!") if wrong_dir.include?(current_dir_name)
-      version = Souls.get_latest_version_txt(service_name: "worker").join(".")
-      file_name = "worker-v#{version}.tgz"
-      url = "https://storage.googleapis.com/souls-bucket/boilerplates/workers/#{file_name}"
-      system("curl -OL #{url}")
-      system("mkdir -p ./apps/worker")
-      system("tar -zxvf ./#{file_name} -C ./apps/")
-      system("cp ./apps/api/config/database.yml ./apps/worker/config/")
-      FileUtils.rm(file_name)
-      line = Paint["====================================", :yellow]
-      puts("\n")
-      puts(line)
-      txt2 = <<~TEXT
-           _____ ____  __  ____#{'        '}
-          / ___// __ \\/ / / / /   %{red1}
-          \\__ \\/ / / / / / / /   %{red2}
-         ___/ / /_/ / /_/ / /___%{red3}#{' '}
-        /____/\\____/\\____/_____%{red4}#{'  '}
-      TEXT
-      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["SOULs Worker Activated!", :white]
-      puts(welcome)
-      souls_ver = Paint["SOULs Version: #{Souls::VERSION}", :white]
-      puts(souls_ver)
-      puts(line)
-      endroll = <<~TEXT
-        Easy to Run
-        $ cd ./apps/worker
-        $ bundle
-        $ souls sync model
-        $ souls s
-        Go To : http://localhost:3000
-        Doc: https://souls.elsoul.nl
-      TEXT
-      cd = Paint[endroll, :white]
-      puts(cd)
-      puts(line)
-    end
   end
 end

data/lib/souls/version.rb CHANGED Viewed

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

data/lib/souls/versions/.souls_api_version CHANGED Viewed

	@@ -1 +1 @@
1	- 0.14.3
1	+ 0.15.2

data/lib/souls/versions/.souls_worker_version CHANGED Viewed

	@@ -1 +1 @@
1	- 0.14.3
1	+ 0.15.2

data/lib/souls.rb CHANGED Viewed

@@ -246,7 +246,7 @@ module Souls
   end
   class Configuration
-    attr_accessor :app, :strain, :project_id, :github_repo, :worker_endpoint, :fixed_gems
+    attr_accessor :app, :strain, :project_id, :github_repo, :worker_endpoint, :fixed_gems, :workers
     def initialize
       @app = nil
@@ -255,6 +255,7 @@ module Souls
       @github_repo = nil
       @worker_endpoint = nil
       @fixed_gems = nil
+      @workers = nil
     end
   end
 end

metadata CHANGED Viewed

@@ -1,16 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.35.3
+  version: 0.36.2
 platform: ruby
 authors:
 - POPPIN-FUMI
 - KishiTheMechanic
 - James Neve
-autorequire:
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-31 00:00:00.000000000 Z
+date: 2021-09-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -125,6 +125,7 @@ files:
 - lib/souls/api/update/rspec_mutation.rb
 - lib/souls/api/update/rspec_resolver.rb
 - lib/souls/api/update/type.rb
+- lib/souls/cli/create/index.rb
 - lib/souls/cli/docker/index.rb
 - lib/souls/cli/gcloud/compute/index.rb
 - lib/souls/cli/gcloud/iam/index.rb
@@ -157,7 +158,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 +174,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 ワークフローを標準装備。開発者がビジネスロジックに集中し、楽しくコードが書けるような環境を目指しています。