del 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7f262a1fbdb6bb5a8928920aaa055ac37d1fde2cd789b17bbd66bb9ed0216d6b
-  data.tar.gz: 525e7f6afa5e20b3f59bc6df19b013b0eea9b8e33208dbb100ddd819f2df2e6f
+  metadata.gz: 275fb2e7d68148752f83c9e9c01d72f03631822c8f8c51261b6bc78917e25c24
+  data.tar.gz: 7071efd3d8cde47caba440ae0016bcef36df20b99cb65c69067bd967a8b3c473
 SHA512:
-  metadata.gz: 4916e972d8a2f76b43b74c26fecc74491defdde8664039a7278ea17962e42a823430e106c9c0dd004ad744ea11de7a88ef3a90e06fc4b3fd8a60e077569e6351
-  data.tar.gz: bfd3f1bda27c2b65a6222aa1cedc79f004e592a91880fddac74ffca32f2f59154bb32c3c14fc787cdf6f61fa7efd0b565eb5e160a25b866928357b92032e7e94
+  metadata.gz: bdd37cdf1329695640e361542372ca9d0195d31c481526751c21417c38303ca9e0001d6568bd5b900c5d9ae303fb7088769712ec62eb91a121fcb5d6c65d193b
+  data.tar.gz: c2486029c1495bfde34aaa803a9d20398847feeb1d4669aea2a01dc95955bec795195206f3e0901eba6da27963e6c00fbdb3011eaf19a0897839802ff57b3e18

data/README.md

@@ -1,8 +1,6 @@
 # Del
 
-Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/del`. To experiment with that code, run `bin/console` for an interactive prompt.
-
-TODO: Delete this and the text above, and describe your gem
+Del is a funky robosapien.
 
 ## Installation
 
@@ -22,7 +20,7 @@ Or install it yourself as:
 
 ## Usage
 
-TODO: Write usage instructions here
+    $ del routes.rb # see lib/del/examples/routes.rb for an example
 
 ## Development
 
@@ -32,7 +30,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/del.
+Bug reports and pull requests are welcome on GitHub at https://github.com/mokhan/del.
 
 ## License
 

data/exe/del

@@ -3,6 +3,8 @@
 require "del"
 require "pathname"
 
+startup_file = Pathname.new(ARGV[0]) if ARGV[0]
 Del.start(
-  dotenv_file: ENV.fetch("DELRC", Pathname.new(Dir.home).join(".delrc"))
+  dotenv_file: ENV.fetch("DELRC", Pathname.new(Dir.home).join(".delrc")),
+  startup_file: startup_file,
 )

data/lib/del/configuration.rb

@@ -0,0 +1,29 @@
+module Del
+  class Configuration
+    attr_accessor :default_rooms
+    attr_accessor :host
+    attr_accessor :jid
+    attr_accessor :jid
+    attr_accessor :logger
+    attr_accessor :muc_domain
+    attr_accessor :name
+    attr_accessor :password
+    attr_accessor :rooms
+    attr_accessor :router
+    attr_accessor :users
+
+    def initialize
+      @default_rooms = ENV.fetch("DEL_ROOMS", '').split(',')
+      @host = ENV.fetch("DEL_HOST", 'chat.hipchat.com')
+      @jid = ENV.fetch("DEL_JID")
+      @logger = Logger.new(STDOUT)
+      @logger.level = Logger::INFO
+      @muc_domain = ENV.fetch("DEL_MUC_DOMAIN", "conf.hipchat.com")
+      @name = ENV.fetch("DEL_FULL_NAME")
+      @password = ENV.fetch("DEL_PASSWORD")
+      @rooms = Repository.new
+      @router = DefaultRouter.new
+      @users = Repository.new
+    end
+  end
+end

data/lib/del/connection.rb

@@ -4,8 +4,8 @@ module Del
 
     def initialize(configuration:)
       @configuration = configuration
-      @rooms = configuration[:rooms]
-      @users = configuration[:users]
+      @rooms = configuration.rooms
+      @users = configuration.users
       @mucs = {}
     end
 
@@ -14,9 +14,9 @@ module Del
         Del.logger.error(error)
         disconnect
       end
-      client.connect(configuration[:host])
+      client.connect(configuration.host)
       sleep 0.0001 until client.is_connected?
-      client.auth(configuration[:password])
+      client.auth(configuration.password)
       roster = Jabber::Roster::Helper.new(client, false)
       roster.add_update_callback do |old_item, item|
         users.upsert(item['jid'], User.new(item['jid'], item)) if item
@@ -25,13 +25,13 @@ module Del
       roster.wait_for_roster
       client.add_message_callback do |message|
         next if message.type == :error || message.body.nil?
-        user = configuration[:users].find_by(message.from.strip)
+        user = configuration.users.find_by(message.from.strip)
         robot.receive(message.body, source: Source.new(user: user))
       end
       client.send(Jabber::Presence.new(:chat))
-      configuration[:default_rooms].each do |room|
+      configuration.default_rooms.each do |room|
         Del.logger.debug("Joining #{room} as #{robot.name}")
-        room_jid = jid_for(room, configuration[:muc_domain].dup, robot.name)
+        room_jid = jid_for(room, configuration.muc_domain.dup, robot.name)
         stripped_jid = room_jid.strip.to_s
         next if @mucs[stripped_jid]
 
@@ -44,7 +44,7 @@ module Del
         end
         muc.join(room_jid)
       end
-      list_rooms(configuration[:muc_domain]).each do |room|
+      list_rooms(configuration.muc_domain).each do |room|
         rooms.upsert(room)
       end
     end
@@ -61,7 +61,7 @@ module Del
     end
 
     def disconnect
-      puts "byte me!"
+      Del.logger.info("byte me!")
       client.close
     rescue IOError, SystemCallError => error
       Del.logger.error(error)
@@ -74,7 +74,7 @@ module Del
     end
 
     def jid
-      @jid ||= jid_for(configuration[:jid], "chat.hipchat.com", "bot")
+      @jid ||= jid_for(configuration.jid, "chat.hipchat.com", "bot")
     end
 
     def list_rooms(muc_domain)

data/lib/del/default_router.rb

@@ -1,9 +1,19 @@
 module Del
   class DefaultRouter
-    def route(message)
-      Del.logger.info(message.to_s)
+    def initialize(routes = [])
+      @routes = routes
+    end
 
-      message.reply(message.text.reverse)
+    def register(pattern, &block)
+      @routes.push(pattern: pattern, command: block)
+    end
+
+    def route(message)
+      @routes.each do |route|
+        if route[:pattern].match(message.text)
+          route[:command].call(message)
+        end
+      end
     end
   end
 end

data/lib/del/examples/routes.rb

@@ -0,0 +1,7 @@
+Del.configure do |config|
+  puts "Registering custom routes."
+
+  config.router.register(/.*/) do |message|
+    message.reply(message.text.reverse)
+  end
+end

data/lib/del/robot.rb

@@ -6,15 +6,16 @@ module Del
 
     def initialize(configuration:)
       @connection = Connection.new(configuration: configuration)
-      @jid = configuration[:jid]
-      @name = configuration[:name]
-      @router = configuration[:router]
-      @users = configuration[:users]
-      @rooms = configuration[:rooms]
+      @jid = configuration.jid
+      @name = configuration.name
+      @router = configuration.router
+      @users = configuration.users
+      @rooms = configuration.rooms
     end
 
     def get_funky!
       connection.connect(self)
+      Del.logger.info("It's fire! 🔥")
       sleep
     rescue Interrupt
       connection.disconnect

data/lib/del/version.rb

@@ -1,3 +1,3 @@
 module Del
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/lib/del.rb

@@ -6,6 +6,7 @@ require "xmpp4r/muc/helper/simplemucclient"
 require "xmpp4r/roster/helper/roster"
 
 require "del/connection"
+require "del/configuration"
 require "del/default_router"
 require "del/message"
 require "del/repository"
@@ -15,11 +16,16 @@ require "del/user"
 require "del/version"
 
 module Del
-  def self.start(dotenv_file:)
+  def self.start(dotenv_file:, startup_file:)
     puts "Loading... #{dotenv_file}"
     Dotenv.load(dotenv_file.to_s)
-    puts "It's fire! 🔥"
-    Del.logger.level = Logger::INFO
+    Del.configure do |config|
+      config.router.register(/.*/) do |message|
+        logger.debug(message.to_s)
+      end
+    end
+    load startup_file if startup_file && File.exist?(startup_file)
+
     del = Robot.new(configuration: configuration)
     del.get_funky!
   end
@@ -29,21 +35,10 @@ module Del
   end
 
   def self.configuration
-    @configuration ||= {
-      default_rooms: ENV.fetch("DEL_ROOMS", '').split(','),
-      host: ENV.fetch("DEL_HOST"),
-      jid: ENV.fetch("DEL_JID"),
-      logger: Logger.new(STDOUT),
-      muc_domain: ENV.fetch("DEL_MUC_DOMAIN"),
-      name: ENV.fetch("DEL_FULL_NAME"),
-      password: ENV.fetch("DEL_PASSWORD"),
-      rooms: Repository.new,
-      router: DefaultRouter.new,
-      users: Repository.new,
-    }
+    @configuration ||= Configuration.new
   end
 
   def self.logger
-    @logger ||= configuration[:logger]
+    @logger ||= configuration.logger
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: del
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - mo
@@ -100,8 +100,10 @@ files:
 - del.gemspec
 - exe/del
 - lib/del.rb
+- lib/del/configuration.rb
 - lib/del/connection.rb
 - lib/del/default_router.rb
+- lib/del/examples/routes.rb
 - lib/del/message.rb
 - lib/del/repository.rb
 - lib/del/robot.rb