tagrity 0.2.16 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 021e64164031ab6fa1be2a1080f679730fba4f89c5c7d8de3e71a119d0984519
-  data.tar.gz: 3d70b525056a82b6b6586a3125dc84729e0aa1a48495a08be1bffa0f1e76cc18
+  metadata.gz: 13500a07d1e3b5d4252c672f4f834ce6fa1c4469b3a85c6c25aea178c63aa711
+  data.tar.gz: 3872291c8b4bd1fca09bafc0f66f813f197dbc02ae13a0b381496a0f1e1eccda
 SHA512:
-  metadata.gz: 0cc1385017a29cea175198b53075b3fe98fea195424422714d91eaa18bef7b082209bbf456e34b9728e6b22a82f782880bcbf6f8124df32ba3e980e8348698b4
-  data.tar.gz: a2b24b69c5493d0fd7f80e6c5ef37c7433dc9b0d21bcfee1896574225a8a49fe18b5eca96c538c639946fffa4fc5ef7f2f16d7a44e543c5b7e0b568a4b4a3ae9
+  metadata.gz: 3656fff98985bb4a27b8194f6318461be7ff4ca6ad4b840b658e5d1de9cddc69b3e329018d8dcdc97bdd018654f77d15c942c80d257aa88c38b13c871563a61b
+  data.tar.gz: f804edab3d0b1ef85af2f0debf2cdce7a5c07314366d0b595cac4b7fb8a0dfb59fa81198b618ee76a63b6dc1d6cd54e8468706996c1fcdf0cc61867312b80b62

data/.travis.yml

@@ -3,9 +3,9 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.6.3
+  - 2.7.1
 before_install:
-  - gem install bundler -v 2.0.2
+  - gem install bundler -v 2.1.4
   - gem install ripper-tags -v 0.8.1
   - brew unlink python@2
   - brew install --HEAD universal-ctags/universal-ctags/universal-ctags

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tagrity (0.2.16)
+    tagrity (0.3.0)
       cli-ui (~> 1.3.0)
       listen (~> 3.2.1)
       pry (~> 0.9.9)

data/README.md

@@ -32,19 +32,19 @@ tagrity status
 
 ## Configuration
 
-Configuration can be done through use of a `tagrity_config.yml` file that looks like the following:
+Configuration can be done through use of a local `.tagrity_config.yml` file that looks like the following:
 
-**NOTE:** Tagrity will look for a global config file at `$XDG_CONFIG_HOME/tagrity/tagrity_config.yml` (usually this will be `~/.config/tagrity/tagrity_config.yml`). This can be overridden by a local config in the current directory under the name `.tagrity_config.yml`.
+**NOTE:** Tagrity will also look for a global config file at `$XDG_CONFIG_HOME/tagrity/tagrity_config.yml` (usually this will be `~/.config/tagrity/tagrity_config.yml`). This will be overriden by a local config file.
 
 **NOTE:** Tagrity needs to be restarted for configuration changes to take effect.
 
-[`tagrity_config.yml`](https://github.com/RRethy/tagrity/blob/master/sample_config.yml)
+[Sample `tagrity_config.yml`](https://github.com/RRethy/tagrity/blob/master/sample_config.yml)
 
 ```yaml
 # which command to use to generate tags for a specific file extension
 # overrides default_command
 # tag generation commands must support --append, -f, -L
-# NOTE: Exuberant-ctags does NOT satisfy this, instead use Universal-ctags
+# NOTE: Exuberant-ctags does NOT satisfy this requirement, instead use Universal-ctags
 #
 # Default: empty
 extension_commands:
@@ -75,15 +75,6 @@ extensions_whitelist: [rb, c, h, js]
 # Default: []
 extensions_blacklist: [erb, html, txt]
 
-# how to integrate with git
-# git_strategy: TRACKED | IGNORED | NA
-# TRACKED: only index files tracked by git
-# IGNORED: only index files which are not ignored by git
-# NA: don't use git, index all files under pwd
-#
-# Default: NA
-git_strategy: IGNORED
-
 # which paths (relative to pwd) to ignore
 # It's usually better to avoid this since tagrity integrates with git by
 # default using the strategy specified by git_strategy

data/TODO.md

@@ -0,0 +1,8 @@
+# TODO
+
+* Better error handling
+* Delete old tags before doing --append (similar to ripper-tags funtionality, but do it for all ctags-alikes)
+* Restart process which were terminated due to a system shutdown
+    * Will have to add `tagrity stop <pid>` instead of forcing users to use `kill <pid>`
+* Watch local and global config for changes and reload automatically
+* Better --fresh for git repos

data/lib/tagrity/cli.rb

@@ -9,7 +9,7 @@ module Tagrity
   class CLI < Thor
     desc "version", "print tagrity version"
     def version()
-      puts VERSION
+      puts Tagrity::VERSION
     end
 
     desc "start", "Start watching pwd"

data/lib/tagrity/commands/start.rb

@@ -15,7 +15,7 @@ module Tagrity
           dir = Dir.pwd
           assert_not_running(dir)
 
-          Process.daemon(:nochdir => true) unless fg
+          Process.daemon(true) unless fg
           logger.fg = fg
 
           tag_generator = Provider.provide(:tag_generator)
@@ -34,11 +34,11 @@ module Tagrity
           ) do |modified, added, removed|
             unless modified.empty?
               logger.info("modified absolute path: #{modified}")
-              tag_generator.generate(modified)
+              tag_generator.generate(modified, true)
             end
             unless added.empty?
               logger.info("added absolute path: #{added}")
-              tag_generator.generate(added)
+              tag_generator.generate(added, true)
             end
             unless removed.empty?
               logger.info("removed absolute path: #{removed}")

data/lib/tagrity/tag_generator.rb

@@ -14,26 +14,36 @@ module Tagrity
     end
 
     def generate_all
-      if File.exists?(tagf)
-        File.delete(tagf)
-      end
-      cmd = if check_git?
-        'git ls-files 2> /dev/null'
+      files = []
+      if Helper.git_dir?
+        untracked_files = `git ls-files --others --exclude-standard 2> /dev/null`.split("\n")
+        if $?.exitstatus != 0
+          @logger.error("Failed to get a listing of all untracked files under pwd for use with --fresh.")
+          untracked_files = []
+        end
+        tracked_files = `git ls-files 2> /dev/null`.split("\n")
+        if $?.exitstatus != 0
+          @logger.error("Failed to get a listing of all tracked files under pwd for use with --fresh.")
+          tracked_files = []
+        end
+        files = tracked_files.concat untracked_files
       else
-        'find * -type f 2> /dev/null'
+        files = `find * -type f 2> /dev/null`.split("\n")
       end
-      files = `#{cmd}`.split("\n")
-      if $?.exitstatus == 0
-        generate(files)
-      else
-        @logger.error("Failed to get a listing of all files under pwd for use with --fresh. Used #{cmd}.")
+      if not files.empty? and File.exists?(tagf)
+        File.delete(tagf)
       end
+
+      generate(files, false)
     end
 
-    def generate(files)
+    def generate(files, check_git)
       return if files.empty?
+      if not Helper.git_dir?
+        check_git = false
+      end
       files
-        .select { |file| generate_tags?(file)}
+        .select { |file| generate_tags?(file, check_git) }
         .group_by { |file| @config.command_for_extension(file.split('.').last) }
         .each do |cmd, fnames|
         Tempfile.create do |tmpf|
@@ -42,7 +52,7 @@ module Tagrity
           if $?.exitstatus == 0
             @logger.info("{#{cmd}} generated tags for #{fnames} into #{tagf}")
           else
-            @logger.info("{#{cmd}} failed to generate tags for #{fnames} into #{tagf}")
+            @logger.info("{#{cmd}} failed (#{$?.exitstatus}) to generate tags for #{fnames} into #{tagf}")
           end
         end
       end
@@ -66,8 +76,8 @@ module Tagrity
 
     private
 
-    def generate_tags?(file)
-      copacetic_with_git?(file) && indexable?(file)
+    def generate_tags?(file, check_git)
+      return (!check_git || !Helper.file_ignored?(file)) && indexable?(file)
     end
 
     def indexable?(file)

data/lib/tagrity/version.rb

@@ -1,3 +1,3 @@
 module Tagrity
-  VERSION = "0.2.16"
+  VERSION = "0.3.1"
 end

data/sample_config.yml

@@ -1,7 +1,7 @@
 # which command to use to generate tags for a specific file extension
 # overrides default_command
 # tag generation commands must support --append, -f, -L
-# NOTE: Exuberant-ctags does NOT satisfy this, instead use Universal-ctags
+# NOTE: Exuberant-ctags does NOT satisfy this requirement, instead use Universal-ctags
 #
 # Default: empty
 extension_commands:
@@ -32,15 +32,6 @@ extensions_whitelist: [rb, c, h, js]
 # Default: []
 extensions_blacklist: [erb, html, txt]
 
-# how to integrate with git
-# git_strategy: TRACKED | IGNORED | NA
-# TRACKED: only index files tracked by git
-# IGNORED: only index files which are not ignored by git
-# NA: don't use git, index all files under pwd
-#
-# Default: NA
-git_strategy: IGNORED
-
 # which paths (relative to pwd) to ignore
 # It's usually better to avoid this since tagrity integrates with git by
 # default using the strategy specified by git_strategy

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tagrity
 version: !ruby/object:Gem::Version
-  version: 0.2.16
+  version: 0.3.1
 platform: ruby
 authors:
 - Adam P. Regasz-Rethy
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -141,6 +141,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- TODO.md
 - bin/console
 - bin/setup
 - exe/tagrity