dev 1.0.147 → 1.0.148

data/bin/devgem

@@ -22,10 +22,50 @@ rescue LoadError
 end
 
 require 'dev'
+DB=Dev::Database.new
 
-puts "welcome to devgem"
+def get_pattern(args,index)
+  pattern=nil
+  pattern=args[index] if args.count > index
+  pattern="%#{pattern}%" if !pattern.nil? && !pattern.include?('%') && !pattern.include?("'") && !pattern.include?('"')
+  return pattern
+end
+
+def usage(args)
+  puts "welcome to devgem"
+end
 
-puts ("no arguments passed") if(ARGV.length == 0)
-ARGV.each do|a|
-  puts "Argument: #{a}"
+def list(args)
+  pattern=get_pattern(args,1)
+  puts "listing all branches" if pattern.nil?
+  puts "listing branches LIKE #{pattern}" if !pattern.nil?
+  branches=DB.find_branches(pattern)
+  branches.each{ |b| puts "  #{b}" }
 end
+
+def status(args)
+  pattern=get_pattern(args,1)
+  branches=DB.find_branches(pattern)
+  branches.each{ |b| Dev::Cmd::Build.status(b) }
+end
+
+def build(args)
+  pattern=get_pattern(args,1)
+  puts "building all branches" if pattern.nil?
+  puts "building branches LIKE #{pattern}" if !pattern.nil?
+  branches=DB.find_branches(pattern)
+  branches.each{ |b| Dev::Cmd::Build.build(b) }
+end
+
+def work(args)
+  pattern=get_pattern(args,1)
+  branches=DB.find_branches(pattern)
+  branches.each{ |b| Dev::Cmd::Build.work(b) }
+end
+
+list(ARGV) if(ARGV.count > 0 && ARGV[0]=="list")
+status(ARGV) if(ARGV.count > 0 && ARGV[0]=="status")
+build(ARGV) if(ARGV.count > 0 && ARGV[0]=="build")
+work(ARGV) if(ARGV.count > 0 && ARGV[0]=="work")
+usage(ARGV) if(ARGV.count==0 || ARGV[0]=="help")
+

data/lib/dev/Commands.rb

@@ -1,4 +1,4 @@
-["Compile","Replace","Setup","Test","Commit","Info","Update","Pull"].each{ |f| require_relative("cmd/#{f}.rb") }
+["Compile","Replace","Setup","Test","Commit","Info","Update","Pull","Build"].each{ |f| require_relative("cmd/#{f}.rb") }
 
 module Dev
 class Commands < Hash

data/lib/dev/Database.rb

@@ -29,17 +29,72 @@ class Database
     table_names=Dev::Database.get_table_names(filename)
 	@db = SQLite3::Database.new filename
 	@db.execute("create table Branches(Name text,Uri text,UNIQUE(Name));") if !table_names.include? "Branches"
+
+	columns=""
+	[:uri,:revision,:dir,:user,:machine,:ruby_version,:ruby_platform,:cmd,:status,:start_time,:end_time,:elapsed,:timeout,:timed_out,:output,:error].each { |s|
+	  columns="#{columns}," if columns.length > 0
+	  columns="#{columns}#{s.to_s} text"
+	}
+	@db.execute("create table Results(#{columns});") if ! table_names.include? "Results"
   end
 
   def set_branch_uri(name,uri)
     @db.execute("insert or replace into Branches (Name,Uri) VALUES ('#{name}','#{uri}');")
   end
 
-  def get_branch_uri(name,uri)
+  def add_result(h)
+    columns=""
+	values=""
+	[:uri,:revision,:dir,:user,:machine,:ruby_version,:ruby_platform,:cmd,:status,:start_time,:end_time,:elapsed,:timeout,:timed_out,:output,:error].each { |s|
+	  sval=""
+	  sval=h[s].to_s if h.has_key?(s)
+	  sval.gsub("'","''")	# need to escape single quotes for sqlite
+	  columns="#{columns}," if columns.length > 0
+	  values="#{values}," if values.length > 0
+	  columns="#{columns}#{s.to_s}"
+	  values="#{values}'#{sval}'"
+	}
+	#puts "insert or replace into Results (#{columns}) VALUES (#{values});"
+	@db.execute("insert or replace into Results (#{columns}) VALUES (#{values});")
+  end
+
+  def get_results(where_hash)
+    array=Array.new
+    where=""
+	where_hash.each{ |k,v|
+	  sval=v.to_s
+	  sval.gsub("'","''")	# need to escape single quotes for sqlite
+	  where="#{where} AND " if where.length > 0
+	  where="#{where}#{k.to_s}='#{sval}'"
+	}
+    
+	columns=""
+	[:uri,:revision,:dir,:user,:machine,:ruby_version,:ruby_platform,:cmd,:status,:start_time,:end_time,:elapsed,:timeout,:timed_out,:output,:error].each { |s|
+	  columns="#{columns}," if columns.length > 0
+	  columns="#{columns}#{s.to_s}"
+	}
+
+	
+	@db.execute("select #{columns} from Results where #{where};") do |row|
+	  h=Hash.new
+	  index = 0
+	  [:uri,:revision,:dir,:user,:machine,:ruby_version,:ruby_platform,:cmd,:status,:start_time,:end_time,:elapsed,:timeout,:timed_out,:output,:error].each { |s|
+	    #puts "row[#{index}].to_s=#{row[index].to_s}"
+	    h[s]=row[index].to_s
+	    index=index+1
+	  }
+	  array << h if !h.empty?
+	end
+	  
+	return array
+  end
+
+  def get_branch_uri(name)
+    uri=""
     @db.execute("select Uri from Branches where Name='#{name}';") do |row|
-	  return row[0]
+	  uri=eval(row[0].to_s)[0]
 	end
-	return ""
+	return uri
   end
 
   def find_branches(pattern)
@@ -47,7 +102,7 @@ class Database
 	sql="select Name from Branches where Name LIKE '#{pattern}';"
 	sql="select Name from Branches;" if pattern.nil? || pattern.length==0
 	@db.execute(sql) do |row|
-	  names << row[0]
+	  names << row[0] if(row[0].length > 0)
 	end
 	return names
   end

data/lib/dev/SystemCall.rb

@@ -7,7 +7,7 @@ require 'systemu'
 module Dev
 
 class SystemCall
-  attr_accessor :output,:error,:status,:command,:start_time,:end_time,:timed_out,:dir,:cache, :capture_output, :capture_error
+  attr_accessor :output,:error,:status,:command,:start_time,:end_time,:timeout,:timed_out,:dir,:cache, :capture_output, :capture_error
 
   def initialize(cmd)
     if(cmd.kind_of?(Hash))
@@ -41,7 +41,9 @@ class SystemCall
     hash[:status]=@status
     hash[:start_time]=@start_time
     hash[:end_time]=@end_time
-    hash[:timed_out]=@timed_out
+	hash[:elapsed]=elapsed.to_s
+	hash[:time_out]=@time_out
+    hash[:timeout]=@timeout
     hash[:cache]=@cache
     hash[:capture_output]=@capture_output
     hash[:capture_error]=@capture_error
@@ -56,6 +58,7 @@ class SystemCall
     @status=hash[:status] unless hash[:status].nil?
     @start_time=hash[:start_time] unless hash[:start_time].nil?
     @end_time=hash[:end_time] unless hash[:end_time].nil?
+	@time_out=hash[:timeout] unless hash[:timeout].nil?
     @timed_out=hash[:timed_out] unless hash[:timed_out].nil?
     @cache=hash[:cache] unless hash[:cache].nil?
     @capture_output=hash[:capture_output] unless hash[:capture_output].nil?
@@ -174,6 +177,22 @@ class SystemCall
       puts summary
     end
   end
+
+  def self.puts_hash_summary(h)
+    if(h[:status] != 0 && h[:status] != "0")
+      summary =  "  [".foreground(:cyan) + "X".foreground(:red).bright + "]".foreground(:cyan) + " " + h[:cmd].foreground(:green) + " has exit status of " + h[:status].to_s
+      summary += " dir: " + h[:dir] unless h[:dir].nil?
+      puts summary
+      puts h[:output] if !h[:output].nil?
+      warn h[:error] if !h[:error].nil?
+      throw "exit status was " + h[:status].to_s
+    else
+      elapsed_str="[" + "%.0f" %(h[:elapsed]) + "s]"
+      summary = "  [".foreground(:cyan) + "+".foreground(:green) + "]".foreground(:cyan) + " " + h[:cmd].foreground(:green) + " " + elapsed_str.foreground(:cyan) 
+      summary += " dir: " + h[:dir] unless h[:dir].nil?
+      puts summary
+    end
+  end
  
 end # class SystemCall
 

data/lib/dev/Tasks.rb

@@ -21,20 +21,25 @@ CLOBBER.include('bin','obj')
 def generate_task_hash(project)
   task_hash = { 
     :info=> { :desc=> 'display information about the rakefile' },
-    :test=> { :desc=> 'run unit tests' },
+    #:test=> { :desc=> 'run unit tests' },
     :loc=> { :desc=> 'count the lines of code' },
-    :setup=> { :desc=> 'setup the project environment' },
+    #:setup=> { :desc=> 'setup the project environment' },
     :pull=> { :desc=> 'rake working copies of dependencies' },
     :check=> { :desc=> 'checks if the project default task may be skipped' }
   }
+  if(!project[:setup].nil? && project[:setup].length > 0)
+    task_hash[:setup]={ :desc=> 'setup the project environment' }
+  end
+
   if(project[:scm_type]=="svn" || project[:scm_type]=="git")
     task_hash[:add]   ={ :desc=> 'add files defined by src_glob to source code management' }
 	task_hash[:commit]={ :desc=> 'commit changes to source code management' }
 	task_hash[:update]={ :desc=> 'updates changes from source code management' }
   end
   
-  task_hash[:compile] = { :desc=> 'compile source code' } if CMD.has_key?(:compile) || project.has_key?(:compile)
-  task_hash[:replace] = { :desc=> 'replace text' } if CMD.has_key?(:replace)
+  task_hash[:compile] = { :desc=> 'compile source code' } if CMD.has_key?(:compile) && CMD[:compile].length > 0 #project.has_key?(:compile) && project[:compile].length > 0
+  task_hash[:replace] = { :desc=> 'replace text' } if CMD.has_key?(:replace) && CMD[:replace].length > 0
+  task_hash[:test]={:desc=>'run unit tests'} if CMD.has_key?(:test) && CMD[:test].length > 0
  
   if project[:type]=="gem" || project[:type]=="ruby"
     task_hash[:features] = { :desc=> 'tests cucumber features' }
@@ -64,13 +69,14 @@ def generate_tasks(project)
     Rake.application.instance_variable_get('@tasks').delete('default')
 	task_list=""
 	["check","add","setup","replace","compile","post_compile","test","commit","update"].each {|t|
-		if(hash.has_key?(t.to_sym) || task_exists?(t) || CMD.has_key?(t.to_sym) )
+		if(hash.has_key?(t.to_sym) || task_exists?(t) || (CMD.has_key?(t.to_sym) && CMD[t.to_sym].count > 0) )
 			task_list = "#{task_list}," if task_list.length > 0
 			task_list = "#{task_list} :#{t}"
 			default_code = "#{default_code} :#{t},"
 		end
 	}
-	eval("task :default => [#{task_list}] do; task_start('default'); end")
+	desc="desc '#{task_list}'".gsub(' ',"").gsub(':',"")
+	eval("#{desc}; task :default => [#{task_list}] do; task_start('default'); end")
   end
 end
 

data/lib/dev/cmd/Build.rb

@@ -0,0 +1,105 @@
+module Dev
+module Cmd
+class Build
+
+  def self.build(branch)
+    db=Dev::Database.new
+
+    puts " "
+    puts "building branch " + branch.foreground(:green)
+	h=Dev::Cmd::Build.get_branch_hash(branch)
+    Hash.print_hash("",h)
+
+	# does a result already exist?
+	results=db.get_results({:uri=>"#{h[:uri]}", :revision=>"#{h[:revision]}", :user=>"#{h[:user]}", :machine=>"#{h[:machine]}"})
+
+	result=results[0] if !results.empty?
+	if(results.empty?)
+	  result=h
+
+	  # export to local directory
+	  FileUtils.mkdir("#{Dev::Enviroment.dev_root}/exp") if !File.exists?("#{Dev::Environment.dev_root}/exp")
+	  FileUtils.rm_r(h[:dir]) if File.exists? h[:dir]
+	  Dev::Commands.execute_cmd("svn export #{h[:uri]}@#{h[:revision]} #{h[:dir]}")
+
+	  # rake in local directory
+	  call=Dev::SystemCall.new({:cmd=>'rake default',:dir=>h[:dir],:capture_output=>true,:capture_error=>true})
+	  call.puts_summary
+
+	  ch=call.get_hash
+	  [:cmd,:status,:start_time,:end_time,:elapsed,:timeout,:timed_out,:output,:error].each{ |k| h[k]=ch[k]; }
+
+	  # store results to database
+	
+	  db.add_result(result)
+	end
+
+	puts "results hash:"
+	puts " "
+	Hash.print_hash("",result)
+
+	Dev::SystemCall.puts_hash_summary(result)
+
+	return 0
+  end
+
+  def self.status(branch)
+    db=Dev::Database.new
+    #puts "status of branch " + branch.foreground(:green) + "@#{h[:revision]}"
+	h=Dev::Cmd::Build.get_branch_hash(branch)
+	puts "status of branch " + branch.foreground(:green) + "@#{h[:revision]}"
+    #Hash.print_hash("",h)
+
+	# do any results exist for latest revision?
+	results=db.get_results({:uri=>"#{h[:uri]}", :revision=>"#{h[:revision]}"})
+
+	puts "  no results" if results.empty?
+
+	fail="  [".foreground(:cyan) + "X".foreground(:red).bright + "]".foreground(:cyan)
+	pass="  [".foreground(:cyan) + "+".foreground(:green) + "]".foreground(:cyan)
+	results.each{ |r|
+	  status=pass
+	  status=fail if r[:status] != 0 && r[:status] != "0"
+	  elapsed="[" + "%.0f" %(r[:elapsed]) + "s]".foreground(:cyan)
+	  context="#{r[:user]}@#{r[:machine]}".foreground(:green)
+	  puts "#{status} #{context} #{elapsed} #{r[:end_time]}"
+	}
+  end
+
+  def self.work(branch)
+    db=Dev::Database.new
+
+    puts " "
+    puts "working on branch " + branch.foreground(:green)
+	h=Dev::Cmd::Build.get_branch_hash(branch)
+	h[:dir]="#{Dev::Environment.dev_root}/wrk/#{branch}"
+    #Hash.print_hash("",h)
+
+	# export to local directory
+	FileUtils.mkdir("#{Dev::Enviroment.dev_root}/wrk") if !File.exists?("#{Dev::Environment.dev_root}/wrk")
+	Dev::Commands.execute_cmd("svn co #{h[:uri]} #{h[:dir]}") if !File.exists? h[:dir]
+
+	# rake in local directory
+	call=Dev::SystemCall.new({:cmd=>'rake default',:dir=>h[:dir],:capture_output=>true,:capture_error=>true})
+	puts "------------------------------------------------------------".foreground(:green)
+	call.puts_summary
+	puts "------------------------------------------------------------".foreground(:green)
+
+  end
+
+  def self.get_branch_hash(branch)
+    db=Dev::Database.new
+    h=Hash.new
+	h[:uri]=db.get_branch_uri(branch)
+	h[:revision]=Dev::Svn.last_changed_revision(h[:uri])
+	h[:dir]="#{Dev::Environment.dev_root}/exp/#{branch}-#{h[:revision]}"
+	h[:user]="#{Dev::Environment.user}"
+	h[:machine]="#{Dev::Environment.machine}"
+	h[:ruby_version]=RUBY_VERSION
+	h[:ruby_platform]=RUBY_PLATFORM
+	return h
+  end
+
+end # class Setup
+end # module Cmd
+end # module Dev

data/lib/dev/cmd/Compile.rb

@@ -19,7 +19,7 @@ class Compile < Array
 	  platforms=Dev::Cmd::Compile.extract_platforms(csproj)
 	  platforms.each { |platform|
 	    skip=(!RUBY_PLATFORM.include?("w32") && platform=="x64")
-	    array << "{:cmd=> '#{csbuild} #{csproj} /property:Configuration=Release /property:Platform=\"#{platform}\" /p:OutputPath=./bin/#{platform}/Release', :auto=>true}" if !skip
+	    self << "{:cmd=> '#{csbuild} #{csproj} /property:Configuration=Release /property:Platform=\"#{platform}\" /p:OutputPath=./bin/#{platform}/Release', :auto=>true}" if !skip
 	  }
 	}
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.147
+  version: 1.0.148
   prerelease: 
 platform: ruby
 authors:
@@ -166,6 +166,7 @@ files:
 - README
 - lib/dev/Array.rb
 - lib/dev/BoostBuild.rb
+- lib/dev/cmd/Build.rb
 - lib/dev/cmd/Commit.rb
 - lib/dev/cmd/Compile.rb
 - lib/dev/cmd/Info.rb
@@ -209,7 +210,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: dev
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: dev