souls 0.23.5 → 0.23.9

data/lib/souls.rb

@@ -10,162 +10,174 @@ require "paint"
 require "whirly"
 
 module Souls
-  SOULS_METHODS = [
-    "model",
-    "query",
-    "mutation",
-    "type",
-    "resolver",
-    "policy",
-    "rspec_factory",
-    "rspec_model",
-    "rspec_query",
-    "rspec_mutation",
-    "rspec_resolver",
-    "rspec_policy"
-  ]
+  SOULS_METHODS = %w[
+    model
+    query
+    mutation
+    type
+    resolver
+    policy
+    rspec_factory
+    rspec_model
+    rspec_query
+    rspec_mutation
+    rspec_resolver
+    rspec_policy
+  ].freeze
+  public_constant :SOULS_METHODS
   class Error < StandardError; end
-    class << self
-      attr_accessor :configuration
+  class << self
+    attr_accessor :configuration
+  end
 
-      def run_psql
-        system "docker run --rm -d \
-          -p 5433:5432 \
-          -v postgres-tmp:/var/lib/postgresql/data \
-          -e POSTGRES_USER=postgres \
-          -e POSTGRES_PASSWORD=postgres \
-          -e POSTGRES_DB=souls_test \
-          postgres:13-alpine"
-        system "docker ps"
-      end
+  def self.run_psql
+    system(
+      "docker run --rm -d \
+        -p 5433:5432 \
+        -v postgres-tmp:/var/lib/postgresql/data \
+        -e POSTGRES_USER=postgres \
+        -e POSTGRES_PASSWORD=postgres \
+        -e POSTGRES_DB=souls_test \
+        postgres:13-alpine"
+    )
+    system("docker ps")
+  end
 
-      def run_mysql
-        system "docker run --rm -d \
-          -p 3306:3306 \
-          -v mysql-tmp:/var/lib/mysql \
-          -e MYSQL_USER=mysql \
-          -e MYSQL_ROOT_PASSWORD=mysql \
-          -e MYSQL_DB=souls_test \
-          mysql:latest"
-        system "docker ps"
-      end
+  def self.run_mysql
+    system(
+      "docker run --rm -d \
+        -p 3306:3306 \
+        -v mysql-tmp:/var/lib/mysql \
+        -e MYSQL_USER=mysql \
+        -e MYSQL_ROOT_PASSWORD=mysql \
+        -e MYSQL_DB=souls_test \
+        mysql:latest"
+    )
+    system("docker ps")
+  end
 
-      def run_awake url
-        app = Souls.configuration.app
-        system "gcloud scheduler jobs create http #{app}-awake --schedule '0,10,20,30,40,50 * * * *' --uri #{url} --http-method GET"
-      end
+  def self.run_awake(url)
+    app = Souls.configuration.app
+    system(
+      "gcloud scheduler jobs create http #{app}-awake
+      --schedule '0,10,20,30,40,50 * * * *' --uri #{url} --http-method GET"
+    )
+  end
 
-      def show_wait_spinner(fps = 10)
-        chars = %w[| / - \\]
-        delay = 1.0 / fps
-        iter = 0
-        spinner = Thread.new do
-          while iter
-            print chars[(iter += 1) % chars.length]
-            sleep delay
-            print "\b"
-          end
-        end
-        yield.tap do
-          iter = false
-          spinner.join
+  def self.show_wait_spinner(fps = 10)
+    chars = %w[| / - \\]
+    delay = 1.0 / fps
+    iter = 0
+    spinner =
+      Thread.new do
+        while iter
+          print(chars[(iter += 1) % chars.length])
+          sleep(delay)
+          print("\b")
         end
       end
+    yield.tap do
+      iter = false
+      spinner.join
+    end
+  end
 
-      def gemfile_latest_version
-        file_path = "./Gemfile"
-        updated_gems = []
-        updated_gem_versions = []
-        updated_lines = []
-        from_dev = false
-        File.open(file_path, "r") do |f|
-          f.each_line do |line|
-            from_dev = true if line.include? "group"
-            next unless line.include? "gem "
-            gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
-            url = URI("https://rubygems.org/api/v1/versions/#{gem[0]}/latest.json")
-            res = Net::HTTP.get_response(url)
-            data = JSON.parse res.body
-            next if data["version"].to_s == gem[1].to_s
-            updated_lines << if from_dev
-              "  gem \"#{gem[0]}\", \"#{data["version"]}\""
-                             else
-              "gem \"#{gem[0]}\", \"#{data["version"]}\""
-                             end
-            updated_gems << (gem[0]).to_s
-            updated_gem_versions << data["version"]
-            system "gem update #{gem[0]}"
-          end
-        end
-        {
-          gems: updated_gems,
-          lines: updated_lines,
-          updated_gem_versions: updated_gem_versions
-        }
+  def self.gemfile_latest_version
+    file_path = "./Gemfile"
+    updated_gems = []
+    updated_gem_versions = []
+    updated_lines = []
+    from_dev = false
+    File.open(file_path, "r") do |f|
+      f.each_line do |line|
+        from_dev = true if line.include?("group")
+        next unless line.include?("gem ")
+
+        gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
+        url = URI("https://rubygems.org/api/v1/versions/#{gem[0]}/latest.json")
+        res = Net::HTTP.get_response(url)
+        data = JSON.parse(res.body)
+        next if data["version"].to_s == gem[1].to_s
+
+        updated_lines << if from_dev
+                           "  gem \"#{gem[0]}\", \"#{data['version']}\""
+                         else
+                           "gem \"#{gem[0]}\", \"#{data['version']}\""
+                         end
+        updated_gems << (gem[0]).to_s
+        updated_gem_versions << data["version"]
+        system("gem update #{gem[0]}")
       end
+    end
+    {
+      gems: updated_gems,
+      lines: updated_lines,
+      updated_gem_versions: updated_gem_versions
+    }
+  end
 
-      def update_gemfile
-        file_path = "./Gemfile"
-        tmp_file = "./tmp/Gemfile"
-        new_gems = gemfile_latest_version
-        logs = []
-        message = Paint["\nAlready Up to date!", :green]
-        return "Already Up to date!" && puts(message) if new_gems[:gems].blank?
-        @i = 0
-        File.open(file_path, "r") do |f|
-          File.open(tmp_file, "w") do |new_line|
-            f.each_line do |line|
-              gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
-              if new_gems[:gems].include? gem[0]
-                old_ver = gem[1].split(".")
-                new_ver = new_gems[:updated_gem_versions][@i].split(".")
-                if old_ver[0] < new_ver[0]
-                  logs << Paint % [
-                    "#{gem[0]} v#{gem[1]} → %{red_text}",
-                    :white,
-                    {
-                      red_text: ["v#{new_gems[:updated_gem_versions][@i]}", :red]
-                    }
-                  ]
-                elsif old_ver[1] < new_ver[1]
-                  logs << Paint % [
-                    "#{gem[0]} v#{gem[1]} → v#{new_ver[0]}.%{yellow_text}",
-                    :white,
-                    {
-                      yellow_text: ["#{new_ver[1]}.#{new_ver[2]}", :yellow]
-                    }
-                  ]
-                elsif old_ver[2] < new_ver[2]
-                  logs << Paint % [
-                    "#{gem[0]} v#{gem[1]} → v#{new_ver[0]}.#{new_ver[1]}.%{green_text}",
-                    :white,
-                    {
-                      green_text: [(new_ver[2]).to_s, :green]
-                    }
-                  ]
-                end
-                if gem[0] == "souls"
-                  logs << Paint["\nSOULs Doc: %{cyan_text}", :white, { cyan_text: ["https://souls.elsoul.nl\n", :cyan] }]
-                end
-                new_line.write "#{new_gems[:lines][@i]}\n"
-                @i += 1
-              else
-                new_line.write line
-              end
+  def self.update_gemfile
+    file_path = "./Gemfile"
+    tmp_file = "./tmp/Gemfile"
+    new_gems = gemfile_latest_version
+    logs = []
+    message = Paint["\nAlready Up to date!", :green]
+    return "Already Up to date!" && puts(message) if new_gems[:gems].blank?
+
+    @i = 0
+    File.open(file_path, "r") do |f|
+      File.open(tmp_file, "w") do |new_line|
+        f.each_line do |line|
+          gem = line.gsub("gem ", "").gsub("\"", "").gsub("\n", "").gsub(" ", "").split(",")
+          if new_gems[:gems].include?(gem[0])
+            old_ver = gem[1].split(".")
+            new_ver = new_gems[:updated_gem_versions][@i].split(".")
+            if old_ver[0] < new_ver[0]
+              logs << Paint % [
+                "#{gem[0]} v#{gem[1]} → %{red_text}",
+                :white,
+                {
+                  red_text: ["v#{new_gems[:updated_gem_versions][@i]}", :red]
+                }
+              ]
+            elsif old_ver[1] < new_ver[1]
+              logs << Paint % [
+                "#{gem[0]} v#{gem[1]} → v#{new_ver[0]}.%{yellow_text}",
+                :white,
+                {
+                  yellow_text: ["#{new_ver[1]}.#{new_ver[2]}", :yellow]
+                }
+              ]
+            elsif old_ver[2] < new_ver[2]
+              logs << Paint % [
+                "#{gem[0]} v#{gem[1]} → v#{new_ver[0]}.#{new_ver[1]}.%{green_text}",
+                :white,
+                {
+                  green_text: [(new_ver[2]).to_s, :green]
+                }
+              ]
+            end
+            if gem[0] == "souls"
+              logs << Paint % ["\nSOULs Doc: %{cyan_text}", :white, { cyan_text: ["https://souls.elsoul.nl\n", :cyan] }]
             end
+            new_line.write("#{new_gems[:lines][@i]}\n")
+            @i += 1
+          else
+            new_line.write(line)
           end
         end
-        FileUtils.rm "./Gemfile"
-        FileUtils.rm "./Gemfile.lock"
-        FileUtils.mv "./tmp/Gemfile", "./Gemfile"
-        system "bundle update"
-        success = Paint["\n\nSuccessfully Updated These Gems!\n", :green]
-        puts success
-        logs.each do |line|
-          puts line
-        end
       end
     end
+    FileUtils.rm("./Gemfile")
+    FileUtils.rm("./Gemfile.lock")
+    FileUtils.mv("./tmp/Gemfile", "./Gemfile")
+    system("bundle update")
+    success = Paint["\n\nSuccessfully Updated These Gems!\n", :green]
+    puts(success)
+    logs.each do |line|
+      puts(line)
+    end
+  end
 
   def self.configure
     self.configuration ||= Configuration.new
@@ -173,14 +185,15 @@ module Souls
   end
 
   class Configuration
-    attr_accessor :app, :strain, :project_id, :worker_name, :api_name
+    attr_accessor :app, :strain, :project_id, :worker_repo, :api_repo, :worker_endpoint
 
     def initialize
       @app = nil
       @project_id = nil
       @strain = nil
-      @worker_name = nil
-      @api_name = nil
+      @worker_repo = nil
+      @api_repo = nil
+      @worker_endpoint = nil
     end
   end
 end

data/lib/souls/gcloud.rb

@@ -1,5 +1,6 @@
 require_relative "./gcloud/compute"
 require_relative "./gcloud/iam"
+require_relative "./gcloud/pubsub"
 
 module Souls
   module Gcloud

data/lib/souls/gcloud/compute.rb

@@ -3,58 +3,70 @@ module Souls
     class << self
       def auth_login
         project_id = Souls.configuration.project_id
-        system "gcloud config set project #{project_id}"
-        system "gcloud auth login"
+        system("gcloud config set project #{project_id}")
+        system("gcloud auth login")
       end
 
       def enable_permissions
-        system "gcloud services enable compute.googleapis.com"
-        puts "Operating permission to compute.googleapis.com ..."
-        system "gcloud services enable iam.googleapis.com"
-        puts "Operating permission to iam.googleapis.com ..."
-        system "gcloud services enable dns.googleapis.com"
-        puts "Operating permission to dns.googleapis.com ..."
-        system "gcloud services enable sqladmin.googleapis.com"
-        puts "Operating permission to sqladmin.googleapis.com ..."
-        system "gcloud services enable sql-component.googleapis.com"
-        puts "Operating permission to sql-component.googleapis.com ..."
-        system "gcloud services enable servicenetworking.googleapis.com"
-        puts "Operating permission to servicenetworking.googleapis.com ..."
-        system "gcloud services enable containerregistry.googleapis.com"
-        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 compute.googleapis.com")
+        puts("Operating permission to compute.googleapis.com ...")
+        system("gcloud services enable iam.googleapis.com")
+        puts("Operating permission to iam.googleapis.com ...")
+        system("gcloud services enable dns.googleapis.com")
+        puts("Operating permission to dns.googleapis.com ...")
+        system("gcloud services enable sqladmin.googleapis.com")
+        puts("Operating permission to sqladmin.googleapis.com ...")
+        system("gcloud services enable sql-component.googleapis.com")
+        puts("Operating permission to sql-component.googleapis.com ...")
+        system("gcloud services enable servicenetworking.googleapis.com")
+        puts("Operating permission to servicenetworking.googleapis.com ...")
+        system("gcloud services enable containerregistry.googleapis.com")
+        puts("Operating permission to containerregistry.googleapis.com")
+        system("gcloud services enable run.googleapis.com")
+        puts("Operating permission to run.googleapis.com")
       end
 
       def create_network
         return "Error: Please Set Souls.configuration" if Souls.configuration.app.nil?
+
         network = Souls.configuration.app
-        system "gcloud compute networks create #{network}"
+        system("gcloud compute networks create #{network}")
       rescue StandardError => e
-        raise StandardError, e
+        raise(StandardError, e)
       end
 
-      def create_firewall ip_range: "10.140.0.0/20"
+      def create_firewall(ip_range: "10.140.0.0/20")
         network = Souls.configuration.app
-        system "gcloud compute firewall-rules create #{network} --network #{network} --allow tcp,udp,icmp --source-ranges #{ip_range}"
-        system "gcloud compute firewall-rules create #{network}-ssh --network #{network} --allow tcp:22,tcp:3389,icmp"
+        system(
+          "gcloud compute firewall-rules create #{network}
+          --network #{network}
+          --allow tcp,udp,icmp
+          --source-ranges #{ip_range}"
+        )
+        system("gcloud compute firewall-rules create #{network}-ssh --network #{network} --allow tcp:22,tcp:3389,icmp")
       end
 
       def create_private_access
         network = Souls.configuration.app
         project_id = Souls.configuration.project_id
-        system "gcloud compute addresses create #{network}-my-network \
-        --global \
-        --purpose=VPC_PEERING \
-        --prefix-length=16 \
-        --description='peering range for SOULs' \
-        --network=#{network} \
-        --project=#{project_id}"
+        system(
+          "gcloud compute addresses create #{network}-my-network \
+          --global \
+          --purpose=VPC_PEERING \
+          --prefix-length=16 \
+          --description='peering range for SOULs' \
+          --network=#{network} \
+          --project=#{project_id}"
+        )
       end
 
-      def create_sql_instance root_pass: "Postgre123!", zone: "asia-northeast1-b"
+      def create_sql_instance(root_pass: "Postgre123!", zone: "asia-northeast1-b")
         app = "#{Souls.configuration.app}-db"
-        system "gcloud sql instances create #{app} --database-version=POSTGRES_13 --cpu=2 --memory=7680MB --zone=#{zone} --root-password='#{root_pass}' --database-flags cloudsql.iam_authentication=on"
+        system(
+          "gcloud sql instances create #{app}
+            --database-version=POSTGRES_13 --cpu=2 --memory=7680MB --zone=#{zone}
+            --root-password='#{root_pass}' --database-flags cloudsql.iam_authentication=on"
+        )
       end
     end
   end

data/lib/souls/gcloud/iam.rb

@@ -1,31 +1,31 @@
 module Souls
   module Gcloud
     class << self
-      def create_service_account service_account: "souls-app"
+      def create_service_account(service_account: "souls-app")
         `gcloud iam service-accounts create #{service_account} \
         --description="Souls Service Account" \
         --display-name="#{service_account}"`
       end
 
-      def create_service_account_key service_account: "souls-app"
+      def create_service_account_key(service_account: "souls-app")
         project_id = Souls.configuration.project_id
         `gcloud iam service-accounts keys create ./config/keyfile.json \
           --iam-account #{service_account}@#{project_id}.iam.gserviceaccount.com`
       end
 
-      def add_service_account_role service_account: "souls-app", role: "roles/firebase.admin"
+      def add_service_account_role(service_account: "souls-app", role: "roles/firebase.admin")
         project_id = Souls.configuration.project_id
         `gcloud projects add-iam-policy-binding #{project_id} \
         --member="serviceAccount:#{service_account}@#{project_id}.iam.gserviceaccount.com" \
         --role="#{role}"`
       end
 
-      def add_permissions service_account: "souls-app"
-        self.add_service_account_role service_account: service_account, role: "roles/cloudsql.serviceAgent"
-        self.add_service_account_role service_account: service_account, role: "roles/containerregistry.ServiceAgent"
-        self.add_service_account_role service_account: service_account, role: "roles/pubsub.serviceAgent"
-        self.add_service_account_role service_account: service_account, role: "roles/firestore.serviceAgent"
-        self.add_service_account_role service_account: service_account, role: "roles/iam.serviceAccountUser"
+      def add_permissions(service_account: "souls-app")
+        add_service_account_role(service_account: service_account, role: "roles/cloudsql.serviceAgent")
+        add_service_account_role(service_account: service_account, role: "roles/containerregistry.ServiceAgent")
+        add_service_account_role(service_account: service_account, role: "roles/pubsub.serviceAgent")
+        add_service_account_role(service_account: service_account, role: "roles/firestore.serviceAgent")
+        add_service_account_role(service_account: service_account, role: "roles/iam.serviceAccountUser")
       end
     end
   end