dev 2.0.268 → 2.0.269

data/lib/base/projects.rb

@@ -8,25 +8,24 @@ require_relative('../apps/git.rb')
 require_relative('../apps/svn.rb')
 
 class Projects < Hash
-	attr_accessor :dev
+	attr_accessor :env
 
-	def initialize dev=nil
-		@dev=dev
-		@dev=Dev.new if @dev.nil?
+	def initialize env=nil
+		@env=env if env.kind_of?(Environment)
+		@env=Environment.new if @env.nil?
 		open
 	end
 
 	def filename
-		"#{@dev.get_env('DEV_ROOT')}/data/Projects.json"
+		"#{@env.root_dir}/data/Projects.json"
 	end
 
-    def update_state
-    	self.each{|k,v|
-    		self[k]=Project.new(v) if(v.is_a?(String))
-    		self[k]=Project.new(v) if(!v.is_a?(Project) && v.is_a?(Hash))
-    		self[k][:fullname]=k
-    	}
-    end
+    #def update_state
+    #	self.each{|k,v|
+    #		self[k]=Project.new(v) if(v.is_a?(String))
+    #		self[k][:fullname]=k
+    #	}
+    #end
 
 	def save
 		Dir.make File.dirname(filename) if !File.exists? File.dirname(filename)
@@ -35,49 +34,132 @@ class Projects < Hash
 
 	def open
 		if File.exists? filename
-		  #@filename=filename if filename.length > 0
-		  JSON.parse(IO.read(filename)).each{|k,v| self[k]=v}
-		  update_state
+		  JSON.parse(IO.read(filename)).each{|k,v|
+		  	if(v.kind_of?(Project))
+		  		self[k]=v
+		  	else
+		  		self[k]=Project.new(v)
+		  	end
+		}
+		  #update_state
 	    end
 	end
 
-    def list filter=''
-		self.each{|k,v|
-			puts "#{v.status} #{k}" if(filter.length == 0 || k.include?(filter))
-		}
+    def get_projects value=''
+    	puts "get_projects #{value.to_s}" if @env.debug?
+    	puts "get_project total project count #{self.length}" if @env.debug?
+    	projects=Array.new
+    	filter=''
+    	filter=value.to_s if !value.nil? && value.kind_of?(String)
+    	filter=value[0].to_s if !value.nil? && value.kind_of?(Array) && !value[0].to_s.include?('=')
+
+        puts "get_project filter '#{filter}'" if @env.debug?
+    	self.each{|k,v|
+    		puts " checking project #{k}" if @env.debug?
+    		puts " v.class #{v.class}" if @env.debug?
+    		if(filter.length==0 || k.include?(filter))
+    			if(v.kind_of?(Project))
+    			   projects << v
+    			   v.env=@env
+    			end
+    		end
+    	}
+    	projects
+    end
+
+    def add args
+    	url=args[0]
+    	project=Project.new(url)
+    	project[:fullname]=args[1] if args.length > 1
+    	project.set_timeout args[2] if args.length > 2
+    	if(!self.has_key?(project[:fullname]) && project[:fullname].length > 0)
+    		@env.out "adding #{project.fullname}\n"
+    		self[project.fullname]=project
+    		self.save
+    	end
+    end
+
+    def help args
+    end
+    
+    def work args
+    	projects=get_projects args
+		puts "working #{projects.length} projects..." if @env.debug?
+		exit_code=0
+    	projects.each{|project|
+    		begin
+    		    result=project.work
+    		    exit_code=result.exit_code if(result.exit_code!=0)
+    		rescue => error
+		    	puts "error raised during work #{project.fullname}"
+		    	puts "--------------------------------------------"
+		    	puts error
+		    	puts "--------------------------------------------"
+		    end
+    	}
+    	exit_code
+	end
+
+	def info args
+		projects=get_projects args
+		puts "collecting info for #{projects.length} projects..." if @env.debug?
+		exit_code=0
+    	projects.each{|project|
+    		begin
+    		    result=project.info
+    		    exit_code=result.exit_code if(result.exit_code!=0)
+    		rescue => error
+		    	puts "error raised during work #{project.fullname}"
+		    	puts "--------------------------------------------"
+		    	puts error
+		    	puts "--------------------------------------------"
+		    end
+    	}
+    	exit_code
+	end
+
+    def list args
+    	projects=get_projects args
+		puts "listing #{projects.length} projects..." if @env.debug?
+    	projects.each{|project|
+    		project.list
+    		
+    	}
 	end
 
 	def make args
-		filter=''
-		filter=args[1] if !args.nil? && args.length > 0
-		self.each{|k,v|
-			if filter.nil? || filter.length==0 || k.include?(filter)
-				tag=v.latest_tag
-				if(tag.length > 0)
-				   logfile="#{Environment.dev_root}/log/#{v.fullname}/#{tag}/#{Environment.user}@#{Environment.machine}.json"
-				   if(!File.exists?(logfile))
-				     puts "making #{k} #{tag}" if(!File.exists?(logfile))
-				     rake_default=v.make tag
-				     puts rake_default.summary if !rake_default.nil?
-				   else
-				   	 rake_default=v.make tag
-				   	 puts rake_default.summary if !rake_default.nil? && rake_default[:exit_code] != 0
-				   end
-			    end
+		projects=get_projects args
+		puts "making #{projects.length} projects..." if @env.debug?
+		exit_code=0
+		projects.each{|project|
+			begin
+			    result=project.make
+			    exit_code=result.exit_code if(result.exit_code!=0)
+		    rescue => error
+		    	puts "error raised during make #{project.fullname}"
+		    	puts "--------------------------------------------"
+		    	puts error
+		    	puts "--------------------------------------------"
 		    end
 		}
+		exit_code
 	end
 
-	def work args
-		filter=nil
-		filter=args[1] if !args.nil? && args.length > 0
-		self.each{|k,v|
-			if filter.nil? || filter.length==0 || k.to_s.include?(filter)
-				last_work_time=nil
-			 	v.work
+	def clobber args
+		projects=get_projects args
+		puts "clobbering #{projects.length} projects..." if @env.debug?
+		projects.each{|project|
+			begin
+			    project.clobber
+			    #Dir.remove_empty @env.wrk_dir
+		    rescue => error
+		    	puts "error raised during clobber #{project.fullname}"
+		    	puts "--------------------------------------------"
+		    	puts error
+		    	puts "--------------------------------------------"
 		    end
 		}
-	end
+    end
 
 	def update args
 		filter=''
@@ -122,28 +204,16 @@ class Projects < Hash
 		self.each{|k,v| v.rake if v.respond_to?("rake".to_sym)}
 	end
 
-    def add args
-    	if(args.length > 1)
-    	  project=Project.new(args[1])
-    	  project[:fullname] = args[2] if args.length > 2
-    	  if(project.fullname.length > 0 && !self.has_key?(project.fullname))
-		   	puts "adding #{project.fullname}"
-		   	self[project.fullname]=project
-		   	self.save #Projects.user_projects_filename
-		  end
-		end
-    end
-
 	def import pattern=''
-		wrk="#{Environment.dev_root}/wrk"
+		wrk=@env.wrk_dir
 		if File.exists?(wrk)
 		   Dir.chdir(wrk) do
+		   	    puts "scanning #{wrk} for imports..."
 		   		Dir.glob('**/rakefile.rb').each{|rakefile|
 		   			rakedir=File.dirname(rakefile)
 		   			url = Project.get_url rakedir
-		   			#puts "checking #{url}"
 		   			project = Project.new(Project.get_url(rakedir))
-		   			project[:fullname]=Project.get_fullname rakedir if(project.fullname.include?(':'))
+		   			project[:fullname]=rakedir.gsub(@env.wrk_dir,'') if(project.fullname.include?(':'))
 		   			if(pattern.length==0 || project.fullname.include?(pattern))
 		   				if(project.fullname.length > 0 && !self.has_key?(project.fullname))
 		   				    puts "importing #{project.fullname}"
@@ -152,13 +222,7 @@ class Projects < Hash
 		   			end
 		   		}
 		   end
-		   self.save Projects.user_projects_filename
+		   self.save
 	    end
 	end
-end
-
-#PROJECTS=Projects.new
-#PROJECTS.open Projects.user_projects_filename if File.exists? Projects.user_projects_filename
-#current=Projects.current # this makes sure the current project is added to PROJECTS
-#PROJECTS[current.fullname]=current if(!current.nil? && !PROJECTS.has_key?(current.fullname) && current.wrk_dir == Rake.application.original_dir)
-#PROJECTS.save Projects.user_projects_filename if !File.exists? Projects.user_projects_filename
+end

data/lib/base/timeout.rb

@@ -1,5 +1,3 @@
-puts __FILE__ if defined?(DEBUG)
-
 ############################################################################
 # The following code is based on code originally copied from 
 # https://gist.github.com/lpar/1032297
@@ -16,13 +14,11 @@ puts __FILE__ if defined?(DEBUG)
 def run_with_timeout(directory,command, timeout, tick)
   output = ''
   exit_code=1
-  begin
-    # Start task in another thread, which spawns a process
-    stdin, stderrout, thread = Open3.popen2e(command, :chdir=>directory)
-    # Get the pid of the spawned process
-    pid = thread[:pid]
-    start = Time.now
 
+  Open3.popen2e(command, :chdir=>directory) { |stdin,stderrout,thread|
+    pid = thread.pid
+
+    start = Time.now
     while (Time.now - start) < timeout and thread.alive?
       # Wait up to `tick` seconds for output/error data
       Kernel.select([stderrout], nil, nil, tick)
@@ -33,10 +29,15 @@ def run_with_timeout(directory,command, timeout, tick)
         # A read would block, so loop around for another select
       rescue EOFError
         # Command has completed, not really an error...
+        exit_code=wait_thread.value
         break
       end
+
+      sleep(0.5)
     end
 
+    exit_code=wait_thread.value
+
     # Give Ruby time to clean up the other thread
     sleep 1
 
@@ -44,17 +45,54 @@ def run_with_timeout(directory,command, timeout, tick)
       # We need to kill the process, because killing the thread leaves
       # the process alive but detached, annoyingly enough.
       Process.kill("TERM", pid)
-    else
-      exit_code=thread.value
-      sleep 1
+      exit_code=5
     end
 
-  ensure
-    stdin.close if stdin
-    stderrout.close if stderrout
-  end
+    
+  }
+
   return [output,exit_code]
-end
+end  
+#  begin
+#    # Start task in another thread, which spawns a process
+#    stdin, stderrout, thread = Open3.popen2e(command, :chdir=>directory)
+#    # Get the pid of the spawned process
+#    pid = thread[:pid]
+#    start = Time.now
+#
+#    while (Time.now - start) < timeout and thread.alive?
+#      # Wait up to `tick` seconds for output/error data
+#      Kernel.select([stderrout], nil, nil, tick)
+#      # Try to read the data
+#      begin
+#        output << stderrout.read_nonblock(BUFFER_SIZE)
+#      rescue IO::WaitReadable
+#        # A read would block, so loop around for another select
+#      rescue EOFError
+#        # Command has completed, not really an error...
+#        exit_code=$?.exitstatus
+#        break
+#      end
+#    end
+#
+#    # Give Ruby time to clean up the other thread
+#    sleep 1
+
+#    if thread.alive?
+      # We need to kill the process, because killing the thread leaves
+      # the process alive but detached, annoyingly enough.
+#      Process.kill("TERM", pid)
+#      exit_code=5
+#    else
+#      sleep 1
+#    end
+
+#  ensure
+#    stdin.close if stdin
+#    stderrout.close if stderrout
+#  end
+#  return [output,exit_code]
+#end
 
 require 'timeout'
 def run_with_timeout2(directory,command,timeout)

data/lib/base/version.rb

@@ -1,4 +1,51 @@
 class Version
+	def self.extract text
+		[/[Vv]ersion\s*=\s*['"]([\d.]+)['"]/,
+		 /Version\(\s*"([\d.]+)"\s*\)/].each{|regex|
+			scan=text.scan(regex)
+			if(!scan.nil?)
+				return scan[0][0] if(scan.length > 0 && !scan[0].nil? && scan[0].length > 0)
+			end
+		}
+		nil
+	end
+
+	def self.extract_from_file filename
+		Version.extract IO.read(filename)
+	end
+
+	def self.extract_from_filelist filelist
+		version=nil
+		filelist.each{|f|
+			version=extract_from_file f
+			return version if !version.nil?
+		}
+		nil
+	end
+
+    def self.update_text text, version
+    	text=text.gsub(/version\s*=\s*'[\d.]+'/,"version='#{version}'")
+    	text=text.gsub(/version\s*=\s*"[\d.]+"/,"version=\"#{version}\"")
+    	text=text.gsub(/Version\s*=\s*'[\d.]+'/,"Version='#{version}'")
+    	text=text.gsub(/Version\s*=\s*"[\d.]+"/,"Version=\"#{version}\"")
+    	text=text.gsub(/Version\(\s*"[\d.]+"\s*\)/,"Version(\"#{version}\")")
+    	text=text.gsub(/Name\s*=\s*"Version"\s*Value\s*=\s*"[\d.]+"/,"Name=\"Version\" Value=\"#{version}\"")
+    end
+
+	def self.update_file filename, version
+		if(File.exists?(filename))
+			orig=IO.read(filename)
+			text=Version.update_text orig,version
+			File.open(filename,'w'){|f|f.write(text)} if(orig!=text)
+		end
+	end
+
+	def self.update_filelist filelist,version
+		filelist.each{|f|
+			Version.update_file f,version
+		}
+	end
+
 	def self.read filename
 		return "#{Gem::Specification.load(filename).version.to_s}" if filename.include?('.gemspec') 
 		if filename.include?('AssemblyInfo.cs')  
@@ -7,6 +54,10 @@ class Version
 				return scan[0][0] if(scan.length > 0 && !scan[0].nil? && scan[0].length > 0)
 			end
 		   #return IO.read(filename).scan(/Version\(\"([\d.]+)\"\)/)[0][0] 
+		   scan=IO.read(wxs).scan(/Version=\"([\d.]+)\"/)
+		   if(!scan.nil?)
+		        return scan[0][0] if(scan.length > 0 && !scan[0].nil? && scan[0].length > 0)
+		   end
 	    end
 		'0.0.0'
 	end
@@ -18,6 +69,9 @@ class Version
 		Dir.glob('**/AssemblyInfo.cs').each{|assemblyInfo|
 			return Version.read assemblyInfo
 		}
+		Dir.glob('**/*.wxs').each{|wxs|
+			return Version.read wxs
+		}
 		'0.0.0'
 	end
 end

data/lib/commands.rb

@@ -7,8 +7,10 @@ Dir.glob("#{File.dirname(__FILE__)}/tasks/*.rb").each{|rb|
   require(rb)
 }
 class Commands < Hash
-
-	def initialize directory=Dir.pwd
+	attr_accessor :env
+	def initialize env=nil,directory=Rake.application.original_dir
+		@env=env
+		@env=Environment.new() if @env.nil?
 		Dir.chdir(directory) do
 		  self[:pull]=Pull.new
 		  self[:update]=Update.new

data/lib/dev.rb

@@ -5,62 +5,68 @@ require_relative('apps.rb')
 require_relative('tasks.rb')
 require_relative('commands.rb')
 
-if(File.exists?(Environment.configuration))
-  require Environment.configuration
-end
-
-PROJECT=Project.new()
+#PROJECT=Project.new()
 
 class Dev
-	attr_accessor :projects,:history
+	attr_accessor :env,:projects,:commands
 
 	def initialize env=nil
-		@env=Hash.new
-		@env_aliases={'HOME' => ['USERPROFILE'],
-		          'DEV_ROOT' => ['DEV_HOME','HOME','USERPROFILE']
-		}
-		env.each{|k,v| @env[k.to_s]=v} if !env.nil?
-		@projects=Projects.new(self)
-		@history=History.new(self)
+		@env=Environment.new(env) if !env.nil? && env.kind_of?(Hash)
+		@env=Environment.new() if @env.nil?
+		@projects=Projects.new(@env)
+		@commands=Commands.new(@env)
+		@output=''
 	end
+    
+	def execute args
+		args=args.split(' ') if(args.kind_of?(String))
 
-	def reset
-		@projects=nil
-	end
+        # parse arguments that are of the form KEY=VALUE
+		args.each{|arg|
+		 	if(arg.include?('='))
+		 		words=arg.split('=')
+		 		if(words.length==2)
+		 			ENV[words[0]]=words[1]
+		 		end
+		 	end
+		}
 
-	def get_env key
-		if(!@env.nil? && @env.has_key?(key))
-		  return @env[key] 
-	    end
-		value = ENV[key]
-		if(value.nil?)
-			if(@env_aliases.has_key?(key))
-				@env_aliases[key].each{|akey|
-					value=get_env(akey) if value.nil?
-				}
-			end
+		if args.length == 0
+	       return usage
+	    else
+		   subcommand=args[0] if args.length > 0
+		   subargs=Array.new
+		   subargs=args[1,args.length-1] if args.length > 1
+
+		   return projects.add(subargs) if subcommand=='add'
+		   return projects.clobber(subargs) if subcommand=='clobber'
+		   return projects.import(subargs) if subcommand=='import'
+		   return projects.list(subargs) if subcommand=='list'
+		   return projects.make(subargs) if subcommand=='make'
+		   return projects.info(subargs) if subcommand=='info'
+		   return projects.work(subargs) if subcommand=='work'
+		   return projects.update(subargs) if subcommand=='update'
+
+		   @env.out "unknown command: '#{subcommand}'"
+		   1
 		end
-		value
 	end
+
     
-	def execute args
-		if(args.kind_of?(String))
-			args=args.split(' ')
-		end
-		#projects=Projects.new
-		#projects.open Projects.user_projects_filename if File.exists? Projects.user_projects_filename
-		projects.add(args) if args.length > 0 && args[0] == 'add'
-		projects.import(args.length>1 ? args[1]:'') if args.length > 0 && args[0] == 'import'
-		projects.list(args.length>1 ? args[1]:'') if args.length > 0 && args[0] == 'list'
-		projects.make(args) if args.length > 0 && args[0] == 'make'
-		projects.work(args) if args.length > 0 && args[0] == 'work'
-		projects.update(args) if args.length > 0 && args[0] == 'update'
-		usage if args.length == 0
-	end
 
 	def usage
-		puts 'Usage:'
-		puts ' list [pattern]'
+		return 0
+		@env.out 'usage: dev <subcommand> [options]'
+		@env.out ''
+		@env.out 'available subcommands'
+		@env.out ' help'
+		@env.out ' list'
+		@env.out ' make'
+		@env.out ' info'
+		@env.out ' work'
+		@env.out ''
+		@env.out "Type 'dev help <subcommand>' for help on a specific subcommand.'"
+		0
 	end
 end