robit 0.0.2 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aa7365251d2282f85ae122fd949d775aa5b869e0
-  data.tar.gz: 9228b3a6ec8e9059e5a2810fb39ed2ad923b956b
+  metadata.gz: b5b85c01b693f3ac29dd57d3dff69bdbc261846c
+  data.tar.gz: 1edbb9bf2cb403e3940d5f5175f176f4ee54a551
 SHA512:
-  metadata.gz: 87bb8722cc559d0a65fe474ea809084c4bbf9a4b1340c5909d438eb939f4f845504b63bfa05b3590ecd28e0694f40e9003922b8a9a47b7b77bd13c370f1af054
-  data.tar.gz: b9025cd5e292784fa3ab784b5694a6293b69f72c6346bffbf95b7b760811102e93b015385ee1bc33f717425f23ec1b5332138e6c8aef5e8370f47da94fc08ee2
+  metadata.gz: 7750236883ff882f7c9d32eb55702bcc448d3ac2fa63cd417760c03e14a5e26900b29e877627fb4b02d2529ecdb48f9082d4532156c33bf8b6c629b5a13c481e
+  data.tar.gz: 77498fd591231cbc34c2a18d9f2dcffefe0fe0cc39188c0bbd883a9a8d25acd610058678876195ade2d340ef758475c7daf6965ca8e9320efe0cba5d6622eaec

data/.gitignore

@@ -12,4 +12,5 @@
 .yardoc
 Gemfile.lock
 doc
-pkg
+pkg
+config.json

data/VERSION

@@ -1 +1 @@
-0.0.2
+1.0.0

data/bin/robit

@@ -16,6 +16,7 @@ require 'ostruct'
 require 'logger'
 require 'trollop'
 require 'hipchat'
+require 'json'
 
 require_relative '../lib/robit'
 
@@ -29,36 +30,32 @@ Opts = Trollop::options do
 
     Options:
   EOS
-  opt :jid,   "Jabber ID",             type: :string, required: true, short: 'j'
-  opt :pass,  "Jabber password",       type: :string, required: true, short: 'p'
-  opt :nick,  "HipChat @mention name", type: :string, required: true, short: 'n'
-  opt :name,  "HipChat full name",     type: :string, required: true, short: 'N'
-  opt :rooms, "Hipchat rooms",         type: :string, required: true, short: 'r'
-  opt :api_key, "HipChat v1 API key",  type: :string, required: true, short: 'k'
+  opt :config, "Path to configuration", type: :string, required: true, short: 'c'
 end
 
-short_room_names = Opts[:rooms].split(',')
-
+Config = JSON::parse File::read(Opts[:config]), symbolize_names: true
 
 Robut::Connection.configure do |config|
-  config.jid          = Opts[:jid]
-  config.password     = Opts[:pass]
-  config.mention_name = Opts[:nick]
-  config.nick         = Opts[:name]
-  config.rooms        = Opts[:rooms].split(',')
+  config.jid          = Config[:jabber_user]
+  config.password     = Config[:jabber_pass]
+  config.mention_name = Config[:hipchat_nick]
+  config.nick         = Config[:hipchat_name]
+  config.rooms        = Config[:hipchat_rooms]
   Robut::Storage::YamlStore.file = ".robut_store"
   config.store        = Robut::Storage::YamlStore
   config.logger       = Logger.new(STDOUT)
 
   config.nick_db = Daybreak::DB.new '.nick.db', default: []
 
-  config.hipchat = HipChat::Client.new Opts[:api_key]
+  config.hipchat = HipChat::Client.new Config[:hipchat_api_key]
 
   config.hipchat_rooms = []
   hipchat_rooms = config.hipchat.rooms
 
   raise 'No rooms!' if hipchat_rooms.length.zero?
 
+  short_room_names = Config[:hipchat_rooms].dup
+
   hipchat_rooms.each_with_index do |r, i|
     next unless short_room_names.include? r.xmpp_jid
     puts 'room_name: %s, room: %s' % [
@@ -72,9 +69,9 @@ Robut::Connection.configure do |config|
     short_room_names.delete r.xmpp_jid
     sleep 3 # So we don't blow the API rate limit
   end
-end
 
-raise short_room_names.inspect unless short_room_names.empty?
+  raise short_room_names.inspect unless short_room_names.empty?
+end
 
 
 Robut::Plugin.plugins = [

data/lib/robit/plugins/alias_nick.rb

@@ -67,8 +67,9 @@ private
 
 
     tos.each do |to|
+      rooms = db[to]
 
-      db[to].each do |name|
+      rooms.each do |name|
         rroom, hroom = nil, nil
 
         if name =~ /^@/
@@ -93,7 +94,7 @@ private
         end
       end
 
-      reply "Notified #{to_sentence db[to]}."
+      reply "Notified #{to_sentence rooms}." unless rooms.empty?
     end
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: robit
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 1.0.0
 platform: ruby
 authors:
 - Sean Clemmer