slack_game 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1714a9ce57da98a5744300173827bacd3572fd82
-  data.tar.gz: 973ede97c8c5c5605154da43ebabfe37119a33ec
+  metadata.gz: 01f77ed835aa5b2d8e53d359b7e91f8f4f39ef3e
+  data.tar.gz: 6ced2289003b0962059447d43a08173c977fb7b2
 SHA512:
-  metadata.gz: edc9cc44a9b9fe3441bbfd351bdacbd5e41b034669b60bb898ea8139d855be9b83b7e08ac3cd62746296da7c87fd37d440c77bc45395e3da2de4dcd5715cb7e5
-  data.tar.gz: 8eff5e97d1e156505f29a94987d4d7433760b6dd1d3db2ffc197a90cbe26ade5c72ca7696db51f3799dda7eff6635b06bfdca380409a1ebf3cd351ec8ebcbeac
+  metadata.gz: 89f3d14578e39414f112375c1684d525298f7fbda2c9b4d2cad41e98c82ca8c08a837da50dee3c503843cc69c1a0e94b861af89bc9362813d0e1699589e10962
+  data.tar.gz: 3c850b0eadb61a88e4f4b1649cf808e95bc8f3f484065ecf1e08d9f70071f7febb6e173109d4b6b3d565c94810205bc4c3c693a043da632451590df60c3e919c

data/lib/slack_game.rb

@@ -4,3 +4,9 @@ require 'slack_game/canvas'
 require 'slack_game/controller'
 require 'slack_game/game'
 require "slack_game/version"
+
+module SlackGame
+  Slack.configure do |conf|
+    conf.token = ENV['SLACK_TOKEN'] || raise(StandardError.new("environment variable 'SLACK_TOKEN' required"))
+  end
+end

data/lib/slack_game/canvas.rb

@@ -1,7 +1,7 @@
 module SlackGame
   class Canvas
-    attr_reader :channel, :last_update
-    attr_accessor :matrix
+    attr_reader :channel
+    attr_accessor :dot_matrix
 
     def self.inherited(subclass)
       subclass.class_variable_set(:@@dot, {})
@@ -16,36 +16,38 @@ module SlackGame
     end
 
     def initialize(channel, x, y)
-      @slack = Slack::Client.new(token: ENV['SLACK_TOKEN'])
+      @slack = Slack::Web::Client.new
       @channel = resolve_channel(channel)
-      @matrix = y.times.inject([]) { |acc| acc << Array.new(x) }
+      @dot_matrix = y.times.inject([]) { |acc| acc << Array.new(x) }
     end
 
-    def draw
-      encoded_matrix = encode(matrix)
-      result = if last_update
-        @slack.chat_update(ts: last_update, channel: channel, text: encoded_matrix)
+    def draw(parsers = nil)
+      emoji_matrix = dot2emoji(dot_matrix)
+      result = if @last_update
+        @slack.chat_update(ts: @last_update, channel: channel, text: emoji_matrix)
       else
-        @slack.chat_postMessage(channel: channel, text: encoded_matrix, as_user: true)
+        posted = @slack.chat_postMessage(channel: channel, text: emoji_matrix, as_user: true)
+        if parsers
+          Array(parsers).select { |p| p.instance_of?(SlackGame::Controller::ReactionParser) }.each do |parser|
+            @slack.reactions_add(name: parser.emoji, channel: channel, timestamp: posted['ts'])
+          end
+        end
+        posted
       end
       @last_update = result['ok'] ? result['ts'] : raise
     end
 
     private
 
-    def encode(matrix)
-      encoded = matrix.map { |l| line_encode(l) }
-      encoded.join("\n")
+    def dot2emoji(matrix)
+      matrix.map { |l| line_convert(l) }.join("\n")
     end
 
-    def line_encode(line)
-      encoded_line = line.map do |t|
-        dot_emoji(t)
-      end
-      encoded_line.join
+    def line_convert(line)
+      line.map { |t| convert(t) }.join
     end
 
-    def dot_emoji(id)
+    def convert(id)
       self.class.dot_map[id] || ENV['DEFAULT_SPACER'] || ':spacer:'
     end
 

data/lib/slack_game/controller.rb

@@ -8,6 +8,10 @@ module SlackGame
         parsers << InputParser.new(command, pattern)
       end
 
+      def subclass.reaction(command, emoji)
+        parsers << ReactionParser.new(command, emoji)
+      end
+
       def subclass.parsers
         self.class_variable_get(:@@parsers)
       end
@@ -19,41 +23,72 @@ module SlackGame
     end
 
     def init
-      slack = Slack::Client.new(token: ENV['SLACK_TOKEN'])
-      @rtm = slack.realtime
-      @rtm.on(:message) do |m|
-        input(m['text'])
-      end
+      @rtm = Slack::RealTime::Client.new
+      @rtm.on(:message) { |m| input(m) }
+      @rtm.on(:reaction_add) { |m| input(m) }
+      @rtm.on(:reaction_removed) { |m| input(m) }
     end
 
     def listen
       @thread = Thread.new do
-        @rtm.start
+        @rtm.start!
       end
       @thread.run
     end
 
-    def input(command)
-      parser = self.class.parsers.find { |p| p.match?(command) }
-      @command = parser.command if parser
+    def input(message)
+      matched = parsers.find { |p| p.match?(message) }
+      @command = matched.command if matched
     end
 
-    def take
+    def take_last_command
       command = @command
       @command = nil
       command
     end
 
-    class InputParser
-      attr_reader :pattern, :command
+    def parsers
+      self.class.parsers
+    end
+
+    class Parser
+      attr_reader :command
+    end
+
+    class InputParser < Parser
+      attr_reader :pattern
 
       def initialize(command, pattern)
         @command = command
         @pattern = pattern
       end
 
-      def match?(input)
-        !! pattern.match(input)
+      def match?(message)
+        !! pattern.match(message['text'])
+      end
+    end
+
+    class ReactionParser < Parser
+      attr_reader :emoji, :any
+
+      def initialize(command, emoji)
+        @command = command
+        @emoji = chomp(emoji)
+      end
+
+      def match?(message)
+        return false unless ['reaction_add', 'reaction_removed'].include?(message['type'])
+        message['reaction'] == @emoji
+      end
+
+      private
+
+      def chomp(emoji)
+        if emoji.start_with?(':') && emoji.end_with?(':')
+          emoji[1..-2]
+        else
+          emoji
+        end
       end
     end
   end

data/lib/slack_game/game/demo.rb

@@ -8,14 +8,14 @@ module SlackGame
         @controller = Controller.new
         @canvas = Canvas.new(channel, x, y)
         @position = Position.new(0, 0, 0..9, 0..9)
-        @canvas.matrix[@position.y][@position.x] = Canvas::CHARACTOR
-        @canvas.draw
+        @canvas.dot_matrix[@position.y][@position.x] = Canvas::CHARACTOR
+        @canvas.draw(@controller.parsers)
       end
 
       def main_loop
         loop{
           begin
-            update(@controller.take)
+            update(@controller.take_last_command)
           rescue => e
             puts "GAME OVER #{e.message}"
             break
@@ -39,10 +39,10 @@ module SlackGame
       def set_position(x, y)
         @position.x = x
         @position.y = y
-        matrix = @canvas.matrix
+        matrix = @canvas.dot_matrix
         matrix = matrix.map { |n| n.map { |d| d == Canvas::CHARACTOR ? Canvas::PAINTED : d } }
         matrix[@position.y][@position.x] = Canvas::CHARACTOR
-        @canvas.matrix = matrix
+        @canvas.dot_matrix = matrix
         @canvas.draw
       end
 

data/lib/slack_game/game/demo/controller.rb

@@ -11,6 +11,10 @@ module SlackGame
         command LEFT, /l/
         command DOWN, /d/
         command UP, /u/
+        reaction RIGHT, 'point_right'
+        reaction LEFT, 'point_left'
+        reaction DOWN, 'point_down'
+        reaction UP, 'point_up'
       end
     end
   end

data/lib/slack_game/game/lifegame.rb

@@ -6,7 +6,7 @@ module SlackGame
       def initialize(channel, size = 10)
         @canvas = Canvas.new(channel, size, size)
         @field = Field.new(size)
-        @canvas.matrix = @field.to_display
+        @canvas.dot_matrix = @field.to_display
         @canvas.draw
       end
 
@@ -22,7 +22,7 @@ module SlackGame
       end
 
       def update
-        @canvas.matrix = @field.next.to_display
+        @canvas.dot_matrix = @field.next.to_display
         @canvas.draw
       end
 

data/lib/slack_game/version.rb

@@ -1,3 +1,3 @@
 module SlackGame
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/slack_game.gemspec

@@ -18,7 +18,8 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "slack-api", "~> 1.0"
+  spec.add_runtime_dependency "slack-ruby-client", "~> 0.7"
+  spec.add_runtime_dependency "faye-websocket"
   spec.add_development_dependency "bundler", "~> 1.10"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec"

metadata

@@ -1,29 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: slack_game
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Kinoshita.Yasuhiro
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2015-12-18 00:00:00.000000000 Z
+date: 2016-07-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: slack-api
+  name: slack-ruby-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.0'
+        version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: faye-websocket
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -143,7 +157,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Play games on slack