slappy 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1f6569438c773c309cbc6946bb9b25dcb60dc59d
-  data.tar.gz: 31f3eeee45abc61e2ca093d9ae7fbab63e5e055a
+  metadata.gz: 8e79a1760b63ef1b9dc0b47ddc653346f56d972f
+  data.tar.gz: 081b83f1f491f9173a1fd25f085c42faed243013
 SHA512:
-  metadata.gz: 27ff356c54218c17816ab23e147c364dabfced2f567fe3e9cc91255ae60ede45582d2a19ab4fc848e4b7787e20eacd7ee13022181c9f173df07094178792dc5a
-  data.tar.gz: 609792027661024892179ce92f058c491fae2cb8bb6b05c57b06010ec0f047c79a8b7c9bc9ebe39cba8a17b9fb56ad62c833f4b6cb0f8c1b7ce0c83ef5752025
+  metadata.gz: c5b60c4a6050e4df1e15f5f0d8ddd3a544edbf69669c18148dd505e05ddd152041dd14acfd662db472d73338ca32347a54cd409cdfee0e232a72374f0c78ed6b
+  data.tar.gz: af1e4362d1387b85cc69e7492ed88b9b2f0f0a8e5bae0fd8eb042c2762742b597ad90c1cc4f3fddfb01db993d293742ed575173d3eddc9af1a2da81124edfecd

data/.hound.yml

@@ -15,6 +15,12 @@ Style/Documentation:
 Style/StringLiterals:
   EnforcedStyle: single_quotes
 
+##################### Lint ##################################
+
+Lint/UnusedBlockArgument:
+  Exclude:
+    - 'templates/slappy_config.rb'
+
 ##################### Metrics ##################################
 
 Metrics/AbcSize:

data/.travis.yml

@@ -12,9 +12,6 @@ before_script:
 script:
 - ruby --version
 - bundle exec rspec
-branches:
-  only:
-  - master
 notifications:
   slack:
     secure: ocTnQAT5/a3gu93ZZ0vinihMT6/NG3fp4pV2li9WSJRuImFwSTI2eAmjlOZbk/SaZIdj2alGIB2HqMH6sHFheCiUSuAzf+8aaGvBwFh//x+2uibXccoyZLIUoDb5OMHCZSilkQgx8MtsGsPCr+7ryvclxIL+3YJz2NjTpwPPoLsXUNXXzaJtYHknb62BCGGTC5wz8J5JOVKloDXVz4F2CMZqX2ylM/DxFTl5LI94kT/7pv7KfelCHsm6R0F4ALaJT0zumx+t/QAlezzlvRqu81L76yPlEgdahydY77yd7xVqUOEhvNEEiriHMR/+4xYMEieVvERlDLsk4kvywX6YbGId/5tDaQvRIkHIN/9XeKnt/DyMbBVugC0MtZGbNREtD2a9u85V0Zzv/ufBva3FHtbWsHXBtETrb3ty9yrplDkqg/H9vOfISfnSYxOk8F56DMj0h6QSaocCk/9hk31C2I66ZvmmJC5LkSNN77KFT0u32nSFAi5Maj3FhGGW2eXg/jWqBjjyYqUQtjeQguqhtPna5QSpmY17a6l7LAujoQ/romkiEIW+Qwd2tPv53DVe5q1fWNTSrr5LVhkKjkATAWlKLv8oJOj86/EcaoNCZFS7mufq16hDMW9UJbEsuqguRCZKR49FC/U80NWwx+jrkzHY41Meh6yeYd5JQyODb9E=

data/README.md

@@ -43,6 +43,7 @@ Example:
 ```ruby
 # catch pattern
 hear '^hello, slappy!' do |event|
+  logger.info 'received message!'
   say 'hello!!', channel: event.channel #=> respond message to channel
 end
 ```
@@ -122,22 +123,22 @@ require 'slappy'
 
 # called when start up
 Slappy.hello do
-  puts 'successfly connected'
+  Slappy.logger.info 'successfly connected'
 end
 
 # called when match message
 Slappy.hear 'foo' do
-  puts 'foo'
+  Slappy.logger.info 'foo'
 end
 
 # use regexp in string literal
 Slappy.hear 'bar (.*)' do |event|
-  puts event.matches[1] #=> Event#matches return MatchData object
+  Slappy.logger.info event.matches[1] #=> Event#matches return MatchData object
 end
 
 # event object is slack event JSON (convert to Hashie::Mash)
 Slappy.hear '^bar (.*)' do |event|
-  puts event.channel #=> channel id
+  Slappy.logger.info event.channel #=> channel id
   Slappy.say 'slappy!', channel: event.channel #=> to received message channel
   Slappy.say 'slappy!', channel: '#general'
   Slappy.say 'slappy!', username: 'slappy!', icon_emoji: ':slappy:'
@@ -145,12 +146,35 @@ end
 
 # use regexp literal
 Slappy.hear /^foobar/ do
-  puts 'slappppy!'
+  Slappy.logger.info 'slappppy!'
 end
 
 Slappy.start #=> Start slappy process
 ```
 
+## Release Note
+
+- v0.4.0
+  - Support logger
+  - Support load lib directory
+  - Add New command
+    - version
+  - Choise dsl enabled in slappy_config
+
+- v0.3.0
+  - Introduce DSL
+  - Introduce CLI commands
+    - start
+    - new
+  - Use String literal for hear parameter
+  - Chose dsl use in slappy_config
+
+- v0.2.0
+  - Modify interface
+
+- v0.1.0
+  - Release
+
 ## Feature
 
 - [ ] Execute in shell (because testable).

data/lib/slappy/cli.rb

@@ -10,6 +10,11 @@ module Slappy
       build_command(:generator).call(dir_name)
     end
 
+    desc 'version', 'show version number'
+    def version
+      puts Slappy::VERSION
+    end
+
     private
 
     def build_command(command_name)

data/lib/slappy/commands/generator.rb

@@ -8,6 +8,7 @@ module Slappy
 
         mkdir target_dir unless @target_dir.nil?
         mkdir scripts_dir_path
+        mkdir lib_dir_path
 
         copy template_script_path, scripts_dir_path
         copy config_file_path,     target_dir
@@ -27,6 +28,10 @@ module Slappy
         File.expand_path 'templates', gem_root_dir
       end
 
+      def lib_dir_path
+        File.expand_path Slappy.configuration.lib_dir_path, target_dir
+      end
+
       def scripts_dir_path
         File.expand_path Slappy.configuration.scripts_dir_path, target_dir
       end

data/lib/slappy/commands/run.rb

@@ -4,7 +4,9 @@ module Slappy
       class InvalidPathError < StandardError; end
 
       def call
+        load_dsl
         load_config
+        load_libs
         load_scripts
         Slappy.start
       rescue InvalidPathError => e
@@ -13,6 +15,11 @@ module Slappy
 
       private
 
+      def load_dsl
+        return if Slappy.configuration.dsl == :disabled
+        require 'slappy/dsl'
+      end
+
       def load_config
         file = File.expand_path Slappy.configuration.config_file_path, Dir.pwd
         begin
@@ -22,18 +29,32 @@ module Slappy
         end
       end
 
-      def load_scripts
-        script_dir = Slappy.configuration.scripts_dir_path
+      def load_directory(dir_name, &block)
+        dir_path = Slappy.configuration.send dir_name.to_sym
 
-        unless FileTest.directory? script_dir
-          message = "directory #{script_dir} not found"
+        unless FileTest.directory? dir_path
+          message = "directory #{dir_path} not found"
           fail InvalidPathError.new, message
         end
 
-        script_dir = "./#{script_dir}" unless script_dir.match(%r{"./"})
-        Dir.glob("#{script_dir}/**/*.rb").each do |file|
-          block = proc { require file }
-          block.call
+        dir_path = "./#{dir_path}" unless dir_path.match(%r{"./"})
+        block.call(dir_path)
+      end
+
+      def load_libs
+        load_directory(:lib_dir_path) do |lib_dir|
+          Dir.glob("#{lib_dir}/**/*.rb").each do |file|
+            require file
+          end
+        end
+      end
+
+      def load_scripts
+        load_directory(:scripts_dir_path) do |script_dir|
+          Dir.glob("#{script_dir}/**/*.rb").each do |file|
+            block = proc { require file }
+            block.call
+          end
         end
       end
     end

data/lib/slappy/configuration.rb

@@ -1,11 +1,19 @@
 module Slappy
   class Configuration
-    attr_accessor :robot, :token, :scripts_dir_path
+    attr_accessor :robot, :token, :scripts_dir_path, :lib_dir_path, :logger
 
     def initialize
       @robot = Robot.new
     end
 
+    def logger
+      unless @logger
+        @logger = Logger.new(STDOUT)
+        @logger.level = Logger::INFO
+      end
+      @logger
+    end
+
     def token
       @token || ENV['SLACK_TOKEN']
     end
@@ -14,10 +22,22 @@ module Slappy
       './slappy_config.rb'
     end
 
+    def lib_dir_path
+      @lib_dir_path || './lib'
+    end
+
     def scripts_dir_path
       @scripts_dir_path || './slappy-scripts'
     end
 
+    def dsl
+      @dsl || :enabled
+    end
+
+    def dsl=(symbol)
+      fail ArgumentError if [:enabled, :disabled].include? symbol
+    end
+
     def send_params
       {
         username: robot.username,

data/lib/slappy/dsl.rb

@@ -2,7 +2,7 @@ module Slappy
   module DSL
     extend Forwardable
 
-    def_delegators :Slappy, :hello, :hear, :say, :start
+    def_delegators :Slappy, :hello, :hear, :say, :start, :logger
   end
 end
 

data/lib/slappy/listener.rb

@@ -7,7 +7,7 @@ module Slappy
     end
 
     def call(event)
-      return unless Time.at(event.ts.to_f) > Slappy.start_time
+      return unless Time.at(event.ts.to_f) > Slappy.client.start_time
       return unless event.text.match @regexp
       @callback.call(event)
     end

data/lib/slappy/version.rb

@@ -1,3 +1,3 @@
 module Slappy
-  VERSION = '0.3.0'
+  VERSION = '0.4.0'
 end

data/lib/slappy.rb

@@ -4,10 +4,14 @@ require 'hashie'
 require 'slack'
 require 'termcolor'
 require 'thor'
+require 'logger'
 
 module Slappy
   class << self
-    @configuration = nil
+    extend Forwardable
+
+    def_delegators :configuration, :logger
+    def_delegators :client, :start, :hello, :hear, :say
 
     def configure
       @configuration = Configuration.new
@@ -21,17 +25,6 @@ module Slappy
       @configuration || configure
     end
 
-    def method_missing(method, *args, &block)
-      return super unless client.respond_to?(method)
-      client.send(method, *args, &block)
-    end
-
-    def respond_to?(method)
-      client.respond_to?(method) || super
-    end
-
-    private
-
     def client
       @client ||= Client.new
     end

data/templates/slappy_config.rb

@@ -1,16 +1,33 @@
-require 'slappy/dsl'
-
 Slappy.configure do |config|
   ## Slappy Settings
   #
   # token:
   #   Slack API Token
-  config.token = ENV['SLACK_TOKEN']
+  #
+  # config.token = ENV['SLACK_TOKEN']
 
   # scripts_path_dir:
   #   Slappy scripts directory.
   #   Slappy load scripts in this directory.
-  config.scripts_dir_path = 'slappy-scripts'
+  #
+  # config.scripts_dir_path = 'slappy-scripts'
+
+  # logger:
+  #   Use logger object.
+  #
+  # config.logger = Logger.new(STDOUT)
+
+  # logger.level:
+  #   Specify logger level.
+  #
+  # config.logger.level = Logger::INFO
+
+  # dsl:
+  #   use dsl
+  #
+  #   param: :enabled or :disabled
+  #
+  # config.dsl = :enabled
 
   ## Default parameters
   #
@@ -23,18 +40,22 @@ Slappy.configure do |config|
 
   # username:
   #   Name of bot.
-  config.robot.username = 'slappy'
+  #
+  # config.robot.username = 'slappy'
 
   # channel:
   #   Channel, private group, or IM channel to send message to.
   #   Can be an encoded ID, or a name. See below for more details.
-  config.robot.channel = nil
+  #
+  # config.robot.channel = nil
 
   # icon_emoji:
   #   emoji to use as the icon for this message. Overrides icon_url.
-  config.robot.icon_emoji = nil
+  #
+  # config.robot.icon_emoji = nil
 
   # icon_url:
   #    URL to an image to use as the icon for this message
-  config.robot.icon_url = nil
+  #
+  # config.robot.icon_url = nil
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: slappy
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - wakaba260
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-08 00:00:00.000000000 Z
+date: 2015-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: slack-api