oktags 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 064d3e1decf8e198564e3ea03bfa9ffef9b6982a7aa4626984ecd7390a4ecc7f
-  data.tar.gz: bd34c659eb79cc5c9f27245f85390baf2cafdb6c8096d01778e83eaaaaa3a6a4
+  metadata.gz: a89cb6486aade586eadf73e6357523224302d7d4034a2dd3bef56a560d6e8f6c
+  data.tar.gz: 0d103fef3b089a96eb954b0d3fce4709f93a2c11b2c0a938519a9886fa60593e
 SHA512:
-  metadata.gz: 8a0305539aff833792c1d76ba98acdba725115c0dad65438476d12a6ac83ae425cc2e3c4feac123f830ddc95e4156feadbca9a3ac7fc3db72d8d0f9e0660116e
-  data.tar.gz: 83d1259fc52913ea08a3fbcfd9c688da832bd0f5c42be2e2b346b0955f146391211405eeb0b1bdf6d572bc5244136bc5b5be9a68c91ca5fadca026638626f54d
+  metadata.gz: f94eef23e1e45da986d19b664ec370869bdb9fe9230ddc6bd95cc46d7cd552d2c86a96781e23ef15591ca10453c56539b4a6af513dc35cb501972cd6703841f0
+  data.tar.gz: 6bbfbe8fc72f800293af14782d373fa7eb882ee98c970b72c63816d6e31af2cc8e4d891d49812fac5c14182283cb1ba3cccbefe7e95afc7a5b6275882768764b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    oktags (0.1.0)
+    oktags (0.2.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/ok/tags.rb

@@ -2,8 +2,28 @@
 # coding: utf-8
 
 require 'optparse'
+require 'set'
 require 'readline'
 require 'fileutils'
+require 'byebug'
+
+# TODO: Put this into it's own file
+class Hash
+  # like invert but not lossy. possibly a good blog post.
+  def safe_invert
+    inject({}) do |acc, (k, v)|
+      if v.is_a? Array
+        v.each do |vx|
+          acc[vx] = acc[vx].nil? ? k : [acc[vx], k].flatten
+        end
+      else
+        acc[v] = acc[v].nil? ? k : [acc[v], k].flatten
+      end
+      acc
+    end
+  end
+end
+
 
 module OK
   module Tags
@@ -16,18 +36,39 @@ module OK
       s&.gsub(/[\[\]]/) { |x| "\\" + x }
     end
 
-    def find_tags_for(path = '**/*')
-      tags = []
+    def search_files_with_tags(path = '**/*')
+      tagged_files = Hash.new { |h, k| h[k] = [] }
+
       Dir.glob(escape_glob(path)).each do |file|
-        file = File.basename(file, '.*')
+        basename = File.basename(file, '.*')
         file_tags =
-          file.match(/--\[(.*)\]/)&.to_a&.at(1)&.split(',')&.map(&:strip)&.map(
-            &:downcase
-          )
-        tags << file_tags if file_tags
+          basename.match(/--\[(.*)\]/)&.to_a&.at(1)&.split(',')&.map(&:strip)
+            &.map(&:downcase)
+        file_tags.each { |t| tagged_files[t] << file } if file_tags
       end
+      tagged_files
+    end
+
+    def list_files_with_tags(tags, path = '**/*')
+      # TODO: Refactor reused code
+      tags = tags.split(',')&.map(&:strip)&.map(&:downcase)
+
+      tagged_files = search_files_with_tags(path)
+      files =
+        tagged_files.safe_invert.filter do |files, file_tags|
+          file_tags = [file_tags] if file_tags.is_a? String
+          tags.to_set.subset?(file_tags.to_set)
+        end&.keys&.flatten&.sort
 
-      tags.flatten.compact.sort
+      puts files
+      files
+    end
+
+    def find_tags_for(path = '**/*')
+      tagged_files =
+        path ? search_files_with_tags(path) : search_files_with_tags
+      # return an array with redundant tags
+      tagged_files.map { |k, v| Array.new(v.count, k) }.flatten.sort
     end
 
     def count_tags(tags)
@@ -136,14 +177,6 @@ module OK
     def main
       OptionParser.new do |opts|
         opts.banner = 'Usage: oktags [options]'
-        opts.on(
-          '-l',
-          '--list [PATH]',
-          'List file tags (optionally for PATH)'
-        ) do |path|
-          path ? list_pretty_tags(path) : list_pretty_tags
-          exit
-        end
         opts.on(
           '-a',
           '--add-tags TAGS FILE',
@@ -152,6 +185,14 @@ module OK
           add_tags_to_file(tags, ARGV[0])
           exit
         end
+        opts.on(
+          '-d',
+          '--delete-tag-from-file TAG FILE',
+          'Delete TAG from FILE'
+        ) do |tag|
+          delete_tag_from_file(tag, ARGV[0])
+          exit
+        end
         opts.on(
           '-i',
           '--add-tags-interactively FILE',
@@ -160,6 +201,14 @@ module OK
           read_and_add_tags_for(file)
           exit
         end
+        opts.on(
+          '-l',
+          '--list [PATH]',
+          'List file tags (optional PATH)'
+        ) do |path|
+          path ? list_pretty_tags(path) : list_pretty_tags
+          exit
+        end
         opts.on(
           '-r',
           '--rename-tag OLD_TAG NEW_TAG',
@@ -169,14 +218,20 @@ module OK
           exit
         end
         opts.on(
-          '-d',
-          '--delete-tag-from-file TAG FILE',
-          'Delete TAG from FILE'
-        ) do |tag|
-          delete_tag_from_file(tag, ARGV[0])
+          '-s',
+          '--search-files-with-tags TAGS [PATH]',
+          'Search files which include (comma-separated) tags recursively (optional PATH)'
+        ) do |tags|
+          if ARGV[0]
+            list_files_with_tags(tags, ARGV[0])
+          else
+            list_files_with_tags(tags)
+          end
           exit
         end
       end.parse!
     end
   end
 end
+
+OK::Tags.main

data/lib/ok/version.rb

@@ -1,5 +1,5 @@
 module OK
   module Tags
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: oktags
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Alain M. Lafon