souls 0.17.4 → 0.17.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d75356f72b972890fc8381fc9b0bafeb5785fb8d6dcc7a6d7e20b4c2e6bba27
-  data.tar.gz: 2f91cc0387b40bb24f2cbc4ce95d9c8c60c51f32683472957b56d69ee942b111
+  metadata.gz: 163a0612fcb59636db008669eb27569e63fe1e4a3701fc211ae5ff92690be49e
+  data.tar.gz: 3850ab3b22daedd286886373963807e46af14040d7a021d6dedb9968801c40e0
 SHA512:
-  metadata.gz: f77af6d106b7d7fe8ea44d79902712e8f4121b98f3a15dff038fda23d54f518866485be26d8ff3455786386bd7cab4c47b0ffcf5825764656b660dc754f9f79d
-  data.tar.gz: dfc7a4779c8fc36341a56dc52facc8ad3c5274575aa176270d32d76d78e598552178ce4c5c17e90bd2f69b08860468f33639c07f4de0140ea5545b71b556e950
+  metadata.gz: dd2cb7901bc22a359f6cced93fafe7f28ee4f978ab798c85eb8d39365270e8fb34bd193efb7614f3a6f550c3c062e9d2740ab8e70a51cc8b821c6b21af999baa
+  data.tar.gz: 1307838fc825c08cfc91b0f72bf4b28d0742c3c2594f4e3a7c07bd1e48058c323fe721c509cf9c1ca4657f4033e40ce100ca3ad123656fd94561ba175e3b7abf

data/Gemfile

@@ -4,7 +4,8 @@ source "https://rubygems.org"
 gemspec
 
 gem "activesupport", "6.1.0"
+gem "parser", "3.0.0"
 gem "rake", "13.0.3"
 gem "rspec", "3.1.0"
-gem "rubocop", "1.7.0"
-gem "steep", "0.39.0"
+gem "rubocop", "1.12.1"
+gem "steep", "0.43.1"

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    souls (0.16.7)
+    souls (0.17.8)
 
 GEM
   remote: https://rubygems.org/
@@ -13,30 +13,27 @@ GEM
       tzinfo (~> 2.0)
       zeitwerk (~> 2.3)
     ast (2.4.2)
-    ast_utils (0.3.0)
-      parser (~> 2.4)
-      thor (>= 0.19)
     concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
-    ffi (1.14.2)
-    i18n (1.8.9)
+    ffi (1.15.0)
+    i18n (1.8.10)
       concurrent-ruby (~> 1.0)
-    language_server-protocol (3.15.0.1)
-    listen (3.4.1)
+    language_server-protocol (3.16.0.0)
+    listen (3.5.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
     minitest (5.14.4)
     parallel (1.20.1)
-    parser (2.7.2.0)
+    parser (3.0.0.0)
       ast (~> 2.4.1)
     rainbow (3.0.0)
     rake (13.0.3)
     rb-fsevent (0.10.4)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
-    rbs (1.0.6)
+    rbs (1.1.1)
     regexp_parser (2.1.1)
-    rexml (3.2.4)
+    rexml (3.2.5)
     rspec (3.1.0)
       rspec-core (~> 3.1.0)
       rspec-expectations (~> 3.1.0)
@@ -49,42 +46,45 @@ GEM
     rspec-mocks (3.1.3)
       rspec-support (~> 3.1.0)
     rspec-support (3.1.2)
-    rubocop (1.7.0)
+    rubocop (1.12.1)
       parallel (~> 1.10)
-      parser (>= 2.7.1.5)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
       rubocop-ast (>= 1.2.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 2.0)
+      unicode-display_width (>= 1.4.0, < 3.0)
     rubocop-ast (1.4.1)
       parser (>= 2.7.1.5)
     ruby-progressbar (1.11.0)
-    steep (0.39.0)
+    steep (0.43.1)
       activesupport (>= 5.1)
-      ast_utils (~> 0.3.0)
-      language_server-protocol (~> 3.15.0.1)
+      language_server-protocol (>= 3.15, < 4.0)
       listen (~> 3.0)
-      parser (~> 2.7.0)
+      parallel (>= 1.0.0)
+      parser (>= 2.7)
       rainbow (>= 2.2.2, < 4.0)
-      rbs (~> 1.0.0)
-    thor (1.1.0)
+      rbs (~> 1.1.0)
+      terminal-table (>= 2, < 4)
+    terminal-table (3.0.0)
+      unicode-display_width (~> 1.1, >= 1.1.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.7.0)
     zeitwerk (2.4.2)
 
 PLATFORMS
-  x86_64-darwin-20
+  x86_64-linux
 
 DEPENDENCIES
   activesupport (= 6.1.0)
+  parser (= 3.0.0)
   rake (= 13.0.3)
   rspec (= 3.1.0)
-  rubocop (= 1.7.0)
+  rubocop (= 1.12.1)
   souls!
-  steep (= 0.39.0)
+  steep (= 0.43.1)
 
 BUNDLED WITH
-   2.2.11
+   2.2.14

data/LICENSE.txt

@@ -52,7 +52,7 @@ You may add Your own copyright statement to Your modifications and may provide a
 
 END OF TERMS AND CONDITIONS
 
-Copyright 2020 ELSOUL LABO B.V.
+Copyright 2021 ELSOUL LABO B.V.
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

data/Steepfile

@@ -5,5 +5,4 @@ target :app do
 
   # check 'app'
   check "rbs"
-
 end

data/exe/souls

@@ -1,29 +1,24 @@
 #!/usr/bin/env ruby
 require "souls"
-
+STRAINS = ["graph", "worker", "media", "admin"]
 begin
-  begin
-    require "./config/initializers/souls" unless ARGV[0] == "new" || ARGV[0] == "init"
-  rescue
-    Souls::Init.config_init
-  end
   case ARGV[0]
   when "new"
     if ARGV[1].nil?
       puts "you need to specify your app name \n `souls new app_name`"
       exit
     end
-    puts "Which framework:   \n 1. SOULs GraphQL API \n 2. SOULs GraphQL API gRPC compatible \n 3. SOULs gRPC Service \n 4. SOULs Media Web \n 5. SOULs Admin Web \n Enter Number: "
+    puts "Which framework:   \n 1. SOULs GraphQL API \n 2. SOULs Worker \n 3. SOULs Media Web \n 4. SOULs Admin Web \n Enter Number: "
     strain = STDIN.gets.chomp.to_i
-    (1..5).include?(strain) ? puts("Generating SOULs.. \n") : raise(StandardError, "Choose Number 1..5")
-    Souls::Init.create_souls strain: strain, app_name: ARGV[1]
+    (1..4).include?(strain) ? puts("Generating SOULs.. \n") : raise(StandardError, "Choose Number 1..4")
+    Souls::Init.download_souls app_name: ARGV[1], repository_name: "souls_#{STRAINS[strain.to_i - 1]}"
   when "s", "server"
     strain = Souls.configuration.strain
     case strain
     when "media", "admin"
       system "yarn dev"
-    when "service"
-      system "bundle exec rake run_server"
+    when "worker"
+      system "bundle exec puma -p 3000 -e development"
     else
       system "foreman start -f Procfile.dev"
     end
@@ -42,8 +37,6 @@ begin
     end
   when "i", "infra"
     Souls.send ARGV[1]
-  when "p", "proto"
-    Souls::Init.proto proto_package_name: "souls", service: ARGV[1]
   when "init"
     Souls::Init.config_init
   when "-v", "--version"
@@ -69,6 +62,8 @@ begin
       Souls::Init.test_dir
     when "policy"
       Souls::Init.policy class_name: ARGV[2]
+    when "rspec_policy"
+      Souls::Init.rspec_policy class_name: ARGV[2]
     when "node_type"
       Souls::Init.node_type class_name: ARGV[2]
     when "resolver"
@@ -139,8 +134,7 @@ begin
     system "docker build . -t souls:latest"
     system "docker run --rm -p 3000:3000 souls:latest"
   when "deploy"
-    project_id = Souls.configuration.project_id
-    system "gcloud builds submit --config=cloudbuild.yml --project #{project_id}"
+    system "gcloud builds submit --config=cloudbuild.yml --project #{ARGV[1]}"
   else
     puts "Welcome to SOULs!"
   end

data/lib/souls.rb

@@ -10,367 +10,6 @@ module Souls
     class << self
       attr_accessor :configuration
 
-      def delete_forwarding_rule forwarding_rule_name: "grpc-gke-forwarding-rule"
-        system "gcloud compute -q forwarding-rules delete #{forwarding_rule_name} --global"
-      end
-
-      def create_forwarding_rule forwarding_rule_name: "grpc-gke-forwarding-rule", proxy_name: "grpc-gke-proxy", port: 8000
-        system "gcloud compute -q forwarding-rules create #{forwarding_rule_name} \
-                --global \
-                --load-balancing-scheme=INTERNAL_SELF_MANAGED \
-                --address=0.0.0.0 \
-                --target-grpc-proxy=#{proxy_name} \
-                --ports #{port} \
-                --network #{Souls.configuration.network}"
-      end
-
-      def delete_target_grpc_proxy proxy_name: "grpc-gke-proxy"
-        system "gcloud compute -q target-grpc-proxies delete #{proxy_name}"
-      end
-
-      def create_target_grpc_proxy proxy_name: "grpc-gke-proxy", url_map_name: "grpc-gke-url-map"
-        system "gcloud compute -q target-grpc-proxies create #{proxy_name} \
-                --url-map #{url_map_name} \
-                --validate-for-proxyless"
-      end
-
-      def create_path_matcher url_map_name: "grpc-gke-url-map", service_name: "grpc-gke-helloworld-service", path_matcher_name: "grpc-gke-path-matcher", hostname: "helloworld-gke", port: "8000"
-        system "gcloud compute -q url-maps add-path-matcher #{url_map_name} \
-                --default-service #{service_name} \
-                --path-matcher-name #{path_matcher_name} \
-                --new-hosts #{hostname}:#{port}"
-      end
-
-      def delete_url_map url_map_name: "grpc-gke-url-map"
-        system "gcloud compute -q url-maps delete #{url_map_name}"
-      end
-
-      def create_url_map url_map_name: "grpc-gke-url-map", service_name: "grpc-gke-helloworld-service"
-        system "gcloud compute -q url-maps create #{url_map_name} \
-                --default-service #{service_name}"
-      end
-
-      def add_backend_service service_name: "grpc-gke-helloworld-service", zone: "us-central1-a", neg_name: ""
-        system "gcloud compute -q backend-services add-backend #{service_name} \
-                --global \
-                --network-endpoint-group #{neg_name} \
-                --network-endpoint-group-zone #{zone} \
-                --balancing-mode RATE \
-                --max-rate-per-endpoint 5"
-      end
-
-      def delete_backend_service service_name: "grpc-gke-helloworld-service"
-        system "gcloud compute -q backend-services delete #{service_name} --global"
-      end
-
-      def create_backend_service service_name: "grpc-gke-helloworld-service", health_check_name: "grpc-gke-helloworld-hc"
-        system "gcloud compute -q backend-services create #{service_name} \
-                --global \
-                --load-balancing-scheme=INTERNAL_SELF_MANAGED \
-                --protocol=GRPC \
-                --health-checks #{health_check_name}"
-      end
-
-      def delete_firewall_rule firewall_rule_name: "grpc-gke-allow-health-checks"
-        system "gcloud compute -q firewall-rules delete #{firewall_rule_name}"
-      end
-
-      def create_firewall_rule firewall_rule_name: "grpc-gke-allow-health-checks"
-        network = Souls.configuration.network
-        system "gcloud compute -q firewall-rules create #{firewall_rule_name} \
-                --network #{network} \
-                --action allow \
-                --direction INGRESS \
-                --source-ranges 35.191.0.0/16,130.211.0.0/22 \
-                --target-tags allow-health-checks \
-                --rules tcp:50051"
-      end
-
-      def delete_health_check health_check_name: "grpc-gke-helloworld-hc"
-        system "gcloud compute -q health-checks delete #{health_check_name}"
-      end
-
-      def create_health_check health_check_name: "grpc-gke-helloworld-hc"
-        system "gcloud compute -q health-checks create grpc #{health_check_name} --use-serving-port"
-      end
-
-      def create_network
-        return "Error: Please Set Souls.configuration" if Souls.configuration.nil?
-        network = Souls.configuration.network
-        system "gcloud compute networks create #{network}"
-      end
-
-      def create_firewall_tcp ip_range:
-        network = Souls.configuration.network
-        `gcloud compute firewall-rules create #{network} --network #{network} --allow tcp,udp,icmp --source-ranges #{ip_range}`
-      end
-
-      def create_firewall_ssh
-        network = Souls.configuration.network
-        `gcloud compute firewall-rules create #{network}-ssh --network #{network} --allow tcp:22,tcp:3389,icmp`
-      end
-
-      def get_network_group_list
-        system "gcloud compute network-endpoint-groups list"
-      end
-
-      def create_network_group
-        app = Souls.configuration.app
-        network = Souls.configuration.network
-        sub_network = Souls.configuration.network
-        system("gcloud compute network-endpoint-groups create #{app} \
-                --default-port=0 \
-                --network #{network} \
-                --subnet #{sub_network} \
-                --global")
-      end
-
-      def export_network_group
-        app = Souls.configuration.app
-        system "NEG_NAME=$(gcloud compute network-endpoint-groups list | grep #{app} | awk '{print $1}')"
-        `echo $NEG_NAME > ./config/neg_name`
-      end
-
-      def delete_network_group_list neg_name:
-        zone = Souls.configuration.zone
-        system "gcloud compute network-endpoint-groups delete #{neg_name} --zone #{zone} -q"
-      end
-
-      def delete_cluster
-        app = Souls.configuration.app
-        zone = Souls.configuration.zone
-        system "gcloud container clusters delete #{app} --zone #{zone} -q"
-      end
-
-      def config_set_main
-        project_id = Souls.configuration.main_project_id
-        system "gcloud config set project #{project_id}"
-      end
-
-      def config_set
-        project_id = Souls.configuration.project_id
-        system "gcloud config set project #{project_id}"
-      end
-
-      def create_cluster
-        app = Souls.configuration.app
-        network = Souls.configuration.network
-        sub_network = Souls.configuration.network
-        machine_type = Souls.configuration.machine_type
-        zone = Souls.configuration.zone
-        system("gcloud container clusters create #{app} \
-                --network #{network} \
-                --subnetwork #{sub_network} \
-                --zone #{zone} \
-                --scopes=https://www.googleapis.com/auth/cloud-platform \
-                --machine-type #{machine_type} \
-                --enable-autorepair \
-                --enable-ip-alias \
-                --num-nodes 2 \
-                --enable-autoscaling \
-                --min-nodes 1 \
-                --max-nodes 4 \
-                --tags=allow-health-checks")
-      end
-
-      def deploy
-        strain = Souls.configuration.strain
-        case strain
-        when "api"
-          Souls::Init.api_deploy
-        when "service"
-          Souls::Init.service_deploy
-        else
-          puts "coming soon..."
-        end
-      end
-
-      def update
-        `souls i apply_deployment`
-      end
-
-      def resize_cluster pool_name: "default-pool", node_num: 1
-        app = Souls.configuration.app
-        zone = Souls.configuration.zone
-        system "gcloud container clusters resize #{app} --node-pool #{pool_name} --num-nodes #{node_num} --zone #{zone}"
-      end
-
-      def create_namespace
-        namespace = Souls.configuration.namespace
-        system("kubectl create namespace #{namespace}")
-      end
-
-      def create_ip
-        ip_name = "#{Souls.configuration.app}-ip"
-        system("gcloud compute addresses create #{ip_name} --global")
-      end
-
-      def apply_deployment
-        namespace = Souls.configuration.namespace
-        system("kubectl apply -f ./infra/deployment.yml --namespace=#{namespace}")
-      end
-
-      def apply_secret
-        namespace = Souls.configuration.namespace
-        system("kubectl apply -f ./infra/secret.yml --namespace=#{namespace}")
-      end
-
-      def apply_service
-        namespace = Souls.configuration.namespace
-        system("kubectl apply -f ./infra/service.yml --namespace=#{namespace}")
-      end
-
-      def apply_ingress
-        namespace = Souls.configuration.namespace
-        system("kubectl apply -f ./infra/ingress.yml --namespace=#{namespace}")
-      end
-
-      def delete_deployment
-        namespace = Souls.configuration.namespace
-        system("kubectl delete -f ./infra/deployment.yml --namespace=#{namespace}")
-      end
-
-      def delete_secret
-        namespace = Souls.configuration.namespace
-        system("kubectl delete -f ./infra/secret.yml --namespace=#{namespace}")
-      end
-
-      def delete_service
-        namespace = Souls.configuration.namespace
-        system("kubectl delete -f ./infra/service.yml --namespace=#{namespace}")
-      end
-
-      def delete_ingress
-        namespace = Souls.configuration.namespace
-        system("kubectl delete -f ./infra/ingress.yml --namespace=#{namespace}")
-      end
-
-      def create_dns_conf
-        app = Souls.configuration.app
-        namespace = Souls.configuration.namespace
-        domain = Souls.configuration.domain
-        `echo "#{domain}. 300 IN A $(kubectl get ingress --namespace #{namespace} | grep #{app} | awk '{print $3}')" >> ./infra/dns_conf`
-        "created dns file!"
-      end
-
-      def set_dns
-        project_id = Souls.configuration.main_project_id
-        `gcloud dns record-sets import -z=#{project_id} --zone-file-format ./infra/dns_conf`
-      end
-
-      def service_api_enable
-        `gcloud services enable iam.googleapis.com`
-        `gcloud services enable dns.googleapis.com`
-        `gcloud services enable container.googleapis.com`
-        `gcloud services enable containerregistry.googleapis.com`
-        `gcloud services enable servicenetworking.googleapis.com`
-        `gcloud services enable sqladmin.googleapis.com`
-        `gcloud services enable sql-component.googleapis.com`
-        `gcloud services enable cloudbuild.googleapis.com`
-      end
-
-      def update_container zone: :asia
-        project_id = Souls.configuration.project_id
-        firestore = Google::Cloud::Firestore.new
-        strain = Souls.configuration.strain
-        app = Souls.configuration.app
-        container = case strain
-                    when "api"
-                      app
-                    else
-                      Souls.configuration.service_name
-                    end
-        zones = {
-          us: "gcr.io",
-          eu: "eu.gcr.io",
-          asia: "asia.gcr.io"
-        }
-        versions = firestore.doc "containers/#{container}/versions/1"
-        if versions.get.exists?
-          versions = firestore.col("containers").doc(container).col("versions")
-          query = versions.order("version_counter", "desc").limit 1
-          query.get do |v|
-            @next_version = v.data[:version_counter] + 1
-          end
-        else
-          @next_version = 1
-        end
-        version = firestore.col("containers").doc(container).col("versions").doc @next_version
-        version.set version: "v#{@next_version}", version_counter: @next_version, zone: zones[zone], created_at: Time.now.utc
-
-        system("docker build . -t #{app}:v#{@next_version}")
-        system("docker tag #{app}:v#{@next_version} #{zones[zone]}/#{project_id}/#{app}:v#{@next_version}")
-        system("docker push #{zones[zone]}/#{project_id}/#{app}:v#{@next_version}")
-      end
-
-      def create_service_account
-        service_account = Souls.configuration.app
-        `gcloud iam service-accounts create #{service_account} \
-        --description="Souls Service Account" \
-        --display-name="#{service_account}"`
-      end
-
-      def create_service_account_key
-        project_id = Souls.configuration.project_id
-        service_account = Souls.configuration.app
-        `gcloud iam service-accounts keys create ./config/keyfile.json \
-          --iam-account #{service_account}@#{project_id}.iam.gserviceaccount.com`
-      end
-
-      def add_service_account_role role: "roles/firebase.admin"
-        project_id = Souls.configuration.project_id
-        service_account = Souls.configuration.app
-        `gcloud projects add-iam-policy-binding #{project_id} \
-        --member="serviceAccount:#{service_account}@#{project_id}.iam.gserviceaccount.com" \
-        --role="#{role}"`
-      end
-
-      def get_pods
-        namespace = Souls.configuration.namespace
-        system("kubectl get pods --namespace=#{namespace}")
-      end
-
-      def get_svc
-        namespace = Souls.configuration.namespace
-        system("kubectl get svc --namespace=#{namespace}")
-      end
-
-      def get_ingress
-        namespace = Souls.configuration.namespace
-        system("kubectl get ingress --namespace=#{namespace}")
-      end
-
-      def run
-        app = Souls.configuration.app
-        system("docker rm -f web")
-        system("docker build . -t #{app}:latest")
-        system("docker run --name web -it --env-file $PWD/.env -p 3000:3000 #{app}:latest")
-      end
-
-      def get_clusters
-        system("kubectl config get-clusters")
-      end
-
-      def get_current_cluster
-        system("kubectl config current-context")
-      end
-
-      def use_context cluster:
-        system("kubectl config use-context #{cluster}")
-      end
-
-      def get_credentials
-        app = Souls.configuration.app
-        zone = Souls.configuration.zone
-        system "gcloud container clusters get-credentials #{app} --zone #{zone}"
-      end
-
-      def create_ssl
-        app = Souls.configuration.app
-        domain = Souls.configuration.domain
-        system "gcloud compute ssl-certificates create #{app}-ssl --domains=#{domain} --global"
-      end
-
       def run_psql
         `docker run --rm -d \
           -p 5433:5432 \
@@ -430,21 +69,10 @@ module Souls
   end
 
   class Configuration
-    attr_accessor :main_project_id, :project_id, :app, :network, :namespace, :service_name, :machine_type, :zone, :domain, :google_application_credentials, :strain, :proto_package_name
+    attr_accessor :app
 
     def initialize
-      @main_project_id = nil
-      @project_id = nil
       @app = nil
-      @network = nil
-      @namespace = nil
-      @service_name = nil
-      @machine_type = nil
-      @zone = nil
-      @domain = nil
-      @google_application_credentials = nil
-      @strain = nil
-      @proto_package_name = nil
     end
   end
 end

data/lib/souls/generate.rb

@@ -20,7 +20,9 @@ module Souls
       end
 
       def policy class_name: "souls"
-        file_path = "./app/policy/#{class_name.singularize}_policy.rb"
+        dir_name = "./app/policies"
+        FileUtils.mkdir_p dir_name unless Dir.exist? dir_name
+        file_path = "./app/policies/#{class_name.singularize}_policy.rb"
         File.open(file_path, "w") do |f|
           f.write <<~EOS
             class #{class_name.camelize}Policy < ApplicationPolicy
@@ -59,6 +61,50 @@ module Souls
         [file_path]
       end
 
+      def rspec_policy class_name: "souls"
+        dir_name = "./spec/policies"
+        FileUtils.mkdir_p dir_name unless Dir.exist? dir_name
+        file_path = "./spec/policies/#{class_name}_policy_spec.rb"
+        File.open(file_path, "w") do |new_line|
+          new_line.write <<~EOS
+            describe #{class_name.camelize}Policy do
+              subject { described_class.new(user, #{class_name.underscore}) }
+
+              let(:#{class_name.underscore}) { FactoryBot.create(:#{class_name.underscore}) }
+
+              context "being a visitor" do
+                let(:user) { FactoryBot.create(:user) }
+
+                it { is_expected.to permit_action(:index) }
+                it { is_expected.to permit_action(:show) }
+                it { is_expected.to forbid_actions([:create, :update, :delete]) }
+              end
+
+              context "being a retailer" do
+                let(:user) { FactoryBot.create(:user, user_role: 1) }
+
+                it { is_expected.to permit_action(:index) }
+                it { is_expected.to permit_action(:show) }
+                it { is_expected.to forbid_actions([:create, :update, :delete]) }
+              end
+
+              context "being a staff" do
+                let(:user) { FactoryBot.create(:user, user_role: 3) }
+
+                it { is_expected.to permit_actions([:create, :update, :delete]) }
+              end
+
+              context "being an administrator" do
+                let(:user) { FactoryBot.create(:user, user_role: 4) }
+
+                it { is_expected.to permit_actions([:create, :update, :delete]) }
+              end
+            end
+          EOS
+        end
+        [file_path]
+      end
+
       def resolver_head class_name: "souls"
         FileUtils.mkdir_p "./app/graphql/resolvers" unless Dir.exist? "./app/graphql/resolvers"
         file_path = "./app/graphql/resolvers/#{class_name.singularize}_search.rb"
@@ -180,18 +226,18 @@ module Souls
       def resolver_end class_name: "souls"
         file_path = "./app/graphql/resolvers/#{class_name.singularize}_search.rb"
         File.open(file_path, "a") do |f|
-          f.write <<-EOS
-      scope = scope.where("created_at >= ?", value[:start_date]) if value[:start_date]
-      scope = scope.where("created_at <= ?", value[:end_date]) if value[:end_date]
-
-      branches << scope
-
-      value[:OR].inject(branches) { |s, v| normalize_filters(v, s) } if value[:OR].present?
-
-      branches
-    end
-  end
-end
+          f.write <<~EOS
+                              scope = scope.where("created_at >= ?", value[:start_date]) if value[:start_date]
+                              scope = scope.where("created_at <= ?", value[:end_date]) if value[:end_date]
+            #{'            '}
+                              branches << scope
+            #{'            '}
+                              value[:OR].inject(branches) { |s, v| normalize_filters(v, s) } if value[:OR].present?
+            #{'            '}
+                              branches
+                            end
+                          end
+                        end
           EOS
         end
         [file_path]
@@ -358,11 +404,11 @@ end
             f.each_line.with_index do |line, i|
               if @on
                 if line.include?("end") || line.include?("t.index")
-                  new_line.write <<-EOS
-      )
-    end
-  end
-end
+                  new_line.write <<~EOS
+                          )
+                        end
+                      end
+                    end
                   EOS
                   break
                 end
@@ -406,9 +452,6 @@ end
         rspec_resolver_end class_name: singularized_class_name
       end
 
-
-
-
       def add_delete class_name: "souls"
         singularized_class_name = class_name.singularize.underscore
         pluralized_class_name = class_name.pluralize.underscore
@@ -450,32 +493,27 @@ end
 
       def add_mutation class_name: "souls", file_name: "hoi"
         singularized_class_name = class_name.singularize.underscore
-        file_path = "./app/graphql/mutations/#{singularized_class_name}/#{file_name}.rb"
-        file_path
+        "./app/graphql/mutations/#{singularized_class_name}/#{file_name}.rb"
       end
 
       def add_type class_name: "souls", file_name: "hoi"
         singularized_class_name = class_name.singularize.underscore
-        file_path = "./app/graphql/types/#{file_name}.rb"
-        file_path
+        "./app/graphql/types/#{file_name}.rb"
       end
 
       def add_edge class_name: "souls", file_name: "hoi"
         singularized_class_name = class_name.singularize.underscore
-        file_path = "./app/graphql/types/#{file_name}.rb"
-        file_path
+        "./app/graphql/types/#{file_name}.rb"
       end
 
       def add_connection class_name: "souls", file_name: "hoi"
         singularized_class_name = class_name.singularize.underscore
-        file_path = "./app/graphql/types/#{file_name}.rb"
-        file_path
+        "./app/graphql/types/#{file_name}.rb"
       end
 
       def add_rspec_mutation class_name: "souls", file_name: "hoi"
         singularized_class_name = class_name.singularize.underscore
-        file_path = "./app/graphql/types/#{file_name}.rb"
-        file_path
+        "./app/graphql/types/#{file_name}.rb"
       end
     end
   end

data/lib/souls/init.rb

@@ -1,103 +1,6 @@
 module Souls
-  STRAINS = ["graph", "api", "service", "media", "admin"]
   module Init
     class << self
-      def create_souls strain: 1, app_name: "souls"
-        config_needed = (1..3)
-        project = {}
-        project[:strain] = STRAINS[strain.to_i - 1]
-        begin
-          puts "Google Cloud Main PROJECT_ID(This project will controll Cloud DNS):      (default: elsoul2)"
-          project[:main_project_id] = STDIN.gets.chomp
-          project[:main_project_id] == "" ? project[:main_project_id] = "elsoul2" : true
-          puts "Google Cloud PROJECT_ID:      (default: elsoul2)"
-          project[:project_id] = STDIN.gets.chomp
-          project[:project_id] = "elsoul2" if project[:project_id] == ""
-          puts "VPC Network Name:          (default: default)"
-          project[:network] = STDIN.gets.chomp
-          project[:network] == "" ? project[:network] = "default" : true
-          puts "Namespace:          (default: souls)"
-          project[:namespace] = STDIN.gets.chomp
-          project[:namespace] == "" ? project[:namespace] = "souls" : true
-          if project[:strain] == "service"
-            puts "Service Name:          (default: blog-service)"
-            project[:service_name] = STDIN.gets.chomp
-            project[:service_name] == "" ? project[:service_name] = "blog-service" : true
-          end
-          puts "Instance MachineType:       (default: custom-1-6656)"
-          project[:machine_type] = STDIN.gets.chomp
-          project[:machine_type] == "" ? project[:machine_type] = "custom-1-6656" : true
-          puts "Zone:           (default: us-central1-a)"
-          project[:zone] = STDIN.gets.chomp
-          project[:zone] == "" ? project[:zone] = "us-central1-a" : true
-          puts "Domain:          (e.g API: el-soul.com, Serive: xds:///blog-service:8000)"
-          project[:domain] = STDIN.gets.chomp
-          project[:domain] == "" ? project[:domain] = "el-soul.com" : true
-          puts "Google Application Credentials Path:      (default: #{app_name}/config/credentials.json)"
-          project[:google_application_credentials] = STDIN.gets.chomp
-          project[:google_application_credentials] == "" ? project[:google_application_credentials] = "./config/credentials.json" : true
-          puts project
-          puts "Enter to finish set up!"
-          confirm = STDIN.gets.chomp
-          raise StandardError, "Retry" unless confirm == ""
-          download_souls app_name: app_name, repository_name: "souls_#{STRAINS[strain.to_i - 1]}"
-          initial_config_init app_name: app_name, project: project if config_needed.include?(strain)
-        rescue StandardError => error
-          puts error
-          retry
-        end
-      end
-
-      def initial_config_init app_name: "souls", project: {}
-        `touch "#{app_name}/config/initializers/souls.rb"`
-        file_path = "#{app_name}/config/initializers/souls.rb"
-        File.open(file_path, "w") do |f|
-          f.write <<~EOS
-            Souls.configure do |config|
-              config.main_project_id = "#{project[:main_project_id]}"
-              config.project_id = "#{project[:project_id]}"
-              config.app = "#{app_name}"
-              config.namespace = "#{project[:namespace]}"
-              config.service_name = "#{project[:service_name]}"
-              config.network = "#{project[:network]}"
-              config.machine_type = "#{project[:machine_type]}"
-              config.zone = "#{project[:zone]}"
-              config.domain = "#{project[:domain]}"
-              config.google_application_credentials = "#{project[:google_application_credentials]}"
-              config.strain = "#{project[:strain]}"
-              config.proto_package_name = "souls"
-            end
-          EOS
-        end
-      end
-
-      def config_init app_name: "souls", project: {}
-        `touch ./config/initializers/souls.rb`
-        file_path = "./config/initializers/souls.rb"
-        puts "Generating souls conf..."
-        sleep(rand(0.1..0.3))
-        puts "Generated!"
-        puts "Let's Edit SOULs Conf: `#{file_path}`"
-        File.open(file_path, "w") do |f|
-          f.write <<~EOS
-            Souls.configure do |config|
-              config.main_project_id = "#{project[:main_project_id]}"
-              config.project_id = "#{project[:project_id]}"
-              config.app = "#{app_name}"
-              config.namespace = "#{project[:namespace]}"
-              config.service_name = "#{project[:service_name]}"
-              config.network = "#{project[:network]}"
-              config.machine_type = "#{project[:machine_type]}"
-              config.zone = "#{project[:zone]}"
-              config.domain = "#{project[:domain]}"
-              config.google_application_credentials = "#{project[:google_application_credentials]}"
-              config.strain = "#{project[:strain]}"
-              config.proto_package_name = "souls"
-            end
-          EOS
-        end
-      end
-
       def get_version repository_name: "souls_service"
         data = JSON.parse `curl \
         -H "Accept: application/vnd.github.v3+json" \
@@ -111,7 +14,7 @@ module Souls
         system "tar -zxvf ./#{version}.tar.gz"
         system "mkdir #{app_name}"
         folder = version.delete "v"
-        system "cp -r #{repository_name}-#{folder}/ #{app_name}/"
+        system "cp -r #{repository_name}-#{folder}/* #{app_name}/"
         system "rm -rf #{version}.tar.gz && rm -rf #{repository_name}-#{folder}"
         txt = <<~TEXT
              _____ ____  __  ____#{'        '}
@@ -129,119 +32,6 @@ module Souls
         puts "------------------------------"
       end
 
-      def proto proto_package_name: "souls", service: "blog"
-        system "grpc_tools_ruby_protoc -I ./protos --ruby_out=./app/services --grpc_out=./app/services ./protos/#{service}.proto"
-        service_pb_path = "./app/services/#{service}_services_pb.rb"
-        new_file = "./app/services/#{proto_package_name}.rb"
-        File.open(new_file, "w") do |new_line|
-          File.open(service_pb_path, "r") do |f|
-            f.each_line.with_index do |line, i|
-              case i
-              when 0
-                new_line.write "# Generated by the SOULs protocol buffer compiler.  DO NOT EDIT!\n"
-              when 3
-                next
-              else
-                puts "#{i}: #{line}"
-                new_line.write line.to_s
-              end
-            end
-          end
-        end
-        FileUtils.rm service_pb_path
-        puts "SOULs Proto Created!"
-      end
-
-      def service_deploy
-        service_name = Souls.configuration.service_name
-        health_check_name = "#{service_name}-hc"
-        firewall_rule_name = "#{service_name}-allow-health-checks"
-        zone = Souls.configuration.zone
-        url_map_name = "#{service_name}-url-map"
-        path_matcher_name = "#{service_name}-path-mathcher"
-        port = "5000"
-        proxy_name = "#{service_name}-proxy"
-        forwarding_rule_name = "#{service_name}-forwarding-rule"
-
-        Souls.create_service_account
-        Souls.create_service_account_key
-        Souls.add_service_account_role
-        Souls.add_service_account_role role: "roles/containerregistry.ServiceAgent"
-        Souls.create_health_check health_check_name: health_check_name
-        Souls.create_firewall_rule firewall_rule_name: firewall_rule_name
-        Souls.create_backend_service service_name: service_name, health_check_name: health_check_name
-        Souls.export_network_group
-        file_path = "./config/neg_name"
-        File.open(file_path) do |f|
-          Souls.add_backend_service service_name: service_name, neg_name: f.gets.to_s, zone: zone
-        end
-        Souls.create_url_map url_map_name: url_map_name, service_name: service_name
-        Souls.create_path_matcher url_map_name: url_map_name, service_name: service_name, path_matcher_name: path_matcher_name, hostname: app, port: port
-        Souls.create_target_grpc_proxy proxy_name: proxy_name, url_map_name: url_map_name
-        Souls.create_forwarding_rule forwarding_rule_name: forwarding_rule_name, proxy_name: proxy_name, port: port
-      end
-
-      def api_deploy
-        Souls.service_api_enable
-        Souls.create_service_account
-        Souls.create_service_account_key
-        Souls.add_service_account_role
-        Souls.add_service_account_role role: "roles/containerregistry.ServiceAgent"
-        Souls.config_set
-        Souls.create_network
-        Souls.create_cluster
-        Souls.get_credentials
-        Souls.create_namespace
-        Souls.create_ip
-        Souls.create_ssl
-        Souls.apply_deployment
-        Souls.apply_service
-        Souls.apply_ingress
-        puts "Wainting for Ingress to get IP..."
-        sleep 1
-        puts "This migth take a few mins..."
-        sleep 90
-        Souls.create_dns_conf
-        Souls.config_set_main
-        Souls.set_dns
-        Souls.config_set
-      end
-
-      def local_deploy
-        `souls i run_psql`
-        `docker pull`
-      end
-
-      def service_update
-        `souls i apply_deployment`
-      end
-
-      def api_update
-        `souls i apply_deployment`
-      end
-
-      def service_delete
-        service_name = Souls.configuration.service_name
-        firewall_rule_name = "#{service_name}-allow-health-checks"
-        url_map_name = "#{service_name}-url-map"
-        proxy_name = "#{service_name}-proxy"
-        forwarding_rule_name = "#{service_name}-forwarding-rule"
-
-        Souls.delete_forwarding_rule forwarding_rule_name: forwarding_rule_name
-        Souls.delete_target_grpc_proxy proxy_name: proxy_name
-        Souls.delete_url_map url_map_name: url_map_name
-        Souls.delete_backend_service service_name: service_name
-        Souls.delete_health_check health_check_name: health_check_name
-        Souls.delete_firewall_rule firewall_rule_name: firewall_rule_name
-      end
-
-      def api_delete
-        `souls i delete_deployment`
-        `souls i delete_secret`
-        `souls i delete_service`
-        `souls i delete_ingress`
-      end
-
       def model class_name: "souls"
         file_path = "./app/models/#{class_name.singularize}.rb"
         return ["Model already exist! #{file_path}"] if File.exist? file_path

data/lib/souls/version.rb

@@ -1,3 +1,3 @@
 module Souls
-  VERSION = "0.17.4"
+  VERSION = "0.17.9"
 end

data/souls.gemspec

@@ -4,7 +4,7 @@ Gem::Specification.new do |spec|
   spec.name          = "souls"
   spec.version       = Souls::VERSION
   spec.authors       = ["POPPIN-FUMI", "KishiTheMechanic", "James Neve"]
-  spec.email         = ["fumitake.kawasaki@el-soul.com", "shota.kishi@el-soul.com", "jamesoneve@gmail.com"]
+  spec.email         = ["f.kawasaki@elsoul.nl", "s.kishi@elsoul.nl", "jamesoneve@gmail.com"]
 
   spec.summary       = "SOULS is a GraphQL Based Web Application Framework for Microservices on Multi Cloud Platform such as Google Cloud Platform, Amazon Web Services, and Alibaba Cloud. Auto deploy with scalable condition. You can focus on business logic. No more infra problems."
   spec.description   = "SOULS is a Web Application Framework for Microservices on Multi Cloud Platform such as Google Cloud Platform, Amazon Web Services, and Alibaba Cloud. Auto deploy with scalable condition. You can focus on business logic. No more infra problems."
@@ -18,7 +18,7 @@ Gem::Specification.new do |spec|
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
   spec.bindir        = "exe"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.17.4
+  version: 0.17.9
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,15 +10,15 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-04-01 00:00:00.000000000 Z
+date: 2021-04-07 00:00:00.000000000 Z
 dependencies: []
 description: SOULS is a Web Application Framework for Microservices on Multi Cloud
   Platform such as Google Cloud Platform, Amazon Web Services, and Alibaba Cloud.
   Auto deploy with scalable condition. You can focus on business logic. No more infra
   problems.
 email:
-- fumitake.kawasaki@el-soul.com
-- shota.kishi@el-soul.com
+- f.kawasaki@elsoul.nl
+- s.kishi@elsoul.nl
 - jamesoneve@gmail.com
 executables:
 - souls