l5m-tools 0.0.2.beta → 0.0.2.pre

data/Gemfile

@@ -10,6 +10,6 @@ group :development do
   gem "rdoc", "~> 3.12"
   gem "bundler", "~> 1.2.0"
   gem "jeweler", "~> 1.8.4"
-  #gem "etc"
+  gem "etc"
   #gem "rcov", ">= 0"
 end

data/VERSION

@@ -1 +1 @@
-0.0.2.beta
+0.0.2.pre

data/bin/l5m

@@ -1,7 +1,3 @@
 #!/usr/bin/env ruby
 require 'l5m-tools'
-if ARGV[0] == 'svn'
-    L5MTools.svn.run(*ARGV) 
-else
-    L5MTools.application.run(*ARGV) 
-end
+L5MTools.application.run(*ARGV)

data/bin/set_env.sh

@@ -3,17 +3,19 @@ alias svn.log='svn.tool log'
 alias svn.status='svn.tool status'
 alias svn.update='svn.tool update'
 alias update.root='rm -rf $CATALINA_HOME/webapps/ROOT && rm -rf $CATALINA_HOME/webapps/ROOT.war && scp $DEV_HOST:/home/l5m/mytc/webapps/ROOT.war $CATALINA_HOME/webapps'
-#export JAVA_HOME="C:/Program Files/Java/jdk1.5.0_14"
+export JAVA_HOME="C:/Program Files/Java/jdk1.5.0_14"
 function update.28(){
     ssh 28 "cd ~/project && ./make_wars.sh $@ && ./deploy_on_28.sh $@"
 }
 export WEBAPPS='$CATALINA_HOME/webapps' 
+#export CLASS_PATH=$(find C:/eclipse/plugins/org.junit4_4.3.1/ "C:/Program Files/Java/jdk1.5.0_14/jre/lib/" "C:/Program Files/Java/jdk1.5.0_14/jre/lib/ext/" C:/Tomcat5.5/common/lib/  C:/Tomcat5.5/common/lib/ C:/Tomcat5.5/shared/lib/ C:/Tomcat5.5/shared/lib/ C:/Tomcat5.5/common/i18n/ -regex ".*\.\(jar\|zip\)"  | xargs echo  |tr ' ' ';')
+#export CLASSPATH=$CLASS_PATH
 function sync.package(){
     svn.tool.rb status  $1 | awk '{print $2}' | sed '/^$/d' | sed -e 's/\\/\//g' | while read fi ; do echo $fi && cp $WORKSPACE/$1/src/$fi $WORKSPACE/$2/src/$fi; done
 }
-for i in $CATALINA_HOME/common/lib/ $CATALINA_HOME/common/i18n/
+for d in $ECLIPSE_HOME/plugins/org.junit4_4.3.1/ $JAVA_HOME/jre/lib/ JAVA_HOME/jre/lib/ext/ $CATALINA_HOME/common/lib/  $CATALINA_HOME/common/lib/ $CATALINA_HOME/shared/lib/ $CATALINA_HOME/shared/lib/ $CATALINA_HOME/common/i18n/
 do
-    export CLASS_PATH=$CLASS_PATH;(find $i -regex ".*\.\(jar\|zip\)" | xargs echo  |tr ' ' ';')
+    export CLASS_PATH = $CLASS_PATH;$(find $i -regex ".*\.\(jar\|zip\)"  | xargs echo  |tr ' ' ';')
 done
 
 export CLASSPATH=$CLASS_PATH

data/bin/svn.tool

@@ -1,3 +1,2 @@
 #!/usr/bin/env ruby
-require 'l5m-tool'
-L5MTools.svn.run(*ARGV)
+require 'l5m-tool.rb'

data/l5m-tools.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "l5m-tools"
-  s.version = "0.0.2.beta"
+  s.version = "0.0.2.pre"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["RONGHAI"]
-  s.date = "2013-02-07"
+  s.date = "2013-02-05"
   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"]
@@ -35,9 +35,7 @@ Gem::Specification.new do |s|
     "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",
@@ -67,17 +65,20 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, ["~> 1.2.0"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_development_dependency(%q<etc>, [">= 0"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, ["~> 1.2.0"])
       s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+      s.add_dependency(%q<etc>, [">= 0"])
     end
   else
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, ["~> 1.2.0"])
     s.add_dependency(%q<jeweler>, ["~> 1.8.4"])
+    s.add_dependency(%q<etc>, [">= 0"])
   end
 end
 

data/lib/l5m-tools/env.rb

@@ -3,6 +3,6 @@ module L5MTools
     raise "no CATALINA_HOME env" unless CATALINA_HOME = ENV["CATALINA_HOME"]    
     raise "no SVN_USER env" unless SVN_USER = ENV["SVN_USER"]
     raise "no SENDER_EMAIL env" unless SENDER_EMAIL = ENV["SENDER_EMAIL"]
-    PACKAGES = ENV["PACKAGES"].split(/[,;:]/) if ENV["PACKAGES"]
+    PACKAGES = ENV["PACKAGES"].split(',') if ENV["PACKAGES"]
     DEV_HOST = ENV["DEV_HOST"]
 end

data/lib/l5m-tools/l5m-tools-module.rb

@@ -1,12 +1,9 @@
 require 'l5m-tools/application'
-require 'l5m-tools/svn'
+
 module L5MTools 
     class << self 
         def application
           @application ||= L5MTools::Application.new
-        end        
-        def svn
-           @svn ||= L5MTools::SVN.new
         end
     end
 end

data/lib/l5m-tools/svn.rb

@@ -1,20 +1,5 @@
-require 'l5m-tools/env'
-require 'pathname'
-
 module L5MTools
     class SVN
-        require 'l5m-tools/tools'
-        include Tools
-        require 'l5m-tools/array'
-        require 'yaml'
-        
-        class << self
-            require "fileutils"
-            include FileUtils
-        end        
-        copy(Pathname.new(__FILE__).parent + 'ignore/svn_ingore.yaml', File.expand_path('~/svn_ingore.yaml')) unless File.exists? File.expand_path('~/svn_ingore.yaml')
-        IGNORE_FILES = YAML::load(File.open(File.expand_path('~/svn_ingore.yaml'), 'rb') { |f| f.read } )        
-        SPERATE = "------------------------------------------------------------------------"        
         class << self
             def method_missing(method_id, *arguments, &block)
                 self.class_eval %{
@@ -25,85 +10,30 @@ module L5MTools
                     end
                 }, __FILE__, __LINE__
                 send(method_id, *arguments, &block)
-            end
-        end
-        
-        def method_missing(method_id, *arguments, &block) 
-            self.class.class_eval %{
-                def #{method_id}(packz, options={}, svn_options=[], &b)
-                    rs = ''
-                    packz.each{|pac|
-                        next unless change_to_package_directory(pac)                       
-                        rs << SVN.#{method_id}(*svn_options)
-                    }
-                    rs
-                end
-            }, __FILE__, __LINE__
-            puts 
-            send(method_id, arguments[0], arguments[1], arguments[2], &block)
-        end
-        
-        def change_to_package_directory package
-            change_directory "#{WORKSPACE}/#{package}"
+            end        
         end
-      
-
-        def log packages, options={}, svn_options=[]
-            log = ''
-            usr = options[:username] || ''
-            date = options[:date] || Date.today.strftime("%F")
-            reverse = options[:reverse]            
-            packages.each{|pac|     
-                next unless change_to_package_directory(pac)
-                commits =  SVN.log("-q", "-r", "HEAD:{#{date}}") .split($/).delete_if{|c| c[0] == '-' || (usr != '' && c.split("|")[1].strip != usr)}.collect! {|c| c.split("|")[0].strip[1..-1]}.sort!
-                commits.reverse! if reverse
-                commits.each{|c|
-                    log << SVN.log("-v", "-r", c).gsub!(/(#{$/}){2,}/m,$/+$/)
-                }
-            }
-            log.gsub!(/(#{SPERATE}#{$/}#{SPERATE})/m, SPERATE)
-            log
-        end 
         
-        def status packages, options={}, svn_options=[]
-            status  = ''
-            packages.each{|pac| 
-                innert_dirs =(pac.include?("tag"))?["src", "WebContent"]:["src"];
-                lines = [];
-                innert_dirs.each{|d|             
-                    next unless change_to_package_directory("#{pac}/#{d}")
-                    lines += (SVN.status).split($/)
-                 }
-                lines -= IGNORE_FILES[pac] unless IGNORE_FILES[pac].nil?
-                status << "#{pac} #{$/}" << lines.join($/) << "#{$/}" unless lines.empty?
-            } 
-            status
-        end
-
-        def update packages, options={}, svn_options=[]
-            log = ''
-            packages.each{|pac|
-                next unless change_to_package_directory(pac)
-                log << pac+"...#{$/}"
-                log << SVN.update
-            }
-            log
-        end
-        alias :st :status
         def run(*args, &block)
             cmd = args.shift
-            args , svn_args = args[0..(args.index '--')], args[((args.index '--')+1)..-1] if args.index '--'
-           
-            options = {username:(args.option! '--user' || SVN_USER), reverse:(args.delete('-r')), date: (args.option!('--date')), mail:(args.delete('-e') || args.delete('--email')) }          
-            options[:sendto] = args.option!('-s') || SENDER_EMAIL
-            options[:title]  = args.option!('--title') || "svn #{cmd} @#{Time.now.strftime("%F %T")}" 
-            
+            args = args[0..(args.index '--')] if args.index '--'
+            options = {}
+            options[:username] = args.option! '--user'
+            options[:reverse] = args.delete('-r')
+            options[:date] = args.option!('--date')
+            options[:mail] = args.delete('-e') || args.delete('--email');
+            options[:username] ||= SVN_USER
             packages =  args.empty? ? PACKAGES : args
-            
-            result = send cmd, packages, options, svn_args
-            send_mail(options[:sendto], options[:title] , result) if options[:mail]
-            block.call(result) if block_given?
-            result
-        end
+            result = case cmd
+                when 'status', 'st' then svn_status(packages)
+                when 'update' then svn_update(packages)
+                when 'log' then svn_log(packages, options[:date] , options[:username] , options[:reverse])
+                else usage   
+            end  
+            #send_mail(SEND_TO, "svn #{cmd} @#{Time.now.strftime("%F %T")}" , result) if options[:mail] || (puts result) unless result.nil? || result.empty?       
+        end       
+    end
+    class Application    
+        
+
     end
 end

data/lib/l5m-tools/tools.rb

@@ -1,69 +1,62 @@
-module L5MTools
-    module Tools
-        def send_mail to, subject="", body=""
-            require 'win32ole'
-            outlook = WIN32OLE.new('Outlook.Application') 
-            mapi = outlook.GetNameSpace('MAPI')
-            message = outlook.CreateItem(0) 
-            message.Subject =   subject
-            message.Body = body
-            message.To = to
-            message.Save
-            message.Send
-            mapi.SyncObjects
-        end
-        
-        require "fileutils"
-        include FileUtils
-        require 'pathname'
-        
-        def replace(in_file, replacements)
-            contents = IO.read(in_file)
-            changed = false
-            replacements.each do | key, value |
-                if(contents.gsub!(key, value))
-                    changed = true;
-                end
-            end
-            File.open(in_file, 'w') { | io | io.puts(contents) } 
-            return changed
-        end
-        def copy_silently(from, to, replacements)
-            copy(from, to)
-            replace(to, replacements)
-        end
-        def change_directory(dir, &operation)
-            return Dir::chdir(dir, &operation) if File.exists? dir
-        end        
-        def ask(default_answer, *question_lines)
-            puts question_lines
-            print "[#{default_answer}] => "
-            answer = STDIN.readline.strip       
-            answer == '' ? default_answer.to_s : answer.to_s
-        end
-
-
-        def to_file(file, replacements = {}) 
-            dirname =  File.dirname(file)
-            basename = File.basename(file)
-            replacements.each do | key, value |
-                basename.gsub!(key, value)
-            end
-            dirname + File::SEPARATOR + basename; 
-        end
-
-        def duplicate_and_replace(file, replacements = {})
-            to = to_file(file, replacements)
-            yield to if block_given?
-            copy_silently(file, to, replacements)           
-        end
-        
-        
-        def user_home
-            require 'etc'
-            Etc.getpwuid.dir
-        end
-        
-        #module_function :send_mail, :replace, :copy_silently, :change_directory, :ask    
-    end
-end
+module L5MTools
+    module Tools
+        def send_mail to, subject="", body="" 
+            outlook = WIN32OLE.new('Outlook.Application') 
+            mapi = outlook.GetNameSpace('MAPI')
+            message = outlook.CreateItem(0) 
+            message.Subject =   subject
+            message.Body = body
+            message.To = to
+            message.Save
+            message.Send
+            mapi.SyncObjects
+        end
+        
+        require "fileutils"
+        include FileUtils
+        require 'pathname'
+        
+        def replace(in_file, replacements)
+            contents = IO.read(in_file)
+            changed = false
+            replacements.each do | key, value |
+                if(contents.gsub!(key, value))
+                    changed = true;
+                end
+            end
+            File.open(in_file, 'w') { | io | io.puts(contents) } 
+            return changed
+        end
+        def copy_silently(from, to, replacements)
+            copy(from, to)
+            replace(to, replacements)
+        end
+        def change_directory(dir, &operation)
+            return Dir::chdir(dir, &operation) if File.exists?dir
+        end        
+        def ask(default_answer, *question_lines)
+            puts question_lines
+            print "[#{default_answer}] => "
+            answer = STDIN.readline.strip       
+            answer == '' ? default_answer.to_s : answer.to_s
+        end
+
+
+        def to_file(file, replacements = {}) 
+            dirname =  File.dirname(file)
+            basename = File.basename(file)
+            replacements.each do | key, value |
+                basename.gsub!(key, value)
+            end
+            dirname + File::SEPARATOR + basename; 
+        end
+
+        def duplicate_and_replace(file, replacements = {})
+            to = to_file(file, replacements)
+            yield to if block_given?
+            copy_silently(file, to, replacements)           
+        end
+        
+        #module_function :send_mail, :replace, :copy_silently, :change_directory, :ask    
+    end
+end

data/lib/l5m-tools.rb

@@ -10,7 +10,7 @@ module L5MTools
             application = ask("","Please input application name") 
             use_base_worker = ask("true","Use AbstractBaseWorker?").to_boolean
             old_make_app(package, application, use_base_worker, &block)
-        end
+        end        
         alias :make :make_app
         alias :dup :duplicate_app        
         def run(*args, &block)

data/test/test_l5m-tools.rb

@@ -5,30 +5,11 @@ class TestL5mTools < Test::Unit::TestCase
 #    flunk "hey buddy, you should probably rename this file and start testing for real"
 #  end
 
-    #should "duplicate app test" do        
-    #    L5MTools.application.run('dup', 'c:/files.cvs', 'HelloWorld', 'Yahoo')    
-    #end
+    should "duplicate app test" do        
+        L5MTools.application.run('dup', 'c:/files.cvs', 'HelloWorld', 'Yahoo')    
+    end
     #should "make app test" do        
        #L5MTools.application.make_app  
     #end
-    #should "svn update test" do        
-    #   puts L5MTools.svn.run('update', 'rem')    
-   # end
-    #should "svn info test" do        
-    #   puts L5MTools.svn.run('info', '-s' ,'ronghai@me.com', '--title','test case' , '-e' , 'rei')    
-    #end
-#    should "svn info test" do        
-#       puts L5MTools.svn.run('help', 'rei')    
-#    end   
-#    should "svn info test" do        
-#       puts L5MTools.svn.run('info', 'rei' , '--','--xml')    
-#    end  
-
-#    should "svn log test" do        
-#        puts L5MTools.svn.run('log', 'rei')    
-#    end
     
-#    should "svn status test" do        
-#       puts L5MTools.svn.run('st', 'rei')    
-#    end  
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: l5m-tools
 version: !ruby/object:Gem::Version
-  version: 0.0.2.beta
+  version: 0.0.2.pre
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-07 00:00:00.000000000 Z
+date: 2013-02-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70256627042100 !ruby/object:Gem::Requirement
+  requirement: &70309971360060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70256627042100
+  version_requirements: *70309971360060
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70256627041060 !ruby/object:Gem::Requirement
+  requirement: &70309971358780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: '3.12'
   type: :development
   prerelease: false
-  version_requirements: *70256627041060
+  version_requirements: *70309971358780
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70256627040220 !ruby/object:Gem::Requirement
+  requirement: &70309971358160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.2.0
   type: :development
   prerelease: false
-  version_requirements: *70256627040220
+  version_requirements: *70309971358160
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70256627038780 !ruby/object:Gem::Requirement
+  requirement: &70309971357380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,7 +54,18 @@ dependencies:
         version: 1.8.4
   type: :development
   prerelease: false
-  version_requirements: *70256627038780
+  version_requirements: *70309971357380
+- !ruby/object:Gem::Dependency
+  name: etc
+  requirement: &70309971356700 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70309971356700
 description: A tool set for Lake5Media and QingheTech developer
 email: ronghai.wei@outlook.com
 executables:
@@ -85,9 +96,7 @@ files:
 - 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
@@ -117,7 +126,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 314583582771401735
+      hash: 1132866967503484104
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/lib/l5m-tools/array.rb

@@ -1,13 +0,0 @@
-class Array
-    ##
-    # This method will return the argument value.
-    # = Example
-    #   ["svn", "--email", "ronghai@test.com"].option!('--email)' => "ronghai@test.com"
-    #   And the list will be ["svn"]
-    #   get option index --email index, delete --email, then delete value next to --email
-    def option!(opt)
-      if i = self.index(opt)         
-        return self.delete_at(i) && self.delete_at(i)
-      end
-    end
-end

data/lib/l5m-tools/ignore/svn_ingore.yaml

@@ -1,21 +0,0 @@
----
-customtags:
-- M      com\l5m\customtags\tags\servlets\ContextInitListener.java
-qhtcommon:
-- M      com\l5m\common\engine\DbHandler.java
-- M      com\l5m\common\bean\NavigationBean.java
-- M      com\l5m\common\bean\PackageFileBean.java
-- M      com\l5m\common\util\BASE64Encoder.java
-- M      com\l5m\common\util\AppLog.java
-common:
-- "?      javascript\\timespan.js"
-- "?      javascript\\prototypeV7.js"
-- "?      javascript\\timespanlite.js"
-- "?      javascript\\timespanweekly.js"
-- D      javascript\prototype.js
-- M      jsp\TimeSpanNew.jsp
-- M      com\l5m\common\engine\DbHandler.java
-- M      com\l5m\common\l5m_util\module\DemoModule.java
-- M      com\l5m\common\util\NavigationAccessUtil.java
-- "?      com\\l5m\\common\\util\\view"
-- "?      com\\l5m\\common\\util\\db"