geturl 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 411f93bbcd2d3d670c3690bfe90c7bcf90b2af1c4ccab49c79cb0c697245ebc4
-  data.tar.gz: 53246132b245beb548e09311cb291d8dbce585fcaef3b98d3b6356d24ad42353
+  metadata.gz: 3d9ec99a5f37c46ebbbf76d465debe1abc47d11ee6875141fb4bd503a81ff983
+  data.tar.gz: a267f7a3b1f5ec2cabf17644c7bf6d677f9b88051435c4fe39b625faaabd1741
 SHA512:
-  metadata.gz: 2fb81625dc50caa479849145ebb598d980d5948237c90b9394291a2ed0fd5a8b609ca59d0d84f42eda6388f10e25192703c5e3e6beed3c727dff8f7b3551dd0c
-  data.tar.gz: f97fe1082a7a68ebdd9e1ba91a955d99767e773a9f23f0668db3c772c2e5545ea7d84831abc9be219c0c98a88af32b7c296ceb093c6c0cd0d017b4c26f5dba75
+  metadata.gz: 8568cd64eb2f3441d7b8c725d0d1245f28c0656302ecb4e680d792a2a60019678c4c49208df1c5a5428c516fac0bc8f8f35f4cd68873bb7aa491a9cec3a2c76a
+  data.tar.gz: 81a8416623afbc57f2046105bb3f6abd7f9727479cd6d9865476f5f516b7d8a9d577febe9c083a0a7ab9f527ebbfeca76d70d4c51b2e3aa5e4d0055ec93021a3

data/bin/geturl

@@ -9,8 +9,9 @@ module GetUrlCli
 
   # Reads the command line and runs the selected action.
   def run
-    flags = %w(--save --delete --reload --sources --register --unregister --reload -v --show-all --color)
-    parameters = %w(--format --sources --tags --description --template)
+    flags = %w(--save --delete --reload --sources --register --unregister
+               --reload -v --show-all --match-all --color --show-score)
+    parameters = %w(--format --sources --tags --description --template -n)
     @arguments, @options = CliParser.parse(flags, parameters)
 
     if @options.include?('--save')
@@ -54,6 +55,9 @@ module GetUrlCli
     geturl --show-all [source-id]
     geturl --reload
 
+    # More information
+    For more details, please visit: https://gitlab.com/osisoft-gems/geturl
+
     }.gsub(/^    /, '')
   end
 
@@ -142,8 +146,8 @@ module GetUrlCli
 
   # Searches for specific urls.
   def search
-    ids = @option['--sources'].to_s.split(',') rescue nil
-    items = GetUrl::Searcher.search(@arguments, 'ids' => ids)
+    @options['ids'] = @option['--sources'].to_s.split(',') rescue nil
+    items = GetUrl::Searcher.search(@arguments, @options)
     output_data(items)
   end
 

data/lib/geturl/geturl-searcher.rb

@@ -67,6 +67,10 @@ module GetUrl
       # Removes all items that are not relevant (score of 0).
       @items.delete_if {|item| item['score'] == 0}
 
+      if options['--match-all']
+        @items.delete_if {|item| item['scored_keywords'] < keywords.size}
+      end
+
       # Sort by score
       @items.sort {|x, y|
         y['score'] <=> x['score'] rescue y <=> x
@@ -75,7 +79,12 @@ module GetUrl
       # Remove all score values
       @items.each {|item|
         item.delete('score')
-      }
+        item.delete('scored_keywords')
+      } unless options.include?('--show-score')
+
+      n = options['-n'].to_i || 0
+      @items = @items[0..n-1] if n > 0
+
       return @items
     end
 
@@ -89,14 +98,19 @@ module GetUrl
       score = 0
       begin
         score += get_field_score(item['name'], keyword, 50, 25)
-        score += get_field_score(item['description'], keyword, 10, 2)
+        score += get_field_score(item['url'], keyword, 50, 25)
+        score += get_field_score(item['description'], keyword, 30, 2)
         item['tags'].to_a.each {|tag|
-          score += get_field_score(tag, keyword, 30, 5)
+          score += get_field_score(tag, keyword, 20, 5)
         }
       rescue
       end
       item['score'] ||= 0
-      item['score'] += score * factor
+      item['scored_keywords'] ||= 0
+      if score > 0
+        item['score'] += score * factor
+        item['scored_keywords'] += 1
+      end
     end
 
 

metadata

@@ -1,20 +1,23 @@
 --- !ruby/object:Gem::Specification
 name: geturl
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Taco Jan Osinga
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-14 00:00:00.000000000 Z
+date: 2018-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: mustache
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.5
   type: :runtime
@@ -22,6 +25,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.0.5
 - !ruby/object:Gem::Dependency
@@ -29,6 +35,9 @@ dependencies:
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.3
   type: :runtime
@@ -36,6 +45,9 @@ dependencies:
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.0'
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.0.3
 description: A simple command-line bookmarking tool, with support of external, read-only