l5m-tools 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bae6e18f53c230e4c72b64b1f302109705bc4656
-  data.tar.gz: a68049e881cd27fa517cab33385a54458508fd43
+  metadata.gz: 7baee4e84d596afc3dd9bbe3bc7c360395b359ee
+  data.tar.gz: cc160307e3304879b9683bb63339ada3080802f7
 SHA512:
-  metadata.gz: 59a2d96fcf11f68a2ab2d0c2303b973c952a37fd1c59cadea49f6661d70f5f266a91b8e3030466af05a2a6520d49ef1603b5e2ebf86d64bee1d8b2f5003ef82f
-  data.tar.gz: 9867b638d593e97a9b14b58daca3ca22ec86697040d8fe1902b9d25a5d1c85f2cb1e417ffcdd746b223f8473bf0342ae7486131f3088f3574c0902cdc08024a3
+  metadata.gz: c477451805fc81b274d05347dd72f0707d1fa91b0efc8d8f14a769428788d122d6d9c05d3724bbad29f4d5674d229b066b1c9f96168a6417c3ff571a6210c9c0
+  data.tar.gz: b05d5a223b79d3861f4dba9d8586e27c0eaa842d744f3ff85e3ede81f481be882e665b8b10ada22bccce2198ede96d895a523f86984da9675ff67b080dfb7a77

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.2.0

data/l5m-tools.gemspec

@@ -1,81 +1,82 @@
-# Generated by jeweler
-# DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
-# -*- encoding: utf-8 -*-
-
-Gem::Specification.new do |s|
-  s.name = "l5m-tools"
-  s.version = "0.1.4"
-
-  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
-  s.authors = ["RONGHAI"]
-  s.date = "2015-07-29"
-  s.description = "A tool set for Lake5Media and QingheTech developer"
-  s.email = "ronghai.wei@outlook.com"
-  s.executables = ["duplicate-app", "l5m", "make-app", "set_env.sh", "svn.tool"]
-  s.extra_rdoc_files = [
-    "LICENSE",
-    "README.md"
-  ]
-  s.files = [
-    ".document",
-    "LICENSE",
-    "README.md",
-    "VERSION",
-    "bin/duplicate-app",
-    "bin/l5m",
-    "bin/make-app",
-    "bin/set_env.sh",
-    "bin/svn.tool",
-    "info",
-    "l5m-tools.gemspec",
-    "lib/l5m-tools.rb",
-    "lib/l5m-tools/application.rb",
-    "lib/l5m-tools/array.rb",
-    "lib/l5m-tools/env.rb",
-    "lib/l5m-tools/ignore/svn_ingore.yaml",
-    "lib/l5m-tools/l5m-tools-module.rb",
-    "lib/l5m-tools/string.rb",
-    "lib/l5m-tools/svn.rb",
-    "lib/l5m-tools/template/Template.jsp",
-    "lib/l5m-tools/template/TemplateBaseAbstractWorker.java",
-    "lib/l5m-tools/template/TemplateServicerImpl.java",
-    "lib/l5m-tools/template/TemplateViewer.java",
-    "lib/l5m-tools/template/TemplateWorker.java",
-    "lib/l5m-tools/template/frt.jsp",
-    "lib/l5m-tools/template/ms2.jsp",
-    "lib/l5m-tools/template/rad.jsp",
-    "lib/l5m-tools/template/ttv2.jsp",
-    "lib/l5m-tools/tools.rb",
-    "test/helper.rb",
-    "test/test_l5m-tools.rb"
-  ]
-  s.homepage = "http://github.com/RONGHAI/l5m-tools"
-  s.licenses = ["MIT"]
-  s.post_install_message = ""
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.14"
-  s.summary = "A tool set for Lake5Media and QingheTech developer"
-
-  if s.respond_to? :specification_version then
-    s.specification_version = 4
-
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<shoulda>, [">= 0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, [">= 0"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
-    else
-      s.add_dependency(%q<shoulda>, [">= 0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, [">= 0"])
-      s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-    end
-  else
-    s.add_dependency(%q<shoulda>, [">= 0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, [">= 0"])
-    s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
-  end
-end
-
+# Generated by jeweler
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in rakefile, and run 'rake gemspec'
+# -*- encoding: utf-8 -*-
+# stub: l5m-tools 0.2.0 ruby lib
+
+Gem::Specification.new do |s|
+  s.name = "l5m-tools"
+  s.version = "0.2.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.require_paths = ["lib"]
+  s.authors = ["RONGHAI"]
+  s.date = "2016-06-14"
+  s.description = "A tool set for Lake5Media and QingheTech developer"
+  s.email = "ronghai.wei@outlook.com"
+  s.executables = ["duplicate-app", "l5m", "make-app", "set_env.sh", "svn.tool"]
+  s.extra_rdoc_files = [
+    "LICENSE",
+    "README.md"
+  ]
+  s.files = [
+    ".document",
+    "LICENSE",
+    "README.md",
+    "VERSION",
+    "bin/duplicate-app",
+    "bin/l5m",
+    "bin/make-app",
+    "bin/set_env.sh",
+    "bin/svn.tool",
+    "info",
+    "l5m-tools.gemspec",
+    "lib/l5m-tools.rb",
+    "lib/l5m-tools/application.rb",
+    "lib/l5m-tools/array.rb",
+    "lib/l5m-tools/env.rb",
+    "lib/l5m-tools/ignore/svn_ingore.yaml",
+    "lib/l5m-tools/l5m-tools-module.rb",
+    "lib/l5m-tools/string.rb",
+    "lib/l5m-tools/svn.rb",
+    "lib/l5m-tools/template/Template.jsp",
+    "lib/l5m-tools/template/TemplateBaseAbstractWorker.java",
+    "lib/l5m-tools/template/TemplateServicerImpl.java",
+    "lib/l5m-tools/template/TemplateViewer.java",
+    "lib/l5m-tools/template/TemplateWorker.java",
+    "lib/l5m-tools/template/frt.jsp",
+    "lib/l5m-tools/template/ms2.jsp",
+    "lib/l5m-tools/template/rad.jsp",
+    "lib/l5m-tools/template/ttv2.jsp",
+    "lib/l5m-tools/tools.rb",
+    "test/helper.rb",
+    "test/test_l5m-tools.rb"
+  ]
+  s.homepage = "http://github.com/RONGHAI/l5m-tools"
+  s.licenses = ["MIT"]
+  s.post_install_message = ""
+  s.rubygems_version = "2.4.8"
+  s.summary = "A tool set for Lake5Media and QingheTech developer"
+
+  if s.respond_to? :specification_version then
+    s.specification_version = 4
+
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<shoulda>, [">= 0"])
+      s.add_development_dependency(%q<rdoc>, [">= 0"])
+      s.add_development_dependency(%q<bundler>, [">= 0"])
+      s.add_development_dependency(%q<jeweler>, [">= 0"])
+    else
+      s.add_dependency(%q<shoulda>, [">= 0"])
+      s.add_dependency(%q<rdoc>, [">= 0"])
+      s.add_dependency(%q<bundler>, [">= 0"])
+      s.add_dependency(%q<jeweler>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<shoulda>, [">= 0"])
+    s.add_dependency(%q<rdoc>, [">= 0"])
+    s.add_dependency(%q<bundler>, [">= 0"])
+    s.add_dependency(%q<jeweler>, [">= 0"])
+  end
+end
+

data/lib/l5m-tools/application.rb

@@ -16,66 +16,52 @@ module L5MTools
             package = package[0...(package.index(/[\/\\]/))]
             require 'l5m-tools/l5m-tools-module'
             L5MTools.svn.delete([package], {}, [ "--force", svnfile])
-        end       
-        def duplicate_app(*args)
-            delete = args.delete('-d')
-            replacements  = {args[1] => args[2]}
+        end
 
-            unless File.exist?(args[0])
-                duplicate_wo_csv(*args)
-            else
-                File.open(args[0], "r") do |infile|
-                    while (line = infile.gets)
-                        line = line.chomp.strip
-                        if line.length > 0 && line[0] != '#'
-                            #duplicate_and_replace( line.chomp ,  replacements ) 
-                            #FileUtils.rm(line, :force => true) if delete
-                            rm(line, :force => true) if duplicate_and_replace( line.chomp ,  replacements )[1] != line && delete
-                        end 
+
+        def search_files(package, application)
+            Dir.glob("#{WORKSPACE}/#{package}/{src,WebContent}/**/#{application}*.*", File::FNM_CASEFOLD).each{|line|  
+                bn = File.basename(line, ".*")
+                unless(bn[application.length] =~ /[a-z0-9]/)
+                    yield line if block_given?
+                end              
+            }
+        end
+
+        def read_files(csvfile)
+            File.open(csvfile, "r") do |infile|
+                while (line = infile.gets)
+                    line = line.chomp.strip
+                    if line.length > 0 && line[0] != '#'
+                        yield line if block_given?
                     end
                 end
             end
         end
 
-        def duplicate_wo_csv(*args)
+        def duplicate_app(*args)
             delete = args.delete('-d')
-            package = args[0]
-            application = args[1]
             replacements  = {args[1] => args[2]}
-            Dir.glob("#{WORKSPACE}/#{package}/{src,WebContent}/**/#{application}*.*", File::FNM_CASEFOLD).each{|line|  
-                bn = File.basename(line, ".*")
-                #puts line #File.basename(line, ".*") 
-                unless(bn[application.length] =~ /[a-z0-9]/)
-                    #puts line #File.basename(line, ".*") 
-                    rm(line, :force => true) if duplicate_and_replace( line.chomp ,  replacements )[1] != line && delete
-                end                
+            p = ->(line){
+                rm(line, :force => true) if duplicate_and_replace( line.chomp ,  replacements )[1] != line && delete
             }
+            if File.exist?(args[0])
+                read_files(args[0], &p)
+            else
+                search_files(args[0], args[1], &p)
+            end
         end
 
-        def del_wo_csv(*args)
-            package = args[0]
-            application = args[1]
-            Dir.glob("#{WORKSPACE}/#{package}/{src,WebContent}/**/#{application}*.*", File::FNM_CASEFOLD).each{|line|  
-                bn = File.basename(line, ".*")
-                unless(bn[application.length] =~ /[a-z0-9]/)
-                    puts line
-                    rm(line, :force => true)
-                end                
-            }
-        end
-        #read file list from file and delete them
+       
         def del(*args)
-             unless File.exist?(args[0])
-                del_wo_csv(*args)
+            p = ->(file){
+                rm(file, :force => true)
+                puts file
+            }
+            if File.exist?(args[0])
+                read_files(args[0], &p)
             else
-                File.open(args[0], "r") do |infile|
-                    while (line = infile.gets)
-                        line = line.chomp.strip
-                        if line.length > 0 && line[0] != '#'
-                            rm(line, :force => true)
-                        end
-                    end
-                end
+                search_files(args[0], args[1], &p)
             end
         end
         def make_app(package, application, use_base_worker, &block)
@@ -83,22 +69,19 @@ module L5MTools
             replacements = {
               '!REPLACE_ME_FILE!' => application,
               '!REPLACE_STYLE!' => package
-            }  
-            copy_with_replace(  use_base_worker  ? (TEMPLATE_DIR+"TemplateBaseAbstractWorker.java") :    (TEMPLATE_DIR+"TemplateWorker.java") , 
-                "#{WORKSPACE}/#{package}/src/com/l5m/#{package}/engine/worker/#{application}Worker.java"  , replacements ) 
-            copy_with_replace( TEMPLATE_DIR+"TemplateServicerImpl.java" , 
-                    "#{WORKSPACE}/#{package}/src/com/l5m/#{package}/engine/servicer/#{application}ServicerImpl.java"  , replacements ) 
-
-            copy_with_replace( TEMPLATE_DIR+"TemplateViewer.java" , 
-                    "#{WORKSPACE}/#{package}/src/com/l5m/#{package}/engine/exporter/#{application}Viewer.java"  , replacements ) 
-
-            if File.exist?( TEMPLATE_DIR+"#{package}.jsp")
-                copy_with_replace( TEMPLATE_DIR+"#{package}.jsp" ,
-                    "#{WORKSPACE}/#{package}/src/jsp/#{application}.jsp" , replacements ) 
-            else 
-                copy_with_replace( TEMPLATE_DIR+"Template.jsp" , 
-                    "#{WORKSPACE}/#{package}/src/jsp/#{application}.jsp" , replacements ) 
-            end            
+            }
+            [ 
+              #worker
+              ["#{TEMPLATE_DIR}/"<<( use_base_worker ? "TemplateBaseAbstractWorker.java" : "TemplateWorker.java") , "#{WORKSPACE}/#{package}/src/com/l5m/#{package}/engine/worker/#{application}Worker.java"],
+              #servicer
+              ["#{TEMPLATE_DIR}/TemplateServicerImpl.java", "#{WORKSPACE}/#{package}/src/com/l5m/#{package}/engine/servicer/#{application}ServicerImpl.java" ],
+              #Viewer
+              ["#{TEMPLATE_DIR}/TemplateViewer.java", "#{WORKSPACE}/#{package}/src/com/l5m/#{package}/engine/exporter/#{application}Viewer.java"  ],
+              #jsp
+              [File.exist?( TEMPLATE_DIR+"#{package}.jsp") ? TEMPLATE_DIR+"#{package}.jsp" : TEMPLATE_DIR+"Template.jsp",  "#{WORKSPACE}/#{package}/src/jsp/#{application}.jsp"]
+            ].each{ |(a, b)|
+                copy_with_replace(a, b, replacements)
+            }
             block.call(Time.now, package, application, use_base_worker) if block_given?
         end
 

data/lib/l5m-tools/svn.rb

@@ -39,7 +39,6 @@ module L5MTools
                     rs
                 end
             }, __FILE__, __LINE__
-            puts 
             send(method_id, arguments[0], arguments[1], arguments[2], &block)
         end
         

metadata

@@ -1,71 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: l5m-tools
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - RONGHAI
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-29 00:00:00.000000000 Z
+date: 2016-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '3.12'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.8.4
+        version: '0'
 description: A tool set for Lake5Media and QingheTech developer
 email: ronghai.wei@outlook.com
 executables:
@@ -79,7 +79,7 @@ extra_rdoc_files:
 - LICENSE
 - README.md
 files:
-- .document
+- ".document"
 - LICENSE
 - README.md
 - VERSION
@@ -120,17 +120,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: A tool set for Lake5Media and QingheTech developer