lita-irkit 0.0.5 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5f9374e8bd6b531e066c64258a5ccbbb2d1ee9a7
-  data.tar.gz: 209ef8ece76ad641cf2cf813f097e7270cd5cb8a
+  metadata.gz: fc4e1799d85b776ce4bb87623d8aa3d567a3a17b
+  data.tar.gz: 5dc5038f08b66dee9a7386832d1dbbc210ea9487
 SHA512:
-  metadata.gz: 1acdf7852b8c3b980ef37dec6998250ebb9b34d4e139d9ab9badc07e6821bea6f50196eb8020662fe3f00ecd6201645442d2cbf21a8aac5c3391903f915fa40a
-  data.tar.gz: f0adb68a7aa27ef1cea92df57c12476aa72bc46846d1231fd4c0bea33b18f9b2c0c963d61e28b17aad1c7c0c54186de49a7a4d5886352bd28bf43f18cbde14a3
+  metadata.gz: 4b6add3d4a8d6094c851bf615f1acc1c8e22e3e33d03346ec66c190056497f15aa25b41fc790a182790e07222b63dea8f65335766e4e9f48cba8932bc1b3435d
+  data.tar.gz: 3f097080c6bf1fed561970bf852c6f7e50b1746b5555367bc9564b30163931bbc64f275ee9c16325388f0f00d833a48cec176051e62954529070d21ff216cde9

data/README.md

@@ -21,10 +21,20 @@ config.handlers.irkit.clientkey = ENV["IRKIT_CLIENTKEY"]
 ## Usage
 
 ```
-route /^ir list/,        :ir_list,   command: true, help: { "ir list"                  => "list irkit command names" }
-route /^ir save (.+)/,   :ir_save,   command: true, help: { "ir save [command_name]"   => "save irkit command as name" }
-route /^ir send (.+)/,   :ir_send,   command: true, help: { "ir send [command_name]"   => "send irkit command" }
-route /^ir remove (.+)/, :ir_remove, command: true, help: { "ir remove [command_name]" => "remove irkit command" }
+route /^ir list/,            :ir_list,         command: false, help: { "ir list"                      => "list irkit command names" }
+route /^ir send (.+)/,       :ir_send,         command: false, help: { "ir send [command_name]"       => "send irkit command" }
+route /^ir all off/,         :ir_send_all_off, command: false, help: { "ir all off"                   => "send irkit commands which end with 'off'" }
+route /^ir register (.+)/,   :ir_register,     command: true,  help: { "ir register [command_name]"   => "register irkit command" }
+route /^ir unregister (.+)/, :ir_unregister,   command: true,  help: { "ir unregister [command_name]" => "unregister irkit command" }
+route /^ir migrate/,         :ir_migrate,      command: true
+```
+
+## Migration from 0.0.x to 0.1.0
+Since Redis namespace has been changed at v0.1.0, You must run migration command when upgrading to v0.1.0 or later.
+
+```
+@your_bot ir migrate
+#=> :ok_woman: 10 keys are migrated.
 ```
 
 ## License

data/lib/lita/handlers/irkit.rb

@@ -4,74 +4,75 @@ require 'json'
 module Lita
   module Handlers
     class Irkit < Handler
-      def self.default_config(handler_config)
-        handler_config.deviceid  = ENV['IRKIT_DEVICEID']
-        handler_config.clientkey = ENV['IRKIT_CLIENTKEY']
-      end
+      config :deviceid,  required: true, default: ENV['IRKIT_DEVICEID']
+      config :clientkey, required: true, default: ENV['IRKIT_CLIENTKEY']
 
       route /^ir list/,            :ir_list,         command: false, help: { "ir list"                      => "list irkit command names" }
       route /^ir send (.+)/,       :ir_send,         command: false, help: { "ir send [command_name]"       => "send irkit command" }
       route /^ir all off/,         :ir_send_all_off, command: false, help: { "ir all off"                   => "send irkit commands which end with 'off'" }
       route /^ir register (.+)/,   :ir_register,     command: true,  help: { "ir register [command_name]"   => "register irkit command" }
       route /^ir unregister (.+)/, :ir_unregister,   command: true,  help: { "ir unregister [command_name]" => "unregister irkit command" }
+      route /^ir migrate/,         :ir_migrate,      command: true
 
       def ir_list(response)
-        response.reply Lita.redis.keys('irkit:messages:*').map{|key| key.gsub(/^irkit:messages:/, '')}.join(', ')
+        response.reply redis.keys.map{ |key| key.sub(/^messages:/, '') }.join(', ')
       end
 
       def ir_register(response)
         cmd     = response.matches[0][0]
-        ir_data = irkit_api.get('/1/messages', clientkey: config.clientkey).body
+        ir_data = irkit_api.get('messages', clientkey: config.clientkey).body
         return response.reply "ir data not found" if ir_data.length == 0
 
-        Lita.redis[key_for_cmd(cmd)] = JSON.parse(ir_data)['message'].to_json
+        redis["messages:#{cmd}"] = JSON.parse(ir_data)['message'].to_json
         response.reply ":ok_woman:"
       end
 
       def ir_send(response)
         cmd = response.matches[0][0]
-        message = Lita.redis[key_for_cmd(cmd)]
-        return response.reply 'ir data not found' unless message
 
-        send_message(message)
-        response.reply ":ok_woman:"
+        if send_command(cmd)
+          response.reply ":ok_woman:"
+        else
+          response.reply 'ir data not found' unless message
+        end
       end
 
       def ir_send_all_off(response)
-        keys = Lita.redis.keys(key_for_all_off_cmd)
-        keys.each do |key|
-          message = Lita.redis[key]
-          send_message(message)
+        cmds = redis.keys('messages:*off').map{ |key| key.sub(/^messages:/, '') }
+        cmds.each do |cmd|
+          send_command(cmd)
         end
         response.reply ":ok_woman:"
       end
 
       def ir_unregister(response)
         cmd = response.matches[0][0]
-        Lita.redis.del key_for_cmd(cmd)
+        redis.del "messages:#{cmd}"
         response.reply ":ok_woman:"
       end
 
-    private
+      def ir_migrate(response)
+        keys = Lita.redis.keys('irkit:messages:*')
 
-      def key_for_cmd(cmd)
-        "irkit:messages:#{cmd}"
-      end
+        Lita.redis.pipelined do
+          keys.each do |key|
+            Lita.redis.rename key, key.sub(/^irkit:messages:/, 'handlers:irkit:messages:')
+          end
+        end
 
-      def key_for_all_off_cmd
-        "irkit:messages:*off"
+        response.reply ":ok_woman: #{keys.size} keys are migrated."
       end
 
-      def send_message(message)
-        irkit_api.post('/1/messages', clientkey: config.clientkey, deviceid: config.deviceid, message: message)
-      end
+      def send_command(command)
+        return false unless message = redis["messages:#{command}"]
 
-      def config
-        Lita.config.handlers.irkit
+        irkit_api.post('messages', clientkey: config.clientkey, deviceid: config.deviceid, message: message)
       end
 
+    private
+
       def irkit_api
-        @conn ||= Faraday.new(url: 'https://api.getirkit.com') do |faraday|
+        @conn ||= Faraday.new(url: 'https://api.getirkit.com/1') do |faraday|
           faraday.request  :url_encoded             # form-encode POST params
           faraday.response :logger                  # log requests to STDOUT
           faraday.adapter  Faraday.default_adapter  # make requests with Net::HTTP

data/lita-irkit.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "lita-irkit"
-  spec.version       = "0.0.5"
+  spec.version       = "0.1.0"
   spec.authors       = ["fukayatsu"]
   spec.email         = ["fukayatsu@gmail.com"]
   spec.description   = %q{Use IRKit on Lita}

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: lita-irkit
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.1.0
 platform: ruby
 authors:
 - fukayatsu
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-16 00:00:00.000000000 Z
+date: 2015-04-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: lita
@@ -148,7 +148,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Use IRKit on Lita