tagrity 0.2.6 → 0.2.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7abbd36d4074d7f610bbbed3e71d903568893a67164ed0e80ba3f08ec02dd421
-  data.tar.gz: e353956fd28322c2683f56ce2fc7859e0e52ec2463e4c7e003d4798048fa8210
+  metadata.gz: f61241e904a145f2f947f2577961fb622fb82293f1382ab91f5f461452e92de2
+  data.tar.gz: f0fa1c4fdea48600c548bc9deb5606ca2af9b73f45aad8d3fe74d67502204fdb
 SHA512:
-  metadata.gz: 42589ff58a766a2cf3704320dd28d3f22c18e63ef65f5790191165cd33f6aa1d39b0e39eccf6fd58a78b09ea3b30557a3a07a7e62c588a13115371d553a239cb
-  data.tar.gz: f3842c9081dcf17c74f8651b504a1c4af4d416e54bdca36b2a466272dd0fcb3b5dee5db9a0e677c99f849a934942d7986247960cda2130a32a8c1364d7039c6b
+  metadata.gz: a9f47bbd86cf5daffbe74d3c5d1ba6ee0be97a6c73060de99d5f284a52b8f08e7ddacaf8158af97a7e365916777d94c117d50b1b6a77623edaeffd37ef3a2eb3
+  data.tar.gz: 6e7f2ce3a2249e1bb8c8b7535073617ac3ba4978e31aa4733cdbce61da7b828967eabf5c4442ef9e79ef746243c8f98a831aa125a278908a0041b72b3472bf35

data/.gitignore

@@ -11,3 +11,4 @@
 .rspec_status
 
 /var/
+lib/tagrity/var/

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    tagrity (0.2.6)
+    tagrity (0.2.10)
       cli-ui (~> 1.3.0)
       listen (~> 3.0)
       pry (~> 0.9.9)
@@ -22,7 +22,7 @@ GEM
       coderay (~> 1.0)
       method_source (~> 0.8)
       slop (~> 3.4)
-    rake (10.5.0)
+    rake (13.0.1)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.1)
       ffi (~> 1.0)
@@ -48,7 +48,7 @@ PLATFORMS
 
 DEPENDENCIES
   bundler (~> 2.0)
-  rake (~> 10.0)
+  rake (~> 13.0)
   ripper-tags (~> 0.8.0)
   rspec (~> 3.0)
   tagrity!

data/README.md

@@ -16,7 +16,7 @@ $ gem install tagrity
 tagrity start
 ```
 
-That's it! It will monitor pwd and by default only index files tracked by git.
+That's it! It will monitor pwd and index any files which change. Check out [Configuration](#configuration) to restrict which files get indexed.
 
 To stop watching pwd, use
 
@@ -78,11 +78,11 @@ extensions_blacklist: [erb, html, txt]
 # how to integrate with git
 # git_strategy: TRACKED | IGNORED | NA
 # TRACKED: only index files tracked by git
-# IGNORED: don't index files which are ignored by git
+# IGNORED: only index files which are not ignored by git
 # NA: don't use git, index all files under pwd
 #
-# Default: TRACKED
-git_strategy: TRACKED
+# 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
@@ -141,8 +141,9 @@ Usage:
   tagrity logs
 
 Options:
-  [-n=N]  # the number of log lines to print
-          # Default: 10
+  [-n=N]                   # the number of log lines to print
+                           # Default: 10
+  [--debug], [--no-debug]  # if debug logs be printed too
 
 Print the logs for pwd
 ```

data/lib/tagrity/cli.rb

@@ -25,8 +25,9 @@ module Tagrity
 
     desc "logs", "Print the logs for pwd"
     option :n, type: :numeric, default: 10, desc: "the number of log lines to print"
+    option :debug, type: :boolean, default: false, desc: "if debug logs be printed too"
     def logs
-      Command::Logs::call(options['n'])
+      Command::Logs::call(options['n'], options['debug'])
     end
   end
 end

data/lib/tagrity/commands/logs.rb

@@ -1,12 +1,13 @@
 require 'tagrity/tlogger'
+require 'tagrity/provider'
 
 module Tagrity
   module Command
     class Logs
       class << self
-        def call(n)
+        def call(n, debug)
           if File.readable?(logf)
-            puts `cat #{logf} | tail -n #{Integer(n)}`.split("\n")
+            system("cat #{logf} | grep -F #{log_levels(debug).map { |lvl| " -e '#{lvl}' " }.join} | tail -n #{Integer(n)}")
           else
             puts "Error: There doesn't seem to be a log file for #{Dir.pwd}"
           end
@@ -14,8 +15,14 @@ module Tagrity
 
         private
 
+        def log_levels(debug)
+          levels = ['INFO', 'WARN', 'ERROR', 'FATAL', 'UNKNOWN']
+          levels << 'DEBUG' if debug
+          levels
+        end
+
         def logf
-          Tlogger.instance.logf
+          Provider.provide(:tlogger).logf
         end
       end
     end

data/lib/tagrity/commands/start.rb

@@ -16,11 +16,11 @@ module Tagrity
           assert_not_running(dir)
 
           Process.daemon(nochdir: true) unless fg
+          logger.fg = fg
 
           tag_generator = Provider.provide(:tag_generator)
           PidFile.write(PidFile.new(dir, Process.pid))
 
-          logger.fg = fg
           logger.info("Watching #{dir} with process pid #{Process.pid}")
 
           if fresh
@@ -66,7 +66,7 @@ module Tagrity
         end
 
         def logger
-          @logger ||= Tlogger.instance
+          @logger ||= Provider.provide(:tlogger)
         end
       end
     end

data/lib/tagrity/commands/stop.rb

@@ -1,5 +1,6 @@
 require 'cli/ui'
 require 'tagrity/tlogger'
+require 'tagrity/provider'
 
 module Tagrity
   module Command
@@ -14,10 +15,14 @@ module Tagrity
             pid_files.each do |pid_file|
               pid_file.delete
               puts ::CLI::UI.fmt "{{green:#{"Successfully killed #{pid_file.pid}"}}}"
-              Tlogger.instance.info("Successfully killed #{pid_file.pid}")
+              logger.info("Successfully killed #{pid_file.pid}")
             end
           end
         end
+
+        def logger
+          @logger ||= Provider.provide(:tlogger)
+        end
       end
     end
   end

data/lib/tagrity/config_file.rb

@@ -1,6 +1,8 @@
 require 'yaml'
 require 'singleton'
 require 'tagrity/helper'
+require 'tagrity/tlogger'
+require 'tagrity/provider'
 
 module Tagrity
   class ConfigFile
@@ -18,6 +20,12 @@ module Tagrity
       read_config(fname: global_config_path)
     end
 
+    def initial_load
+      if @config.nil?
+        read_config
+      end
+    end
+
     def command_for_extension(extension)
       cmd = extension_commands[extension.to_s]
       if cmd.nil?
@@ -44,35 +52,35 @@ module Tagrity
     end
 
     def extension_commands
-      config['extension_commands']
+      @config['extension_commands']
     end
 
     def default_command
-      config['default_command']
+      @config['default_command']
     end
 
     def tagf
-      config['tagf']
+      @config['tagf']
     end
 
     def extensions_whitelist
-      config['extensions_whitelist']
+      @config['extensions_whitelist']
     end
 
     def extensions_blacklist
-      config['extensions_blacklist']
+      @config['extensions_blacklist']
     end
 
     def git_strategy
-      config['git_strategy']
+      @config['git_strategy']
     end
 
     def excluded_paths
-      config['excluded_paths']
+      @config['excluded_paths']
     end
 
     def to_s
-      config.to_s
+      @config.to_s
     end
 
     private
@@ -103,15 +111,15 @@ module Tagrity
     end
 
     def ensure_extensions_whitelist
-      ensure_option('whitelist_extensions', [])
+      ensure_option('extensions_whitelist', [])
     end
 
     def ensure_extensions_blacklist
-      ensure_option('blacklist_extensions', [])
+      ensure_option('extensions_blacklist', [])
     end
 
     def ensure_git_strategy
-      ensure_option('git_strategy', 'TRACKED')
+      ensure_option('git_strategy', 'NA')
     end
 
     def ensure_excluded_paths
@@ -119,28 +127,27 @@ module Tagrity
     end
 
     def ensure_option(name, default)
-      if config[name].nil? || !config[name].is_a?(default.class)
-        config[name] = default
+      if @config[name].nil? || !@config[name].is_a?(default.class)
+        @config[name] = default
       end
     end
 
-    def config
-      @config ||= read_config
-    end
-
     def read_config(fname: nil)
       @config = {}
+      config_fname = '{default configuration}'
       if fname.nil?
         if File.readable?(local_config_path)
-          read_config(fname: local_config_path)
+          config_fname = local_config_path
+          @config = YAML.load_file(local_config_path)
         elsif File.readable?(global_config_path)
-          read_config(fname: global_config_path)
+          config_fname = global_config_path
+          @config = YAML.load_file(global_config_path)
         end
       else
         @config = YAML.load_file(fname)
       end
       init
-      @config
+      logger.debug("Loaded config from #{config_fname} with settings #{@config.to_s}")
     end
 
     def global_config_path
@@ -150,5 +157,9 @@ module Tagrity
     def local_config_path
       File.expand_path("./.#{CONFIG_FNAME}")
     end
+
+    def logger
+      @logger ||= Provider.provide(:tlogger)
+    end
   end
 end

data/lib/tagrity/provider.rb

@@ -8,13 +8,15 @@ module Tagrity
       def provide(want)
         case want
         when :tag_generator
-          provide_tag_generator
+          TagGenerator.new(provide(:config_file), provide(:tlogger))
+        when :tlogger
+          Tlogger.instance
+        when :config_file
+          config = ConfigFile.instance
+          config.initial_load
+          config
         end
       end
-
-      def provide_tag_generator
-        TagGenerator.new(ConfigFile.instance, Tlogger.instance)
-      end
     end
   end
 end

data/lib/tagrity/tag_generator.rb

@@ -20,7 +20,7 @@ module Tagrity
       cmd = if check_git?
         'git ls-files 2> /dev/null'
       else
-        'find * 2> /dev/null'
+        'find * -type f 2> /dev/null'
       end
       files = `#{cmd}`.split("\n")
       if $?.exitstatus == 0
@@ -33,12 +33,12 @@ module Tagrity
     def generate(files)
       return if files.empty?
       files
-        .select { |file| generate_tags?(file) }
-        .group_by { |file| @config.command_for_extension(file.partition('.').last) }
+        .select { |file| generate_tags?(file)}
+        .group_by { |file| @config.command_for_extension(file.split('.').last) }
         .each do |cmd, fnames|
         Tempfile.create do |tmpf|
           IO::write(tmpf.path, fnames.join("\n"))
-          system(cmd, '-f', tagf, '--append', '-L', tmpf.path, out: File::NULL)
+          system(cmd, '-f', tagf, '--append', '-L', tmpf.path, out: File::NULL, err: File::NULL)
           if $?.exitstatus == 0
             @logger.info("{#{cmd}} generated tags for #{fnames} into #{tagf}")
           else
@@ -91,7 +91,7 @@ module Tagrity
     end
 
     def file_excluded?(fname)
-      @config.ignore_extension?(fname.partition('.').last) || @config.path_ignored?(fname)
+      @config.ignore_extension?(fname.split('.').last) || @config.path_ignored?(fname)
     end
 
     def tagf

data/lib/tagrity/tlogger.rb

@@ -16,6 +16,10 @@ module Tagrity
       logger.error(msg)
     end
 
+    def debug(msg)
+      logger.debug(msg)
+    end
+
     def logf
       # TODO this can cause duplicates, unlikely tho
       "#{Helper.log_dir}/#{Dir.pwd.gsub(/\//, '--')}.log"

data/lib/tagrity/version.rb

@@ -1,3 +1,3 @@
 module Tagrity
-  VERSION = "0.2.6"
+  VERSION = "0.2.11"
 end

data/sample_config.yml

@@ -35,11 +35,11 @@ extensions_blacklist: [erb, html, txt]
 # how to integrate with git
 # git_strategy: TRACKED | IGNORED | NA
 # TRACKED: only index files tracked by git
-# IGNORED: don't index files which are ignored by git
+# IGNORED: only index files which are not ignored by git
 # NA: don't use git, index all files under pwd
 #
-# Default: TRACKED
-git_strategy: TRACKED
+# 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

data/tagrity.gemspec

@@ -31,7 +31,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency 'cli-ui', '~> 1.3.0'
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "ripper-tags", "~> 0.8.0"
   spec.add_dependency "pry", "~> 0.9.9"

data/test_files/barbaz.barbaz.c

@@ -0,0 +1,7 @@
+int barbaz_one() {
+  return 0;
+}
+
+int barbaz_two() {
+  return 0;
+}

data/test_files/expected_after_delete

@@ -1,6 +1,8 @@
 barbaz_fun_one	foo/barbaz.rb	/^def barbaz_fun_one$/;"	f	class:Object
 barbaz_fun_two	foo/barbaz.rb	/^def barbaz_fun_two$/;"	f	class:Object
+barbaz_one	barbaz.barbaz.c	/^int barbaz_one() {$/;"	f	typeref:typename:int
 barbaz_one	barbaz.c	/^int barbaz_one() {$/;"	f	typeref:typename:int
+barbaz_two	barbaz.barbaz.c	/^int barbaz_two() {$/;"	f	typeref:typename:int
 barbaz_two	barbaz.c	/^int barbaz_two() {$/;"	f	typeref:typename:int
 foobar_fun_one	foo/foobar.rb	/^def foobar_fun_one$/;"	f	class:Object
 foobar_fun_two	foo/foobar.rb	/^def foobar_fun_two$/;"	f	class:Object

data/test_files/expected_genall_git_tags

@@ -1,6 +1,8 @@
 barbaz_fun_one	foo/barbaz.rb	/^def barbaz_fun_one$/;"	f	class:Object
 barbaz_fun_two	foo/barbaz.rb	/^def barbaz_fun_two$/;"	f	class:Object
+barbaz_one	barbaz.barbaz.c	/^int barbaz_one() {$/;"	f	typeref:typename:int
 barbaz_one	barbaz.c	/^int barbaz_one() {$/;"	f	typeref:typename:int
 barbaz_one	foo/foobar.c	/^int barbaz_one() {$/;"	f	typeref:typename:int
+barbaz_two	barbaz.barbaz.c	/^int barbaz_two() {$/;"	f	typeref:typename:int
 barbaz_two	barbaz.c	/^int barbaz_two() {$/;"	f	typeref:typename:int
 barbaz_two	foo/foobar.c	/^int barbaz_two() {$/;"	f	typeref:typename:int

data/test_files/expected_genall_nongit_tags

@@ -1,7 +1,9 @@
 barbaz_fun_one	foo/barbaz.rb	/^def barbaz_fun_one$/;"	f	class:Object
 barbaz_fun_two	foo/barbaz.rb	/^def barbaz_fun_two$/;"	f	class:Object
+barbaz_one	barbaz.barbaz.c	/^int barbaz_one() {$/;"	f	typeref:typename:int
 barbaz_one	barbaz.c	/^int barbaz_one() {$/;"	f	typeref:typename:int
 barbaz_one	foo/foobar.c	/^int barbaz_one() {$/;"	f	typeref:typename:int
+barbaz_two	barbaz.barbaz.c	/^int barbaz_two() {$/;"	f	typeref:typename:int
 barbaz_two	barbaz.c	/^int barbaz_two() {$/;"	f	typeref:typename:int
 barbaz_two	foo/foobar.c	/^int barbaz_two() {$/;"	f	typeref:typename:int
 foobar_fun_one	foo/foobar.rb	/^def foobar_fun_one$/;"	f	class:Object

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tagrity
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.11
 platform: ruby
 authors:
 - Adam P. Regasz-Rethy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-01-08 00:00:00.000000000 Z
+date: 2020-02-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -72,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -161,6 +161,7 @@ files:
 - tagrity.gemspec
 - test_files/.gitignore
 - test_files/.tagrity_config.yml
+- test_files/barbaz.barbaz.c
 - test_files/barbaz.c
 - test_files/expected_after_delete
 - test_files/expected_genall_git_tags