tagrity 0.2.18 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 00d11ea93d5767a7bfb8e95edbf6aafcfe323bba153b4208dcce786002de3378
-  data.tar.gz: 85e717eba8b2ad87f501d1fd512cedde35c4cdb7b5d9a34343dc7c5e10d935fc
+  metadata.gz: feac80617071ba8f1e51552d8ecf49d3c0464d09f0caf5d58f0fbd983f9a4b61
+  data.tar.gz: 2e1b979a98041aaaf2c9c3929cec40e95735b53dc0a1aaebfe83bf4fb4662d3d
 SHA512:
-  metadata.gz: c2dd19800e5732bcd44944c81b258fc36e04992bb60fb2a6575a9945c6ac2bbfb4de902ac01cd494877af96a01c927b05dc7ffecafac5cc21761f587c136d145
-  data.tar.gz: adcb6bd5d06636593c062ac800bc06871a886c6c251074afe3cb3bcbfaee2a54d77fdce1c19bf8e0283685039f8c05f0c06a127737b4b6a5560dff068408e2c4
+  metadata.gz: 1e1d0a0f06f2f5ed7dca379180466dfe791d03fcbe45451f0960f2050a94e2f36ce5edc0c4fa1d3225cdad545fcbb2b5f170bbb9fb0834eadb5aa90995516a4d
+  data.tar.gz: d9b49c8551382fe60cc9c2a4fde328f6a0140294cf60c257f450afd0581f5057944fc73cc1b70dbf0eb1123eefa21c881b75dbee68dcedc79814d69b2706c63a

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.17)
+    tagrity (0.3.2)
       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,5 @@
+# TODO
+
+* Better error handling
+* 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>`

data/lib/tagrity/cli.rb

@@ -3,6 +3,7 @@ require 'tagrity/commands/start'
 require 'tagrity/commands/stop'
 require 'tagrity/commands/status'
 require 'tagrity/commands/logs'
+require 'tagrity/commands/revive'
 require 'tagrity/version'
 
 module Tagrity
@@ -35,5 +36,10 @@ module Tagrity
     def logs
       Command::Logs::call(options['n'], options['debug'])
     end
+
+    desc "revive", "Restart any tagrity processes that died"
+    def revive
+      Command::Revive::call
+    end
   end
 end

data/lib/tagrity/commands/revive.rb

@@ -0,0 +1,11 @@
+module Tagrity
+  module Command
+    class Revive
+      class << self
+        def call
+          PidFile.revive_dead_pids
+        end
+      end
+    end
+  end
+end

data/lib/tagrity/commands/start.rb

@@ -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/pid_file.rb

@@ -36,6 +36,20 @@ module Tagrity
         end
       end
 
+      def revive_dead_pids
+        Dir.glob("#{Helper.run_dir}/*").reduce([]) do |pid_files, path|
+          pid = pid_from_path(path)
+          dir = File.read(path)
+
+          if not Helper.alive?(pid)
+            File.delete(path)
+            Dir.chdir(File.realdirpath(dir)) do
+              Process.spawn('tagrity start')
+            end
+          end
+        end
+      end
+
       private
 
       def same_dirs?(dir1, dir2)

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.error("{#{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.18"
+  VERSION = "0.3.3"
 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.18
+  version: 0.3.3
 platform: ruby
 authors:
 - Adam P. Regasz-Rethy
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-06-18 00:00:00.000000000 Z
+date: 2020-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -141,12 +141,14 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- TODO.md
 - bin/console
 - bin/setup
 - exe/tagrity
 - lib/tagrity.rb
 - lib/tagrity/cli.rb
 - lib/tagrity/commands/logs.rb
+- lib/tagrity/commands/revive.rb
 - lib/tagrity/commands/start.rb
 - lib/tagrity/commands/status.rb
 - lib/tagrity/commands/stop.rb