souls 3.0.8 → 4.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a8b84646e09108a623ef8af9e847d0b265199214efb36835682862e4c6c1da1
-  data.tar.gz: 6ffb000ccc19a5d45abcc129b070efb7604f6a9d38d7baa40882c5bdc41b0509
+  metadata.gz: 2f7e78a0d34d033b5195daf0a5ed7aecad41eadead327bbcfcbafbd1db678c44
+  data.tar.gz: 9400d82655bb2960b8ad6b3638a9bfcddc87cff88657bd0dbedb76df7e74f327
 SHA512:
-  metadata.gz: 5d1aea6963e33b11a1473ceab5864b6b80a5a4a3bf2e39b006154eaa1a4830cd9c967c22c531178981c3b855c1bb007cbfb0ce36d96851dd4e423101657f806d
-  data.tar.gz: d93b11bc98946d5b2e3acb61d5658974acb0967c1b6bcddb96df2a0bf15bfcbc74e6dec988799c112d4159645ecfa555d1c520d528b0cd4b3ade73d51e84d01f
+  metadata.gz: 457b3830e6dff28fcaae7db2e7d7cfe45ab9baa5b540307197549902fc3c33045bf8de89fa576a30669aa45a89724a595496c883a8de4ba34ada6754e6cea569
+  data.tar.gz: b9fc560fd7c268925921c42a84ae344e1e5ecbd921ef42a4076fc22d1d41c2a406afbf288b41396429f281bea40f4ba53d824b36d8987e70084940c204f6272a

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

@@ -134,29 +134,6 @@ end
               - name: Set up Cloud SDK
                 uses: google-github-actions/setup-gcloud@v0
 
-              - name: Build and test with Rake
-                env:
-                  PGHOST: 127.0.0.1
-                  PGUSER: postgres
-                  RACK_ENV: test
-                  RUBY_YJIT_ENABLE: 1
-                  SOULS_GCP_PROJECT_ID: ${{ secrets.SOULS_GCP_PROJECT_ID }}
-                run: |
-                  sudo apt-get -yqq install libpq-dev
-                  cd apps/#{worker_name}
-                  rm -f .env
-                  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: Sync PubSub
-                run: cd apps/#{worker_name} && souls sync pubsub
-
-              - name: Sync Tasks
-                run: cd apps/#{worker_name} && souls gcloud scheduler sync_schedules --timezone=${{ secrets.TZ }}
-
               - name: Configure Docker
                 run: gcloud auth configure-docker --quiet
 
@@ -178,12 +155,6 @@ end
                       --quiet \\
                       --concurrency=80 \\
                       --port=8080 \\
-                      --set-cloudsql-instances=${{ secrets.SOULS_GCLOUDSQL_INSTANCE }} \\
-                      --set-env-vars="SOULS_DB_USER=${{ secrets.SOULS_DB_USER }}" \\
-                      --set-env-vars="SOULS_DB_PW=${{ secrets.SOULS_DB_PW }}" \\
-                      --set-env-vars="SOULS_DB_HOST=${{ secrets.SOULS_DB_HOST }}" \\
-                      --set-env-vars="TZ=${{ secrets.TZ }}" \\
-                      --set-env-vars="SOULS_SECRET_KEY_BASE=${{ secrets.SOULS_SECRET_KEY_BASE }}" \\
                       --set-env-vars="SOULS_GCP_PROJECT_ID=${{ secrets.SOULS_GCP_PROJECT_ID }}" \\
                       --set-env-vars="RUBY_YJIT_ENABLE=1"
         TEXT
@@ -252,11 +223,10 @@ end
       endroll = <<~TEXT
         Easy to Run
         $ cd apps/#{worker_name}
-        $ souls sync model
         $ souls s
-        Go To : http://localhost:3000/playground
+        Go To : http://localhost:3000
 
-        Doc: https://souls.elsoul.nl
+        Doc: https://souls.el-soul.com/
       TEXT
       cd = Paint[endroll, :white]
       puts(cd)

data/lib/souls/cli.rb

@@ -55,6 +55,11 @@ module SOULs
       system("bundle exec rspec")
     end
 
+    desc "secret", "Generate Secure Random String"
+    def secret
+      puts(SecureRandom.alphanumeric(85))
+    end
+
     desc "build", "Run Docker Build"
     def build
       app = SOULs.configuration.app
@@ -65,8 +70,7 @@ module SOULs
     def tag
       souls_config = SOULs.configuration
       app = souls_config.app
-      region = souls_config.region
-      gcr = region_to_container_url(region:)
+      gcr = souls_config.gcr_region
       project_id = souls_config.project_id
       system("docker tag #{app}:latest #{gcr}/#{project_id}/#{app}:latest")
     end
@@ -75,8 +79,7 @@ module SOULs
     def push
       souls_config = SOULs.configuration
       app = souls_config.app
-      region = souls_config.region
-      gcr = region_to_container_url(region:)
+      gcr = souls_config.gcr_region
       project_id = souls_config.project_id
       system("docker push #{gcr}/#{project_id}/#{app}:latest")
     end

data/lib/souls/version.rb

@@ -1,4 +1,4 @@
 module SOULs
-  VERSION = "3.0.8".freeze
+  VERSION = "4.0.1".freeze
   public_constant :VERSION
 end

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-3.0.8
+4.0.1

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-3.0.8
+4.0.1

data/lib/souls.rb

@@ -40,5 +40,19 @@ module SOULs
     def instance_name
       "souls-#{@app}-db"
     end
+
+    def gcr_region
+      if @region.include?("asia")
+        "asia.gcr.io"
+      elsif @region.include?("eu")
+        "eu.gcr.io"
+      else
+        "gcr.io"
+      end
+    end
+
+    def gcp_db_host
+      "/cloudsql/#{@project_id}:#{@region}:#{instance_name}"
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 3.0.8
+  version: 4.0.1
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-09-01 00:00:00.000000000 Z
+date: 2022-09-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport