tagrity 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a68befc5bd00a195bc6767e46c5f9c32dacf7ea2771bc2f2d85c7f4ce1c8251e
-  data.tar.gz: e4dd17c87a1ea0b66a32647dcff90d4091a546f14111809d99730554a915274d
+  metadata.gz: 0bbba0199d2e4305cc015fc1bf2151892628224fdb31ad0a1b2fe0e08b2a5b8b
+  data.tar.gz: b2910418b53ce0d188c03048ca4554988e1833269ed385a041291dd0427a4499
 SHA512:
-  metadata.gz: 3612f8c0df254ceadbbb200f24cf9fe38b1c62a9cd82c6d3ef28d8be6297a49d309499548287e0a42a903bcf694d43da50d24330efee0934dab70d2188207b99
-  data.tar.gz: fe81fc0f1076e64c1c78c07b5455c5287e1dae663359ebb9451a973c7740bbea9d4a4421de0abaa5e16c6d198eb642222c67dd69306c129a308e11d9a075a7bf
+  metadata.gz: d103e833875ab1d827dc26857a78c9795092ccf1fd8d346fa506fcf3586b6581d5842a6d5a30b9ea470643997a97722e9df922b83cdbd8a1607b222261eaa114
+  data.tar.gz: 24eef3ae46b97b8e56802013a60217e9c8749f81846e4beff6f056f33166e9f2d4935cc4a12f6c8005d5b93d29db9d5803fef18e586f5cd3a8d82faf5b0a7392

data/.byebug_history

@@ -0,0 +1,4 @@
+continue
+n
+next
+ls 

data/Gemfile.lock

@@ -1,18 +1,25 @@
 PATH
   remote: .
   specs:
-    tagrity (0.1.3)
+    tagrity (0.1.6)
       listen (~> 3.0)
+      pry (~> 0.9.9)
       thor (~> 0.20)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    coderay (1.1.2)
     diff-lcs (1.3)
     ffi (1.11.3)
-    listen (3.2.0)
+    listen (3.2.1)
       rb-fsevent (~> 0.10, >= 0.10.3)
       rb-inotify (~> 0.9, >= 0.9.10)
+    method_source (0.9.2)
+    pry (0.9.12.6)
+      coderay (~> 1.0)
+      method_source (~> 0.8)
+      slop (~> 3.4)
     rake (10.5.0)
     rb-fsevent (0.10.3)
     rb-inotify (0.10.0)
@@ -31,6 +38,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.0)
+    slop (3.6.0)
     thor (0.20.3)
 
 PLATFORMS

data/README.md

@@ -4,19 +4,17 @@ Automatically regenerate tags on file changes.
 
 ## Installation
 
-Add this line to your application's Gemfile:
-
-```ruby
-gem 'tagrity'
+```sh
+$ gem install tagrity
 ```
 
-And then execute:
-
-    $ bundle
+## Quick Start
 
-Or install it yourself as:
+```sh
+tagrity start
+```
 
-    $ gem install tagrity
+That's it! By default, tagrity will only index files tracked by git. You may wish to al
 
 ## Usage
 
@@ -93,35 +91,3 @@ A config file is a yaml file with the following possible values.
 Some of these can be overridden with options, however the configfile
 provided via --configfile will override the global config file in
 ~/.config/tagrity/config.yml
-```
-# ext_cmds allows different tag generators to be used depending on the file extension.
-# Multiple extensions does not work, *.html.erb files will be picked up as erb.
-# ext_cmds:
-#   <file extension>: <command to use to generate tags for this file extension>
-# DEFAULT: empty
-ext_cmds:
-  rb: ripper-tags
-  c: ctags
-  go: gotags
-
-# default_cmd specifies the default command to be used to generate tags
-# default_cmd: <command>
-# DEFAULT: ctags
-default_cmd: ctags
-
-# tagf is the filename (relative) to generate tags into
-# tagf: <filename>
-# DEFAULT: tags
-tagf: tags
-
-# excluded_exts specifies which file extensions to not generate tags for.
-# excluded_exts: [<file extension>, ...]
-# DEFAULT: []
-excluded_exts: [rb, h, js]
-
-# excluded_paths specifies which paths to ignore.
-# It's usually better to avoid this since by default tagrity will only look
-# at files which are tracked by git.
-# excluded_paths: [<path>, ...]
-# DEFAULT: []
-excluded_paths: [vendor, node_modules]

data/lib/tagrity/cli.rb

@@ -7,12 +7,13 @@ module Tagrity
   class CLI < Thor
     desc "start", "Start watching a directory (default to pwd)"
     option :dir, desc: "directory to watch (omit to use pwd)"
-    option :fresh, type: :boolean, default: false, desc: "index the whole codebase before watching the file system."
     option :tagf, desc: "filename (relative) to generate tags into (default: 'tags')."
-    option :git, type: :boolean, default: true, desc: "only index files which are being tracked by git"
     option :fg, type: :boolean, desc: "keep the tagrity process running in the foreground"
+    option :fresh, type: :boolean, default: false, desc: "index the whole codebase before watching the file system. This will be slow if the codebase is large."
+    option :git, type: :boolean, default: true, desc: "only index files which are being tracked by git"
     option :configfile, desc: "See README for more info."
-    option :default_cmd, desc: "the default command to be used to generate tags (default: 'ctags')"
+    option :ext_cmds, type: :hash, desc: "which <command> to use to generate tags based on the file extension. <command> must support -f and --append"
+    option :default_cmd, desc: "the default <command> to be used to generate tags (default: 'ctags'). <command> must support -f and --append"
     option :excluded_exts, type: :array, desc: "which file extensions to not generate tags for."
     option :excluded_paths, type: :array, desc: "which paths to ignore. Usually better to ignore this since by default only file tracked by git are indexed."
     def start()
@@ -52,6 +53,7 @@ module Tagrity
         configfile: options[:configfile],
         default_cmd: options[:default_cmd],
         tagf: options[:tagf],
+        ext_cmds: options[:ext_cmds],
         excluded_exts: options[:excluded_exts],
         excluded_paths: options[:excluded_paths],
         git: options[:git]

data/lib/tagrity/commands/start.rb

@@ -24,6 +24,9 @@ module Tagrity
             dir,
             relative: true,
           ) do |modified, added, removed|
+            puts "modified absolute path: #{modified}"
+            puts "added absolute path: #{added}"
+            puts "removed absolute path: #{removed}"
             callbacks.on_files_modified(modified)
             callbacks.on_files_added(added)
             callbacks.on_files_removed(removed)

data/lib/tagrity/config_file.rb

@@ -13,13 +13,14 @@ module Tagrity
       configfile:,
       default_cmd:,
       tagf:,
+      ext_cmds:,
       excluded_exts:,
       excluded_paths:,
       git:
     )
       fname = config_file_name(configfile)
       @config = if fname.nil? then {} else YAML.load_file(fname) end
-      ensure_ext_cmds
+      ensure_ext_cmds(ext_cmds)
       ensure_default_cmd(default_cmd)
       ensure_tagf(tagf)
       ensure_excluded_exts(excluded_exts)
@@ -55,8 +56,8 @@ module Tagrity
 
     private
 
-    def ensure_ext_cmds
-      set_option('ext_cmds', nil, {})
+    def ensure_ext_cmds(ext_cmds)
+      set_option('ext_cmds', ext_cmds, {})
     end
 
     def ensure_default_cmd(default_cmd)

data/lib/tagrity/tag_generator.rb

@@ -1,4 +1,7 @@
 require 'tmpdir'
+require 'tempfile'
+require 'fileutils'
+require 'pry'
 require 'tagrity/helper'
 
 module Tagrity
@@ -32,24 +35,32 @@ module Tagrity
         .select { |file| generate_tags?(file) }
         .group_by { |file| @config.ft_to_cmd(file.partition('.').last) }
         .each do |cmd, fnames|
-        `#{cmd} -f #{tagf} --append #{fnames.join(' ')} &> /dev/null`
-        if $?.exitstatus == 0
-          puts "{#{cmd}} generated tags for #{fnames} into #{tagf}"
-        else
-          puts "{#{cmd}} failed to generate tags for #{fnames} into #{tagf}"
+        Tempfile.create do |tmpf|
+          IO::write(tmpf.path, fnames.join("\n"))
+          system(cmd, '-f', tagf, '--append', '-L', tmpf.path, out: File::NULL)
+          if $?.exitstatus == 0
+            puts "{#{cmd}} generated tags for #{fnames} into #{tagf}"
+          else
+            puts "{#{cmd}} failed to generate tags for #{fnames} into #{tagf}"
+          end
         end
       end
     end
 
     def delete_files_tags(files)
       return if files.empty?
-      `cat #{tagf} | grep -v -F #{files.map { |f| " -e \"	#{f}	\""}.join(' ')} > #{tmp_file} 2> /dev/null`
-        if $?.exitstatus == 0
-          `mv -f #{tmp_file} #{tagf}`
-          puts "Deleted tags for #{files} from #{tagf}"
-        else
-          puts "Failed to delete tags for #{files} from #{tagf}"
+      Tempfile.create do |tmpf|
+        File.open(tagf) do |f|
+          f.each_line do |line|
+            unless files.any? { |fname| line.include?("\t#{fname}\t") }
+              tmpf.write line
+            end
+          end
         end
+        tmpf.rewind
+        FileUtils.mv(tmpf.path, tagf, force: true)
+        puts "Deleted tags for #{files} from #{tagf}"
+      end
     end
 
     private

data/lib/tagrity/version.rb

@@ -1,3 +1,3 @@
 module Tagrity
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end

data/sample_config.yml

@@ -0,0 +1,31 @@
+# ext_cmds allows different tag generators to be used depending on the file extension.
+# Multiple extensions does not work, *.html.erb files will be picked up as erb.
+# ext_cmds:
+#   <file extension>: <command to use to generate tags for this file extension>
+# DEFAULT: empty
+ext_cmds:
+  rb: ripper-tags
+  c: ctags
+  go: gotags
+
+# default_cmd specifies the default command to be used to generate tags
+# default_cmd: <command>
+# DEFAULT: ctags
+default_cmd: ctags
+
+# tagf is the filename (relative) to generate tags into
+# tagf: <filename>
+# DEFAULT: tags
+tagf: tags
+
+# excluded_exts specifies which file extensions to not generate tags for.
+# excluded_exts: [<file extension>, ...]
+# DEFAULT: []
+excluded_exts: [rb, h, js]
+
+# excluded_paths specifies which paths to ignore.
+# It's usually better to avoid this since by default tagrity will only look
+# at files which are tracked by git.
+# excluded_paths: [<path>, ...]
+# DEFAULT: []
+excluded_paths: [vendor, node_modules]

data/tagrity.gemspec

@@ -33,4 +33,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "ripper-tags", "~> 0.8.0"
+  spec.add_dependency "pry", "~> 0.9.9"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tagrity
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Adam P. Regasz-Rethy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-13 00:00:00.000000000 Z
+date: 2019-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -94,6 +94,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.9.9
 description: Ditto
 email:
 - rethy.spud@gmail.com
@@ -102,6 +116,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
+- ".byebug_history"
 - ".gitignore"
 - ".rspec"
 - ".travis.yml"
@@ -114,7 +129,6 @@ files:
 - bin/console
 - bin/setup
 - exe/tagrity
-- foobar.rb
 - lib/tagrity.rb
 - lib/tagrity/cli.rb
 - lib/tagrity/commands/start.rb
@@ -127,6 +141,7 @@ files:
 - lib/tagrity/provider.rb
 - lib/tagrity/tag_generator.rb
 - lib/tagrity/version.rb
+- sample_config.yml
 - tagrity.gemspec
 homepage: https://github.com/RRethy/tagrity
 licenses:
@@ -150,7 +165,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Regenerate tags on file changes.