descartes 0.8.6.2 → 0.8.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75bfebcdf24ae3c4ab530d5efec57517f55f0acc
-  data.tar.gz: 668ac6631f05b85703cf2756403c7b032ab97ff9
+  metadata.gz: 9982795cfe7710d3a6e391251d2d198e5a156f90
+  data.tar.gz: e27b028e30df01fb0784287c5e4b75ab709c74fa
 SHA512:
-  metadata.gz: fd60d9ec9795875ed96f87f6342e67ee25c6b0e68d3549157050280ddbd1b20886a9e1913118f2109c1cf031b6dee378bc18b85aa47b002a0fbd324ad9f04f3d
-  data.tar.gz: 0b351294d480514d70b2c937de1d25aa24d4bbbabe0ad1a1c31632a2d80f5cb471c586eb29052cc8c7af41d4359ee12ec0aa4c484b4fac8ab72ac3b77f4af258
+  metadata.gz: 2e9ba2dedea97aa03164599ae367d82a4ffd41d378f81655875a225d7a5c73b3b494ac50f5ac4c110d73310d90a0c26b0294e1c9fee8f9afced879e61a6e084e
+  data.tar.gz: 5e6a31ce090a8ecb134ebb89a7a15c1490ca5e5da82b765b56beeb3bc9cf5477ff28646c48bfb7a46fae3da187022fbdd27931c0f0290290f3f4c488afc19ed6

data/bin/descartes

@@ -128,8 +128,8 @@ Cinch::Bot.new {
     m.reply ?`
   end
 
-  on :message, /!m/ do |m|
-    m.reply ?µ
+  on :message, /^!m(.*?)/ do |m, sentence|
+    m.reply "µ#{sentence}"
   end
 
   on :message, '!version' do |m|
@@ -137,6 +137,10 @@ Cinch::Bot.new {
   end
 
   on :message, '!modules' do |m|
-    m.reply Descartes.constants.join(', ')
+    modules = [].tap do |plugins|
+      Descartes.each_module { |path, name| plugins << name }
+    end
+
+    m.reply modules.join(', ')
   end
 }.start

data/lib/descartes/descartes.rb

@@ -14,14 +14,19 @@
 
 class Descartes
   class << self
+    def each_module
+      Dir.glob(File.expand_path('../modules/*.rb', __FILE__)).map do |plugin|
+        name = File.basename(plugin, '.rb')
+        yield plugin, name unless name == 'VERSION'
+      end
+    end
+
     def load(options = {})
       $options = options
       $options[:exclude] ||= []
 
       puts 'Importing modules..'
-      Dir.glob(File.expand_path('../modules/*.rb', __FILE__)).each do |plugin|
-        name = plugin.split(?/).last.split(?.).first.downcase
-
+      each_module do |plugin, name|
         if $options[:exclude].include?(name)
           puts "- Skipping #{name}..."
         else
@@ -31,11 +36,12 @@ class Descartes
         end
       end
 
-      plugins = Descartes.constants.map do |p|
-        "Descartes::#{p}".split('::').inject(Object) { |o, c| o.const_get c }
+      [].tap do |plugins|
+        Descartes.constants.map do |name|
+          plugin = "Descartes::#{name}".split('::').inject(Object) { |o, c| o.const_get c }
+          plugins << plugin if plugin.is_a?(Class) && plugin.include?(Cinch::Plugin)
+        end
       end
-
-      plugins.select { |plugin| plugin.is_a?(Class) && plugin.include?(Cinch::Plugin) }
     end
   end
 end

data/lib/descartes/modules/crunchyroll.rb

@@ -19,7 +19,7 @@ class Descartes
   class Crunchybot
     include Cinch::Plugin
 
-    match  /^\.cr$/, use_prefix: false, method: :today
+    match /^\.cr$/, use_prefix: false, method: :today
     def today(m)
       crunchyroll = Crunchyroll.today
 
@@ -47,7 +47,7 @@ class Descartes
       m.reply "Sono stati già trasmessi: #{aired}." unless aired.empty?
     end
 
-    match  /^\.cr (.+)$/, use_prefix: false, method: :get
+    match /^\.cr (.+)$/, use_prefix: false, method: :get
     def get(m)
       series = Crunchyroll.get m.params[1].split('.cr ')[1]
 

data/lib/descartes/version.rb

@@ -13,5 +13,5 @@
 ##
 
 class Descartes
-  VERSION ||= '0.8.6.2'
+  VERSION ||= '0.8.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: descartes
 version: !ruby/object:Gem::Version
-  version: 0.8.6.2
+  version: 0.8.7
 platform: ruby
 authors:
 - Giovanni Capuano
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-24 00:00:00.000000000 Z
+date: 2015-06-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cinch
@@ -156,20 +156,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.8'
-- !ruby/object:Gem::Dependency
-  name: arnaldo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.1'
 description: A serious modular ruby IRC bot.
 email: webmaster@giovannicapuano.net
 executables:
@@ -180,7 +166,6 @@ files:
 - bin/descartes
 - lib/descartes.rb
 - lib/descartes/descartes.rb
-- lib/descartes/modules/arnaldo.rb
 - lib/descartes/modules/azzone.rb
 - lib/descartes/modules/crunchyroll.rb
 - lib/descartes/modules/currency.rb

data/lib/descartes/modules/arnaldo.rb

@@ -1,25 +0,0 @@
-##
-#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-#                    Version 2, December 2004
-#
-# Everyone is permitted to copy and distribute verbatim or modified
-# copies of this license document, and changing it is allowed as long
-# as the name is changed.
-#
-#            DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
-#   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-#
-#  0. You just DO WHAT THE FUCK YOU WANT TO.
-##
-require 'arnaldo'
-
-class Descartes
-  class Arnaldo
-    include Cinch::Plugin
-
-    match 'proverb'
-    def execute(m)
-      m.reply "“#{::Arnaldo.get}”".colorize
-    end
-  end
-end