hipchat_searcher 0.0.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fd098a01a0e50974e9e94aad6531217212b4f02
-  data.tar.gz: ff849519de62525a531f4705e0f4dcfe4c0c7f39
+  metadata.gz: a8309c6be22ec8e7c5c8f3f84f6f6821cd6cb5b8
+  data.tar.gz: f63d664d10d4d230be61613ab41522969985c215
 SHA512:
-  metadata.gz: 88be4494c9f37e92b7668dcee89e9b57b106d788bf6b2d50c3ea967c5fb6d21140dff7ad5f9413cf69290677766b404b5c5a0f849e932bf81927a627dd682827
-  data.tar.gz: 2633cdb60c1494e9545048b0cc73031c647f876afa64bce65644c3c20043857752b6448db960ad4f285ed9a3ff042bdc3121dc312d3a37aeb819125a1d37088f
+  metadata.gz: cd7a35657366b4ab599b2a455c4cf7e1b1bf66aa9b659d6b26adf4f9caf46087e666ab4dda00aa8dae24224097e9d7e77d25b64049a4a20d620112717edc3fcd
+  data.tar.gz: 32da7707e122689d756fd2e137bd6521f4c1c59ea44c7142e9da0e91c86025cf56b5939fb2bdc15fe5f79bf74e8ae0a3052daff4afb16c90177c486032ae5c41

data/.rspec

@@ -0,0 +1,3 @@
+--color
+--format documentation
+--require spec_helper

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+# 1.0.0
+### Feature
+* Newer search result is output to the upstream
+* Enable to search option `-e` named `deep-search`
+   * Specify this option, search the log older than 75 recently
+* Specify `date` option, also search the log with option `-e`
+   * The reason is that refer to the `Bugfix`
+* Refactor the code
+
+### Bugfix
+* Date option searches the date *until* you specify, Fix to search to the date of latest from you specified
+
 # 0.0.3
 ### Feature
 * Enable to search option `-A`, `-B`, `-C`, such as `grep`

data/README.md

@@ -25,8 +25,7 @@ echo {access_token} > ~/.hps
 `hipchat_searcher` search for a regular expression the words that you specify.  
 In the specifications of the [hipchat api](https://www.hipchat.com/docs/apiv2/), `hipchat_searcher` search of the upcoming 100 comments.
 
-* Search the words in all room
-   * But it searches ALL the room that user know, so there may be heavy.
+* Search the words in all room. (but it searches ALL the room that user know, so there may be heavy)
 
 ```
 hps word
@@ -38,6 +37,24 @@ hps word
 hps word -r room-name
 ```
 
+* Search the words of trailing context after each match. Such as `grep` command option.
+
+```
+hps word -A 2
+```
+
+* Search the words of trailing context before each match. Such as `grep` command option.
+
+```
+hps word -B 2
+```
+
+* Search the words of trailing context surrounding each match. The following is equivalent to -A 2 -B 2.
+
+```
+hps word -C 2
+```
+
 * Search the words that specified user talks
 
 ```

data/bin/hps

@@ -23,4 +23,9 @@ end.to_hash
 options = HipchatSearcher::Options.new(hash)
 
 # run command
-HipchatSearcher::Command.run(ARGV.shift, options)
+begin
+  HipchatSearcher::Command.run(ARGV.shift, options)
+rescue Interrupt
+  $stderr.puts "HipchatSearcher execute interrupt, exit..."
+  exit 1
+end

data/hipchat_searcher.gemspec

@@ -25,5 +25,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
+  spec.add_development_dependency "webmock"
   spec.add_development_dependency "coveralls"
 end

data/lib/hipchat_searcher.rb

@@ -1,8 +1,13 @@
 require 'hipchat_searcher/command'
 require 'hipchat_searcher/config'
+require 'hipchat_searcher/item_extention'
 require 'hipchat_searcher/message'
 require 'hipchat_searcher/options'
+require 'hipchat_searcher/search_proxy'
+require 'hipchat_searcher/search_proxy/simple'
+require 'hipchat_searcher/search_proxy/grep'
 require 'hipchat_searcher/result'
 require 'hipchat_searcher/room'
-require 'hipchat_searcher/searcher'
+require 'hipchat_searcher/runner'
+require 'hipchat_searcher/deep_runner'
 require 'hipchat_searcher/version'

data/lib/hipchat_searcher/command.rb

@@ -3,7 +3,9 @@ module HipchatSearcher
     def initialize(pattern, options)
       @pattern = pattern
       @options = options
-      @config  = Config.new
+      @options.config = Config.new
+
+      config_valid!
     end
 
     def self.run(pattern, options)
@@ -11,22 +13,58 @@ module HipchatSearcher
     end
 
     def run
-      all_room = Room.new(@config.token, @options.room_options).all_room
-
-      rooms = if @options.room?
-                room_names = @options.room.split(',')
-                all_room.select do |r|
-                  room_names.include?(r.name)
-                end
-              else
-                all_room
-              end
+      if @options.deep?
+        deep_run
+      else
+        simple_run
+      end
+    end
 
-      message = Message.new(@config.token, @options.message_options)
+    def deep_run
+      rooms.each do |room|
+        DeepRunner.run(@pattern, room, @options)
+      end
+    end
 
+    def simple_run
       rooms.each do |room|
-        hist = message.history(room)
-        Searcher.search(@pattern, hist, @options.search_options)
+        Runner.run(@pattern, room, @options)
+      end
+    end
+
+    private
+
+    def all_room
+      Room.new(@options.config.token, @options.room_options).all_room
+    end
+
+    def config_valid!
+      unless @options.config.valid?
+        print_no_authorization_token
+        exit 1
+      end
+    end
+
+    def print_no_authorization_token
+      puts <<-EOS
+Authorization token required.
+
+* To create config file, run this command
+`echo {auth_token} > ~/.hps`
+
+* To get new auth_token, visit and sign in.
+https://www.hipchat.com/
+      EOS
+    end
+
+    def rooms
+      if @options.room?
+        room_names = @options.room.split(',')
+        all_room.select do |r|
+          room_names.include?(r.name)
+        end
+      else
+        all_room
       end
     end
   end

data/lib/hipchat_searcher/deep_runner.rb

@@ -0,0 +1,27 @@
+module HipchatSearcher
+  class DeepRunner < Runner
+    def run
+      result = @message.history(@room)
+      i = 1
+      while result.items.size == limit
+        break if @options.end?
+
+        if i == 1
+          i += 1
+          search(result)
+        else
+          option = { date: result.oldest_date }
+          result = @message.history(@room, option)
+          @limit_flag = true
+          search(result)
+        end
+      end
+    end
+
+    private
+
+    def limit
+      @limit_flag ? 100 : 75
+    end
+  end
+end

data/lib/hipchat_searcher/item_extention.rb

@@ -0,0 +1,25 @@
+module HipchatSearcher
+  module ItemExtention
+    attr_accessor :pattern
+
+    def contents
+      "%s\n%s\n\n" % [_date, _message]
+    end
+
+    def mention_name
+      self.from.mention_name rescue self.from
+    end
+
+    def _date
+      "  Date: %s" % self.date
+    end
+
+    def _message
+      msg = self.message.gsub(pattern) do |matched|
+        matched.colorize(:red)
+      end
+
+      "  @%s: %s" % [mention_name, msg]
+    end
+  end
+end

data/lib/hipchat_searcher/message.rb

@@ -8,15 +8,16 @@ module HipchatSearcher
       @client  = ::HipChat::Client.new(@token, api_version: 'v2')
     end
 
-    def get_history(id)
-      @client[id].history(@options)
+    def get_history(id, options)
+      option = @options.merge(options)
+      @client[id].history(option)
     end
 
-    def history(room)
+    def history(room, options={})
       id        = room.id   rescue room
       room_name = room.name rescue room
 
-      h = get_history(id)
+      h = get_history(id, options)
       Result.new(h).tap {|r| r.room = room_name }
     end
   end

data/lib/hipchat_searcher/options.rb

@@ -2,8 +2,12 @@ require 'hashie/mash'
 
 module HipchatSearcher
   class Options < Hashie::Mash
+    def deep?
+      !!self['deep'] || !!self['date']
+    end
+
     def message_options
-      date? ? { date: date } : {}
+      {}
     end
 
     def room_options
@@ -16,9 +20,14 @@ module HipchatSearcher
         o.merge!(after_context:  after_context)  if after_context?
         o.merge!(before_context: before_context) if before_context?
         o.merge!(context: context)               if context?
+        o.merge!(date: date)                     if date?
       end
     end
 
+    def grep_options?
+      !!before_context || !!after_context || !!context
+    end
+
     class << self
 
       # [shortname, longname, description]
@@ -26,7 +35,7 @@ module HipchatSearcher
         [
          ['r=', 'room=',           'Search only the log of the room that you specified'],
          ['u=', 'user=',           'Search only the log that specified user talk'],
-         ['d=', 'date=',           'Search the log since specified date'],
+         ['d=', 'date=',           'Search the log until the day of latest from the date you specified'],
          ['A=', 'after_context=',  'Search the log that trails context after each match'],
          ['B=', 'before_context=', 'Search the log that trails context before each match'],
          ['C=', 'context=',        'Search the log that trails context surround each match'],
@@ -36,7 +45,8 @@ module HipchatSearcher
       # [shortname, longname, description]
       def with_boolean
         [
-         ['a', 'archived', 'Include in the search of the room that have been archived']
+         ['a', 'archived', 'Include in the search of the room that have been archived'],
+         ['e', 'deep',     'Search older than comment of 75 recently']
         ]
       end
     end

data/lib/hipchat_searcher/result.rb

@@ -11,12 +11,16 @@ module HipchatSearcher
       valid!
     end
 
-    def rooms
-      @response['items'].map {|i| ::Hashie::Mash.new(i) }
+    def items
+      @items ||= JSON.parse(@response)['items'].map {|i| ::Hashie::Mash.new(i) }
     end
 
-    def items
-      @messages = JSON.parse(@response)['items'].map {|i| ::Hashie::Mash.new(i) }
+    def oldest_date
+      items.first.date rescue nil
+    end
+
+    def rooms
+      @response['items'].map {|i| ::Hashie::Mash.new(i) }
     end
 
     def valid!

data/lib/hipchat_searcher/runner.rb

@@ -0,0 +1,33 @@
+module HipchatSearcher
+  class Runner
+    def initialize(pattern, room, options)
+      @pattern = pattern
+      @room    = room
+      @options = options
+      @message = Message.new(@options.config.token, @options.message_options)
+    end
+
+    def self.run(pattern, room, options)
+      new(pattern, room, options).run
+    end
+
+    def run
+      result = @message.history(@room)
+      search(result)
+    end
+
+    def search(result)
+      search_proxy.search(@pattern, result, @options.search_options)
+    end
+
+    private
+
+    def search_proxy
+      if @options.grep_options?
+        SearchProxy.new('grep')
+      else
+        SearchProxy.new('simple')
+      end
+    end
+  end
+end

data/lib/hipchat_searcher/search_proxy.rb

@@ -0,0 +1,12 @@
+module HipchatSearcher
+  class SearchProxy
+    def initialize(proxy)
+      @proxy = proxy
+    end
+
+    def search(pattern, result, options)
+      klass = self.class.const_get(@proxy.to_s.capitalize)
+      klass.search(pattern, result, options)
+    end
+  end
+end

data/lib/hipchat_searcher/search_proxy/grep.rb

@@ -0,0 +1,91 @@
+require 'colorize'
+require 'date'
+
+module HipchatSearcher
+  class SearchProxy
+    class Grep < Simple
+
+      def initialize(pattern, result, options={})
+        super
+        @print_room = false
+        @print_item = {}
+      end
+
+      def self.search(pattern, result, options)
+        new(pattern, result, options).search
+      end
+
+      def around_items(index)
+        items[range(index)].map do |itm|
+          itm.extend(HipchatSearcher::ItemExtention).tap do |i|
+            i.pattern = pattern
+          end
+        end
+      end
+
+      def search
+        items.each_with_index do |item, idx|
+          if before?(item.date)
+            @options[:end] = true
+            break
+          end
+
+          if pattern =~ item.message
+            around_items(idx).each do |itm|
+              puts_search_result(itm)
+            end
+          end
+        end
+
+        nil
+      end
+
+      private
+
+      def option_after?
+        !!@options[:after_context]
+      end
+
+      def option_before?
+        !!@options[:before_context]
+      end
+
+      def option_context?
+        !!@options[:context]
+      end
+
+      def printed?(id)
+        if @print_item.key?(id)
+          true
+        else
+          @print_item[id] = 1
+          false
+        end
+      end
+
+      def range(index)
+        param = []
+
+        case
+        when option_before?
+          _i = index - @options[:before_context].to_i
+          param = _i < 0 ? [0, index] : [_i, index]
+        when option_after?
+          _i = index + @options[:after_context].to_i
+          param = [index, _i]
+        when option_context?
+          _i = index - @options[:context].to_i
+          _j = index + @options[:context].to_i
+          param = _i < 0 ? [0, _j] : [_i, _j]
+        end
+
+        Range.new(*param)
+      end
+
+      def puts_contents(item)
+        print_room? ? nil : puts_room
+        puts item.contents unless printed?(item.id)
+      end
+    end
+  end
+end