jabot 0.1 → 0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff021f217c892d1015fe7791c05bc2bf095997cc
-  data.tar.gz: 902785b742bd60b0f56f1b1d973f608a33de684d
+  metadata.gz: 115cb996f99108b9fc761fe4bef7f03f26a0b6ee
+  data.tar.gz: 4141684ea21bd308543c594acffe4d290841a95a
 SHA512:
-  metadata.gz: 82fe2c43436564e7c89020ee325f69bd7ff051a93ed66be9ae8cd9f7dfdf108b2d130225b421c28423047a8f20a0cd236b3b787a5af4baaec08399efa39fe4d0
-  data.tar.gz: 94ef967101953ade0fe2258cca734d45bc7d4910e9ba7cd38889c646e1397fca2807d5b41eb7b04768b4eb2634a9a1e49fcc19bfef4e7cec6e014148201dc863
+  metadata.gz: e4aa4e355c67f4ca36cc3c8b8c11fb148b8d98a50dc8ad9284745ff9cb0445022272f59f9a333c7f97ea249793b2f9db140ca355c7012ca7cae2ee757996b537
+  data.tar.gz: 26d8f741a7a19b5a59077fc4e52736de6bb2c440f5c98a1865433e3b409f5894843e04bc3f52bb3cb2d292c931441bfbe8b163c578c77170e4187d33d6b15af2

data/lib/jabot.rb

@@ -6,23 +6,23 @@ require 'jabot/dsl'
 
 module Jabot
 
-	class Base
+  class Base
     include Jabot::DSL
 
-		attr_reader :jabber, :commands
-		attr_accessor :config
+    attr_reader :jabber, :commands
+    attr_accessor :config
 
-		def initialize
-			@config = {
-					username: '',
-			    password: '',
+    def initialize
+      @config = {
+          username: '',
+          password: '',
           clients: []
-			}
+      }
       @standalone_mode = false
     end
 
-		def configure(&block)
-			@commands = Commands.new
+    def configure(&block)
+      @commands = Commands.new
       standard_commands
       instance_eval(&block)
 
@@ -32,7 +32,7 @@ module Jabot
       end
     end
 
-		def start_listen
+    def start_listen
       @jabber.listen do |message, sender_id|
         begin
           result = @commands.run(message)
@@ -52,11 +52,11 @@ module Jabot
 
     #add standard commands
     def standard_commands
-      command :quit do
-        @jabber.stop
+      command :stop do
+        @jabber.disconnect
       end
     end
-	end
+  end
 
   #start jabot
   #
@@ -76,10 +76,10 @@ module Jabot
   #    'Hello!'
   #  end
   #end
-	def self.start(&block)
-		@base = Base.new
+  def self.start(&block)
+    @base = Base.new
     @base.configure(&block)
-		@base.start_listen
+    @base.start_listen
   end
 
 end

data/lib/jabot/commands.rb

@@ -1,42 +1,42 @@
 #encoding: utf-8
 
 module Jabot
-	class Commands
+  class Commands
 
     class CommandNotExists < StandardError; end
 
-		def initialize
-			@commands_list = {}
-		end
+    def initialize
+      @commands_list = {}
+    end
 
-		def add_command(name, &block)
-			@commands_list[name] = block unless command_exists? name
-		end
+    def add_command(name, &block)
+      @commands_list[name] = block unless command_exists? name
+    end
 
-		def command_exists?(command_name)
-			@commands_list.include? command_name
+    def command_exists?(command_name)
+      @commands_list.include? command_name
     end
 
-		def run(command_line)
+    def run(command_line)
       c = parse command_line
       unless command_exists? c[:name].downcase
         raise CommandNotExists, "command '#{c[:name]}' not found"
       end
 
       begin
-			  @commands_list[ c[:name].downcase ].call( *c[:args] )
+        @commands_list[c[:name].downcase].call(*c[:args])
       rescue
         'Error while executing command'
       end
-		end
-
-		def parse(command_line)
-			args = command_line.split
-			{
-					:name => args.shift.to_sym,
-					:args => args
-			}
     end
 
-	end
+    def parse(command_line)
+      args = command_line.split
+      {
+          :name => args.shift.to_sym,
+          :args => args
+      }
+    end
+
+  end
 end

data/lib/jabot/dsl.rb

@@ -1,25 +1,24 @@
-
 module Jabot
-	module DSL
-		def command(name, &block)
+  module DSL
+    def command(name, &block)
       @commands.add_command(name, &block)
-		end
+    end
 
-		def username(value)
-			@config[:username] = value
-		end
+    def username(value)
+      @config[:username] = value
+    end
 
-		def password(value)
-			@config[:password] = value
-		end
+    def password(value)
+      @config[:password] = value
+    end
 
-		def clients(list)
-			raise StandardError, 'Clients list must be an array' unless list.is_a?(Array)
-			@config[:clients] = list
+    def clients(list)
+      raise StandardError, 'Clients list must be an array' unless list.is_a?(Array)
+      @config[:clients] = list
     end
 
     def standalone_mode
       @standalone_mode = true
     end
-	end
+  end
 end

data/lib/jabot/jabber.rb

@@ -4,19 +4,19 @@ require 'xmpp4r/client'
 
 module Jabot
 
-	class Jabber
-		include ::Jabber
+  class Jabber
+    include ::Jabber
     ::Jabber.debug = false
 
-		attr_reader :remote_clients
+    attr_reader :remote_clients
     attr_reader :is_listen
 
-		def initialize(options)
-			@client_id = options[:client_id]
-			@client_password = options[:client_password]
+    def initialize(options)
+      @client_id = options[:client_id]
+      @client_password = options[:client_password]
 
-			@remote_clients = []
-			@is_listen = false
+      @remote_clients = []
+      @is_listen = false
 
       @client = Client::new JID::new(@client_id + '/bot')
       #@client.on_exception do
@@ -24,44 +24,44 @@ module Jabot
       #  connect
       #end
 
-			connect
+      connect
     end
 
-		def connect
-			@client.connect
-			@client.auth @client_password
+    def connect
+      @client.connect
+      @client.auth @client_password
 
-			presence = Presence.new(:dnd, 'server running')
-			@client.send presence
-		end
+      presence = Presence.new(:dnd, 'server running')
+      @client.send presence
+    end
 
-		def disconnect
+    def disconnect
       @is_listen = false
-			@client.close
-		end
+      @client.close
+    end
 
-		def add_remote_client(id)
-			@remote_clients << id unless @remote_clients.include?(id)
-		end
+    def add_remote_client(id)
+      @remote_clients << id unless @remote_clients.include?(id)
+    end
 
-		def send_to_all(text)
-			@remote_clients.each do |to|
-				send to, text
-			end
-		end
+    def send_to_all(text)
+      @remote_clients.each do |to|
+        send to, text
+      end
+    end
 
-		def send(to, text)
-			message = Message::new to, text
-			@client.send message
-		end
+    def send(to, text)
+      message = Message::new to, text
+      @client.send message
+    end
 
-		def listen
-			@is_listen = true
+    def listen
+      @is_listen = true
 
       @message_callback = @client.add_message_callback 0, @message_callback do |m|
-				if m.type != :error
-					sender_id = "#{m.from.node}@#{m.from.domain}"
-					#puts' "Message received from "' + sender_id# + ": " + m.body
+        if m.type != :error
+          sender_id = "#{m.from.node}@#{m.from.domain}"
+          #puts' "Message received from "' + sender_id# + ": " + m.body
           unless m.body.nil?
             if @remote_clients.include?(sender_id)
               yield(m.body, sender_id) if block_given?
@@ -73,10 +73,6 @@ module Jabot
       end
     end
 
-    def stop
-      @is_listen = false
-    end
-
-	end
+  end
 
 end

data/lib/jabot/version.rb

@@ -1,3 +1,3 @@
 module Jabot
-	VERSION = '0.1'
+  VERSION = '0.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jabot
 version: !ruby/object:Gem::Version
-  version: '0.1'
+  version: '0.2'
 platform: ruby
 authors:
 - Andrey Skat