hubotgf 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3081b3ac191abd7c00ec91e0d3f0f631ade1f3de
-  data.tar.gz: 1e5f660fe4af80c44ca49dded3802c2d8ce3672e
+  metadata.gz: 36c084e387e5d2faf558ef7c501448b46762fdc9
+  data.tar.gz: 79b120d98354bb04b55a35e65265241905e570f9
 SHA512:
-  metadata.gz: a503182580bf19c75a6a4e9a5119a556e43c7f7228367ef049ac626f7adf1b421a66273ba9a2cc58e2ee418f202e533984ef6f915a75af490ac1193a65a629d2
-  data.tar.gz: 5b0fe56427428076505ea3f7ffceaec8a43a99bae25990c7d1fadaa13c61ef115d755d97709cc19bd6ecd328d6cab9ba170fee5c7cd94bceb751f0f075b07cd3
+  metadata.gz: 6e3a6ee2b92a9a7008c42c06526ad09a0371d46ccf1584a949c240a3ca449bb5609b5502f9bdc39d4b2b1495534e4ccbc1421f9946320ce065b5291df7ff3949
+  data.tar.gz: d168f9858bfedb2e5e3b5f80d20a68b9fa6cf6cea940ceba34db9db4e4cab99c2fb56c3cb4cf039da6a9c974e39919a4d5525fa0df316195d9b4ce9d965955f9

data/app/controllers/hubotgf/tasks_controller.rb

@@ -2,7 +2,7 @@ module HubotGf
   class TasksController < ActionController::Base
 
     def create
-      result = HubotGf::Worker.start params[:command], { sender: params[:_sender], room: params[:_room] }
+      result = HubotGf::Worker.start(params[:command], params[:_sender], params[:_room])
       head (result ? :ok : :not_found)
     end
 

data/config/routes.rb

@@ -1,4 +1,3 @@
 HubotGf::Engine.routes.draw do
   resources :tasks, only: :create
-  # post '/hubotgf/tasks', controller: 'hubot_gf/tasks', action: 'create'
 end

data/lib/hubotgf.rb

@@ -1,5 +1,7 @@
 require "hubotgf/engine"
 require "hubotgf/config"
+require "hubotgf/command"
+require "hubotgf/command_collection"
 require "hubotgf/worker"
 require "hubotgf/messenger"
 

data/lib/hubotgf/command.rb

@@ -0,0 +1,16 @@
+module HubotGf
+  class Command
+
+    attr_accessor :regex, :_method, :text
+
+    def initialize(hash)
+      @regex   = hash.keys.first
+      @_method = hash.values.first
+    end
+
+    def arguments
+      regex.match(text).captures
+    end
+
+  end
+end

data/lib/hubotgf/command_collection.rb

@@ -0,0 +1,28 @@
+module HubotGf
+  class CommandCollection
+
+    attr_accessor :regex, :method
+
+    def initialize(worker)
+      @commands = []
+      @worker   = worker
+    end
+
+    def <<(hash)
+      @commands << Command.new(hash)
+    end
+
+    def include?(text)
+      !!match(text)
+    end
+
+    def match(text)
+      command = @commands.find { |cmd| cmd.regex =~ text }
+      if command
+        command.text = text
+        command
+      end
+    end
+
+  end
+end

data/lib/hubotgf/config.rb

@@ -9,11 +9,7 @@ module HubotGf
     end
 
     def perform
-      @perform || lambda do |worker, args, metadata = {}|
-        arity = worker.instance_method(:perform).arity
-        args << metadata[:sender] if arity > args.length
-        args << metadata[:room]   if arity > args.length
-
+      @perform ||= lambda do |worker, args|
         case performer
         when :sidekiq
           Sidekiq::Client.enqueue(worker, *args)
@@ -22,7 +18,6 @@ module HubotGf
         else
           worker.new.perform(*args)
         end
-
       end
     end
 

data/lib/hubotgf/version.rb

@@ -1,3 +1,3 @@
 module HubotGf
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/hubotgf/worker.rb

@@ -4,28 +4,47 @@ module HubotGf
     def self.included(base)
       @workers ||= []
       @workers << base
-      base.extend ClassMethods
+      base.extend(ClassMethods)
     end
 
-    def self.start(command, metadata = {})
-      worker = @workers.find { |w| w.command =~ command }
+    def self.start(command, sender = nil, room = nil)
+      worker = @workers.find { |w| w.commands.include? command }
       if worker
-        arguments = worker.command.match(command).captures
-        HubotGf::Config.perform.call(worker, arguments, metadata)
+        command = worker.commands.match(command)
+        arguments = command.arguments.unshift(command._method, sender, room)
+        HubotGf::Config.perform.(worker, arguments)
       end
     end
 
-    def gf
-      HubotGf::Messenger.new
+    # Sidekiq entry
+    def perform(method, sender, room, *args)
+      @sender, @room = sender, room
+      send method, *args
+    end
+
+    def reply(message)
+      HubotGf::Messenger.new.pm(@sender, message)
+    end
+
+    def rebroadcast(message)
+      HubotGf::Messenger.new.broadcast(@room, message)
     end
 
     module ClassMethods
-      def command=(command)
-        @command = command
+      def self.extended(base)
+        attr_accessor :command
       end
 
-      def command
-        @command || ''
+      def listen(hash = {})
+        @commands ||= CommandCollection.new(self)
+        @commands << hash
+      end
+
+      def commands; @commands; end
+
+      # Resque entry
+      def perform(*args)
+        new.perform(*args)
       end
     end
 

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hubotgf
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Logan Serman
-- Michael Eatherly
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-02 00:00:00.000000000 Z
+date: 2014-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -126,13 +125,14 @@ dependencies:
 description: Rails sidekick for Hubot
 email:
 - loganserman@gmail.com
-- meatherly@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
 - app/controllers/hubotgf/tasks_controller.rb
 - config/routes.rb
+- lib/hubotgf/command.rb
+- lib/hubotgf/command_collection.rb
 - lib/hubotgf/config.rb
 - lib/hubotgf/engine.rb
 - lib/hubotgf/messenger.rb
@@ -160,9 +160,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.6
+rubygems_version: 2.0.3
 signing_key: 
 specification_version: 4
 summary: Rails sidekick for Hubot
 test_files: []
-has_rdoc: