boty 0.0.14 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1456a7baa55bfe9bd3d7f66044b48ad900753686
-  data.tar.gz: 3bf63d30f6d2f77b20fe2ae7b13fbbed8283ad26
+  metadata.gz: f7c783caaed0c590d532335aeea11bea43728cd9
+  data.tar.gz: 9771f725b49e5aca5f20e60c637afdfa5117ba97
 SHA512:
-  metadata.gz: 13a273517a75e7d28dfcf8784167ad6950843a97ef1392bf4c522910f4ad456dade641ec935d9a79018e88c1914eba02b2b9a58664c11956beba791275abcb32
-  data.tar.gz: 973e402fa4780ca293790850b58690ab51d62ee0d3540bc0026f1a35190b3ee1b7846609ab2086409a3df09a6da96aaaed5973432e1745e3baeeaea68c3fc90f
+  metadata.gz: 3363a3588cc5ef5978bbb106752ffd158de63f04242e2b38093f3de8dc25b92873a3cdb22ca994bf5c800676d6ec94d62d6d4ecd61d2cbdb8cea895cb4bc650a
+  data.tar.gz: 48ab7f8d3be6eae365461c780f9aa0e9bbd333c48ccc33363a54ece2a55d66bdb498d3ac1e2a09e0b9612f440afffc70846806ff1ff4cecf5ef65f1ee4dda912

data/.travis.yml

@@ -0,0 +1,9 @@
+language: ruby
+rvm:
+ - "2.2.0"
+ - "2.2.3"
+#matrix:
+#  include:
+#    - rvm: rbx
+#      gemfile: gemfiles/Gemfile.rbx
+script: bundle exec rspec --require=spec_helper

data/Gemfile

@@ -1,3 +1,5 @@
 source 'https://rubygems.org'
 
 gemspec
+
+gem "byebug"

data/Gemfile.lock

@@ -1,8 +1,9 @@
 PATH
   remote: .
   specs:
-    boty (0.0.14)
+    boty (0.0.15)
       eventmachine
+      faraday
       faye-websocket
       i18n
       thor
@@ -15,12 +16,13 @@ GEM
     dotenv (2.0.2)
     eventmachine (1.0.8)
     fakefs (0.6.7)
+    faraday (0.9.2)
+      multipart-post (>= 1.2, < 3)
     faye-websocket (0.10.1)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
-    foreman (0.78.0)
-      thor (~> 0.19.1)
     i18n (0.7.0)
+    multipart-post (2.0.0)
     rake (10.4.2)
     rspec (3.4.0)
       rspec-core (~> 3.4.0)
@@ -49,7 +51,6 @@ DEPENDENCIES
   byebug
   dotenv
   fakefs
-  foreman
   rake (~> 10.0)
   rspec
 

data/README.md

@@ -1,4 +1,5 @@
 # Boty
+![](https://travis-ci.org/ricardovaleriano/boty.svg?branch=master)
 
 `Boty` is a utilitary to create bots (at this time, specificaly Slack bots).
 

data/bin/bot

@@ -1,10 +1,11 @@
 #!/usr/bin/env ruby
 require "./lib/boty"
 
-Boty.locale = ARGV.pop || :en
 
 session = Boty::Session.new
 session.start do |bot|
+  Boty.locale = ARGV.pop || :en
+
   bot.desc I18n.t "template.presence", bot_name: bot.name
   bot.message(/#{bot.name}/i) do |message|
     next if message.from? self

data/boty.gemspec

@@ -25,11 +25,10 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "faye-websocket"
   spec.add_runtime_dependency "thor"
   spec.add_runtime_dependency "i18n"
+  spec.add_runtime_dependency "faraday"
 
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
-  spec.add_development_dependency "foreman"
-  spec.add_development_dependency "byebug"
   spec.add_development_dependency "rspec"
   spec.add_development_dependency "dotenv"
   spec.add_development_dependency "fakefs"

data/gemfiles/Gemfile.rbx

@@ -0,0 +1,6 @@
+source 'https://rubygems.org'
+
+gemspec path: "../"
+
+gem "rubinius-compiler"
+gem "rubinius-debugger"

data/lib/boty/action.rb

@@ -39,7 +39,12 @@ module Boty
     end
 
     def execute(bot, message)
-      ScriptDSL.new(bot).instance_exec message, &action if message.match! regex
+      dsl = ScriptDSL.new(bot)
+      if match = message.match!(regex)
+        matches = Array(match)
+        matches.shift
+        dsl.instance_exec(*matches, &action)
+      end
     rescue => e
       logger.error e.message
       raise e

data/lib/boty/bot.rb

@@ -1,9 +1,11 @@
 module Boty
   class Bot
     include Boty::Logger
+    attr_accessor :trigger_message
     attr_reader :id, :name
 
     def initialize(bot_info, session)
+      Locale.reload
       @raw_info, @id, @name = bot_info, bot_info["id"], bot_info["name"]
       @handlers ||= []
       @commands ||= []
@@ -33,11 +35,11 @@ module Boty
       end
     end
 
-    def message(regex, &block)
+    def match(regex, &block)
       @handlers << create_action(regex, &block)
     end
 
-    def no_message(regex, &block)
+    def no_match(regex, &block)
       @handlers.delete_if do |action|
         action.is_this? regex, block
       end
@@ -64,7 +66,7 @@ module Boty
     end
 
     def say(message, api_parameters = {})
-      channel = (@_message && @_message.channel) || "general"
+      channel = (@trigger_message && @trigger_message.channel) || "general"
       options = { channel: channel }.merge api_parameters
       post_response = Slack.chat.post_message message, options
       logger.debug { "post response: #{post_response}" }
@@ -82,8 +84,8 @@ module Boty
     end
 
     def im(message)
-      logger.debug { "sending im messge to #{@_message.user.name}" }
-      Slack.chat.post_im @_message.user.id, message
+      logger.debug { "sending im messge to #{@trigger_message.user.name}" }
+      Slack.chat.post_im @trigger_message.user.id, message
     end
 
     def brain
@@ -119,13 +121,13 @@ module Boty
 
     def message_handler(data)
       actions = has_valid_mention?(data) ? @commands : @handlers
-      @_message = Message.new data
+      @trigger_message = Message.new data
       begin
         Array(actions).each do |action|
-          action.execute self, @_message
+          action.execute self, @trigger_message
         end
       ensure
-        @_message = nil
+        @trigger_message = nil
       end
     end
   end

data/lib/boty/locale.rb

@@ -0,0 +1,11 @@
+module Boty
+  class Locale
+    def self.reload
+      default_locales_path = File.expand_path("../../../locale/**/*.yml", __FILE__)
+      locales = (Dir["locale/**/*.yml"] + Dir[default_locales_path]).
+        map { |file| File.expand_path file }
+      I18n.load_path = locales.uniq
+      I18n.available_locales = I18n::Backend::Simple.new.available_locales
+    end
+  end
+end

data/lib/boty/script_dsl.rb

@@ -2,23 +2,75 @@ require "forwardable"
 
 module Boty
   class ScriptDSL
-    attr_accessor :bot
-
     INSTANCES = {}
     private_constant :INSTANCES
     class << self
       alias original_constructor new
     end
 
+    attr_accessor :bot
+
     extend Forwardable
-    def_delegators :bot, :desc, :respond, :name, :say, :im, :brain, :know_how
+    def_delegators :bot, :desc, :respond, :name, :brain, :know_how, :im, :say,
+      :match, :no_match, :no_respond, :no
+    def_delegators :message, :user, :channel
+
+    def self.new(bot)
+      INSTANCES[bot] ||= original_constructor bot
+    end
 
     def initialize(bot)
       @bot = bot
     end
 
-    def self.new(bot)
-      INSTANCES[bot] ||= original_constructor bot
+    def message
+      @bot.trigger_message
+    end
+
+    def hear(*args, &block)
+      match(*args, &block)
+    end
+
+    def command(*args, &block)
+      respond(*args, &block)
+    end
+
+    def match_im(*args, &block)
+      command(*args, &block)
+    end
+
+    def http
+      @http ||= HTTP.new
+    end
+  end
+
+  class HTTP
+    [:get, :post, :put, :delete, :head, :patch, :options].each do |verb|
+      define_method verb do |url, params = {}|
+        response = connection verb, url, params
+        handle_response response
+      end
+    end
+
+    private
+
+    def connection(verb, url, params)
+      uri = URI url
+      Faraday.new(url: "#{uri.scheme}://#{uri.host}") { |builder|
+        builder.adapter(*Faraday.default_adapter)
+      }.public_send(verb) { |req|
+        req.url uri.path, params
+      }
+    end
+
+    def handle_response(response)
+      # TODO: use a response parser accordingly to the
+      body = response.body
+      if /application\/json/.match response.headers["Content-Type"]
+        JSON.parse body
+      else
+        body
+      end
     end
   end
 end

data/lib/boty/session.rb

@@ -9,18 +9,18 @@ module Boty
     def start(&block)
       EM.run do
         login
-        bot = initialize_bot(&block)
-
+        @bot = initialize_bot(&block)
         stablish_connection do |ws|
           ws.on :message do |event|
             begin
-              on_message event, bot
+              on_message event, @bot
             rescue StandardError => e
               logger.error "Message #{event} could not be processed. #{e.message}"
             end
           end
         end
       end
+      self
     end
 
     private
@@ -34,7 +34,7 @@ module Boty
 
     def initialize_bot(&block)
       Bot.new(@slack_info["self"], self).tap { |bot|
-        block.call bot if block_given?
+        block.call ScriptDSL.new(bot) if block_given?
         logger.debug { "bot is configured and ready to go!" }
       }
     end

data/lib/boty/version.rb

@@ -1,3 +1,3 @@
 module Boty
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/lib/boty.rb

@@ -10,15 +10,13 @@ rescue LoadError
 end
 
 require "faye/websocket"
-
 require "i18n"
-locales = Dir[File.expand_path("../../locale/**/*", __FILE__)]
-I18n.load_path += locales
 
 $:.unshift File.expand_path("../../lib", __FILE__)
 
 module Boty
   def self.locale=(lang)
+    Locale.reload
     I18n.locale = lang
   end
 
@@ -35,4 +33,5 @@ require "boty/message"
 require "boty/action"
 require "boty/script_loader"
 require "boty/script_dsl"
+require "boty/locale"
 require "boty/bot"

data/script/knows.rb

@@ -1,6 +1,6 @@
 desc "knows", I18n.t("scripts.knows")
-respond(/knows/i) do
-  say KnownFormmater.new(know_how).format
+command(/knows/i) do
+  im KnownFormmater.new(know_how).format
 end
 
 class KnownFormmater

data/script/pug.rb

@@ -1,12 +1,12 @@
 desc "pug me", I18n.t("scripts.pug_me")
-respond(/pug me/i) do
-  response = JSON.parse Net::HTTP.get(URI "http://pugme.herokuapp.com/random")
+command(/pug me/i) do
+  response = http.get "http://pugme.herokuapp.com/random"
   say "<#{response["pug"]}>"
 end
 
 desc "pug bomb X", I18n.t("scripts.pug_bomb")
-respond(/pug bomb( (\d+))?/i) do |message|
-  count = message.match[2] || 5
-  response = JSON.parse Net::HTTP.get(URI "http://pugme.herokuapp.com/bomb?count=#{count}")
+command(/pug bomb( \d+)?/i) do |count|
+  count = (count || "5").strip
+  response = http.get "http://pugme.herokuapp.com/bomb", count: count
   response["pugs"].each do |pug| say "<#{pug}>" end
 end

data/script/remember.rb

@@ -1,18 +1,17 @@
 desc I18n.t("scripts.remember.command"),
      I18n.t("scripts.remember.desc", name: name)
-respond(/remember(:?) (.+)/i) do |message|
+command(/remember(:?) (.+)/i) do |_, stuff|
   brain[:user] ||= {}
-  brain[:user][message.user.name] ||= []
-  brain[:user][message.user.name] << message.match[2]
+  brain[:user][user.name] ||= []
+  brain[:user][user.name] << stuff
   im I18n.t("scripts.remember.response")
 end
 
 desc I18n.t("scripts.about.command"), I18n.t("scripts.about.desc")
-respond(/about (\w+\b)(:?) (.+)/i) do |message|
-  user = message.match[3]
+command(/about (\w+\b)(:?) (.+)/i) do |brain_area, _, user_about|
   im I18n.t "scripts.about.response",
-            brain_area: message.match[1],
-            user_asking: message.user.name,
-            user_about: user
-  brain[message.match[1].to_sym][user].each do |info| im info end
+            brain_area: brain_area,
+            user_asking: user.name,
+            user_about: user_about
+  brain[message.match[1].to_sym][user_about].each do |info| im info end
 end

data/template/project/bot.tt

@@ -1,13 +1,21 @@
 #!/usr/bin/env ruby
 require "./<%= bot_name %>"
 
-Boty.locale = ARGV.pop || :en
+def set_locale(locale)
+  begin
+    Boty.locale = locale || :en
+  rescue I18n::InvalidLocale
+    Boty.locale = :en
+  end
+end
 
 session = Boty::Session.new
 session.start do |bot|
+  set_locale ARGV.pop
+
   bot.desc I18n.t "template.presence", bot_name: bot.name
-  bot.message(/#{bot.name}/i) do |message|
+  bot.match(/#{bot.name}/i) do
     next if message.from? self
-    say I18n.t "template.hello", user_name: message.user.name
+    say I18n.t "template.hello", user_name: user.name
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: boty
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
 platform: ruby
 authors:
 - Ricardo Valeriano
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-11-30 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: eventmachine
@@ -67,61 +67,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: faraday
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '1.10'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
-- !ruby/object:Gem::Dependency
-  name: foreman
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.10'
 - !ruby/object:Gem::Dependency
-  name: byebug
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -175,6 +161,7 @@ extra_rdoc_files: []
 files:
 - ".env"
 - ".gitignore"
+- ".travis.yml"
 - CODE_OF_CONDUCT.md
 - Gemfile
 - Gemfile.lock
@@ -187,10 +174,12 @@ files:
 - bin/setup
 - boty.gemspec
 - exe/boty
+- gemfiles/Gemfile.rbx
 - lib/boty.rb
 - lib/boty/action.rb
 - lib/boty/bot.rb
 - lib/boty/cli.rb
+- lib/boty/locale.rb
 - lib/boty/logger.rb
 - lib/boty/message.rb
 - lib/boty/rspec.rb
@@ -221,6 +210,7 @@ files:
 - template/project/Rakefile
 - template/project/app/.empty
 - template/project/bot.tt
+- template/project/locale/.empty
 - template/project/script/ping.rb
 - template/project/spec/.empty
 - template/project/spec/script/ping_spec.rb