advanced_ruby_command_handler 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97c6a7076b47b7d2dda46986b94f2972363dc81c17c55d619a7d668e8c39df09
-  data.tar.gz: 3b6a580272ef1e6f5f86b49719fc50c5616aeb2a729592b913ea45ffb88857d3
+  metadata.gz: b97941216c2de5b7a5c5eac1d8613b3fb6e0670e2c52e9efb01337ab7d9be3ff
+  data.tar.gz: 1d11b79ca18ebb54e0fd7463e359955e005b022c326866a412cbe491d757e759
 SHA512:
-  metadata.gz: e8133e6028b5acb9095b4e48a653db545840091de10e4d0c6af5d390c21f2aab4762b1250a951ebf9f3545b81d31fd7a905a5f7ae39f7edd680780e70b8a7fcc
-  data.tar.gz: 52d14801db9f0d424dd18a13b732e16fdcb504131c966b6ce243c12f3f8d4c961da6e5563445b7beda70ab0edfe008d1d75dedffa5795db1176404534287f0cf
+  metadata.gz: 5ba9dca758046935b6fe4e888401eda55575461325d76fe5afbac37037de4c2b84f52f0d9ce9aa8004b121a7e2b8b3ae7e00a8c9aa7c601fa05d99a5c0176de7
+  data.tar.gz: e21cd5ddac2ad88a7604eac57fa1b0919f723ef995d44758322053339a03820013ba05b7e72103fec3f5979c89942a1569c96950445bb29e924fcdfc5d4053b7

data/.gitignore

@@ -6,4 +6,6 @@
 /pkg/
 /spec/reports/
 /tmp/
-/.idea/
+/.idea/
+*.gem
+*.yml

data/Gemfile.lock

@@ -1,7 +1,8 @@
 PATH
   remote: .
   specs:
-    advanced_ruby_command_handler (0.1.3)
+    advanced_ruby_command_handler (0.1.5)
+      discordrb
 
 GEM
   remote: https://rubygems.org/

data/advanced_ruby_command_handler.gemspec

@@ -29,8 +29,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  # Uncomment to register a new dependency of your gem
-  # spec.add_dependency "example-gem", "~> 1.0"
+  spec.add_dependency "discordrb"
 
   # For more information and examples about making a new gem, checkout our
   # guide at: https://bundler.io/guides/creating_gem.html

data/lib/advanced_ruby_command_handler/app/client.rb

@@ -5,6 +5,7 @@ require "fileutils"
 require "yaml"
 require_relative "command_handler"
 require_relative "event_handler"
+require_relative "utils"
 
 module AdvancedRubyCommandHandler
   class Client < Discordrb::Bot
@@ -41,6 +42,8 @@ module AdvancedRubyCommandHandler
                                               .each do |event|
         Events.method(event).call(self)
       end
+
+      at_exit { @console_logger.info("Application exited") }
     end
 
     def run
@@ -49,8 +52,9 @@ module AdvancedRubyCommandHandler
       Thread.new do
         @console_logger.info("Type '.exit' to turn off the bot")
         # @console_logger.info("Type '.reload' to reload the bot")
-
-        exit if $stdin.gets.chomp == ".exit"
+        loop do
+          Process.exit!(true) if $stdin.gets.chomp == ".exit"
+        end
       end
 
       super.run

data/lib/advanced_ruby_command_handler/app/command.rb

@@ -5,8 +5,51 @@ module CommandHandler
     attr_reader :props, :run
 
     def initialize(props, &run)
-      @props = props
+      @props = load_proprieties(props)
       @run = run
     end
+
+    def load_proprieties(props)
+      return props unless props.instance_of?(Hash)
+
+      props[:aliases] ||= nil
+      props[:description] ||= nil
+      props[:args] ||= nil
+      props[:strict_args] ||= false
+      props[:use_example] ||= nil
+      props[:category] ||= nil
+      props[:user_permissions] ||= []
+      props[:client_permissions] ||= []
+      if props[:client_permissions].instance_of?(Array) && props[:client_permissions].empty?
+        props[:client_permissions].push(
+          :add_reactions,
+          :send_messages,
+          :embed_links,
+          :attach_files,
+          :use_external_emoji
+        )
+      elsif props[:client_permissions] == :default
+        props[:client_permissions] = %i[
+          add_reactions
+          send_messages
+          embed_links
+          attach_files
+          use_external_emoji
+        ]
+      end
+
+      Hash[
+        :name => props[:name],
+        :aliases => props[:aliases],
+        :description => props[:description],
+        :args => props[:args],
+        :strict_args => props[:strict_args],
+        :use_example => props[:use_example],
+        :category => props[:category],
+        :user_permissions => props[:user_permissions],
+        :client_permissions => props[:client_permissions]
+      ]
+    end
+    private :load_proprieties
   end
 end

data/lib/advanced_ruby_command_handler/app/command_handler.rb

@@ -10,7 +10,9 @@ module AdvancedRubyCommandHandler
         next if %w[. ..].include?(dir)
 
         Dir.entries("#{client.commands_dir}/#{dir}").each do |file|
-          next if %w(. ..).include?(file)
+          next if %w[. ..].include?(file)
+
+          p "#{client.commands_dir}/#{dir}/#{file}"
 
           load "#{client.commands_dir}/#{dir}/#{file}"
 

data/lib/advanced_ruby_command_handler/app/defaults/events/message.rb

@@ -11,7 +11,14 @@ module Events
 
       next unless command
 
-      command.run.call(message, client)
+      begin
+        command.run.call(message, client)
+      rescue StandardError => e
+        client.console_logger.error(e)
+        client.file_logger.write(e, :errors)
+      ensure
+        client.console_logger.info("Command '#{command.props[:name]}' used by #{message.author.username}")
+      end
     end
   end
 end

data/lib/advanced_ruby_command_handler/app/event_handler.rb

@@ -13,7 +13,7 @@ module AdvancedRubyCommandHandler
         events << File.basename(file, ".rb")
       end
 
-      Dir["#{File.dirname(__FILE__)}/defaults/events/*.rb"].each do |file|
+      Dir["#{File.dirname(__FILE__)}/defaults/events/*.rb"].sort.each do |file|
         next if events.include?(File.basename(file, ".rb"))
 
         require file

data/lib/advanced_ruby_command_handler/app/logger.rb

@@ -57,7 +57,6 @@ module AdvancedRubyCommandHandler
         puts "[#{console_color(:magenta, time)}] - [#{console_color(color, mode.to_s.upcase)}] : #{message.to_s}"
       end
     end
-
     private :console_color
   end
 end

data/lib/advanced_ruby_command_handler/app/utils.rb

@@ -7,5 +7,13 @@ module CommandHandler
 
       false
     end
+
+    # Do NOT use that
+    # FIXME
+    def reload_files(dirs)
+      dirs.each do |dir|
+        Dir.glob("#{dir}/**/*.rb").each { |file| load file }
+      end
+    end
   end
 end

data/lib/advanced_ruby_command_handler/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module AdvancedRubyCommandHandler
-  VERSION = "0.1.3"
+  VERSION = "0.1.5"
 end

data/lib/advanced_ruby_command_handler.rb

@@ -1,12 +1,19 @@
-# frozen_string_literal: true
-
-require_relative "advanced_ruby_command_handler/app/app"
-require_relative "advanced_ruby_command_handler/app/command"
-require_relative "advanced_ruby_command_handler/app/utils"
-
-
-module CommandHandler
-  def self.new(commands_dir: "commands", events_dir: "events", config_file: "config.yml")
-    AdvancedRubyCommandHandler::Client.new(:commands_dir => commands_dir, :events_dir => events_dir, :config_file => config_file)
-  end
-end
+# frozen_string_literal: true
+
+require_relative "advanced_ruby_command_handler/app/app"
+require_relative "advanced_ruby_command_handler/app/command"
+require_relative "advanced_ruby_command_handler/app/utils"
+
+##
+# Represent the CommandHandler as a simply class
+module CommandHandler
+  ##
+  # @!method new
+  # @param [String] commands_dir The command's directory path
+  # @param [String] events_dir The event's directory path
+  # @param [String] config_file The config's file path
+  # @return [AdvancedRubyCommandHandler::Client] the created client
+  def self.new(commands_dir: "commands", events_dir: "events", config_file: "config.yml")
+    AdvancedRubyCommandHandler::Client.new(:commands_dir => commands_dir, :events_dir => events_dir, :config_file => config_file)
+  end
+end

data/tests/commands/test/test.rb

@@ -1,13 +1,19 @@
 # frozen_string_literal: true
 
 require_relative "../../../lib/advanced_ruby_command_handler/app/command"
+require_relative "../../../lib/advanced_ruby_command_handler/app/utils"
 
 module Commands
   def self.test
     CommandHandler::Command.new({
-                                  :name => "test"
-                                }) do |message, client|
-      message.respond "Command test!"
+                                  :name => "test",
+                                  :aliases => ["t"],
+                                  :description => "Une commande pour faire des tests!",
+                                  :args => false,
+                                  :use_example => :default,
+                                  :category => :default
+                                }) do |message, _client|
+      message.respond "Test"
     end
   end
 end

data/tests/config.yml

@@ -1,4 +1,4 @@
 ---
-:token: 'NzEwMTIxODk2OTM0NjM3NjY5.Xrv2jQ.4v9551dYI5nqRSIGfYy19APUmbA'
+:token: 'NzEwMTIxODk2OTM0NjM3NjY5.Xrv2jQ._ypS5jOkYr4onqigdoxGzF2dRj0'
 :prefix: '!'
 :owners: [123456789]

data/tests/events/ready.rb

@@ -7,4 +7,3 @@ module Events
     end
   end
 end
-

data/tests/index.rb

@@ -2,6 +2,5 @@
 
 require_relative "../lib/advanced_ruby_command_handler"
 
-
 CommandHandler.new(:commands_dir => "tests/commands", :events_dir => "tests/events", :config_file => "tests/config.yml")
               .run

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: advanced_ruby_command_handler
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - senchuu
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-08-27 00:00:00.000000000 Z
-dependencies: []
+date: 2021-09-02 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: discordrb
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: an advanced discord bot command handler
 email:
 - senchuuuu@gmail.com
@@ -27,8 +41,6 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- advanced_ruby_command_handler-0.1.1.gem
-- advanced_ruby_command_handler-0.1.2.gem
 - advanced_ruby_command_handler.gemspec
 - bin/console
 - bin/setup