file-timestamp 1.4.0 → 1.5.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZjUwOTc0NDJkZTBhZTUwZGFhZmJlYTdjNjVmMGEwZjY0NjRhNjgxYw==
+    YmQ0MDRiZGJmMGQ5MWI4OGYyNGVlZjI1YmE2M2E5N2ZiNzYyNzYzMA==
   data.tar.gz: !binary |-
-    ZWQ1NDM2ZmMyNzljZjM3ZGMwMGYwNjgwZDYyOWZkYWE2ZDkxMDE2MQ==
+    NzJhYTU3YzEyNmU5NzVkZTk1N2JmNWQ5ZDU1MjJiZTI0NWNiMjlkMg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    Zjc0M2M0Nzc3YzNlNGViZjk5ZGZkYzBiYWMzMDA3Mjk3MWQ1OGUyNzQ3NTNj
-    MDk2MzJmMDc4N2JjZWNlZWQ0MTU0MTNlMjlkMDZjYWZkNTk5OTIwMjYzY2Q3
-    MGM3ODdjMDY5ZmI4NGUxMjIwNWJkN2RmNTFkMjdiMGM3OWVhYTY=
+    ZTJhY2FkZjJjODM2ZWQ1ZDQ1OTJjZDQyNzQyN2M3ODdiZjVjOWYyMmExOTdj
+    YzUzYWU0MDk3MWE4NDgxNjIxYTgxNzRmMTE3YTZmNWJiOTI0NzU2N2Y3MjE4
+    MWJhMDQ5MDljNWQwYTE0MjBmNmJkZDI2N2YzMGU5NzBkNjU0NjY=
   data.tar.gz: !binary |-
-    MDI5ZWJmMTgwMDc0YTk3ZWQ2MGE3ZGRkMzdjZmMxNjI4YjNjZGRhNTU1ZWJj
-    YjRiNTcxMTVhODc4YTQyNzQ5M2Q1ODBhZTFlNTBkNjcyNTBlMWViYzA5NTU5
-    OGVkZDY2MTgzNGJiNDAzZTI1NWVkNjFlZTE1NjZhNGNmOGY1ZDM=
+    MDkyM2Y3ZmRkZmI1YzdjMTI0M2YxMDFjZTBkYjExZTgzNDhiZDg3MmJhYzgw
+    OWMyNTFhZmQ0YWE2ODhkOWQzZmI0NTA2MTMwMmE2MzJkYjkzMzkyMzA5ZTFi
+    ZjBmMGIwODEwZjQ4ODllZTk1NzRmZDNiNTUxOTEzOTA2NjZkOTI=

data/bin/timestamp

@@ -5,9 +5,9 @@ require 'rubygems'
 require 'json'
 require 'optparse'
 
-VERSION = "1.4"
+VERSION = "1.5"
 
-def collectFileMtime dir, file_ext, exclude_dir
+def collectFileMtime dir, exclude_ext, exclude_dir, include_ext
   # debugger
   map = {}
   full_dir = File.expand_path dir
@@ -15,9 +15,9 @@ def collectFileMtime dir, file_ext, exclude_dir
   is_empty = true
   Dir.foreach "." do |file|
     if File.directory? file
-      unless exclude_dir.include? file
+      unless exclude_dir.to_s.include? file
         pwd = Dir.pwd
-        submap = collectFileMtime file, file_ext, exclude_dir
+        submap = collectFileMtime file, exclude_ext, exclude_dir, include_ext
         is_empty = false unless submap.nil? or submap.empty?
         unless submap.nil?
           map[file] = submap
@@ -25,9 +25,12 @@ def collectFileMtime dir, file_ext, exclude_dir
         Dir.chdir pwd
       end
     else
-      if file_ext.include? File.extname file
-        map[file] = (File.mtime file).strftime "%Y%m%d%H%M%S"
-        is_empty = false
+      ext = File.extname file
+      if include_ext.length == 0 or include_ext.to_s.include?(ext)
+        unless exclude_ext.to_s.include? ext
+          map[file] = (File.mtime file).strftime "%Y%m%d%H%M%S"
+          is_empty = false
+        end
       end
     end
   end
@@ -38,7 +41,8 @@ end
 option = {
   :pretty => false,
   :template => "#output#",
-  :include_ext => [".js",".css"],
+  :exclude_ext => [".DS_Store", ".swp"],
+  :include_ext => [],
   :exclude_dir => [".","..",".svn",".git"]
 }
 
@@ -49,10 +53,11 @@ file-timestamp #{VERSION}
 Usage:
 timestamp [dir] 按目录树结构输出指定目录下的所有指定类型文件的时间戳JSON，默认输出当前目录
     EOF
-    opts.on('--format', "格式化输出") { option[:format] = true }
+    opts.on('--pretty', "格式化输出") { option[:pretty] = true }
     opts.on('--template <template>', '指定模板文本，内容占位符为#output#，如--template ";var json=#output#;"') { |template| option[:template] = template}
-    opts.on("--include x,y,z", Array, "要输出时间戳的文件扩展名，默认--include .js,.css") { |include_ext| option[:include_ext] = include_ext }
-    opts.on("--exclude x,y,z", Array, "要排除的目录，默认--exlude .svn,.git") { |exclude_dir| option[:exclude_dir].concat exclude_dir }
+    opts.on("--include-ext x,y,z", Array, "要包含的文件扩展名") { |include_ext| option[:include_ext].concat include_ext }
+    opts.on("--exclude-ext x,y,z", Array, "要排除的文件扩展名") { |exclude_ext| option[:exclude_ext].concat exclude_ext }
+    opts.on("--exclude-dir x,y,z", Array, "要排除的目录，默认--exclude-dir .svn,.git") { |exclude_dir| option[:exclude_dir].concat exclude_dir }
     opts.on("--seajs", "使用默认的seajs模板"){option[:template] = ";define('timestamp', function(require, exports, module) {\n module.exports =#output#\n});" }
     opts.on("--version", "显示版本"){option[:version] = true}
 
@@ -61,9 +66,9 @@ timestamp [dir] 按目录树结构输出指定目录下的所有指定类型文
   if option[:version]
     puts VERSION
   else
-    tree = collectFileMtime(ARGV[0] || ".", option[:include_ext], option[:exclude_dir])
+    tree = collectFileMtime(ARGV[0] || ".", option[:exclude_ext], option[:exclude_dir], option[:include_ext])
 
-    if option[:format]
+    if option[:pretty]
       output = JSON.pretty_generate(tree)
     else
       output = tree.to_json

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: file-timestamp
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.5.0
 platform: ruby
 authors:
 - Zhong Xingdou