mate 2.1.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c775458d416142a253db083e4d9c60a0f54d826cca9b02b4529a95b52a679b86
-  data.tar.gz: 2b80d97ceaf6f1dffb92666cbe5bd35178ac5f018ea44c0008ce18570b3c12fc
+  metadata.gz: af1807dfe07bd73b3f6f6f1bf995e9f7dfb53c6ca77a04c3d8a7c300d4b8d44f
+  data.tar.gz: f55507e729d7c4c2cfb0c26a22e664db8f82f1df3df9e380af0fc34c31a0d80d
 SHA512:
-  metadata.gz: 32f73c550e6dd223f666bef6bf245d33827cddba3622a2a2a71033cc9a4c129636c036fc9f33a004ab055cf2290a5e5c3eadc38e2d91c5bc030c5576a19297b5
-  data.tar.gz: 13d6e400fef725d92257084a779b63bce93b6186e83ed7705208041f61932f8785e6a083fff42cc5c8f451b59867aa6bece381c567f12f39616e9d462675a137
+  metadata.gz: 0420bdd314f766093447f27d14b754f30a84dbdc992dc0671df7f775e37032b25bd26b9411443563d33222c8db0e48131d03fabc8fecc2ab2655afea1c66f5cc
+  data.tar.gz: fd4824a180151d3bdb5e27d052b4d09998a18e0569c27cc7f9879af78f0950c4ea0ba98517d20d15829ac2dd09469be78521f58aa09c7ddd42f2d3c40e25762b

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2019 Ivan Kuchin
+Copyright (c) 2010-2022 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

@@ -1,11 +1,11 @@
 # mate
 
-TextMate project builder and TextMate 2 properties builder using git ignores for exclusions.
+TextMate 2 properties builder using git ignores for exclusions.
 
-You can add `alias mate='tm'` or `alias mate='tm2'` to your `.profile`, `.bash_profile` …
+You can add `alias mate='tm2'` to your `.profile`, `.bash_profile` …
 
-When `tm` command (or `mate` if aliased) is called with one or more paths and any of them is a directory, than project is created in `~/.tmprojs/` and opened. When `tm2` command (or `mate` if aliased) is called with one or more paths, for all directories a `.tm_properties` file is generated or changed and mate is called. Its file and folder filters are built based on all types of git ignores (global, `.gitignore` and `.git/info/exclude`) and special `.tmignore` which works like other ignore files for project but doesn't affect git itself (you can use global `~/.tmignore` file), also `.git` folder and certain files (images, archives, media files, logs and some other binary files) are filtered.
+When `tm2` command (or `mate` if aliased) is called with one or more paths, for all directories a `.tm_properties` file is generated or changed and mate is called. Its file and folder filters are built based on all types of git ignores (global, `.gitignore` and `.git/info/exclude`) and special `.tmignore` which works like other ignore files for project but doesn't affect git itself (you can use global `~/.tmignore` file), also `.git` folder and certain files (images, archives, media files, logs and some other binary files) are filtered.
 
 ## Copyright
 
-Copyright (c) 2010-2019 Ivan Kuchin. See LICENSE.txt for details.
+Copyright (c) 2010-2022 Ivan Kuchin. See LICENSE.txt for details.

data/bin/tm2

@@ -1,11 +1,22 @@
 #!/usr/bin/env ruby
 
+require 'optparse'
+
 require 'mate/bin'
 require 'mate/tm_properties'
 
+options = {}
+OptionParser.new do |op|
+  op.banner = "Usage: #{op.program_name} [options] dir [...]"
+
+  op.on('--no-info-exclude', 'Skip reading .git/info/exclude') do
+    options[:skip_info_exclude] = true
+  end
+end.order!
+
 ARGV.each do |arg|
   if File.directory?(arg)
-    Mate::TmProperties.new(arg).save
+    Mate::TmProperties.create(arg, options)
   end
 end
 

data/lib/mate/bin.rb

@@ -3,10 +3,6 @@ require 'shellwords'
 module Mate
   module Bin
     class << self
-      def v1
-        mate_version(/^mate r\d+/) or abort 'Can\'t find mate binary v1'
-      end
-
       def v2
         mate_version(/^mate 2.\d+/) or abort 'Can\'t find mate binary v2'
       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/ignores.rb

@@ -1,35 +1,48 @@
+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
-    def initialize(dir)
+    def initialize(dir, options)
       @dir = dir
       @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 !options[:skip_info_exclude] && (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, options).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, options).cleanup
           end
         end
       end
     end
 
     def lines
-      escaped_dir = glob_escape(dir.to_s)
       [
-        "exclude = '#{escaped_dir}/#{glob_join(@exclude)}' #{GENERATED_SUFFIX}",
-        "excludeDirectories = '#{escaped_dir}/#{glob_join(@exclude_directories)}' #{GENERATED_SUFFIX}",
+        "exclude = '$CWD/#{glob_join(@exclude)}' #{GENERATED_SUFFIX}",
+        "excludeDirectories = '$CWD/#{glob_join(@exclude_directories)}' #{GENERATED_SUFFIX}",
       ].map{ |line| line.gsub("\r", '\r') }
     end
 
@@ -43,8 +56,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/tm_properties.rb

@@ -1,26 +1,40 @@
 require 'pathname'
+require 'mate/git'
 
 module Mate
   class TmProperties
-    attr_reader :dir, :file
-    def initialize(dir)
+    def self.create(dir, options)
+      new(Git.toplevel(dir) || dir, options).save
+    end
+
+    def initialize(dir, options)
       @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 }
+      @options = options
     end
 
     def save
-      ignores = Ignores.new(dir)
+      ignores = Ignores.new(@dir, @options)
+
+      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/mate.gemspec

@@ -2,9 +2,9 @@
 
 Gem::Specification.new do |s|
   s.name        = 'mate'
-  s.version     = '2.1.1'
-  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.version     = '3.1.0'
+  s.summary     = %q{TextMate 2 properties builder using git ignores for exclusions}
+  s.homepage    = "https://github.com/toy/#{s.name}"
   s.authors     = ['Ivan Kuchin']
   s.license     = 'MIT'
 
@@ -18,6 +18,4 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = %w[lib]
-
-  s.add_runtime_dependency 'plist'
 end

metadata

@@ -1,33 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: mate
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Ivan Kuchin
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-07-14 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: plist
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0'
-description: 
-email: 
+date: 2022-06-14 00:00:00.000000000 Z
+dependencies: []
+description:
+email:
 executables:
-- tm
 - tm2
 extensions: []
 extra_rdoc_files: []
@@ -35,22 +20,20 @@ files:
 - ".gitignore"
 - LICENSE.txt
 - README.markdown
-- 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/3.1.0
   source_code_uri: https://github.com/toy/mate
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -65,9 +48,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.3.11
+signing_key:
 specification_version: 4
-summary: TextMate project builder and TextMate 2 properties builder using git ignores
-  for exclusions
+summary: TextMate 2 properties builder using git ignores for exclusions
 test_files: []

data/bin/tm

@@ -1,10 +0,0 @@
-#!/usr/bin/env ruby
-
-require 'mate/bin'
-require 'mate/tmproj'
-
-if !ARGV.empty? && ARGV.all?(&File.method(:exist?)) && ARGV.any?(&File.method(:directory?))
-  Mate::Tmproj.new(ARGV).open
-else
-  system Mate::Bin.v1, *ARGV
-end

data/lib/mate/tmproj/ignores.rb

@@ -1,100 +0,0 @@
-module Mate
-  class Tmproj::Ignores
-    BINARY_EXTENSIONS = [
-      %w[jpe?g png gif psd], # images
-      %w[zip tar t?(?:g|b)z], # archives
-      %w[mp3 mov], # media
-      %w[log tmp swf fla pdf], # other
-    ]
-    DOUBLE_ASTERISK_R = '(?:.+/)?'
-
-    attr_reader :dir, :file_pattern, :folder_pattern
-    def initialize(dir)
-      @dir = dir
-      @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)
-
-      dir.find do |path|
-        Find.prune if ignore?(path)
-        if path.directory?
-          %w[.gitignore .tmignore .git/info/exclude].each do |ignore_file_name|
-            if (ignore_file = path + ignore_file_name).file?
-              process(path, ignore_file)
-            end
-          end
-        end
-      end
-    end
-
-    def ignore?(path)
-      case
-      when path.file?
-        path.to_s =~ /#{file_r}/
-      when path.directory?
-        path.to_s =~ /#{folder_r}/
-      end
-    end
-
-    def file_r
-      "^#{Regexp.escape(dir.to_s)}/(?:#{file_pattern.join('|')})$"
-    end
-    def folder_r
-      "^#{Regexp.escape(dir.to_s)}/(?:#{folder_pattern.join('|')})$"
-    end
-
-  private
-
-    def process(parent, ignore_file)
-      return unless ignore_file.exist?
-      current_file_pattern = []
-      current_folder_pattern = []
-      ignore_file.readlines.map do |line|
-        line.lstrip[/(.*?)(\r?\n)?$/, 1] # this strange stuff strips line, but allows mac Icon\r files to be ignored
-      end.reject do |line|
-        line.empty? || %w[# !].include?(line[0, 1])
-      end.each do |line|
-        pattern = glob2regexp(line)
-        unless pattern.sub!(/^\//, '')
-          pattern = "#{DOUBLE_ASTERISK_R}#{pattern}"
-        end
-        unless pattern.sub!(/\/$/, '')
-          current_file_pattern << pattern
-        end
-        current_folder_pattern << pattern
-      end
-      current_file_pattern = current_file_pattern.join('|')
-      current_folder_pattern = current_folder_pattern.join('|')
-      unless parent == dir
-        parent_pattern = Regexp.escape(parent.relative_path_from(dir).to_s)
-        current_file_pattern = "#{parent_pattern}/(?:#{current_file_pattern})"
-        current_folder_pattern = "#{parent_pattern}/(?:#{current_folder_pattern})"
-      end
-      file_pattern << current_file_pattern
-      folder_pattern << current_folder_pattern
-    end
-
-    def glob2regexp(glob)
-      glob.gsub(/\[([^\]]*)\]|\{([^\}]*)\}|(\*+)|(\?+)|./) do |m|
-        case
-        when $1
-          "[#{Regexp.escape($1)}]"
-        when $2
-          "(?:#{Regexp.escape($2).split(',').join('|')})"
-        when $3 == '*'
-          '[^/]*'
-        when $3
-          '.*'
-        when $4 == '?'
-          '[^/]'
-        when $4
-          "[^/]{#{$4.length}}"
-        else
-          Regexp.escape(m)
-        end
-      end
-    end
-  end
-end

data/lib/mate/tmproj.rb

@@ -1,66 +0,0 @@
-require 'pathname'
-require 'digest/sha2'
-require 'plist'
-
-module Mate
-  class Tmproj
-    TMPROJ_DIR = Pathname('~').expand_path + '.tmprojs'
-
-    attr_reader :dirs, :file
-    def initialize(dirs)
-      @dirs = dirs.map{ |dir| Pathname(dir).expand_path }
-      @file = TMPROJ_DIR + [
-        Digest::SHA256.hexdigest(@dirs.join('-').downcase),
-        "#{common_dir(@dirs).basename}.tmproj"
-      ].join('/')
-    end
-
-    def open
-      data = Plist::parse_xml(file) rescue {}
-
-      data['documents'] = dirs.map do |dir|
-        ignores = Ignores.new(dir)
-        {
-          :expanded => true,
-          :name => dir.basename.to_s,
-          :regexFileFilter => "!#{ignores.file_r}",
-          :regexFolderFilter => "!#{ignores.folder_r}",
-          :sourceDirectory => dir.to_s
-        }
-      end
-      data['fileHierarchyDrawerWidth'] ||= 269
-      data['metaData'] ||= {}
-      data['showFileHierarchyDrawer'] = true unless data.has_key?('showFileHierarchyDrawer')
-      dimensions = IO.popen(%q{osascript -e 'tell application "Finder" to get bounds of window of desktop'}, &:read).scan(/\d+/).map(&:to_i)
-      data['windowFrame'] ||= "{{#{dimensions[0] + 100}, #{dimensions[1] + 50}}, {#{dimensions[2] - 200}, #{dimensions[3] - 100}}}"
-
-      file.dirname.mkpath
-      file.open('w'){ |f| f.write(data.to_plist) }
-
-      system 'open', file.to_s
-    end
-
-  private
-
-    def common_dir(paths)
-      common = nil
-      paths.each do |path|
-        if path.file?
-          path = path.dirname
-        end
-        ascendants = []
-        path.ascend do |ascendant|
-          ascendants << ascendant
-        end
-        unless common
-          common = ascendants
-        else
-          common &= ascendants
-        end
-      end
-      common && common.first
-    end
-  end
-end
-
-require 'mate/tmproj/ignores'