slappy 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8af98612f787abf18da9970dae3c2774eb02617
-  data.tar.gz: b293a5cba0cc0c58fab718447b2d1646f1a73fa5
+  metadata.gz: 08b2f8a7bb472cacd6e51da0269ee094156f5c3a
+  data.tar.gz: d48fb38cd54741eb27c1fbf5da175b83b6d43066
 SHA512:
-  metadata.gz: 0838f8be93626934b4b8d8c0322ad19db775140536ae31764b0ba7f72e70938d2e26bf68130e488bed397beb4135e1249d8d32893bf16205bc9a0eeb4143f528
-  data.tar.gz: b95e4c625e0a4f32d35844885cfafd3533538396e64c7439169e3ce025d156d70f937019b89260529b835b99a5c4f2506ebddab22e456d13dbcd8f39bcb30337
+  metadata.gz: 718627aa86b2ea59910af1088b9625b4059e6b98d21cca3a685bb469ae1e9c2666e0878d0f566881bcf9c0a6c335e12cb26afea5e93bff0887b1ba6c21c52706
+  data.tar.gz: 02c6b3286816b055d29a596d01a5a8a22c41ceed109f0a09f82c836e3aa9fb5cf1ff08fd67c26cdb0ac9490195041e109c825b7c5b4fce856fe5b2c0f4dff439

data/README.md

@@ -106,6 +106,7 @@ Slappy.say 'hello!' #=> username: slappy, channel: '#general', icon_emoji: ':sla
 ```
 token            - default: ENV['SLACK_TOKEN']
 scripts_dir_path - default : 'slappy-scripts'
+stop_with_error  - default: true
 
 robot.botname    - not effect now
 robot.username   - default: 'slappy'
@@ -178,12 +179,34 @@ There conditions, this event be called:
 - `raise StandardError` in script
 - trap SIGTERM or SIGINT
 
-```
+```ruby
 goodnight do
   logger.info 'goodnight'
 end
 ```
 
+#### From Option
+
+From Option enable to `hear`, `monitor`, and `respond`.
+This option specify reaction target!
+
+```ruby
+# specify target channel
+hear 'slappy', from: { channel: '#slappy' } do |event|
+  logger.info 'slappy!'
+end
+
+# specify target user
+hear 'slappy', from: { username: '@slappy' } do |event|
+  logger.info 'slappy!'
+end
+
+# specify target user and channel
+hear 'slappy', from: { channel: '#slappy', username: '@slappy' } do |event|
+  logger.info 'slappy!'
+end
+```
+
 ### DSL Methods
 
 |method|when execute callback|
@@ -197,7 +220,7 @@ end
 
 ### Event Methods
 
-```
+```ruby
 hear 'slappy' do |event|
   return if event.bot_message? #=> check message from webhook or integration
   event.relpy 'slappy'         #=> relpy to event channel
@@ -207,6 +230,7 @@ end
 
 |method|description|
 |:---:|:---|
+|data|get response JSON Hash (Hashie::Mash) from Slack API|
 |bot_message?|check message from bot (webhook or integration is true)|
 |reply|reply message to event channel|
 |reaction|add reaction to event message|
@@ -216,7 +240,7 @@ end
 
 If you not want execute `slappy start` command, written by (require `'slappy/dsl'` use DSL):
 
-```
+```ruby
 require 'slappy'
 
 Slappy.hello do
@@ -230,7 +254,16 @@ Slappy.start #=> Start WebSocket connection
 
 ## Release Note
 
+- v0.6.1
+  - Fix ts validation
+    - validation skil when ts be nil
+  - Fix option be bang change in Messenger#initialize
+  - Add Event#data
+  - Add stop_with_error option
+
 - v0.6.0
+  - Add from option to hear, monitor
+    - specify event target
   - respond method
     - respond event call when add message to botname prefix
   - goodnight method

data/lib/slappy/client.rb

@@ -14,19 +14,17 @@ module Slappy
     end
 
     def start
-      @start_time = Time.now
-      @callbacks.each do |event_name, listeners|
-        register_event event_name, listeners
-      end
-      set_signal_trap
+      setup
+
       Debug.log 'Slappy start'
+
       begin
         client.start
       rescue StandardError => e
         @callbacks[:goodnight].each(&:call) if @callbacks[:goodnight]
         STDERR.puts e.backtrace.slice!(0) + ': ' + e.message
         STDERR.puts "\tfrom " + e.backtrace.join("\n\tfrom ")
-        exit 1
+        exit 1 if config.stop_with_error
       end
     end
 
@@ -66,6 +64,16 @@ module Slappy
 
     private
 
+    def setup
+      @start_time = Time.now
+
+      @callbacks.each do |event_name, listeners|
+        register_event event_name, listeners
+      end
+
+      set_signal_trap
+    end
+
     def register_callback(name, type, callback)
       @callbacks[type] ||= []
       @callbacks[type].push callback

data/lib/slappy/configuration.rb

@@ -1,11 +1,16 @@
 module Slappy
   class Configuration
-    attr_accessor :robot, :token, :scripts_dir_path, :lib_dir_path, :logger
+    attr_accessor :robot, :token, :scripts_dir_path, :lib_dir_path, :logger, :stop_with_error
 
     def initialize
       @robot = Robot.new
     end
 
+    def stop_with_error
+      @stop_with_error = true if @stop_with_error.nil?
+      @stop_with_error
+    end
+
     def logger
       unless @logger
         @logger = Logger.new(STDOUT)
@@ -15,7 +20,7 @@ module Slappy
     end
 
     def token
-      @token || ENV['SLACK_TOKEN']
+      @token ||= ENV['SLACK_TOKEN']
     end
 
     def config_file_path
@@ -23,15 +28,15 @@ module Slappy
     end
 
     def lib_dir_path
-      @lib_dir_path || './lib'
+      @lib_dir_path ||= './lib'
     end
 
     def scripts_dir_path
-      @scripts_dir_path || './slappy-scripts'
+      @scripts_dir_path ||= './slappy-scripts'
     end
 
     def dsl
-      @dsl || :enabled
+      @dsl ||= :enabled
     end
 
     def dsl=(symbol)

data/lib/slappy/event.rb

@@ -3,7 +3,7 @@ module Slappy
     extend Forwardable
     include Debuggable
 
-    attr_accessor :matches
+    attr_accessor :matches, :data
 
     def_delegators :@data, :method_missing, :respond_to_missing?
 

data/lib/slappy/listeners/concerns/validatable.rb

@@ -29,6 +29,7 @@ module Slappy
       private
 
       def time_valid?(event)
+        return true if event.ts.nil?
         event.ts > Slappy.client.start_time
       end
     end

data/lib/slappy/messenger.rb

@@ -4,11 +4,12 @@ module Slappy
 
     CHANNEL_APIS = [SlackAPI::Channel, SlackAPI::Group, SlackAPI::Direct]
 
-    def initialize(options)
+    def initialize(options = {})
+      opt = options.dup
       @destination = {}
-      @destination = options[:channel]
-      options.delete :channel
-      @options = options
+      @destination = opt[:channel]
+      opt.delete :channel
+      @options = opt
     end
 
     def message

data/lib/slappy/slack_api/concerns/findable.rb

@@ -38,18 +38,7 @@ module Slappy
 
         def list(options = {})
           register_monitor
-
-          unless @list
-            method_name = "#{api_name}_list"
-
-            options[:channel] = SlackAPI.find(options[:channel]).id if options[:channel]
-            result = Slack.send(method_name, options)
-            unless result['ok']
-              exception = SlackError.new "Error message from slack (#{result['error']})"
-              fail exception, exception.message
-            end
-            @list = result[list_name].map { |data| new(data) }
-          end
+          @list = get_list(options) unless @list
           @list
         end
 
@@ -69,6 +58,22 @@ module Slappy
         def find_by_keyword(hash)
           hash.map { |key, value| list.find { |obj| obj.send(key) == value } }.first
         end
+
+        private
+
+        def get_list(options = {})
+          method_name = "#{api_name}_list"
+
+          options[:channel] = SlackAPI.find(options[:channel]).id if options[:channel]
+          result = Slack.send(method_name, options)
+
+          unless result['ok']
+            exception = SlackError.new "Error message from slack (#{result['error']})"
+            fail exception, exception.message
+          end
+
+          result[list_name].map { |data| new(data) }
+        end
       end
     end
   end

data/lib/slappy/version.rb

@@ -1,3 +1,3 @@
 module Slappy
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end

data/templates/slappy_config.rb

@@ -29,6 +29,12 @@ Slappy.configure do |config|
   #
   # config.dsl = :enabled
 
+  # stop_with_error:
+  #   Select bot be stop when catch StandardError.
+  #   If false, puts stack trace but be not stop when bot catch StandardError.
+  #
+  # config.stop_with_exception = true
+
   ## Default parameters
   #
   # There parameters use in say method when send to Slack.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slappy
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - wakaba260
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-22 00:00:00.000000000 Z
+date: 2015-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-api
@@ -292,7 +292,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.5.0
 signing_key: 
 specification_version: 4
 summary: Simple Slack Bot Framework