souls 0.51.0 → 0.52.1

data/lib/souls/cli/upgrade/gemfile.rb

@@ -0,0 +1,108 @@
+module Souls
+  class Upgrade < Thor
+    desc "gemfile", "Update Gemfile/Gemfile.lock Version"
+    def 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
+        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
+
+    private
+
+    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 Souls.configuration.fixed_gems.include?(gem[0].to_s)
+          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
+  end
+end

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

@@ -1 +1 @@
-require_relative "./gem_update"
+require_relative "./gemfile"

data/lib/souls/cli.rb

@@ -0,0 +1,57 @@
+require "souls"
+module Souls
+  class CLI < Thor
+    desc "api [COMMAND]", "souls api Commands"
+    subcommand "api", API
+
+    desc "gcloud [COMMAND]", "souls gcloud Commands"
+    subcommand "gcloud", Gcloud
+
+    desc "docker [COMMAND]", "souls docker Commands"
+    subcommand "docker", Docker
+
+    desc "create [COMMAND]", "souls create worker $worker_name"
+    subcommand "create", Create
+
+    desc "sync", "souls sync Commands"
+    subcommand "sync", Sync
+
+    desc "upgrade", "souls upgrade Commands"
+    subcommand "upgrade", Upgrade
+
+    desc "worker [COMMAND]", "souls worker Commands"
+    subcommand "worker", Worker
+
+    # rubocop:disable Style/StringHashKeys
+    map "c" => :console
+    map "s" => :server
+    map "db:migrate" => :migrate
+    map "db:create_migration" => :create_migration
+    map "db:add_column" => :add_column
+    map "db:rename_column" => :rename_column
+    map "db:change_column" => :change_column
+    map "db:remove_column" => :remove_column
+    map "db:drop_table" => :drop_table
+    map "db:create" => :db_create
+    map "db:migrate:reset" => :mirgate_reset
+    map "db:seed" => :seed
+    map "t" => :test
+    map ["-v", "--v", "--version", "-version"] => :version
+    # rubocop:enable Style/StringHashKeys
+
+    desc "version", "SOULs Version"
+    def version
+      puts(Souls::VERSION)
+    end
+
+    desc "test", "Run Rspec & Rubocop"
+    def test
+      system("rubocop -A")
+      system("bundle exec rspec")
+    end
+
+    def self.exit_on_failure?
+      false
+    end
+  end
+end

data/lib/souls/index.rb

@@ -1,3 +1,4 @@
+require "thor"
 require_relative "./api/index"
 require_relative "./cli/index"
 require_relative "./version"
@@ -5,9 +6,4 @@ require_relative "./worker/index"
 require_relative "./utils/index"
 
 module Souls
-  module Api
-  end
-
-  module Worker
-  end
 end

data/lib/souls/version.rb

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

data/lib/souls/versions/.souls_api_version

@@ -1 +1 @@
-0.30.0
+0.31.1

data/lib/souls/versions/.souls_worker_version

@@ -1 +1 @@
-0.30.0
+0.31.1

data/lib/souls/worker/generate/index.rb

@@ -1,2 +1,2 @@
 require_relative "./mailer"
-require_relative "./mutation"
+require_relative "./job"

data/lib/souls/worker/generate/job.rb

@@ -0,0 +1,45 @@
+module Souls
+  class Generate < Thor
+    desc "job [CLASS_NAME]", "Generate Job File in Worker"
+    method_option mailer: :boolean, aliases: "--mailer", default: false, desc: "Generate Mailer Template"
+    def job(class_name)
+      if options[:mailer]
+        mailer(class_name)
+      else
+        create_mutation(class_name: class_name)
+      end
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
+
+    private
+
+    def create_mutation(class_name: "send-mailer")
+      file_dir = "./app/graphql/mutations/"
+      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+      file_path = "#{file_dir}#{class_name.singularize}.rb"
+      raise(StandardError, "Mutation already exist! #{file_path}") if File.exist?(file_path)
+
+      File.open(file_path, "w") do |f|
+        f.write(<<~TEXT)
+          module Mutations
+            class #{class_name.camelize} < BaseMutation
+              description "Job Description"
+              field :response, String, null: false
+
+              def resolve
+                # Define Job Here
+
+                { response: "Job done!" }
+              rescue StandardError => e
+                GraphQL::ExecutionError.new(e.to_s)
+              end
+            end
+          end
+        TEXT
+      end
+      puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+      file_path
+    end
+  end
+end

data/lib/souls/worker/generate/mailer.rb

@@ -1,56 +1,51 @@
 module Souls
-  module Worker
-    module Generate
-      class << self
-        def mailer(class_name: "mailer", option: "")
-          if option.to_sym == :sendgrid
-            sendgrid_mailer(class_name: class_name)
-          else
-            mailgun_mailer(class_name: class_name)
-          end
-        end
+  class Generate < Thor
+    desc "mailer [MAILER_NAME]", "Generate Mailer Template in Worker"
+    def mailer(class_name)
+      mailgun_mailer(class_name: class_name)
+    rescue Thor::Error => e
+      raise(Thor::Error, e)
+    end
 
-        private
+    private
 
-        def mailgun_mailer(class_name: "mailer")
-          file_dir = "./app/graphql/mutations/"
-          FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
-          file_path = "#{file_dir}#{class_name.singularize}.rb"
-          raise(StandardError, "Mailer already exist! #{file_path}") if File.exist?(file_path)
+    def mailgun_mailer(class_name: "mailer")
+      file_dir = "./app/graphql/mutations/"
+      FileUtils.mkdir_p(file_dir) unless Dir.exist?(file_dir)
+      file_path = "#{file_dir}#{class_name.singularize}.rb"
+      raise(StandardError, "Mailer already exist! #{file_path}") if File.exist?(file_path)
 
-          File.open(file_path, "w") do |f|
-            f.write(<<~TEXT)
-              module Mutations
-                class #{class_name.camelize} < BaseMutation
-                  description "Mail を送信します。"
-                  field :response, String, null: false
+      File.open(file_path, "w") do |f|
+        f.write(<<~TEXT)
+          module Mutations
+            class #{class_name.camelize} < BaseMutation
+              description "Mail を送信します。"
+              field :response, String, null: false
 
-                  def resolve
-                    # First, instantiate the Mailgun Client with your API key
-                    mg_client = ::Mailgun::Client.new("YOUR-API-KEY")
+              def resolve
+                # First, instantiate the Mailgun Client with your API key
+                mg_client = ::Mailgun::Client.new("YOUR-API-KEY")
 
-                    # Define your message parameters
-                    message_params = {
-                      from: "postmaster@YOUR-DOMAIN",
-                      to: "sending@to.mail.com",
-                      subject: "SOULs Mailer test!",
-                      text: "It is really easy to send a message!"
-                    }
+                # Define your message parameters
+                message_params = {
+                  from: "postmaster@YOUR-DOMAIN",
+                  to: "sending@to.mail.com",
+                  subject: "SOULs Mailer test!",
+                  text: "It is really easy to send a message!"
+                }
 
-                    # Send your message through the client
-                    mg_client.send_message("YOUR-MAILGUN-DOMAIN", message_params)
-                    { response: "Job done!" }
-                  rescue StandardError => e
-                    GraphQL::ExecutionError.new(e.to_s)
-                  end
-                end
+                # Send your message through the client
+                mg_client.send_message("YOUR-MAILGUN-DOMAIN", message_params)
+                { response: "Job done!" }
+              rescue StandardError => e
+                GraphQL::ExecutionError.new(e.to_s)
               end
-            TEXT
+            end
           end
-          puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
-          file_path
-        end
+        TEXT
       end
+      puts(Paint % ["Created file! : %{white_text}", :green, { white_text: [file_path.to_s, :white] }])
+      file_path
     end
   end
 end

data/lib/souls/worker/index.rb

@@ -1,6 +1,8 @@
 require_relative "./generate/index"
 
 module Souls
-  module Worker::Generate
+  class Worker < Thor
+    desc "generate [COMMAND]", "souls worker generate Commands"
+    subcommand "generate", Generate
   end
 end

data/lib/souls.rb

@@ -1,4 +1,5 @@
 require_relative "souls/index"
+require_relative "souls/cli"
 require "active_support/core_ext/string/inflections"
 require "date"
 require "json"
@@ -7,6 +8,7 @@ require "net/http"
 require "paint"
 require "whirly"
 require "tty-prompt"
+require "thor"
 
 module Souls
   extend Souls::Utils

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: souls
 version: !ruby/object:Gem::Version
-  version: 0.51.0
+  version: 0.52.1
 platform: ruby
 authors:
 - POPPIN-FUMI
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-10 00:00:00.000000000 Z
+date: 2021-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -96,6 +96,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: |-
   SOULs はサーバーレスフルスタックフレームワークです。柔軟な Ruby GraphQL API と Worker はルーティングの必要がありません。
     クラウド環境への自動デプロイ、CI/CD ワークフローを標準装備。開発者がビジネスロジックに集中し、楽しくコードが書けるような環境を目指しています。
@@ -118,7 +132,6 @@ files:
 - lib/souls/api/generate/edge.rb
 - lib/souls/api/generate/index.rb
 - lib/souls/api/generate/manager.rb
-- lib/souls/api/generate/migration.rb
 - lib/souls/api/generate/model.rb
 - lib/souls/api/generate/mutation.rb
 - lib/souls/api/generate/policy.rb
@@ -139,6 +152,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.rb
 - lib/souls/cli/console/index.rb
 - lib/souls/cli/create/index.rb
 - lib/souls/cli/db/index.rb
@@ -160,7 +174,7 @@ files:
 - lib/souls/cli/sync/index.rb
 - lib/souls/cli/sync/model.rb
 - lib/souls/cli/sync/pubsub.rb
-- lib/souls/cli/upgrade/gem_update.rb
+- lib/souls/cli/upgrade/gemfile.rb
 - lib/souls/cli/upgrade/index.rb
 - lib/souls/index.rb
 - lib/souls/utils/index.rb
@@ -168,8 +182,8 @@ files:
 - lib/souls/versions/.souls_api_version
 - lib/souls/versions/.souls_worker_version
 - lib/souls/worker/generate/index.rb
+- lib/souls/worker/generate/job.rb
 - lib/souls/worker/generate/mailer.rb
-- lib/souls/worker/generate/mutation.rb
 - lib/souls/worker/index.rb
 homepage: https://souls.elsoul.nl
 licenses: