ruboty-wiki_search 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 37665dc5c1be2ac0461c97bc1cb4f56587d3dbcc0c9c5d9e4ba9440795200412
-  data.tar.gz: 2941fc5df8e2ea69545aa42ff00e106db19c0d5c6aaf44e11aed3ae4a0283395
+  metadata.gz: dbd26a93067559b705b8f0e3275a6bba3660c3db65357e46820293c6f23db2cb
+  data.tar.gz: fe0a3fd30a8e6ab5d23f02530da853549bbb37af9bed8da8125aaf99495641b5
 SHA512:
-  metadata.gz: 91a20f08b4fbc400974a4ccea38ebea0df4270756d095d136c801c8de869ec97a808f41b897895ab4dc2d45e86e6f6824f675b7e52663a5f87d33bd8474715c6
-  data.tar.gz: 91da49201c6b6dbb1f535f60d9ce337d9ca52485565c69b1ba7191a1be3db0ef5f4a741628de86f928f9948796081bcf2a20b09666492cbae1dd90425ddacef2
+  metadata.gz: beaf7bb675f97ddc07ab42a5640e11c6caf1ee89a519d1ffda55c26c4818df39adeb6e899b7c1f58f887651e2f6de6b20a559010218a287dca413c3b5f46910e
+  data.tar.gz: 438b1393931195283f15d60820a72d181600bae5756461537a4aac46a7d18b19b24890640e847fa4a7d632b74f8b1170ce17a23ea44aa91fe3493a534e2bc8a8

data/README.md

@@ -29,7 +29,8 @@ GitHub wiki repository cloned directory. ex:`/tmp`
 
 ```
 # search
-ruboty search <string>
+ruboty search <search_string>
+ruboty search repo:<repository> <search_string>
 
 # git clone or pull master branch repository
 ruboty sync

data/lib/ruboty/handlers/wiki_search.rb

@@ -12,7 +12,7 @@ module Ruboty
       on(
         /search (?<search_string>.+)/,
         name: 'search',
-        description: 'search wiki'
+        description: 'search wiki | options repo:<repository>'
       )
 
       def sync(message)

data/lib/ruboty/wiki_search/actions/wiki_search.rb

@@ -12,9 +12,10 @@ module Ruboty
         end
 
         def search
-          search_string = message.match_data[:search_string].strip
+          search_params = search_params(message.match_data[:search_string].strip)
+          message.reply('set search text!') and return unless search_params[:text]
 
-          attachments = Ruboty::WikiSearch::GitOperation.search(search_string).each_with_object([]) do |(repo, detail), arr|
+          attachments = Ruboty::WikiSearch::GitOperation.search(search_params).each_with_object([]) do |(repo, detail), arr|
             arr << {
               color: "##{Digest::MD5.hexdigest(repo)[0..5]}",
               author_name: repo,
@@ -25,13 +26,27 @@ module Ruboty
           end
 
           message.reply(
-            "#{attachments.empty? ? 'No ' : ''}wiki search results: #{search_string}",
+            "#{attachments.empty? ? 'No ' : ''}wiki search results: #{search_params[:text]}",
             parse: 'none',
             attachments: attachments,
           )
+          puts attachments if ENV['DEBUG']
         rescue => e
           message.reply("wiki search error! #{e}")
         end
+
+        private
+
+        def search_params(string)
+          strings = string.gsub(/　/, ' ').split(' ')
+          repo = strings.select {|b| b.start_with?('repo:') }.first&.gsub(/^repo:/, '')
+          strings.delete("repo:#{repo}")
+
+          {
+            repo: repo,
+            text: strings.first,
+          }
+        end
       end
     end
   end

data/lib/ruboty/wiki_search/git_operation.rb

@@ -5,17 +5,19 @@ module Ruboty
   module WikiSearch
     module GitOperation
       class << self
-        def search(string)
+        def search(text:, repo:nil)
           Dir.glob("#{repos_directory}/**/*.md").each_with_object({}) do |file_path, hash|
-            name = file_path.split('/').last
-            repo = file_path.split('/')[-3..-2].join('/')
-            repo_url = "https://#{file_path.split('/')[-4..-2].join('/')}/wiki"
-
-            if name =~ /#{string}/ || !File.readlines(file_path).grep(/#{string}/).empty?
-              hash[repo] ||= {}
-              hash[repo][:url] ||= repo_url
-              hash[repo][:files] ||= []
-              hash[repo][:files] << name.gsub(/\.md$/, '')
+            file_name = file_path.split('/').last
+            file_repo = file_path.split('/')[-3..-2].join('/')
+            file_repo_url = "https://#{file_path.split('/')[-4..-2].join('/')}/wiki"
+
+            next if repo && file_repo !~ /#{repo}/
+
+            if name =~ /#{text}/ || !File.readlines(file_path).grep(/#{text}/).empty?
+              hash[file_repo] ||= {}
+              hash[file_repo][:url] ||= file_repo_url
+              hash[file_repo][:files] ||= []
+              hash[file_repo][:files] << file_name.gsub(/\.md$/, '')
             end
           end
         end

data/lib/ruboty/wiki_search/version.rb

@@ -1,5 +1,5 @@
 module Ruboty
   module WikiSearch
-    VERSION = '0.3.0'
+    VERSION = '0.4.0'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ruboty-wiki_search
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - kimromi