mate 2.1.1 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c775458d416142a253db083e4d9c60a0f54d826cca9b02b4529a95b52a679b86
-  data.tar.gz: 2b80d97ceaf6f1dffb92666cbe5bd35178ac5f018ea44c0008ce18570b3c12fc
+  metadata.gz: 48e7e1cb9ee23a719cdc6b634dc2639e5afa0cfc1d622354bd602c741a1c3f92
+  data.tar.gz: 32d0efa02bb8d71116c59f900244bbaedd8fd0c334ca9c8099feb69d28fab3a8
 SHA512:
-  metadata.gz: 32f73c550e6dd223f666bef6bf245d33827cddba3622a2a2a71033cc9a4c129636c036fc9f33a004ab055cf2290a5e5c3eadc38e2d91c5bc030c5576a19297b5
-  data.tar.gz: 13d6e400fef725d92257084a779b63bce93b6186e83ed7705208041f61932f8785e6a083fff42cc5c8f451b59867aa6bece381c567f12f39616e9d462675a137
+  metadata.gz: a9ebac2d8bd91e393a61201c8697837aff27bfde035272b60ddb4c41ae45a9a2bcade929ad54ff8524b0752442a65bc1582c78f861b9c35da3deeefa6b061aa3
+  data.tar.gz: 8d837dfb721952669be640fb453d9c45ee115de7ca6ee68398277524cf4002fe0e0f03a7e7547aa2af8e5e9275dd2ad7f99d1f28b46d79ac8a2ab08ed7d3e49a

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2019 Ivan Kuchin
+Copyright (c) 2010-2020 Ivan Kuchin
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.markdown

@@ -8,4 +8,4 @@ When `tm` command (or `mate` if aliased) is called with one or more paths and an
 
 ## Copyright
 
-Copyright (c) 2010-2019 Ivan Kuchin. See LICENSE.txt for details.
+Copyright (c) 2010-2020 Ivan Kuchin. See LICENSE.txt for details.

data/bin/tm2

@@ -5,7 +5,7 @@ require 'mate/tm_properties'
 
 ARGV.each do |arg|
   if File.directory?(arg)
-    Mate::TmProperties.new(arg).save
+    Mate::TmProperties.create(arg)
   end
 end
 

data/lib/mate/git.rb

@@ -0,0 +1,32 @@
+module Mate
+  module Git
+    class << self
+      def excludesfile(workind_dir)
+        expand_path IO.popen(%W[git -C #{workind_dir} config --get core.excludesfile], &:read)
+      end
+
+      def global_tmignore
+        expand_path '~/.tmignore'
+      end
+
+      def toplevel(workind_dir)
+        expand_path IO.popen(%W[git -C #{workind_dir} rev-parse --show-toplevel], err: '/dev/null', &:read)
+      end
+
+      def git_dir(workind_dir)
+        expand_path IO.popen(%W[git -C #{workind_dir} rev-parse --absolute-git-dir], err: '/dev/null', &:read)
+      end
+
+    private
+
+      def expand_path(path)
+        return unless path
+
+        path = path.strip
+        return if path == ''
+
+        Pathname(path).expand_path
+      end
+    end
+  end
+end

data/lib/mate/tm_properties.rb

@@ -1,26 +1,39 @@
 require 'pathname'
+require 'mate/git'
 
 module Mate
   class TmProperties
-    attr_reader :dir, :file
+    def self.create(dir)
+      new(Git.toplevel(dir) || dir).save
+    end
+
     def initialize(dir)
       @dir = Pathname(dir).expand_path
       @file = @dir + '.tm_properties'
+      @lines = @file.exist? ? @file.read.split("\n") : []
+      @other_lines = @lines.reject{ |line| line =~ Ignores::GENERATED_R }
     end
 
     def save
-      ignores = Ignores.new(dir)
+      ignores = Ignores.new(@dir)
+
+      write(ignores.lines + @other_lines)
+    end
 
-      lines = if file.exist?
-        file.readlines.reject do |line|
-          line =~ Ignores::GENERATED_R
-        end
+    def cleanup
+      if @other_lines.empty?
+        @file.unlink if @file.exist?
       else
-        []
+        write(@other_lines)
       end
+    end
+
+  private
+
+    def write(lines)
+      return if lines == @lines
 
       @file.open('w') do |f|
-        f.puts ignores.lines
         f.puts lines
       end
     end

data/lib/mate/tm_properties/ignores.rb

@@ -1,6 +1,8 @@
+require 'mate/git'
+
 module Mate
   class TmProperties::Ignores
-    GENERATED_SUFFIX = "## GENERATED ##"
+    GENERATED_SUFFIX = '## GENERATED ##'
     GENERATED_R = /^exclude(?:Directories)? = .* #{Regexp.escape(GENERATED_SUFFIX)}$/
 
     attr_reader :dir
@@ -9,17 +11,29 @@ module Mate
       @exclude = ['**/.git']
       @exclude_directories = []
 
-      process(dir, '.', Pathname(`git config --get core.excludesfile`.strip).expand_path)
-      process(dir, '.', Pathname('~/.tmignore').expand_path)
+      process('.', Git.excludesfile(dir))
+      process('.', Git.global_tmignore)
+      if (git_dir = Git.git_dir(dir))
+        process('.', git_dir + 'info/exclude')
+      end
 
       dir.find do |path|
-        if path.directory?
+        next unless path.lstat.directory?
+
+        toplevel = dir == path
+
+        if !toplevel && (path + '.git').exist?
+          TmProperties.new(path).save
+          Find.prune
+        else
           relative_path = path.relative_path_from(dir).to_s
           Find.prune if ignore_dir?(relative_path)
-          %w[.gitignore .tmignore .git/info/exclude].each do |ignore_file_name|
-            if (ignore_file = path + ignore_file_name).file?
-              process(dir, relative_path, ignore_file)
-            end
+          %w[.gitignore .tmignore].each do |ignore_file_name|
+            process(relative_path, path + ignore_file_name)
+          end
+
+          if !toplevel && (path + '.tm_properties').exist?
+            TmProperties.new(path).cleanup
           end
         end
       end
@@ -43,8 +57,8 @@ module Mate
       end
     end
 
-    def process(parent, subdirectory, ignore_file)
-      return unless ignore_file.exist?
+    def process(subdirectory, ignore_file)
+      return unless ignore_file && ignore_file.exist?
 
       prefix = subdirectory == '.' ? '' : glob_escape("#{subdirectory}/")
 

data/lib/mate/tmproj/ignores.rb

@@ -1,3 +1,5 @@
+require 'mate/git'
+
 module Mate
   class Tmproj::Ignores
     BINARY_EXTENSIONS = [
@@ -14,8 +16,8 @@ module Mate
       @file_pattern = ["#{DOUBLE_ASTERISK_R}.+\\.(?:#{BINARY_EXTENSIONS.flatten.join('|')})"]
       @folder_pattern = ["#{DOUBLE_ASTERISK_R}.git"]
 
-      process(dir, Pathname(`git config --get core.excludesfile`.strip).expand_path)
-      process(dir, Pathname('~/.tmignore').expand_path)
+      process(dir, Git.excludesfile(dir))
+      process(dir, Git.global_tmignore)
 
       dir.find do |path|
         Find.prune if ignore?(path)

data/mate.gemspec

@@ -2,9 +2,9 @@
 
 Gem::Specification.new do |s|
   s.name        = 'mate'
-  s.version     = '2.1.1'
+  s.version     = '2.2.0'
   s.summary     = %q{TextMate project builder and TextMate 2 properties builder using git ignores for exclusions}
-  s.homepage    = "http://github.com/toy/#{s.name}"
+  s.homepage    = "https://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']
   s.license     = 'MIT'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mate
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.2.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-07-14 00:00:00.000000000 Z
+date: 2020-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist
@@ -38,17 +38,18 @@ files:
 - bin/tm
 - bin/tm2
 - lib/mate/bin.rb
+- lib/mate/git.rb
 - lib/mate/tm_properties.rb
 - lib/mate/tm_properties/ignores.rb
 - lib/mate/tmproj.rb
 - lib/mate/tmproj/ignores.rb
 - mate.gemspec
-homepage: http://github.com/toy/mate
+homepage: https://github.com/toy/mate
 licenses:
 - MIT
 metadata:
   bug_tracker_uri: https://github.com/toy/mate/issues
-  documentation_uri: https://www.rubydoc.info/gems/mate/2.1.1
+  documentation_uri: https://www.rubydoc.info/gems/mate/2.2.0
   source_code_uri: https://github.com/toy/mate
 post_install_message: 
 rdoc_options: []
@@ -65,7 +66,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
+rubygems_version: 3.1.2
 signing_key: 
 specification_version: 4
 summary: TextMate project builder and TextMate 2 properties builder using git ignores