souls 0.23.7 → 0.24.1

data/apps/worker/spec/factories/article_categories.rb

@@ -0,0 +1,9 @@
+FactoryBot.define do
+  factory :article_category do
+    name { Faker::Books::CultureSeries.culture_ship_class }
+    tags { %w[tag1 tag2 tag3] }
+    is_deleted { false }
+    created_at { Time.now }
+    updated_at { Time.now }
+  end
+end

data/apps/worker/spec/factories/articles.rb

@@ -0,0 +1,17 @@
+FactoryBot.define do
+  factory :article do
+    association :user, factory: :user
+    title { Faker::Book.unique.title }
+    body { Faker::Quote.matz }
+    thumnail_url { Faker::Internet.url }
+    public_date { Time.now }
+    association :article_category, factory: :article_category
+    is_public { false }
+    just_created { false }
+    slag { Faker::Internet.password(min_length: 16) }
+    tags { %w[tag1 tag2 tag3] }
+    is_deleted { false }
+    created_at { Time.now }
+    updated_at { Time.now }
+  end
+end

data/apps/worker/spec/factories/users.rb

@@ -0,0 +1,23 @@
+require "gimei"
+FactoryBot.define do
+  factory :user do
+    uid { Faker::Internet.password }
+    username { Gimei.kanji }
+    screen_name { Faker::Internet.unique.username }
+    last_name { Gimei.last.hiragana }
+    first_name { Gimei.first.hiragana }
+    last_name_kanji { Gimei.last.kanji }
+    first_name_kanji { Gimei.first.kanji }
+    last_name_kana { Gimei.last.katakana }
+    first_name_kana { Gimei.last.katakana }
+    email { Faker::Internet.unique.email }
+    tel { Faker::PhoneNumber.subscriber_number(length: 10) }
+    icon_url { "https://picsum.photos/200" }
+    birthday { Faker::Date.birthday(min_age: 18, max_age: 65) }
+    gender { Gimei.male }
+    lang { "ja" }
+    category { "user" }
+    roles_mask { :normal }
+    is_deleted { false }
+  end
+end

data/apps/worker/spec/models/article_category_spec.rb

@@ -0,0 +1,7 @@
+RSpec.describe("ArticleCategory Model テスト", type: :model) do
+  describe "ArticleCategory データを書き込む" do
+    it "valid ArticleCategory Model" do
+      expect(FactoryBot.build(:article_category)).to(be_valid)
+    end
+  end
+end

data/apps/worker/spec/models/article_spec.rb

@@ -0,0 +1,7 @@
+RSpec.describe("Article Model テスト", type: :model) do
+  describe "Article データを書き込む" do
+    it "valid Article Model" do
+      expect(FactoryBot.build(:article)).to(be_valid)
+    end
+  end
+end

data/apps/worker/spec/models/user_spec.rb

@@ -0,0 +1,7 @@
+RSpec.describe("User Model テスト", type: :model) do
+  describe "User データを書き込む" do
+    it "valid User Model" do
+      expect(FactoryBot.build(:user)).to(be_valid)
+    end
+  end
+end

data/apps/worker/spec/spec_helper.rb

@@ -0,0 +1,110 @@
+ENV["RACK_ENV"] = "test"
+require "./app"
+require "rspec"
+# require "test/unit"
+require "rack/test"
+require "database_cleaner"
+require "capybara/rspec"
+require "webmock/rspec"
+require "pundit/matchers"
+
+if ENV["RACK_ENV"] == "production"
+  abort("The Souls environment is running in production mode!")
+end
+
+WebMock.disable_net_connect!(allow_localhost: true)
+
+begin
+  ActiveRecord::Migration.maintain_test_schema!
+rescue ActiveRecord::PendingMigrationError => e
+  puts e.to_s.strip
+  exit 1
+end
+
+def app
+  SoulsApi
+end
+
+Pundit::Matchers.configure do |config|
+  # config.user_alias = :user_role
+end
+
+RSpec.configure do |config|
+  config.order = :random
+
+  config.include Capybara::DSL
+  config.expect_with :rspec do |expectations|
+    # config.filter_run_excluding skip: true
+    expectations.include_chain_clauses_in_custom_matcher_descriptions = true
+  end
+
+  # rspec-mocks config goes here. You can use an alternate test double
+  # library (such as bogus or mocha) by changing the `mock_with` option here.
+  config.mock_with :rspec do |mocks|
+    mocks.verify_partial_doubles = true
+  end
+
+  config.shared_context_metadata_behavior = :apply_to_host_groups
+  config.include FactoryBot::Syntax::Methods
+  config.include Rack::Test::Methods
+
+  config.before(:suite) do
+    FactoryBot.find_definitions
+    DatabaseCleaner.clean_with(:truncation)
+  end
+
+  config.before(:each) do |_example|
+    DatabaseCleaner.strategy = :transaction
+    DatabaseCleaner.start
+  end
+
+  config.append_after(:each) { |_example| DatabaseCleaner.clean }
+  config.filter_run_excluding long: true
+  config.filter_run_excluding uses_external_service: true
+end
+
+class ActiveRecord::Base
+  mattr_accessor :shared_connection
+  @@shared_connection = nil
+
+  def self.connection
+    @@shared_connection || retrieve_connection
+  end
+end
+
+ActiveRecord::Base.shared_connection = ActiveRecord::Base.connection
+def get_global_key class_name, id
+  Base64.strict_encode64("#{class_name}:#{id}")
+end
+
+class ActiveSupport::TestCase
+  setup :begin_gc_deferment
+  teardown :reconsider_gc_deferment
+  teardown :scrub_instance_variables
+
+  @@reserved_ivars = %w[@_implementation @_result @_proxy @_assigns_hash_proxy @_backtrace]
+  DEFERRED_GC_THRESHOLD = (ENV["DEFER_GC"] || 1.0).to_f
+
+  @@last_gc_run = Time.now
+
+  def begin_gc_deferment
+    GC.disable if DEFERRED_GC_THRESHOLD > 0
+  end
+
+  def reconsider_gc_deferment
+    if DEFERRED_GC_THRESHOLD > 0 && Time.now - @@last_gc_run >= DEFERRED_GC_THRESHOLD
+
+      GC.enable
+      GC.start
+      GC.disable
+
+      @@last_gc_run = Time.now
+    end
+  end
+
+  def scrub_instance_variables
+    (instance_variables - @@reserved_ivars).each do |ivar|
+      instance_variable_set(ivar, nil)
+    end
+  end
+end

data/config/souls.rb

@@ -1,5 +1,9 @@
 Souls.configure do |config|
-  config.app = "souls-app"
-  config.project_id = "souls-app"
-  config.strain = "api"
+  config.app = "souls-api"
+  config.project_id = "souls-api"
+  config.strain = "worker"
+  config.api_repo = "elsoul/souls_api"
+  config.worker_repo = "elsoul/souls_worker"
+  config.worker_endpoint = "https://worker.com"
+  config.fixed_gems = []
 end

data/exe/souls

@@ -17,7 +17,7 @@ begin
       exit
     end
     first_message = Paint % [
-      "Select Strain: %{red_text} %{yellow_text} %{green_text} %{blue_text} %{cyan_text} %{magenda_text}",
+      "Select Strain: %{red_text} %{yellow_text} %{green_text} %{blue_text} %{cyan_text} %{magenta_text}",
       :white,
       {
         red_text: ["\n1. SOULs GraphQL API", :red],
@@ -25,7 +25,7 @@ begin
         green_text: ["\n3. SOULs Console Web", :green],
         blue_text: ["\n4. SOULs Admin Web", :blue],
         cyan_text: ["\n5. SOULs Media Web", :cyan],
-        magenda_text: ["\n6. SOULs Doc Web", :magenda]
+        magenta_text: ["\n6. SOULs Doc Web", :magenta]
       }
     ]
     puts(first_message)
@@ -42,8 +42,6 @@ begin
     case strain
     when "media", "admin", "console", "doc"
       system("yarn dev")
-    when "worker"
-      system("bundle exec puma -p 3000 -e development")
     else
       system("foreman start -f Procfile.dev")
     end
@@ -69,7 +67,22 @@ begin
     Whirly.start(spinner: "clock", interval: 420, stop: "🎉") do
       Whirly.status = status
       send_method = ARGV[1]
-      Souls::Gcloud.public_send(send_method)
+
+      case send_method
+      when "create_pubsub_topic"
+        topic_name = ARGV[2]
+        args = { topic_name: topic_name }
+        Souls::Gcloud.public_send(send_method, args)
+      when "create_pubsub_subscription"
+        project_id = Souls.configuration.project_id
+        topic_name = ARGV[2]
+        service_account = "#{Souls.configuration.app}@#{project_id}iam.gserviceaccount.com"
+        endpoint = Souls.configuration.endpoint
+        args = { project_id: project_id, topic_name: topic_name, service_account: service_account, endpoint: endpoint }
+        Souls::Gcloud.public_send(send_method, args)
+      else
+        Souls::Gcloud.public_send(send_method)
+      end
       Whirly.status = "Done!"
     end
   when "-v", "--version"

data/lib/souls.rb

@@ -64,24 +64,6 @@ module Souls
     )
   end
 
-  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 self.gemfile_latest_version
     file_path = "./Gemfile"
     updated_gems = []
@@ -97,6 +79,7 @@ module Souls
         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 Souls.configuration.fixed_gems.include?(gem[0].to_s)
         next if data["version"].to_s == gem[1].to_s
 
         updated_lines << if from_dev
@@ -185,14 +168,16 @@ 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, :fixed_gems
 
     def initialize
       @app = nil
       @project_id = nil
       @strain = nil
-      @worker_name = nil
-      @api_name = nil
+      @worker_repo = nil
+      @api_repo = nil
+      @worker_endpoint = nil
+      @fixed_gems = 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

@@ -1,71 +1,73 @@
 module Souls
   module Gcloud
-    def self.auth_login
-      project_id = Souls.configuration.project_id
-      system("gcloud config set project #{project_id}")
-      system("gcloud auth login")
-    end
+    class << self
+      def auth_login
+        project_id = Souls.configuration.project_id
+        system("gcloud config set project #{project_id}")
+        system("gcloud auth login")
+      end
 
-    def self.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")
-    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")
+      end
 
-    def self.create_network
-      return "Error: Please Set Souls.configuration" if Souls.configuration.app.nil?
+      def create_network
+        return "Error: Please Set Souls.configuration" if Souls.configuration.app.nil?
 
-      network = Souls.configuration.app
-      system("gcloud compute networks create #{network}")
-    rescue StandardError => e
-      raise(StandardError, e)
-    end
+        network = Souls.configuration.app
+        system("gcloud compute networks create #{network}")
+      rescue StandardError => e
+        raise(StandardError, e)
+      end
 
-    def self.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")
-    end
+      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")
+      end
 
-    def self.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}"
-      )
-    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}"
+        )
+      end
 
-    def self.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"
-      )
+      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"
+        )
+      end
     end
   end
 end