dev 1.0.148 → 1.0.149

data/lib/dev/Array.rb

@@ -2,7 +2,6 @@ class Array
   # remove all auto generated entries
   def strip_auto_entries
     keep=Array.new
-    puts_debug "Array.strip_auto_entries"
 	self.each { |e| 
 	 if(!e.nil?)
 	   h=nil

data/lib/dev/Commands.rb

@@ -1,4 +1,4 @@
-["Compile","Replace","Setup","Test","Commit","Info","Update","Pull","Build"].each{ |f| require_relative("cmd/#{f}.rb") }
+["Clean","Compile","Replace","Setup","Test","Commit","Info","Update","Pull","Build"].each{ |f| require_relative("cmd/#{f}.rb") }
 
 module Dev
 class Commands < Hash
@@ -51,6 +51,9 @@ class Commands < Hash
 	end
   end
   
+  def execute(c)
+    Dev::Commands::execute_cmd(c)
+  end
   def self.execute_cmd(c)
     # expand the command here....
     command=Dev::Environment.expand_command(c)
@@ -73,10 +76,6 @@ class Commands < Hash
     end
   end
 
-  
-
-  
-
   def add
     unless DEV[:src_glob].nil?
       scm = Dev::Scm.new

data/lib/dev/Deps.rb

@@ -1,7 +1,7 @@
 module Dev
 class Deps < Hash
   def refresh
-    puts_debug "Dev::Project.refresh"
+    puts_debug "Dev::Deps.refresh"
     self.each{ |k,v|
 	  if !v.nil? && v.kind_of?(Hash)
 	    v[:dir]=get_dir(v) if !v.has_key?(:dir)

data/lib/dev/Project.rb

@@ -129,5 +129,5 @@ end
 end # module Dev
 
 DEV=Dev::Project.new#(nil,true)
-DEV.refresh
+#DEV.refresh
 PROJECT=DEV

data/lib/dev/SystemCall.rb

@@ -145,12 +145,14 @@ class SystemCall
 	    output = f.read
 	    f.close
       }
+	  FileUtils.rm("#{filename}.out")
     end
     if(File.exist?("#{filename}.err"))
       File.open("#{filename}.err",'r') {|f|
 	    error = f.read
 	    f.close
       }
+	  FileUtils.rm("#{filename}.err")
     end
     status=$?.exitstatus 
       

data/lib/dev/Tasks.rb

@@ -11,7 +11,11 @@ def task_start(task_name)
   puts "[:#{task_name}]".foreground(:yellow).bright + " " + Dir.pwd
 end
 
-task :clean do; task_start "clean"; end
+task :clean do; 
+  task_start "clean"; 
+  puts "  cleaning tmp dir (max 30 seconds)"
+  Dev::Cmd::Clean.clean_tmp
+ end
 task :clobber do; task_start "clobber"; end
 
 require 'rake/clean'
@@ -27,7 +31,7 @@ def generate_task_hash(project)
     :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)
+  if(!CMD[:setup].nil? && CMD[:setup].length > 0)
     task_hash[:setup]={ :desc=> 'setup the project environment' }
   end
 

data/lib/dev/cmd/Clean.rb

@@ -0,0 +1,26 @@
+require 'timeout'
+require 'tmpdir'
+
+module Dev
+module Cmd
+class Clean
+  def self.clean_tmp
+	puts_debug "Dev::Cmd::Clean.clean_temp"
+	begin
+      status=Timeout::timeout(30){
+	    puts_debug "tmp dir=#{Dir.tmpdir}"
+	    if File.exists?(Dir.tmpdir)
+	      #if RUBY_PLATFORM.include?("w32")
+	      #  cmd="del /Q #{Dir.tmpdir.gsub('/','\\')}"
+		  #  puts_debug cmd
+	      #  `#{cmd}` if RUBY_PLATFORM.include?("w32")
+	      #end
+		end
+	  }
+	rescue
+	  puts_debug "timeout met."
+	end
+  end
+end	# class Compile
+end # module Cmd
+end # module Dev

data/lib/dev/cmd/Replace.rb

@@ -12,12 +12,19 @@ class Replace < Hash
 	if File.exists?(".svn") || File.exists?(".git")
 	  ["vcxproj","csproj"].each { |ext|
 	    if(Dir.glob("**/*.#{ext}").count > 0)
+		  puts_debug "Dev::Cmd::Replace.refresh found file with extension #{ext}"
+		  puts_debug "dep_hash nil" if dep_hash.nil?
+		  puts_debug "dep_hash is empty" if dep_hash.empty?
 		  dep_hash.each{ |k,v|
+		    puts_debug "Dev::Cmd::Replace.refresh found dep of key #{k.to_s}"
 		    if !v.nil? && v.kind_of?(Hash) && v.has_key?(:rev) && v.has_key?(:dir) && !has_key?(k)
+			  puts_debug "adding key #{k.to_s}"
 			  group=v[:dir].split('/')[0]
 			  searchRegex=Regexp.new "#{group}\\\\#{k}\\\\[\\d]+"
 			  self[k]={ glob: "**/*.#{ext}", search: searchRegex, replace: "#{group}\\#{k}\\#{v[:rev]}", auto: true }
 			  #self[k][:auto]=true
+			else
+			  puts_debug "skipping key #{k.to_s}"
 			end
 		  }
 		end

data/lib/dev/cmd/Test.rb

@@ -10,7 +10,7 @@ class Test < Array
 	end
       
 	Dir.glob("*.gemspec").each { |gs| 
-	  self << "{:cmd=>'gem install ./#{gs.gsub('.gemspec','')}-#{DEV[:version]}.gem', :capture_output=>true, :auto=>true}"
+	  self << "{:cmd=>'gem install #{gs.gsub('.gemspec','')}-#{DEV[:version]}.gem', :capture_output=>true, :auto=>true}"
     } 
 
     Dir.glob("*.{Test.csproj,Features.csproj}").each { |cs|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.148
+  version: 1.0.149
   prerelease: 
 platform: ruby
 authors:
@@ -167,6 +167,7 @@ files:
 - lib/dev/Array.rb
 - lib/dev/BoostBuild.rb
 - lib/dev/cmd/Build.rb
+- lib/dev/cmd/Clean.rb
 - lib/dev/cmd/Commit.rb
 - lib/dev/cmd/Compile.rb
 - lib/dev/cmd/Info.rb