jdl 0.0.3 → 0.0.4

data/README.md

@@ -3,6 +3,13 @@
 <!-- TODO: Write a gem description -->
 根据指定目录，扫描内部扩展名为*的所有文件，并输出到jdl.js内，主要用于js测试
 
+TODO:
+
+
+已完成:
+
+- 增加生成模板，可以从本地读取(v0.0.4已实现)
+
 ## Installation
 
 Add this line to your application's Gemfile:
@@ -25,11 +32,43 @@ Or install it yourself as:
       -p, --path                       Set options as path
       -e, --file_ex                    Set options as file_ex
       -o, --output                     Set options as :output_name
+      -d. --verbose                    print debug log
       
       
 - '-p' 指定扫描路径       ：  默认值   .
 - '-e' 指定扫描文件的扩展名 ： 默认值   js
 - '-o' 指定输出文件名称    ： 默认值   jdl.js
+- '-t' 指定模板名称       ： 默认值   无
+- '-d' 是否打印日志       ： 默认值   false
+
+
+### 模板用法
+
+创建t.txt 
+
+    <aa>##item##<aa>
+    
+生成的文件
+
+    ➜  jdl git:(master) ✗ cat jdl.js 
+    <aa>./test/collection.js<aa>
+    <aa>./test/environment.js<aa>
+    <aa>./test/events.js<aa>
+    <aa>./test/model.js<aa>
+    <aa>./test/noconflict.js<aa>
+    <aa>./test/router.js<aa>
+    <aa>./test/sync.js<aa>
+    <aa>./test/vendor/backbone.js<aa>
+    <aa>./test/vendor/jquery.js<aa>
+    <aa>./test/vendor/json2.js<aa>
+    <aa>./test/vendor/qunit.js<aa>
+    <aa>./test/vendor/runner.js<aa>
+    <aa>./test/vendor/underscore.js<aa>
+    <aa>./test/view.js<aa>
+
+测试方法
+
+    ruby -Ilib bin/jdl -p .  -t t.txt
 
 ## Test
 

data/bin/jdl

@@ -38,6 +38,11 @@ option_parser = OptionParser.new do |opts|
     options[:file_ex] = value  
   end
   
+  opts.on('-t t_name', '--template t_name', 'Set options as template_name') do |value|
+    # 这个部分就是使用这个Option后执行的代码
+    options[:template_name] = value  
+  end
+  
   opts.on('-o output', '--output output', 'Set options as output_name') do |value|
     # 这个部分就是使用这个Option后执行的代码
     options[:output_name] = value  
@@ -50,13 +55,5 @@ option_parser = OptionParser.new do |opts|
 end.parse!
 
 # puts options.inspect
-path = options[:path]
-file_ex = options[:file_ex]
-output_name = options[:output_name]
-
-p "path = #{path}"                if(options[:debug])
-p "fname = #{file_ex}"            if(options[:debug])
-p "output_name = #{output_name}"  if(options[:debug])
 
-File.delete(output_name) if File.exist?(output_name)
-Jdl.getfiles(path ,file_ex ,output_name)
+Jdl.parse(options)

data/lib/jdl/version.rb

@@ -1,3 +1,3 @@
 module Jdl
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/jdl.rb

@@ -1,14 +1,24 @@
 require "jdl/version"
 
 module Jdl
-  # Your code goes here...
-  # create runtest.rb for rails.
-  # e.g. :(the name of this file is createruntest.rb)
-  # #>ruby createruntest.rb ./test > runtest.sh
-  # #>chmod 777 runtest.sh
-  #
-  def self.getfiles(path,fname,output_name)
+  
+  def self.parse(options)
+    path = options[:path]
+    file_ex = options[:file_ex]
+    output_name = options[:output_name]
+    template_name = options[:template_name]
 
+    p "path = #{path}"                if(options[:debug])
+    p "file_ex = #{file_ex}"          if(options[:debug])
+    p "output_name = #{output_name}"  if(options[:debug])
+    
+    File.delete(options[:output_name]) if File.exist?(options[:output_name])
+    
+    self.getfiles(path,file_ex,output_name,template_name);
+  
+  end
+  
+  def self.getfiles(path,fname,output_name,template_name)
     re = []
     allre = []
     Dir.foreach(path) do |f|
@@ -16,15 +26,12 @@ module Jdl
     end
     allre.each do |f|
     	fullfilename = path + "/" + f
-      
-      # p fullfilename
-      
     	if f == "." or f == ".." 
          
       elsif File.directory?(fullfilename)
       	resub = []
-    		resub = getfiles(fullfilename,fname,output_name)
-		
+    		resub = getfiles(fullfilename,fname,output_name,template_name)
+
     		if resub.length > 0
     			ref = {}
     			ref[f] = resub
@@ -32,21 +39,32 @@ module Jdl
     		end
       
       elsif File.exist?(fullfilename) and (f =~ /\.#{fname}$/) # only rb file
-        self.print_arr(fullfilename,output_name)
+        self.print_arr(fullfilename,output_name,template_name)
         # p  ff
       	re << f
         # p fullfilename
       end
     end
     
-    # p extname
     return re
   end
- 
 
-  def self.print_arr(content,filename='jdl.js')
+  def self.print_arr(content,filename='jdl.js',template_name)
     f=open(filename,"a") 
-    f.puts("<script src='#{content}'></script>") 
+    
+    if(template_name)
+      #如果有模板名称，则读取模板内容，替换内部的item
+      t_content = ''
+      IO.foreach(template_name) {|x|
+        t_content << x
+      }
+      
+      # p t_content
+      f.puts(t_content.gsub(/##item##/, content)) 
+    else
+      f.puts("<script src='#{content}'></script>") 
+    end
+    
     f.close
   end
 end

data/t.txt

@@ -0,0 +1 @@
+<aa>##item##<aa>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: jdl
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
   prerelease: 
 platform: ruby
 authors:
@@ -60,6 +60,7 @@ files:
 - jdl.gemspec
 - lib/jdl.rb
 - lib/jdl/version.rb
+- t.txt
 - test/collection.js
 - test/environment.js
 - test/events.js
@@ -92,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2541092676907615134
+      hash: -3982637811865650994
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -101,7 +102,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2541092676907615134
+      hash: -3982637811865650994
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25