mate 1.2.1 → 1.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NzVkYWZkNzAyZjYzOGM0Y2I1MTNkY2M4YjBkODk0MjZlYmI4Yjg4Mw==
+    MDQwY2I1MDBhOTNkYmM2YzI4YzgyOWQzZWYyMWJlMjM0YmE1MGY0MQ==
   data.tar.gz: !binary |-
-    NDljYzU4NjM1ZjQxYmM4NmE0YzJhNjk0Y2QzM2RkZWU0ZTcxZWQzMw==
+    NmYzMjUzOTMwOTlmMTdhNzg3YTJkN2NjN2RmMDgwYmRhYmVkNzhmOQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    ZmJkYzE1MjE5M2EyYjYxN2Y2OWJhMGQ5Y2UwZTUwODk1ZTMwMTA0NmE4ZjJl
-    YWMwMjMyN2ViYjQwZjJiZjFjNWIxYzE4MjI5NzcwZWIzODI5MTExYzhiNTc2
-    YjAyOTljZmRiYzMwZjZiMTZhNTE2M2Y4NGJlN2E0MWQyMGRmY2Y=
+    MDE1ZGRiODFjYWYyYjZmMDk5MzFmMGFlYTFiMjkxOTlkOWEwNGRmZTdlM2Uw
+    ZWQyNjY3ZmQzNjk2ODdjYTQ0N2FjMmM2ODU2ZGQwNmUzMDE3NzViMGU2M2Ex
+    OWY3MmFjMDdjMTAyNjBmYmEzNGQzZTM4OGNkOGZhYzViNWIyYjc=
   data.tar.gz: !binary |-
-    YmZhNDhjMjNhZDU5ZGQxNmVhNGUwZDczNTJmYTk4MDgxZTdmODQ2YjZlYWY3
-    YjU5MGZlM2JmMzUwOWYxOWIxNjYzMjI5NGJmOGQ3NWM5MWNjYWY1ZjVkZjIz
-    MzA5MTRiZWZjOWMwNGFlY2E4MmUwZDZmOThkYjRhOTU1M2U0Mjk=
+    YmJjMjBiZTNhMGNmNjhjMTRmZGI5MTdmMWEyM2MyZDY2ZWM4MDYyYjI0NmU1
+    OWE0YzJhODI0MWMwNWQwZWIxYWQ0ODUxMmFhMmMwNDkxYjhlYjk2YjUwMDQ5
+    ZjExMjg1YWJmYWZlNWJkZWU3ZjMwN2VlMTVhMDA0MTlmM2JmMmE=

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2010-2013 Ivan Kuchin
+Copyright (c) 2010-2014 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-2013 Ivan Kuchin. See LICENSE.txt for details.
+Copyright (c) 2010-2014 Ivan Kuchin. See LICENSE.txt for details.

data/lib/mate/tmproj/ignores.rb

@@ -56,7 +56,7 @@ module Mate
       end.reject do |line|
         line.empty? || %w[# !].include?(line[0, 1])
       end.each do |line|
-        pattern = Regexp.escape(line).gsub(/\\\*+/, '[^/]*') # understand only * pattern
+        pattern = glob2regexp(line)
         pattern = "#{DOUBLE_ASTERISK_R}#{pattern}" unless line['/']
         pattern.sub!(/^\//, '')
         unless pattern.sub!(/\/$/, '')
@@ -74,5 +74,26 @@ module Mate
       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/mate.gemspec

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: mate
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Ivan Kuchin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-21 00:00:00.000000000 Z
+date: 2014-04-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: plist