discorb 0.2.5 → 0.4.1

data/{exe/discord-irb → lib/discorb/exe/irb.rb}

@@ -1,5 +1,7 @@
 #!/usr/bin/env ruby
 
+# description: Connect to discord and start IRB.
+
 require "io/console"
 require "discorb"
 require "optparse"
@@ -7,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 = []
@@ -28,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/flag.rb

@@ -25,6 +25,9 @@ module Discorb
       end
     end
 
+    #
+    # Returns the value of the flag.
+    #
     def method_missing(name, args = nil)
       if @values.key?(name.to_s.delete_suffix("?").to_sym)
         @values[name.to_s.delete_suffix("?").to_sym]

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/intents.rb

@@ -75,6 +75,9 @@ module Discorb
       }
     end
 
+    #
+    # (see Flag#method_missing)
+    #
     def method_missing(name, args = nil)
       if @raw_value.key?(name)
         @raw_value[name]

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/permission.rb

@@ -229,6 +229,9 @@ module Discorb
       end
     end
 
+    #
+    # (see Flag#method_missing)
+    #
     def method_missing(method, bool = nil)
       if self.class.bits.key?(method)
         self[method]

data/lib/discorb/utils/colored_puts.rb

@@ -0,0 +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.2.5
+  version: 0.4.1
 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
@@ -70,10 +70,11 @@ description:
 email:
 - sevenc-nanashi@sevenbot.jp
 executables:
-- discord-irb
+- discorb
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/workflows/build_main.yml"
 - ".gitignore"
 - ".yardopts"
 - Changelog.md
@@ -88,7 +89,11 @@ files:
 - discorb.gemspec
 - docs/Examples.md
 - docs/application_command.md
-- docs/discord_irb.md
+- 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
@@ -103,7 +108,7 @@ files:
 - examples/simple/ping_pong.rb
 - examples/simple/rolepanel.rb
 - examples/simple/wait_for_message.rb
-- exe/discord-irb
+- exe/discorb
 - lib/discorb.rb
 - lib/discorb/application.rb
 - lib/discorb/asset.rb
@@ -120,6 +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
@@ -145,6 +156,7 @@ files:
 - lib/discorb/sticker.rb
 - lib/discorb/user.rb
 - lib/discorb/utils.rb
+- lib/discorb/utils/colored_puts.rb
 - lib/discorb/voice_state.rb
 - lib/discorb/webhook.rb
 - po/yard.pot
@@ -161,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: []