dev 2.0.268 → 2.0.269

data/lib/base/gemspec.rb

@@ -1,5 +1,5 @@
 puts __FILE__ if defined?(DEBUG)
-
+require_relative('command.rb')
 
 class Gemspec
 	def self.update gemspec_file
@@ -19,11 +19,19 @@ class Gemspec
 		return spec.version.to_s
     end
 
+    def self.latest_published_version gemname
+    	scan=`gem list -r #{gemname}`.scan(/^dev\s*\(([\d.]+)\)/)
+		if(!scan.nil?)
+			return scan[0][0] if(scan.length > 0 && !scan[0].nil? && scan[0].length > 0)
+		end
+		''
+    end
+
     def self.published_version gemspec_file
   		published_version=''
     	spec=Gem::Specification.load(gemspec_file)
 		begin
-		  published_version = `gem list -r #{spec.name}`.scan(/\((\d+.\d+.\d+)\)/)[0][0]
+		  published_version = latest_published_version spec.name# `gem list -r #{spec.name}`.scan(/\((\d+.\d+.\d+)\)/)[0][0]
 		rescue
 		  published_version=''
 		end

data/lib/base/history.rb

@@ -8,7 +8,32 @@ class History
 		@dev=Dev.new if @dev.nil?
 	end
 	
-	def get_work_command value
+	# .0. for 0 exit codes
+	# .X. for non 0 exit codes
+	# project name is contained in directory name
+	def get_commands pattern
+		commands=Array.new
+		Dir.chdir(@dev.log_dir) do
+			Dir.glob("*#{pattern.gsub('/','-')}*.*").each{|logfile|
+				commands << Command.new(JSON.parse(IO.read(logfile)))
+			}
+		end
+		commands
+	end
+
+	def add_command command
+		code="0"
+		code="X" if command[:exit_code] !=0
+		directory=command[:directory].gsub(@dev.root_dir,'').gsub('/','-')
+		name="#{command[:input]}.#{code}.#{directory}.json"
+		filename="#{@dev.log_dir}/#{name}"
+		puts "add command #{filename}" if @dev.debug?
+		File.open(filename,'w'){|f|f.write(command.to_json)}
+	end
+
+	def get_wrk_command project_fullname
+		commands=get_commands("#{project_fullname}".gsub('/','-'))
+		return commands[0] if commands.length > 0
 		nil
 	end
 end

data/lib/base/project.rb

@@ -2,10 +2,34 @@ puts __FILE__ if defined?(DEBUG)
 
 require 'json'
 require_relative('../apps/svn.rb')
+require_relative('environment.rb')
 require_relative('string.rb')
 
 class Project < Hash
-	attr_accessor :filename
+	attr_accessor :filename,:env
+
+    def initialize value='',fullname=''
+        @filename=''
+        @env=Environment.new
+        self[:url]=Project.get_url
+        self[:fullname]=Project.get_fullname_from_url self[:url] if self[:url].length > 0
+        self[:timeout]=60*5
+        if value.is_a?(String)
+            self[:url] = value if value.is_a?(String) && value.length > 0
+            self[:fullname] = Project.get_fullname_from_url self[:url]
+        elsif(value.is_a?(Hash))
+            value.each{|k,v|self[k.to_sym]=v}
+        else
+            self[:fullname]=Project.get_fullname_from_url self[:url] if self[:url].length > 0
+        end
+        self[:fullname] = fullname if fullname.length > 0
+    end
+
+    def set_timeout value
+        self[:timeout] = value if value.is_a? Numeric
+        self[:timeout] = value.gsub('m','').strip.to_f * 60 if value.include?('m')
+        self[:timeout] = value.gsub('s','').strip.to_f * 60 if value.include?('s')
+    end
 
 	def self.get_url directory=Rake.application.original_dir
 	  url=''
@@ -17,46 +41,26 @@ class Project < Hash
 	end
 
 	def self.get_fullname directory
-	    directory.gsub(Environment.dev_root,'').gsub('/wrk','')
+	    directory.gsub(@env.wrk_dir,'')
 	end
 
 	def self.get_fullname_from_url url
 		return url.gsub('http://','').gsub('https://','').gsub('.com/','/').gsub('.git','')
 	end
 
-	def initialize value=''
-		@filename=''
-
-		self[:url]=Project.get_url
-		self[:fullname]=Project.get_fullname_from_url self[:url] if self[:url].length > 0
-		if value.is_a?(String)
-		    self[:url] = value if value.is_a?(String) && value.length > 0
-		    self[:fullname] = Project.get_fullname_from_url self[:url]
-		elsif(value.is_a?(Hash))
-			value.each{|k,v|self[k.to_sym]=v}
-		else
-			self[:fullname]=Project.get_fullname_from_url self[:url] if self[:url].length > 0
-		end
-
-		#self[:fullname]=Project.get_fullname Rake.application.original_dir if(self.fullname.include?(':') && Rake.application.original_dir.include?('/wrk/'))
-	end
-
-    def url
-    	self[:url]
-    end
-    def fullname
-    	self[:fullname]
-    end
+    def url; self[:url]; end
+    def fullname; self[:fullname]; end
 
     def name
     	parts=fullname.split('/')
     	parts[parts.length-1]
     end
 
-	def wrk_dir
-		FileUtils.mkdir("#{Environment.dev_root}/wrk") if !File.exists? "#{Environment.dev_root}/wrk"
-		"#{Environment.dev_root}/wrk/#{self.fullname}"
-	end
+	def wrk_dir; "#{@env.wrk_dir}/#{self.fullname}"; end
+	def make_dir tag=''
+		"#{@env.make_dir}/#{self.fullname}" if tag.length==0
+    	"#{@env.make_dir}/#{self.fullname}-#{tag}"
+    end
 
 	def pull
 		if(File.exists?(wrk_dir) && File.exists?("#{wrk_dir}/.git"))
@@ -69,15 +73,19 @@ class Project < Hash
 
 	def clone
 		if(!File.exists?(wrk_dir) && self[:url].include?('.git'))
-			puts "cloning #{self[:url]} to #{self.wrk_dir}"
-			puts `git clone #{self[:url]} #{self.wrk_dir}`
+            cmd=Command.new({ :input => "git clone #{self[:url]} #{self.wrk_dir}", :quiet => true,:ignore_failure => true})
+            cmd.execute
+            @env.out cmd.summary
 		end
 	end
 
 	def checkout
 		if(!File.exists?(wrk_dir) && self[:url].include?('svn'))
-			puts "checkout #{self.url} to #{self.wrk_dir}"
-			puts `svn checkout #{self.url} #{self.wrk_dir}`
+			#puts "checkout #{self.url} to #{self.wrk_dir}"
+			#puts `svn checkout #{self.url} #{self.wrk_dir}`
+            cmd=Command.new({ :input => "svn checkout #{self.url} #{self.wrk_dir}", :quiet => true,:ignore_failure => true})
+            cmd.execute
+            @env.out cmd.summary
 		end
 	end
 
@@ -90,25 +98,19 @@ class Project < Hash
 			Dir.chdir(self.wrk_dir) do
 				rake = Command.new({ :input => 'rake', :timeout => 300, :ignore_failure => true })
 				rake.execute
-				puts rake.summary
+				@env.out rake.summary
 			end
 		end
 	end
 
-	def info
-		puts "Project #{name}"
-		puts "#{'fullname'.fix(13)}: #{self.fullname}"
-		puts "#{'url'.fix(13)}: #{self[:url]}"
-		puts "#{'version'.fix(13)}: #{VERSION}" if defined? VERSION
-	end
+	
 
     def latest_tag update=false
-		FileUtils.mkdir("#{Environment.dev_root}/make") if !File.exists? "#{Environment.dev_root}/make"
-		makedir="#{Environment.dev_root}/make/#{self.fullname}"
+		makedir="#{@env.make_dir}/#{self.fullname}"
     	FileUtils.mkdir_p(File.dirname(makedir)) if !File.exists?(File.dirname(makedir))
         if(File.exists?(makedir))
         	Dir.chdir(makedir) do
-        	  Command.exit_code('git pull')
+        	  Command.exit_code('git pull') if update
             end
         else
         	if(update)
@@ -129,49 +131,212 @@ class Project < Hash
         ''
     end
 
-    def make_dir tag
-    	"#{Environment.dev_root}/make/#{self.fullname}-#{tag}"
+    
+
+    def log_filenames tags=nil
+    	tags=Array.new if tags.nil?
+    	filenames=Array.new
+    	Dir.chdir(@env.log_dir) do
+    		dotname=fullname.gsub('/','.')
+    		Dir.glob("#{dotname}*.json").each{|f|
+    			if(tags.length==0)
+    				filenames << "#{@env.log_dir}/#{f}"
+    			else
+    				has_tags=true
+    				tags.each{|tag|
+    					has_tags=false if !f.include? tag
+    				}
+    				filenames << "#{@env.log_dir}/#{f}" if has_tags
+    			end
+    		}
+    	end
+    	filenames
     end
 
-	def make tag=''
-		tag=latest_tag if tag.length==0
+    def command_history tags=nil
+    	commands=Array.new
+    	log_filenames(tags).each{|logfile|
+    		commands << Command.new(JSON.parse(IO.read(logfile)))
+    	}
+        commands
+    end
+
+    def get_logfile tags
+    	tagstring=''
+    	tagstring=tags if tags.kind_of?(String)
+    	tagstring=tags.join('.') if tags.kind_of?(Array)
+    	name="#{self.fullname}.#{tagstring}.json".gsub('/','.')
+    	"#{@env.log_dir}/#{name}"
+    end
+
+    def list
+        history=command_history
+        if(history.length==0)
+            @env.out "?      #{fullname}"
+        else
+            status=0
+            history.each{|c|
+                status=c.exit_code if c.exit_code != 0
+            }
+            if(status==0)
+                @env.out "       #{fullname}"
+            else
+                if(@env.colorize?)
+                    require 'ansi/code'
+                    @env.out ANSI.red + ANSI.bright + "X      #{fullname}" + ANSI.reset
+                else
+                    @env.out "X      #{fullname}"
+                end
+            end
+        end
+    end
+
+    def out_brackets message
+        if(@env.colorize?)
+            require 'ansi/code'
+            @env.out "[" + ANSI.blue + ANSI.bright + message + ANSI.reset + ']'
+        else
+            @env.out "[#{message}]"
+        end
+    end
+
+    def out_cyan message
+        if(@env.colorize?)
+            require 'ansi/code'
+            @env.out ANSI.cyan + ANSI.bright + message + ANSI.reset
+        else
+            @env.out "#{message}"
+        end
+    end
+
+    def out_property name,value
+        if(@env.colorize?)
+            require 'ansi/code'
+            @env.out "#{name}: " + ANSI.white + ANSI.bold + value.to_s.strip + ANSI.reset
+        else
+            @env.out "#{name}: #{value}"
+        end
+    end
+
+    #def info
+    #    @env.out "Project #{name}"
+    #    @env.out "#{'fullname'.fix(13)}: #{self.fullname}"
+    #    @env.out "#{'url'.fix(13)}: #{self[:url]}"
+    #    @env.out "#{'version'.fix(13)}: #{VERSION}" if defined? VERSION
+    #end
+    def info
+        infoCmd=Command.new({ :input => 'info', :exit_code => 0 })
+        #out_cyan '========================================================='
+        #out_cyan fullname
+        out_property "fullname".fix(15), fullname
+        out_property "url".fix(15), url
+        wrk_history=command_history ['work']
+        out_property "work status".fix(15), "?" if wrk_history.length == 0
+        out_property "work status".fix(15), wrk_history[0].summary if wrk_history.length > 0
+        if(wrk_history.length > 0)
+            @env.out wrk_history[0].info
+        end
+        make_history=command_history ['make', latest_tag]
+        out_property "make status".fix(15),"?" if make_history.length == 0
+        out_property "make status".fix(15), make_history[0].summary if make_history.length > 0
+        if(make_history.length >0)
+            @env.out make_history[0].info
+        end
+        infoCmd
+    end
+
+    def clobber
+        clobberCmd=Command.new('clobber')
+        clobberCmd[:exit_code]=0
+        if(File.exists?(wrk_dir))
+            Dir.remove wrk_dir,true
+            @env.out "removed #{wrk_dir}"
+        end
+        if(File.exists?(make_dir))
+            Dir.remove make_dir,true
+            @env.out "removed #{make_dir}"
+        end
+        clobberCmd
+    end
 
-		return if tag.length==0
+    def work
+        clone
+        checkout
+        logfile=get_logfile ['work']
+        if(File.exists?(wrk_dir))
+            rake_default=Command.new({:input =>'rake default',:quiet => true,:ignore_failure => true})
+            if(last_work_mtime.nil? || last_work_mtime < Environment.get_latest_mtime(wrk_dir))
+              Dir.chdir(wrk_dir) do
+
+                @env.out fullname
+                
+                if(!File.exists?'rakefile.rb')
+                    rake_default[:exit_code]=1
+                    rake_default[:error]="rakefile.rb not found."
+                    rake_default[:start_time]=Time.now
+                    rake_default[:end_time]=Time.now
+                else
+                    #rake_default[:timeout] = self[:timeout]
+                    rake_default.execute
+                end
+                rake_default.save logfile
+                update_status
+                @env.out rake_default.summary true
+                return rake_default
+              end
+            else
+                if(File.exists?(logfile))
+                    rake_default.open logfile
+                    @env.out rake_default.summary true if(rake_default[:exit_code] != 0 || @env.show_success?)
+                end
+            end
+            rake_default
+        end
+    end
+
+	def make tag=''
+		tag=latest_tag true if tag.length==0
+		#return if tag.length==0
 		raise 'no tag specified' if tag.length==0
 
-		rake_default=nil
-		logfile="#{Environment.dev_root}/log/#{self.fullname}/#{tag}/#{Environment.user}@#{Environment.machine}.json"
+		rake_default=Command.new({:input => 'rake default',:quiet => true,:ignore_failure => true})
+		logfile=get_logfile ['make',tag]		
 		if(File.exists?(logfile))
-			# load hash from json
-			rake_default=Command.new(JSON.parse(IO.read(logfile)))
-			#puts rake_default.summary
+            rake_default.open logfile
+            @env.out rake_default.summary true if(rake_default[:exit_code] != 0) || @env.show_success?
+            rake_default
 		else
-			FileUtils.mkdir("#{Environment.dev_root}/make") if !File.exists? "#{Environment.dev_root}/make"
-			makedir="#{Environment.dev_root}/make/#{self.fullname}-#{tag}"
+			makedir=make_dir tag
 			FileUtils.mkdir_p(File.dirname(makedir)) if !File.exists? File.dirname(makedir)
 			if(self[:url].include?('.git'))
 				if(!File.exists?(makedir))
 				   clone=Command.new({:input=>"git clone #{self[:url]} #{makedir}",:quiet=>true})
 				   clone.execute
 			    end
-				if(File.exists?(makedir))
+            end
+			if(File.exists?(makedir))
 				  Dir.chdir(makedir) do
-				  	#puts "making #{self.fullname}"
 					checkout=Command.new({:input=>"git checkout #{tag}",:quiet=>true})
 					checkout.execute
 					FileUtils.rm_r '.git'
-					rake_default=Command.new('rake default')
-					rake_default[:quiet]=true
-					rake_default[:ignore_failure]=true
-					#rake_default[:timeout]=5*60*1000
-					rake_default.execute
-					FileUtils.mkdir_p(File.dirname(logfile)) if !File.exists?(File.dirname(logfile))
-					File.open(logfile,'w'){|f|f.write(rake_default.to_json)}
+                    if(!File.exists?'rakefile.rb')
+                        rake_default[:exit_code]=1
+                        rake_default[:error]="rakefile.rb not found."
+                        rake_default[:start_time]=Time.now
+                        rake_default[:end_time]=Time.now
+                    else
+                        #rake_default[:timeout] = self[:timeout]
+                        rake_default.execute 
+                    end
+                    rake_default.save logfile
 					update_status
+                    @env.out rake_default.summary true
 					rake_default
 				  end
-			   end
+            else
+                puts "Project make make_dir #{makedir} does not exist." if @env.debug?
 			end
+			
 			begin
 			    FileUtils.rm_r makedir
 		    rescue
@@ -181,24 +346,22 @@ class Project < Hash
 	end
 
     def last_work_mtime
-    	logfile="#{Environment.dev_root}/log/#{self.fullname}/#{Environment.user}@#{Environment.machine}.json"
-    	if File.exists? logfile
-    		return File.mtime(logfile)
-    	end
+    	logfile=get_logfile ['work']
+    	return File.mtime(logfile) if File.exists? logfile
     	nil
     end
 
     def update_status
-    	status_logfile="#{Environment.dev_root}/log/#{self.fullname}/#{Environment.user}@#{Environment.machine}.status.json"
+    	status_logfile="#{@env.root_dir}/log/#{self.fullname}/#{@env.user}@#{@env.machine}.status.json"
     	status=Hash.new({'status'=>'?'})
-    	wrk_logfile="#{Environment.dev_root}/log/#{self.fullname}/#{Environment.user}@#{Environment.machine}.json"
+    	wrk_logfile="#{@env.root_dir}/log/#{self.fullname}/#{@env.user}@#{@env.machine}.json"
     	if(File.exists?(wrk_logfile))
     		rake_default=Command.new(JSON.parse(IO.read(wrk_logfile)))
     		status[:work_logfile]=wrk_logfile 
     		status['status']='0' 
     		status['status']='X' if rake_default[:exit_code] != 0
         end
-    	make_logfile="#{Environment.dev_root}/log/#{self.fullname}/#{latest_tag}/#{Environment.user}@#{Environment.machine}.json"
+    	make_logfile="#{@env.root_dir}/log/#{self.fullname}/#{latest_tag}/#{@env.user}@#{@env.machine}.json"
     	if(File.exists?(make_logfile))
     		rake_default=Command.new(JSON.parse(IO.read(make_logfile)))
     		status[:make_logfile]=make_logfile 
@@ -212,63 +375,18 @@ class Project < Hash
     end
 
     def status
-    	status_logfile="#{Environment.dev_root}/log/#{self.fullname}/#{Environment.user}@#{Environment.machine}.status.json"
+    	status_logfile="#{@env.root_dir}/log/#{self.fullname}/#{@env.user}@#{@env.machine}.status.json"
     	update_status if !File.exists? status_logfile
     	if(File.exists?(status_logfile))
     	  statusHash=JSON.parse(IO.read(status_logfile))
     	  return statusHash['status'] if(statusHash.has_key?('status'))
     	end
     	'?'
-    	#status='?'
-    	#wrk_logfile="#{Environment.dev_root}/log/#{self.fullname}/#{Environment.user}@#{Environment.machine}.json"
-    	#if(File.exists?(wrk_logfile))
-    	#	rake_default=Command.new(JSON.parse(IO.read(wrk_logfile)))
-    	#	status='0'
-    	#	return 'X' if rake_default[:exit_code] != 0
-    	#end
-    	#make_logfile="#{Environment.dev_root}/log/#{self.fullname}/#{latest_tag}/#{Environment.user}@#{Environment.machine}.json"
-    	#if(File.exists?(make_logfile))
-    	#	rake_default=Command.new(JSON.parse(IO.read(make_logfile)))
-    	#	status='0'
-    	#	return 'X' if rake_default[:exit_code] != 0
-    	#else
-    	#	return '?' # outstanding make
-    	#end
-    	#status
     end
 
     def report
     end
 
-    def work
-    	clone
-    	checkout
-    	if(File.exists?(wrk_dir))
-    		if(last_work_mtime.nil? || last_work_mtime < Environment.get_latest_mtime(wrk_dir))
-    		  Dir.chdir(wrk_dir) do
-    		  	puts "working #{self.fullname}"
-    		  	rake_default=Command.new('rake default')
-				rake_default[:quiet]=true
-				rake_default[:ignore_failure]=true
-				rake_default.execute
-    			#Command.exit_code('rake default')
-    			logfile="#{Environment.dev_root}/log/#{self.fullname}/#{Environment.user}@#{Environment.machine}.json"
-    			FileUtils.mkdir_p(File.dirname(logfile)) if !File.exists?(File.dirname(logfile))
-				File.open(logfile,'w'){|f|f.write(rake_default.to_json)}
-				update_status
-				puts rake_default.summary
-    	      end
-    	    else
-    	    	logfile="#{Environment.dev_root}/log/#{self.fullname}/#{Environment.user}@#{Environment.machine}.json"
-    	    	if(File.exists?(logfile))
-    	    		rake_default=Command.new('rake default')
-    	    		rake_default.open logfile
-    	    		puts rake_default.summary if(rake_default[:exit_code] != 0)
-    	    	end
-    	    end
-    	end
-    end
-
     def update
     	clone
     	checkout
@@ -301,8 +419,6 @@ class Project < Hash
     	tags
     end
 
-	def clobber
-
-	end
+	
 end