discorb 0.3.0 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4f5c9c3f2c3e472300d1fe8462b9e667008bce0a30d11b2ce6cf866f697aedb0
-  data.tar.gz: d2c2fa2edd51a84a1001675d0572bfae3464f5d25b85865a95a7c7f5daebf109
+  metadata.gz: 7322e6131e0e5d070df790e4a4b7ea6ea6ea7a286c975b0732c0c7eff2e9903d
+  data.tar.gz: 045ef3ab63628e0e0fe867de4aef8b1f872076cd74912b38e035c8cb6907c731
 SHA512:
-  metadata.gz: ed4bb639464a3adc7a5982088149421d6d15f7e3c4be37bb59855a5d106ee5a1e1756b10ba401fd3d3ced9008c15e99bb3967f93eb7ff197903fb6cf95e19699
-  data.tar.gz: fc6809db6b8e7a7e65e70fb49ce3b25a2aa4f42145477730e234511a95f278879759d76f5ee9547fa213f34ce3c413f5ba167c7f042d7f73a954718ba22e51d4
+  metadata.gz: f2b045e2b31b6a8fb95d74f87de931b30e67c8f34f647a0994b4feb4f3c3d8c270f2fddab03e995cce4eaf2f770d2698ae537e0e5d328152dc0244f3e6f5c59d
+  data.tar.gz: 3582014d604c85091c3c6180a13766ccab7dce8e0df0319278eb0d89e7cd0d0df2d236b3a58763cc55e5ccf80ef6c46317ad62028c30f0d89002bf48f1bc4b8b

data/.github/workflows/build_main.yml

@@ -0,0 +1,51 @@
+name: Build YARD with main
+
+on:
+  workflow_dispatch:
+  schedule:
+    - cron: "*/8 * * * *"
+
+jobs:
+  main:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - uses: actions/checkout@v2
+      - name: Set up Ruby
+        uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: 3.0.2
+          bundler-cache: true
+      - name: Set up git settings
+        run: |
+          git config --global user.email "action@github.com"
+          git config --global user.name "GitHub Action"
+      - name: Clone pages
+        env:
+          SSH_SECRET: ${{ secrets.SSH }}
+          GIT_SSH_COMMAND: ssh -i ~/ssh_secret
+        run: |
+          echo "$SSH_SECRET" > ~/ssh_secret
+          chmod 600 ~/ssh_secret
+          git clone git@github.com:discorb-lib/discorb-lib.github.io /tmp/pages
+      - name: Install dependencies
+        run: |
+          bundle config --local with 'docs'
+          bundle install
+      - name: Generate document
+        run: bundle exec rake document
+      - name: Push document
+        env:
+          SSH_SECRET: ${{ secrets.SSH }}
+          GIT_SSH_COMMAND: ssh -i ~/ssh_secret
+        run: |
+          echo "$SSH_SECRET" > ~/ssh_secret
+          chmod 600 ~/ssh_secret
+          cp -r ./doc/. /tmp/pages
+          cd /tmp/pages
+          git add -A
+          git commit -m "Update: Update document for ${{ github.sha }} by cron"
+          git update-ref -d refs/remotes/origin/user
+          git push origin main -f
+        continue-on-error: true

data/.gitignore

@@ -35,7 +35,7 @@ build-iPhoneSimulator/
 ## Documentation cache and generated files:
 /.yardoc/
 /_yardoc/
-/doc/
+# /doc/
 /rdoc/
 
 ## Environment normalization:
@@ -54,4 +54,8 @@ build-iPhoneSimulator/
 
 # Used by RuboCop. Remote config files pulled in from inherit_from directive.
 # .rubocop-https?--*
+
+# For documentation generation.
 tmp-template-replace
+tmp-doc
+doc

data/Changelog.md

@@ -73,4 +73,29 @@
 ## 0.2.5
 
 - Add: Add way to add event listener
-- Change: Move document to https://discorb-lib.github.io/
+- Change: Move document to https://discorb-lib.github.io/
+
+## 0.3.0
+
+- Add: Improve CLI tools
+- Add: Add `discorb init`
+- Change: Change `discord-irb` to `discorb irb`
+  
+## 0.3.1
+
+- Add: Add `discorb show`
+- Fix: Fix documenting
+
+## 0.4.0
+
+- Add: Add `discorb setup`
+- Add: Add `discorb run`
+- Add: Add realtime documentation
+
+## 0.4.1
+
+- Add: Add `-s` option to `discorb run`
+  
+## 0.4.2
+
+- Fix: Fix error in `discorb run`

data/Gemfile.lock

@@ -1,10 +1,10 @@
 PATH
   remote: .
   specs:
-    discorb (0.3.0)
-      async
-      async-http
-      async-websocket
+    discorb (0.4.2)
+      async (~> 1.30.1)
+      async-http (~> 0.56.5)
+      async-websocket (~> 0.19.0)
       mime-types (~> 3.3)
 
 GEM
@@ -54,6 +54,7 @@ GEM
 
 PLATFORMS
   x86-mingw32
+  x86_64-linux
 
 DEPENDENCIES
   discorb!

data/Rakefile

@@ -1,30 +1,26 @@
 # frozen_string_literal: true
 
 require "bundler/gem_tasks"
+require_relative "lib/discorb/utils/colored_puts"
 task default: %i[]
 
+# @!visibility private
 def get_version
   require_relative "lib/discorb/common"
-  latest_commit = `git log --oneline`.force_encoding("utf-8").split("\n")[0]
-  version = Discorb::VERSION
-  unless latest_commit.downcase.include?("update version")
-    version += "-dev"
+  tag = `git tag --points-at HEAD`.force_encoding("utf-8").strip
+  if tag.empty?
+    version = "main"
+  else
+    version = Discorb::VERSION
   end
   version
 end
 
-def gputs(text)
-  puts "\e[90m#{text}\e[m"
-end
-
-def sputs(text)
-  puts "\e[92m#{text}\e[m"
-end
-
+desc "Build emoji_table.rb"
 task :emoji_table do
   require_relative "lib/discorb"
 
-  gputs "Building emoji_table.rb"
+  iputs "Building emoji_table.rb"
   res = {}
   Discorb::EmojiTable::DISCORD_TO_UNICODE.each do |discord, unicode|
     res[unicode] ||= []
@@ -47,11 +43,12 @@ task :emoji_table do
   sputs "Successfully made emoji_table.rb"
 end
 
+desc "Format files"
 task :format do
   Dir.glob("**/*.rb").each do |file|
     next if file.start_with?("vendor")
 
-    gputs "Formatting #{file}"
+    iputs "Formatting #{file}"
     `rufo ./#{file}`
     content = ""
     File.open(file, "rb") do |f|
@@ -63,27 +60,37 @@ task :format do
     end
   end
 end
+
+desc "Generate document and replace"
 namespace :document do
   version = get_version
+
+  desc "Just generate document"
   task :yard do
-    sh "yardoc -o doc/#{version}"
+    sh "bundle exec yardoc -o doc/#{version}"
   end
+
+  desc "Replace files"
   namespace :replace do
     require "fileutils"
+
+    desc "Replace CSS"
     task :css do
-      gputs "Replacing css"
+      iputs "Replacing css"
       Dir.glob("template-replace/files/**/*.*")
         .map { |f| f.delete_prefix("template-replace/files") }.each do |file|
         FileUtils.cp("template-replace/files" + file, "doc/#{version}/#{file}")
       end
       sputs "Successfully replaced css"
     end
+
+    desc "Replace HTML"
     task :html do
       require_relative "template-replace/scripts/sidebar.rb"
       require_relative "template-replace/scripts/version.rb"
       require_relative "template-replace/scripts/index.rb"
       require_relative "template-replace/scripts/yard_replace.rb"
-      gputs "Resetting changes"
+      iputs "Resetting changes"
       Dir.glob("doc/#{version}/**/*.html") do |f|
         next if (m = f.match(/[0-9]+\.[0-9]+\.[0-9]+(-[a-z]+)?/)) && m[0] != version
 
@@ -91,21 +98,23 @@ namespace :document do
         content.gsub!(/<!--od-->[\s\S]*<!--eod-->/, "")
         File.write(f, content)
       end
-      gputs "Adding version tab"
+      iputs "Adding version tab"
       %w[file_list class_list method_list].each do |f|
         replace_sidebar("doc/#{version}/#{f}.html")
       end
 
-      gputs "Building version tab"
-      build_version_sidebar("doc/#{version}")
-      gputs "Replacing _index.html"
+      iputs "Building version tab"
+      build_version_sidebar("doc/#{version}", version)
+      iputs "Replacing _index.html"
       replace_index("doc/#{version}", version)
-      gputs "Replacing YARD credits"
+      iputs "Replacing YARD credits"
       yard_replace("doc/#{version}", version)
-      gputs "Successfully replaced htmls"
+      iputs "Successfully replaced htmls"
     end
+
+    desc "Replace EOL"
     task :eol do
-      gputs "Replacing CRLF with LF"
+      iputs "Replacing CRLF with LF"
       Dir.glob("doc/**/*.*") do |file|
         next unless File.file?(file)
 
@@ -122,20 +131,36 @@ namespace :document do
     end
   end
   task :replace => %i[replace:css replace:html replace:eol]
+
+  desc "Build all versions"
   task :build_all do
     require "fileutils"
-    gputs "Building all versions"
+
+    class Bundler::Definition
+      def validate_platforms!
+        # noop
+      end
+    end
+
+    iputs "Building all versions"
+    FileUtils.rm_rf("doc") rescue nil
     FileUtils.cp_r("./template-replace/.", "./tmp-template-replace")
+    Rake::Task["document:yard"].execute
+    Rake::Task["document:replace:html"].execute
+    Rake::Task["document:replace:css"].execute
+    Rake::Task["document:replace:eol"].execute
     tags = `git tag`.force_encoding("utf-8").split("\n")
     tags.each do |tag|
       sh "git checkout #{tag} -f"
-      gputs "Building #{tag}"
+      iputs "Building #{tag}"
       FileUtils.cp_r("./tmp-template-replace/.", "./template-replace")
       version = tag.delete_prefix("v")
       Rake::Task["document:yard"].execute
       Rake::Task["document:replace:html"].execute
       Rake::Task["document:replace:css"].execute
       Rake::Task["document:replace:eol"].execute
+      FileUtils.cp_r("./doc/.", "./tmp-doc")
+      FileUtils.rm_rf("doc")
     end
     version = "."
     Rake::Task["document:yard"].execute
@@ -143,11 +168,19 @@ namespace :document do
     Rake::Task["document:replace:css"].execute
     Rake::Task["document:replace:eol"].execute
     sh "git switch main -f"
+    FileUtils.cp_r("./tmp-doc/.", "./doc")
     sputs "Successfully built all versions"
+  rescue => e
+    sh "git switch main -f"
+    raise e
   end
+
+  desc "Push to discorb-lib/discorb-lib.github.io"
   task :push do
-    gputs "Pushing documents"
+    iputs "Pushing documents"
     Dir.chdir("doc") do
+      sh "git init"
+      sh "git remote add origin git@github.com:discorb-lib/discorb-lib.github.io"
       sh "git add ."
       sh "git commit -m \"Update: Update document\""
       sh "git push -f"

data/discorb.gemspec

@@ -17,7 +17,7 @@ Gem::Specification.new do |spec|
 
   spec.metadata["homepage_uri"] = spec.homepage
   spec.metadata["source_code_uri"] = "https://github.com/discorb-lib/discorb"
-  spec.metadata["changelog_uri"] = "https://github.com/discorb-lib/discorb/blob/main/Changelog.md"
+  spec.metadata["changelog_uri"] = "https://discorb-lib.github.io/file.Changelog.html"
   spec.metadata["documentation_uri"] = "https://discorb-lib.github.io"
 
   # Specify which files should be added to the gem when it is released.
@@ -30,9 +30,9 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   # Uncomment to register a new dependency of your gem
-  spec.add_dependency "async"
-  spec.add_dependency "async-http"
-  spec.add_dependency "async-websocket"
+  spec.add_dependency "async", "~> 1.30.1"
+  spec.add_dependency "async-http", "~> 0.56.5"
+  spec.add_dependency "async-websocket", "~> 0.19.0"
 
   spec.add_dependency "mime-types", "~> 3.3"
   # For more information and examples about making a new gem, checkout our

data/docs/application_command.md

@@ -10,7 +10,13 @@ From: [Discord API docs](https://discord.com/developers/docs/interactions/applic
 
 ## How do I register an application command?
 
-Use {Discorb::Command::Handler.slash}, {Discorb::Command::Handler.slash_group} for slash commands, {Discorb::Command::Handler.user_command} for user menu commands, and {Discorb::Command::Handler.message_command} for message menu commands.
+Write to a your script:
+- {Discorb::Command::Handler.slash}, {Discorb::Command::Handler.slash_group} for slash commands,
+- {Discorb::Command::Handler.user_command} for user menu commands,
+- {Discorb::Command::Handler.message_command} for message menu commands.
+
+And then run `discorb setup` to register your application commands.
+{file:docs/cli/setup.md Learn more about `discorb setup`}. 
 
 ### Note
 

data/docs/cli/irb.md

@@ -2,7 +2,7 @@
 
 # discorb irb
 
-discorb irb is a command line tool for interacting with the Discord API.
+This command will start an interactive Ruby shell with connected client.
 
 
 ## Usage

data/docs/cli/run.md

@@ -0,0 +1,46 @@
+# @title CLI: discorb run
+
+# discorb run
+
+This command will run a client.
+
+
+## Usage
+
+```
+discorb run [options] [script]
+```
+
+### Arguments
+
+#### `script`
+
+The script to run. Defaults to `main.rb`.
+
+#### `-d`, `--deamon`
+
+Run the client in deamon mode.
+
+#### `-l`, `--log-level`
+
+Specify the log level.
+Should be one of the following:
+
+* `none`
+* `debug`
+* `info`
+* `warn`
+* `error`
+* `fatal`
+
+#### `-f`, `--log-file`
+
+Specify the file to write logs to.
+You can use `stdout` to write to the standard output, and `stderr` to write to the standard error.
+
+#### `-c`, `--[no-]log-color`
+
+Whether to colorize the log output.
+If not specified, the default will be:
+- `true` if the file to write logs to is `stdout` or `stderr`.
+- `false` otherwise.

data/docs/cli/setup.md

@@ -0,0 +1,17 @@
+# @title CLI: discorb setup
+
+# discorb setup
+
+This command will setup application commands.
+
+## Usage
+
+```
+discorb setup [script]
+```
+
+### Arguments
+
+#### `script`
+
+The script to setup. Defaults to `main.rb`.

data/docs/cli.md

@@ -17,4 +17,9 @@ Currently, discorb has the following commands:
 | Command | Description |
 |---------|-------------|
 | {file:docs/cli/init.md `init`} | Create a new project. |
-| {file:docs/cli/irb.md `irb`} | Start an interactive Ruby shell with connected client. |
+| {file:docs/cli/irb.md `irb`} | Start an interactive Ruby shell with connected client. |
+| {file:docs/cli/run.md `run`} | Run a client. |
+| {file:docs/cli/setup.md `setup`} | Setup application commands. |
+| `show` | Show your environment. (No document) |
+
+Click the command name to see the document.

data/exe/discorb

@@ -17,6 +17,9 @@ if script.nil?
     puts "\e[90m#{name.rjust(max_length)}\e[m - #{description}"
   end
 
+  puts "\e[94m\nTo run a tool, type:\e[m\n" +
+         "\e[34m  discorb [script]\e[m"
+
   exit 1
 end
 

data/lib/discorb/client.rb

@@ -60,12 +60,11 @@ module Discorb
     # @param [Boolean] colorize_log Whether to colorize the log.
     # @param [:debug, :info, :warn, :error, :critical] log_level The log level.
     # @param [Boolean] wait_until_ready Whether to delay event dispatch until ready.
-    # @param [Boolean] overwrite_application_commands Whether to overwrite application commands on ready.
     #
     def initialize(
       allowed_mentions: nil, intents: nil, message_caches: 1000,
       log: nil, colorize_log: false, log_level: :info,
-      wait_until_ready: true, overwrite_application_commands: true
+      wait_until_ready: true
     )
       @allowed_mentions = allowed_mentions || AllowedMentions.new(everyone: true, roles: true, users: true)
       @intents = (intents or Intents.default)
@@ -86,7 +85,6 @@ module Discorb
       @tasks = []
       @conditions = {}
       @commands = []
-      @overwrite_application_commands = overwrite_application_commands
       @status = :initialized
     end
 
@@ -384,11 +382,69 @@ module Discorb
 
     #
     # Starts the client.
+    # @note This method behavior will change by CLI.
+    # @see file:docs/cli.md
     #
     # @param [String] token The token to use.
     #
     def run(token)
+      case ENV["DISCORB_CLI_FLAG"]
+      when nil
+        start_client(token)
+      when "run"
+        require "json"
+        options = JSON.parse(ENV["DISCORB_CLI_OPTIONS"], symbolize_names: true)
+        Process.daemon if options[:daemon]
+        setup_commands(token) if options[:setup]
+        if options[:log_level]
+          if options[:log_level] == "none"
+            @log.out = nil
+          else
+            @log.out = case options[:log_file]
+              when nil, "stderr"
+                $stderr
+              when "stdout"
+                $stdout
+              else
+                ::File.open(options[:log_file], "a")
+              end
+            @log.level = options[:log_level].to_sym
+            @log.colorize_log = case options[:log_color]
+              when nil
+                if @log.out == $stdout || @log.out == $stderr
+                  true
+                else
+                  false
+                end
+              when true, false
+                options[:log_color]
+              end
+          end
+        end
+        start_client(token)
+      when "setup_command"
+        setup_commands(token)
+      end
+    end
+
+    #
+    # Stops the client.
+    #
+    def close!
+      @connection.send_close
+      @tasks.each(&:stop)
+      @status = :closed
+      @close_condition.signal
+    end
+
+    private
+
+    def start_client(token)
       Async do |task|
+        trap(:SIGINT) {
+          @log.info "SIGINT received, closing..."
+          close!
+        }
         @token = token.to_s
         @close_condition = Async::Condition.new
         main_task = Async do
@@ -403,15 +459,5 @@ module Discorb
         main_task.stop
       end
     end
-
-    #
-    # Stops the client.
-    #
-    def close!
-      @connection.send_close
-      @tasks.each(&:stop)
-      @status = :closed
-      @close_condition.signal
-    end
   end
 end

data/lib/discorb/command.rb

@@ -92,7 +92,6 @@ module Discorb
 
       #
       # Setup commands.
-      # @note This method is called automatically if overwrite_application_commands is set to true.
       # @see Client#initialize
       #
       # @param [String] token Bot token.

data/lib/discorb/common.rb

@@ -4,7 +4,7 @@ module Discorb
   # @return [String] The API base URL.
   API_BASE_URL = "https://discord.com/api/v9"
   # @return [String] The version of discorb.
-  VERSION = "0.3.0"
+  VERSION = "0.4.2"
   # @return [String] The user agent for the bot.
   USER_AGENT = "DiscordBot (https://github.com/discorb-lib/discorb #{VERSION}) Ruby/#{RUBY_VERSION}"
 

data/lib/discorb/error.rb

@@ -35,6 +35,7 @@ module Discorb
 
   #
   # Represents a HTTP error.
+  # @abstract
   #
   class HTTPError < DiscorbError
     # @return [String] the HTTP response code.
@@ -78,6 +79,20 @@ module Discorb
   class NotFoundError < HTTPError
   end
 
+  #
+  # Represents a error because of a cloudflare ban.
+  #
+  class CloudFlareBanError < HTTPError
+    def initialize(resp, client)
+      @client = client
+      @client.close!
+      DiscorbError.instance_method(:initialize).bind(self).call(<<~MESSAGE)
+        The client is banned from CloudFlare.
+        Hint: Try to increase the number of requests per second, e.g. Use sleep in between requests.
+      MESSAGE
+    end
+  end
+
   #
   # Represents a error in client-side.
   #

data/lib/discorb/exe/about.rb

@@ -0,0 +1,14 @@
+# description: Show information of discorb.
+
+puts "  disco\e[31mrb\e[m -  A new Discord API wrapper in Ruby.  \n\n"
+
+informations = {
+  "GitHub" => "https://github.com/discorb-lib/discorb",
+  "Documentation" => "https://discorb-lib.github.io",
+  "RubyGems" => "https://rubygems.org/gems/discorb",
+  "Changelog" => "https://discorb-lib.github.io/file.Changelog.html",
+}
+
+informations.each do |key, value|
+  puts "\e[90m#{key}:\e[m #{value}"
+end

data/lib/discorb/exe/init.rb

@@ -5,6 +5,7 @@ require_relative "../utils/colored_puts"
 
 $path = Dir.pwd
 
+# @!visibility private
 FILES = {
   "main.rb" => <<~'RUBY',
     require "discorb"
@@ -84,19 +85,7 @@ FILES = {
     # This gitignore is from github/gitignore.
     # https://github.com/github/gitignore/blob/master/Ruby.gitignore
   GITIGNORE
-}
-
-def make_files
-  iputs "Making files..."
-  FILES.each do |file, content|
-    File.write($path + "/#{file}", format(content, token: $values[:token]), mode: "wb")
-  end
-  sputs "Made files.\n"
-end
-
-def bundle_init
-  iputs "Initializing bundle..."
-  File.write($path + "/Gemfile", <<~'RUBY', mode: "wb")
+  "Gemfile" => <<~RUBY,
     # frozen_string_literal: true
 
     source "https://rubygems.org"
@@ -106,12 +95,33 @@ def bundle_init
     gem "discorb", "~> 0.2.5"
     gem "dotenv", "~> 2.7"
   RUBY
+}
+
+# @!visibility private
+def create_file(name)
+  File.write($path + "/#{name}", format(FILES[name], token: $values[:token]), mode: "wb")
+end
+
+# @!visibility private
+def make_files
+  iputs "Making files..."
+  create_file("main.rb")
+  create_file(".env")
+  sputs "Made files.\n"
+end
+
+# @!visibility private
+def bundle_init
+  iputs "Initializing bundle..."
+  create_file("Gemfile")
   iputs "Installing gems..."
   system "bundle install"
   sputs "Installed gems.\n"
 end
 
+# @!visibility private
 def git_init
+  create_file(".gitignore")
   iputs "Initializing git repository..."
   system "git init"
   system "git add ."

data/lib/discorb/exe/irb.rb

@@ -9,10 +9,16 @@ require "optparse"
 intents_value = Discorb::Intents.all.value
 token_file = "token"
 
-opt = OptionParser.new
+ARGV.delete_at 0
+
+opt = OptionParser.new <<~BANNER
+                         This command will start an interactive Ruby shell with connected client.
+
+                         Usage: discorb irb [options]
+                       BANNER
 opt.on("-i", "--intents", "intents to use, default to all") { |v| intents_value = v }
 opt.on("-t", "--token-file", "token file to load, default to \"token\"") { |v| token_file = v }
-opt.parse(ARGV)
+opt.parse!(ARGV)
 
 client = Discorb::Client.new(intents: Discorb::Intents.from_value(intents_value))
 $messages = []
@@ -30,7 +36,7 @@ client.on :ready do
            This is a debug client for Discord.
            \e[90mmessage\e[m to get latest message.
 
-           \e[36mhttps://rubydoc.info/gems/discorb/file/docs/discord_irb.md\e[m for more information.
+           \e[36mhttps://discorb-lib.github.io/#{Discorb::VERSION}/file.irb.html\e[m for more information.
          EOS
   end
 

data/lib/discorb/exe/run.rb

@@ -0,0 +1,49 @@
+# description: Run a client.
+require "optparse"
+require "json"
+require "discorb/utils/colored_puts"
+
+ARGV.delete_at 0
+# @!visibility private
+LOG_LEVELS = %w[none debug info warn error fatal]
+
+opt = OptionParser.new <<~BANNER
+                         This command will run a client.
+
+                         Usage: discorb run [options] [script]
+
+                                   script                     The script to run. Defaults to 'main.rb'.
+                       BANNER
+options = {
+  deamon: false,
+  log_level: nil,
+  log_file: nil,
+  log_color: nil,
+  setup: nil,
+}
+opt.on("-d", "--deamon", "Run as a daemon.") { |v| options[:daemon] = v }
+opt.on("-l", "--log-level LEVEL", "Log level.") do |v|
+  unless LOG_LEVELS.include? v.downcase
+    eputs "Invalid log level: \e[31m#{v}\e[91m"
+    eputs "Valid log levels: \e[31m#{LOG_LEVELS.join("\e[91m, \e[31m")}\e[91m"
+    exit 1
+  end
+  options[:log_level] = v.downcase
+end
+opt.on("-f", "--log-file FILE", "File to write log to.") { |v| options[:log_file] = v }
+opt.on("-c", "--[no-]log-color", "Whether to colorize log output.") { |v| options[:log_color] = v }
+opt.on("-s", "--setup", "Whether to setup application commands.") { |v| options[:setup] = v }
+opt.parse!(ARGV)
+
+script = ARGV[0]
+
+script ||= "main.rb"
+
+ENV["DISCORB_CLI_FLAG"] = "run"
+ENV["DISCORB_CLI_OPTIONS"] = JSON.generate(options)
+
+begin
+  load script
+rescue LoadError
+  eputs "Could not load script: \e[31m#{script}\e[91m"
+end

data/lib/discorb/exe/setup.rb

@@ -0,0 +1,26 @@
+# description: Setup application commands.
+require "optparse"
+require "discorb/utils/colored_puts"
+
+ARGV.delete_at 0
+
+opt = OptionParser.new <<~BANNER
+                         This command will setup application commands.
+
+                         Usage: discorb setup [script]
+
+                                   script                     The script to setup.
+                       BANNER
+opt.parse!(ARGV)
+
+script = ARGV[0]
+script ||= "main.rb"
+ENV["DISCORB_CLI_FLAG"] = "setup"
+
+begin
+  load script
+rescue LoadError
+  eputs "Could not load script: \e[31m#{script}\e[m"
+else
+  sputs "Successfully set up commands for \e[32m#{script}\e[m."
+end

data/lib/discorb/exe/show.rb

@@ -0,0 +1,8 @@
+# description: Show information of your environment.
+
+require "etc"
+require "discorb"
+puts "\e[90mRuby:\e[m #{RUBY_VERSION}"
+puts "\e[90mdiscorb:\e[m #{Discorb::VERSION}"
+uname = Etc.uname
+puts "\e[90mSystem:\e[m #{uname[:sysname]} #{uname[:release]}"

data/lib/discorb/gateway.rb

@@ -574,7 +574,6 @@ module Discorb
             @uncached_guilds.delete(data[:id])
             if @uncached_guilds == []
               @ready = true
-              setup_commands.wait if @overwrite_application_commands
               dispatch(:ready)
               @log.info("Guilds were cached")
             end

data/lib/discorb/http.rb

@@ -32,12 +32,7 @@ module Discorb
     def get(path, headers: nil, audit_log_reason: nil, **kwargs)
       Async do |task|
         resp = http.get(get_path(path), get_headers(headers, "", audit_log_reason), **kwargs)
-        rd = resp.body
-        data = if rd.nil? || rd.empty?
-            nil
-          else
-            JSON.parse(rd, symbolize_names: true)
-          end
+        data = get_response_data(resp)
         test_error(if resp.code == "429"
           @client.log.warn "Ratelimit exceeded for #{path}, trying again in #{data[:retry_after]} seconds."
           task.sleep(data[:retry_after])
@@ -66,12 +61,7 @@ module Discorb
     def post(path, body = "", headers: nil, audit_log_reason: nil, **kwargs)
       Async do |task|
         resp = http.post(get_path(path), get_body(body), get_headers(headers, body, audit_log_reason), **kwargs)
-        rd = resp.body
-        data = if rd.nil? || rd.empty?
-            nil
-          else
-            JSON.parse(rd, symbolize_names: true)
-          end
+        data = get_response_data(resp)
         test_error(if resp.code == "429"
           task.sleep(data[:retry_after])
           post(path, body, headers: headers, audit_log_reason: audit_log_reason, **kwargs).wait
@@ -132,12 +122,7 @@ module Discorb
     def put(path, body = "", headers: nil, audit_log_reason: nil, **kwargs)
       Async do |task|
         resp = http.put(get_path(path), get_body(body), get_headers(headers, body, audit_log_reason), **kwargs)
-        rd = resp.body
-        data = if rd.nil? || rd.empty?
-            nil
-          else
-            JSON.parse(rd, symbolize_names: true)
-          end
+        data = get_response_data(resp)
         test_error(if resp.code == "429"
           task.sleep(data[:retry_after])
           put(path, body, headers: headers, audit_log_reason: audit_log_reason, **kwargs).wait
@@ -164,12 +149,7 @@ module Discorb
     def delete(path, headers: nil, audit_log_reason: nil, **kwargs)
       Async do |task|
         resp = http.delete(get_path(path), get_headers(headers, "", audit_log_reason))
-        rd = resp.body
-        data = if rd.nil? || rd.empty?
-            nil
-          else
-            JSON.parse(rd, symbolize_names: true)
-          end
+        data = get_response_data(resp)
         test_error(if resp.code == "429"
           task.sleep(data[:retry_after])
           delete(path, headers: headers, audit_log_reason: audit_log_reason, **kwargs).wait
@@ -257,6 +237,18 @@ module Discorb
       URI(full_path).path
     end
 
+    def get_response_data(resp)
+      if resp["Via"].nil?
+        raise CloudFlareBanError.new(@client, resp)
+      end
+      rd = resp.body
+      if rd.nil? || rd.empty?
+        nil
+      else
+        JSON.parse(rd, symbolize_names: true)
+      end
+    end
+
     def http
       https = Net::HTTP.new("discord.com", 443)
       https.use_ssl = true

data/lib/discorb/log.rb

@@ -3,7 +3,7 @@
 module Discorb
   # @!visibility private
   class Logger
-    attr_reader :out, :colorize_log
+    attr_accessor :out, :colorize_log
 
     @levels = %i[debug info warn error fatal].freeze
 
@@ -14,11 +14,12 @@ module Discorb
     end
 
     def level
-      @levels[@level]
+      self.class.levels[@level]
     end
 
     def level=(level)
-      @level = @levels.index(level)
+      @level = self.class.levels.index(level)
+      raise ArgumentError, "Invalid log level: #{level}" unless @level
     end
 
     def debug(message)

data/lib/discorb/utils/colored_puts.rb

@@ -1,11 +1,14 @@
+# @!visibility private
 def sputs(text)
   puts "\e[92m#{text}\e[m"
 end
 
+# @!visibility private
 def eputs(text)
   puts "\e[91m#{text}\e[m"
 end
 
+# @!visibility private
 def iputs(text)
   puts "\e[90m#{text}\e[m"
 end

data/template-replace/files/css/common.css

@@ -216,8 +216,8 @@ tt {
   font-family: var(--monospace-font);
 }
 
-pre.code {
-  color: var(--header-secondary);
+pre.code code {
+  color: var(--header-secondary) !important;
   tab-size: 2;
 }
 
@@ -310,6 +310,11 @@ li.even {
   background: var(--background-secondary);
 }
 
+li.current {
+  background: var(--background-tertiary);
+}
+
+
 .item:hover {
   background: var(--background-secondary-alt);
 }
@@ -516,4 +521,10 @@ li.r2 {
   border-color: var(--background-tertiary);
   color: var(--interactive-active);
   fill: var(--interactive-active);
+}
+
+dd pre.code {
+  padding: 9px 14px;
+  border-radius: 4px;
+  border: 1px solid var(--background-tertiary);
 }

data/template-replace/resources/version_list.html

@@ -47,9 +47,9 @@
     <ul id="full_list" class="method">
       <!--replace-->
       <!--template-->
-      <li class="!eo!">
+      <li class="!class!">
         <div class="item">
-          <span class='object_link'><a href="../!version!/index.html" title="!version!">!version!</a></span>
+          <span class='object_link'><a href="!path!/index.html" title="!version!">!version!</a></span>
           <small class='git_sha'>!sha!</small>
         </div>
       </li>

data/template-replace/scripts/version.rb

@@ -1,12 +1,24 @@
-def build_version_sidebar(dir)
+def build_version_sidebar(dir, version)
   raw = File.read("template-replace/resources/version_list.html")
   template = raw.match(/<!--template-->(.*)<!--endtemplate-->/m)[1]
   raw.gsub!(template, "")
   res = +""
-  `git tag`.force_encoding("utf-8").split("\n").each.with_index do |tag, i|
+  i = 0
+  `git tag`.force_encoding("utf-8").split("\n").each.with_index do |tag|
+    i += 1
     sha = `git rev-parse #{tag}`.force_encoding("utf-8").strip
     version = tag.delete_prefix("v")
-    res += template.gsub("!version!", version).gsub("!eo!", i % 2 == 0 ? "even" : "odd").gsub("!sha!", sha)
+    cls = i % 2 == 0 ? "even" : "odd"
+    if version == "."
+      cls += " current"
+    end
+    res += template.gsub("!version!", version).gsub("!path!", "../" + version).gsub("!class!", cls).gsub("!sha!", sha)
   end
+  i += 1
+  cls = i % 2 == 0 ? "even" : "odd"
+  if version == "main"
+    cls += " current"
+  end
+  res += template.gsub("!version!", "main").gsub("!path!", "../main").gsub("!class!", cls).gsub("!sha!", "(Latest on GitHub)")
   File.write(dir + "/version_list.html", raw.gsub("<!--replace-->", res))
 end

metadata

@@ -1,57 +1,57 @@
 --- !ruby/object:Gem::Specification
 name: discorb
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.2
 platform: ruby
 authors:
 - sevenc-nanashi
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-05 00:00:00.000000000 Z
+date: 2021-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: async
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.30.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.30.1
 - !ruby/object:Gem::Dependency
   name: async-http
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.56.5
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.56.5
 - !ruby/object:Gem::Dependency
   name: async-websocket
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
@@ -74,6 +74,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build_main.yml"
 - ".gitignore"
 - ".yardopts"
 - Changelog.md
@@ -91,6 +92,8 @@ files:
 - docs/cli.md
 - docs/cli/init.md
 - docs/cli/irb.md
+- docs/cli/run.md
+- docs/cli/setup.md
 - docs/events.md
 - docs/extension.md
 - docs/voice_events.md
@@ -122,8 +125,12 @@ files:
 - lib/discorb/emoji_table.rb
 - lib/discorb/error.rb
 - lib/discorb/event.rb
+- lib/discorb/exe/about.rb
 - lib/discorb/exe/init.rb
 - lib/discorb/exe/irb.rb
+- lib/discorb/exe/run.rb
+- lib/discorb/exe/setup.rb
+- lib/discorb/exe/show.rb
 - lib/discorb/extend.rb
 - lib/discorb/extension.rb
 - lib/discorb/file.rb
@@ -166,7 +173,7 @@ metadata:
   allowed_push_host: https://rubygems.org
   homepage_uri: https://github.com/discorb-lib/discorb
   source_code_uri: https://github.com/discorb-lib/discorb
-  changelog_uri: https://github.com/discorb-lib/discorb/blob/main/Changelog.md
+  changelog_uri: https://discorb-lib.github.io/file.Changelog.html
   documentation_uri: https://discorb-lib.github.io
 post_install_message:
 rdoc_options: []