hipchat_searcher 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2006db1fe811be9753fc96fb820a59263d92168d
-  data.tar.gz: 262e28b8397dead9223a35b50bb3b9df4edf872e
+  metadata.gz: 69cc10fd7c58d30a07200b217825b20c7b445a0b
+  data.tar.gz: 4dc3f4a9387f9111ee4fb06362a750ad8e1ef00e
 SHA512:
-  metadata.gz: 5df17c395a593f1397b68b89b7265b29c16bcc37735dff21241f543de4ba3cca1f1e3ce191ca89610bca0d97de23a9413cc619361ba10dbf9c5e3aed523ad982
-  data.tar.gz: 3eab7cf6cecdbe9c0ebabcb793b522eae83328a6912ee50fc49eb63c397205cb02dc3a7ea9c7d17624cf6c85d164b8464f7b2cda1896ea2eec777f1eb10e7f24
+  metadata.gz: 5118535bdbe1af759eb832d8bae11f94bc4f156110aab3086a0cf58440dcdef605fa3ab8629c1fbcbb0528962a125fb658e166d95863fd5467e97d40b3ec8982
+  data.tar.gz: f5dbf4a436b03cbcc865d22e01ee7dbd030da587b75a0ab499bca5ab38b78a17b42b727b4983434e9ed722f5d4955d8156c7d63bb5b7a9825677bb6dd8c74750

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+# 0.0.2
+### Feature
+* Enable to search Regexp on ignorecase.
+* When specify -u option, It becomes searchable in the specified user.
+* Specify multiple room name for using -r option.
+
+### Bugfix
+* Specify -r option for japanese room name.
+
+# 0.0.1
+* Initial release on 2014-06-22.

data/README.md

@@ -13,8 +13,8 @@ You will be able to search hipchat log more easily.
 
 ## Prepare
 
-* `hitchat_searcher` requires access token on [hipchat](https://www.hipchat.com/). so you visit [hipchat](https://www.hipchat.com/). login and get access token.
-* if you get access token, execute command like this.
+* `hitchat_searcher` requires access token on [hipchat](https://www.hipchat.com/). so you visit [hipchat](https://www.hipchat.com/), login and get access token.
+* If you get access token, execute command like this.
 
 ```
 echo {access_token} > ~/.hps
@@ -22,25 +22,33 @@ echo {access_token} > ~/.hps
 
 ## Usage
 
-* Search word in all room
+`hipchat_searcher` search for a regular expression the words that you specify.
+
+* Search the words in all room
 
 ```
 hps word
 ```
 
-* Search word in specified room
+* Search the words in specified room
 
 ```
 hps word -r room-name
 ```
 
-* Search word since target date
+* Search the words that specified user talks
+
+```
+hps word -u user-name
+```
+
+* Search the words since target date
 
 ```
 hps word -d 2014-01-01
 ```
 
-* Search word in archived room
+* Search the words in archived room
 
 ```
 hps word -a

data/bin/hps

@@ -1,10 +1,26 @@
 #!/usr/bin/env ruby
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 require 'hipchat_searcher'
-require 'optparse'
+require 'slop'
+
+hash = Slop.parse(help: true) do
+  banner 'Usage: hps [searchword] [options]'
+
+  HipchatSearcher::Options.with_value.each do |opt|
+    on *opt
+  end
+
+  HipchatSearcher::Options.with_boolean.each do |opt|
+    on *opt
+  end
+
+  on '-v', '--version', 'Print the version' do
+    puts HipchatSearcher::VERSION
+    exit 0
+  end
+end.to_hash
 
-pattern = ARGV.shift
-hash = ARGV.getopts(HipchatSearcher::Options.short_names, *HipchatSearcher::Options.long_names)
 options = HipchatSearcher::Options.new(hash)
-command = HipchatSearcher::Command.new(pattern, options)
-command.run
+
+# run command
+HipchatSearcher::Command.run(ARGV.shift, options)

data/hipchat_searcher.gemspec

@@ -20,6 +20,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "hipchat"
   spec.add_dependency "colorize"
   spec.add_dependency "hashie"
+  spec.add_dependency "slop"
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"

data/lib/hipchat_searcher/command.rb

@@ -6,12 +6,20 @@ module HipchatSearcher
       @config  = Config.new
     end
 
+    def self.run(pattern, options)
+      new(pattern, options).run
+    end
+
     def run
+      all_room = Room.new(@config.token, @options.room_options).all_room
+
       rooms = if @options.room?
-                [@options.room]
+                room_names = @options.room.split(',')
+                all_room.select do |r|
+                  room_names.include?(r.name)
+                end
               else
-                room = Room.new(@config.token, @options.room_options)
-                room.room
+                all_room
               end
 
       message = Message.new(@config.token, @options.message_options)

data/lib/hipchat_searcher/options.rb

@@ -2,22 +2,6 @@ require 'hashie/mash'
 
 module HipchatSearcher
   class Options < Hashie::Mash
-    def archived
-      self['a'] || self['archived']
-    end
-
-    def archived?
-      !!self['a'] || !!self['archived']
-    end
-
-    def date
-      self['d'] || self['date']
-    end
-
-    def date?
-      !!self['d'] || !!self['date']
-    end
-
     def message_options
       date? ? { date: date } : {}
     end
@@ -26,33 +10,26 @@ module HipchatSearcher
       archived? ? { 'include-archived' => true } : {}
     end
 
-    def room
-      self['r'] || self['room']
-    end
-
-    def room?
-      !!self['r'] || !!self['room']
-    end
-
-    def user
-      self['u'] || self['user']
-    end
-
-    def user?
-      !!self['u'] || !!self['user']
-    end
-
     def search_options
       user? ? { user: user } : {}
     end
 
     class << self
-      def short_names
-        'a:d:h:r:u'
+
+      # [shortname, longname, description]
+      def with_value
+        [
+         ['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'],
+        ]
       end
 
-      def long_names
-        ['room' 'user', 'date', 'archived', 'help']
+      # [shortname, longname, description]
+      def with_boolean
+        [
+         ['a', 'archived', 'Include in the search of the room that have been archived']
+        ]
       end
     end
   end

data/lib/hipchat_searcher/room.rb

@@ -32,7 +32,7 @@ module HipchatSearcher
       end
     end
 
-    def room
+    def all_room
       result = Result.new(get_all_room)
       result.rooms
     end

data/lib/hipchat_searcher/searcher.rb

@@ -12,12 +12,29 @@ module HipchatSearcher
       new(result, options).search(pattern)
     end
 
+    def contents(pattern, item)
+      date    = date(item)
+      message = message(pattern, item)
+
+      "%s\n%s\n\n" % [date, message]
+    end
+
+    def puts_search_result(pattern, item)
+      contents = contents(pattern, item)
+      if option_user?
+        if @options[:user] == user_name(item)
+          puts_contents(contents)
+        end
+      else
+        puts_contents(contents)
+      end
+    end
+
     def search(pattern)
-      pattern = Regexp.new(pattern)
+      pattern = Regexp.new(pattern, Regexp::IGNORECASE)
 
       @result.items.each do |item|
         if pattern =~ item.message
-          @print_room ? nil : puts_room
           puts_search_result(pattern, item)
         end
       end
@@ -25,24 +42,45 @@ module HipchatSearcher
       nil
     end
 
-    def room
-      @result.room
+    private
+
+    def date(item)
+      "  Date: #{item.date}"
+    end
+
+    def message(pattern, item)
+      msg = item.message.gsub(pattern) do |matched|
+        matched.colorize(:red)
+      end
+
+      name = user_name(item)
+      "  @#{name}" + ': ' + msg
+    end
+
+    def option_user?
+      !!@options[:user]
+    end
+
+    def print_room?
+      !!@print_room
     end
 
     def puts_room
       @print_room = true
-      puts room
+      puts room.underline
     end
 
-    def puts_search_result(pattern, item)
-      msg = item.message.gsub(pattern) do |matched|
-        matched.underline
-      end
+    def puts_contents(contents)
+      print_room? ? nil : puts_room
+      puts contents
+    end
+
+    def room
+      @result.room
+    end
 
-      date = "  Date: #{item.date}"
-      name = item.from.mention_name rescue item.from
-      msg  = "  @#{name}" + ': ' + msg
-      puts "%s\n%s\n\n" % [date, msg]
+    def user_name(item)
+      item.from.mention_name rescue item.from
     end
   end
 end

data/lib/hipchat_searcher/version.rb

@@ -1,3 +1,3 @@
 module HipchatSearcher
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/spec/lib/hipchat_searcher/searcher_spec.rb

@@ -17,9 +17,9 @@ describe HipchatSearcher::Searcher do
         r
       end
       let(:search_result) do
-        "Joestars" + "\n" + \
+        "\e[4;39;49mJoestars\e[0m" + "\n" + \
         "  Date: 2014-05-30T01:38:16.741565+00:00" + "\n" + \
-        "  @jotaro: \e[4;39;49myare\e[0m\e[4;39;49myare\e[0m daze" + "\n" + \
+        "  @jotaro: \e[0;31;49myare\e[0m\e[0;31;49myare\e[0m daze" + "\n" + \
         "\n"
       end
 
@@ -41,12 +41,12 @@ describe HipchatSearcher::Searcher do
         r
       end
       let(:search_result) do
-        "Joestars" + "\n" + \
+        "\e[4;39;49mJoestars\e[0m" + "\n" + \
         "  Date: 2014-05-30T01:38:16.741565+00:00" + "\n" + \
-        "  @jotaro: yareyare da\e[4;39;49mze\e[0m" + "\n" \
+        "  @jotaro: yareyare da\e[0;31;49mze\e[0m" + "\n" \
         "\n" + \
         "  Date: 2014-06-09T11:29:10.209014+00:00" + "\n" + \
-        "  @polnareff: a... arinomama ima okotta koto wo hanasu \e[4;39;49mze\e[0m" + "\n" + \
+        "  @polnareff: a... arinomama ima okotta koto wo hanasu \e[0;31;49mze\e[0m" + "\n" + \
         "\n"
       end
 
@@ -65,7 +65,7 @@ describe HipchatSearcher::Searcher do
       let(:response) { File.read(File.join('spec', 'data', 'item-list.json')) }
 
       it { should be_nil }
-
+p
       it 'should no output to stdout' do
         expect do
           subject
@@ -90,7 +90,7 @@ describe HipchatSearcher::Searcher do
 
   describe '#puts_search_result' do
     context 'when only person in room' do
-      subject { searcher(double(:result)).puts_search_result(pattern, item) }
+      subject { searcher(double(:result, room: 'Joestars')).puts_search_result(pattern, item) }
 
       let(:pattern) { Regexp.new('yare') }
       let(:item) do
@@ -100,11 +100,13 @@ describe HipchatSearcher::Searcher do
       end
 
       let(:search_result) do
+        "\e[4;39;49mJoestars\e[0m" + "\n" + \
         "  Date: 2014-05-30T01:38:16.741565+00:00" + "\n" + \
-        "  @jotaro: \e[4;39;49myare\e[0m\e[4;39;49myare\e[0m daze" + "\n\n"
+        "  @jotaro: \e[0;31;49myare\e[0m\e[0;31;49myare\e[0m daze" + "\n" + \
+        "\n"
       end
 
-      it 'should print string of search result' do
+      it 'should print message of search result' do
         expect do
           subject
         end.to output(search_result).to_stdout
@@ -112,7 +114,7 @@ describe HipchatSearcher::Searcher do
     end
 
     context 'when person and bot in room' do
-      subject { searcher(double(:result)).puts_search_result(pattern, item) }
+      subject { searcher(double(:result, room: 'Joestars')).puts_search_result(pattern, item) }
 
       let(:pattern) { Regexp.new('mgi166') }
       let(:item) do
@@ -122,15 +124,74 @@ describe HipchatSearcher::Searcher do
       end
 
       let(:search_result) do
+        "\e[4;39;49mJoestars\e[0m" + "\n" + \
         '  Date: 2014-06-17T08:14:48.305590+00:00' + "\n" + \
-        "  @GitHub: \e[4;39;49mmgi166\e[0m commented on pull request 118 ..." + "\n\n"
+        "  @GitHub: \e[0;31;49mmgi166\e[0m commented on pull request 118 ..." + "\n\n"
+      end
+
+      it 'should print message of search result' do
+        expect do
+          subject
+        end.to output(search_result).to_stdout
+      end
+    end
+
+    context "when user options specified but the user don't speak this message" do
+      subject { described_class.new(double(:result, room: 'Joestars'), user: 'jotaro').puts_search_result(pattern, item) }
+
+      let(:pattern)  { 'ze' }
+      let(:item) do
+        src  = File.read(File.join('spec', 'data', 'item-list.json'))
+        hash = JSON.parse(src)
+        ::Hashie::Mash.new(hash).items.last
+      end
+
+      it 'should not print message' do
+        expect do
+          subject
+        end.to output('').to_stdout
+      end
+    end
+
+    context "when user options specified and the user speak this message" do
+      subject { described_class.new(double(:result, room: 'Joestars'), user: 'jotaro').puts_search_result(pattern, item) }
+
+      let(:pattern)  { 'ze' }
+      let(:item) do
+        src  = File.read(File.join('spec', 'data', 'item-list.json'))
+        hash = JSON.parse(src)
+        ::Hashie::Mash.new(hash).items.first
+      end
+
+      let(:search_result) do
+        "\e[4;39;49mJoestars\e[0m" + "\n" + \
+        "  Date: 2014-05-30T01:38:16.741565+00:00" + "\n" + \
+        "  @jotaro: yareyare da\e[0;31;49mze\e[0m" + "\n" \
+        "\n"
       end
 
-      it 'should print string of search result' do
+      it 'should print message for specified user' do
         expect do
           subject
         end.to output(search_result).to_stdout
       end
     end
   end
+
+  describe '#contents' do
+    subject { searcher(double(:result)).contents(pattern, item) }
+
+    let(:pattern)  { 'ze' }
+    let(:item) do
+      src  = File.read(File.join('spec', 'data', 'item-list.json'))
+      hash = JSON.parse(src)
+      ::Hashie::Mash.new(hash).items.first
+    end
+
+    it 'should return string for search result contents' do
+      should == "  Date: 2014-05-30T01:38:16.741565+00:00" + "\n" + \
+                "  @jotaro: yareyare da\e[0;31;49mze\e[0m" + "\n" \
+                "\n"
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: hipchat_searcher
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - mgi166
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-22 00:00:00.000000000 Z
+date: 2014-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hipchat
@@ -52,6 +52,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: slop
+  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
@@ -118,6 +132,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".travis.yml"
+- CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -137,7 +152,6 @@ files:
 - spec/data/item-list.json
 - spec/data/room-list.txt
 - spec/hipchat_searcher_spec.rb
-- spec/lib/hipchat_searcher/options_spec.rb
 - spec/lib/hipchat_searcher/result_spec.rb
 - spec/lib/hipchat_searcher/searcher_spec.rb
 - spec/spec_helper.rb
@@ -170,7 +184,6 @@ test_files:
 - spec/data/item-list.json
 - spec/data/room-list.txt
 - spec/hipchat_searcher_spec.rb
-- spec/lib/hipchat_searcher/options_spec.rb
 - spec/lib/hipchat_searcher/result_spec.rb
 - spec/lib/hipchat_searcher/searcher_spec.rb
 - spec/spec_helper.rb

data/spec/lib/hipchat_searcher/options_spec.rb

@@ -1,112 +0,0 @@
-require 'spec_helper'
-
-describe HipchatSearcher::Options do
-  describe '#message_options' do
-    context 'when self has "archived" key' do
-      subject { described_class.new(hash).message_options }
-      let(:hash) { {'d' => '2014-06-01' } }
-
-      it 'should return hash include key "include-archived"' do
-        should == { :date => '2014-06-01' }
-      end
-    end
-
-    context "when self don't have 'archived' key" do
-      subject { described_class.new(hash).message_options }
-      let(:hash) { {'room' => 'room-name' } }
-
-      it 'should return empty hash' do
-        should be_empty
-      end
-    end
-  end
-
-  describe '#room_options' do
-    context 'when self has "archived" key' do
-      subject { described_class.new(hash).room_options }
-      let(:hash) { {'archived' => true } }
-
-      it 'should return hash include key "include-archived"' do
-        should == {"include-archived" => true}
-      end
-    end
-
-    context "when self don't have 'archived' key" do
-      subject { described_class.new(hash).room_options }
-      let(:hash) { {'d' => '2014-06-01' } }
-
-      it 'should return empty hash' do
-        should be_empty
-      end
-    end
-  end
-
-  describe '#room?' do
-    context 'given hash has a "room" key as argument' do
-      subject { described_class.new(hash).room? }
-      let(:hash) { {'room' => 'room-name' } }
-
-      it { should be_truthy }
-    end
-
-    context 'given hash has a "r" key as argument' do
-      subject { described_class.new(hash).room? }
-      let(:hash) { {'r' => 'room-name' } }
-
-      it { should be_truthy }
-    end
-
-    context 'given hash have any other keys as argument' do
-      subject { described_class.new(hash).room? }
-      let(:hash) { {'other' => 'xxxx' } }
-
-      it { should be_falsey }
-    end
-  end
-
-  describe '#user?' do
-    context 'given hash has a "user" key as argument' do
-      subject { described_class.new(hash).user? }
-      let(:hash) { {'user' => 'jotaro kujo' } }
-
-      it { should be_truthy }
-    end
-
-    context 'given hash has a "u" key as argument' do
-      subject { described_class.new(hash).user? }
-      let(:hash) { {'u' => 'jojo' } }
-
-      it { should be_truthy }
-    end
-
-    context 'given hash have any other keys as argument' do
-      subject { described_class.new(hash).user? }
-      let(:hash) { {'other' => 'xxxx' } }
-
-      it { should be_falsey }
-    end
-  end
-
-  describe '#date?' do
-    context 'given hash has a "date" key as argument' do
-      subject { described_class.new(hash).date? }
-      let(:hash) { {'date' => '2014-06-1' } }
-
-      it { should be_truthy }
-    end
-
-    context 'given hash has a "u" key as argument' do
-      subject { described_class.new(hash).date? }
-      let(:hash) { {'d' => '2014-06-1' } }
-
-      it { should be_truthy }
-    end
-
-    context 'given hash have any other keys as argument' do
-      subject { described_class.new(hash).date? }
-      let(:hash) { {'other' => 'xxxx' } }
-
-      it { should be_falsey }
-    end
-  end
-end