discorb 0.10.0 → 0.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1b87a672806fd34b5a1a3308bd96db493c13a645a2f4ae7cd6a3b9622cf7a01
-  data.tar.gz: fc1b8e0b433489e1390b958b7b4ebeb9c39c1f2d38ff80c05334dda5f19f3bd8
+  metadata.gz: 711fc9fac1407a6de44da571555d6b5eb0575983453a8371bbb1df960ae376ac
+  data.tar.gz: 33defa63e7f65c82eee318a4d3783c2640fc1dcb54ffdf4941694cef7e72b1a9
 SHA512:
-  metadata.gz: 4c666466d4c10d93e974ecd843d14d9e92b424c18e6fab784dba54ff8c0caf9c5f54feaaa7c03e32f640a237af4ee6795e653691035c3e80e3c7a4af79740143
-  data.tar.gz: 344ecd871e7c1e98a1ad2b68f75f988ee2aabfbe78e24ecf4e8a58da069e04b8e3327f5348414c33a619381c520ea7dbb4fb173cbea6fa153cb2dd5b07b9f9e2
+  metadata.gz: 6a58931cea651763d030c14a61f1f463b7959449bcd70599819c0140884a2a0d86cde1706f97fb3af81013eb6fe2d5372df743a5275dc86f454d01618ba1a90a
+  data.tar.gz: 884bdcfa59ff7612bcf9f0f12186c5e4cf51313b22a71dac308edc2abaaf45f33cf5e6f85c48681beb976309a245610d16dfd5c781bc6e50c90c0f9e215bc11a

data/Changelog.md

@@ -4,6 +4,12 @@
 
 ## v0.10
 
+### v0.10.1
+
+- Add: Add `Client#extensions`
+- Change: `Client#load_extension` allows instance of `Extension`
+- Add: Add `-b` option to `discorb run`
+
 ### v0.10.0
 
 - Change: Sort versions

data/docs/cli/run.md

@@ -53,4 +53,8 @@ Whether to setup application commands.
 
 #### `-e`, `--env`
 
-The name of the environment variable to use for token, or just `-t` or `--token` for intractive prompt.
+The name of the environment variable to use for token, or just `-t` or `--token` for intractive prompt.
+
+#### `-b`, `--bundler`
+
+Whether to use bundler to load the script.

data/lib/discorb/client.rb

@@ -52,6 +52,8 @@ module Discorb
     attr_reader :status
     # @return [Integer] The session ID of connection.
     attr_reader :session_id
+    # @return [Hash{String => Discorb::Extension}] The loaded extensions.
+    attr_reader :extensions
     # @private
     attr_reader :bottom_commands
 
@@ -97,6 +99,7 @@ module Discorb
       @status = :initialized
       @fetch_member = fetch_member
       @title = title
+      @extensions = {}
       set_default_events
     end
 
@@ -369,12 +372,19 @@ module Discorb
     #
     # Load the extension.
     #
-    # @param [Class] ext The extension to load.
+    # @param [Class, Discorb::Extension] ext The extension to load.
     # @param [Object] ... The arguments to pass to the `ext#initialize`.
     #
     def load_extension(ext, ...)
-      raise ArgumentError, "#{ext} is not a extension" unless ext.is_a?(Class) && ext < Discorb::Extension
-      ins = ext.new(self, ...)
+      if ext.is_a?(Class)
+        raise ArgumentError, "#{ext} is not a extension" unless ext < Discorb::Extension
+        ins = ext.new(self, ...)
+      elsif ext.is_a?(Discorb::Extension)
+        ins = ext
+      else
+        raise ArgumentError, "#{ext} is not a extension"
+      end
+
       @events.each_value do |event|
         event.delete_if { |c| c.metadata[:extension] == ins.class.name }
       end
@@ -392,6 +402,7 @@ module Discorb
         @commands << cmd
       end
       @bottom_commands += ins.class.bottom_commands
+      @extensions[ins.class.name] = ins
       ins
     end
 

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.10.0"
+  VERSION = "0.10.1"
   # @return [String] The user agent for the bot.
   USER_AGENT = "DiscordBot (https://discorb-lib.github.io #{VERSION}) Ruby/#{RUBY_VERSION}"
 

data/lib/discorb/exe/run.rb

@@ -22,6 +22,7 @@ options = {
   log_color: nil,
   setup: nil,
   token: false,
+  bundler: :default,
 }
 opt.on("-l", "--log-level LEVEL", "Log level.") do |v|
   unless LOG_LEVELS.include? v.downcase
@@ -36,6 +37,7 @@ opt.on("-c", "--[no-]log-color", "Whether to colorize log output.") { |v| option
 opt.on("-s", "--setup", "Whether to setup application commands.") { |v| options[:setup] = v }
 opt.on("-e", "--env [ENV]", "The name of the environment variable to use for token, or just `-e` or `--env` for intractive prompt.") { |v| options[:token] = v }
 opt.on("-t", "--title TITLE", "The title of process.") { |v| options[:title] = v }
+opt.on("-b", "--[no-]bundler", "Whether to use bundler. Default to true if Gemfile exists, otherwise false.") { |v| options[:bundler] = v }
 opt.parse!(ARGV)
 
 script = ARGV[0]
@@ -54,10 +56,25 @@ elsif options[:token].nil? || options[:token] == "-"
   puts ""
 end
 
+if options[:bundler] == :default
+  dir = Dir.pwd.split("/")
+  options[:bundler] = false
+  dir.length.times.reverse_each do |i|
+    if File.exist? "#{dir[0..i].join("/")}/Gemfile"
+      options[:bundler] = true
+      break
+    end
+  end
+end
+
 ENV["DISCORB_CLI_TITLE"] = options[:title]
 
-begin
-  load script
-rescue LoadError
+if File.exist? script
+  if options[:bundler]
+    system "bundle exec ruby #{script}"
+  else
+    system "ruby #{script}"
+  end
+else
   eputs "Could not load script: \e[31m#{script}\e[91m"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: discorb
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.10.1
 platform: ruby
 authors:
 - sevenc-nanashi