dev 1.0.159 → 1.0.160

data/lib/dev/SystemCall.rb

@@ -110,22 +110,22 @@ class SystemCall
   end
   
   def system2(working_dir,command,capture_output,capture_error)
-    #puts_debug "begin SystemCall.system2"
     capture_output=true if capture_output.nil?
     capture_output=false if capture_output == "false"
     capture_error=true if capture_error.nil?
     capture_error=false unless capture_output
     capture_error=false if capture_error == "false"
         
-    #puts_debug "system2(" + working_dir.to_s + "," + command + ") capture_output(" + capture_output.to_s + ") capture_error(" + capture_error.to_s + ")"
     filename=Dir.tmpdir + "/" + (0...8).map{65.+(rand(25)).chr}.join
-	#puts_debug "  filename=#{filename}"
+	filename=Dir.tmpdir + "/" + (0...8).map{65.+(rand(25)).chr}.join if File.exist? "#{filename}.out"
     working_dir = Dir.pwd if working_dir.nil? || working_dir.empty?
-	#puts_debug "  working_dir=#{working_dir}"
     status=0
     output=""
     error=""
-    #puts_debug "  Dir.chdir(" + working_dir + ")"
+
+	FileUtils.delete("#{filename}.out") if File.exist? "#{filename}.out"
+	FileUtils.delete("#{filename}.err") if File.exist? "#{filename}.err"
+
     Dir.chdir(working_dir) do
       if(capture_output)
         if(capture_error)
@@ -147,27 +147,35 @@ class SystemCall
 	    output = f.read
 	    f.close
       }
-	  FileUtils.rm("#{filename}.out")
+	  begin
+	    FileUtils.rm("#{filename}.out")
+	  rescue
+	    warn "unable to remove file #{filename}.out"
+	  end
     end
     if(File.exist?("#{filename}.err"))
       File.open("#{filename}.err",'r') {|f|
 	    error = f.read
 	    f.close
       }
-	  FileUtils.rm("#{filename}.err")
+	  begin
+	    FileUtils.rm("#{filename}.err")
+	  rescue
+	    warn "unable to remove file #{filename}.err"
+	  end
     end
+	
     status=$?.exitstatus 
-      
-    #puts_debug "status = " + status.to_s
     return status,output,error
   end
     
+
   def puts_summary
     if(@status != 0)
       summary =  "  [".foreground(:cyan) + "X".foreground(:red).bright + "]".foreground(:cyan) + " " + @command.foreground(:green) + " has exit status of " + @status.to_s
       summary += " dir: " + @dir unless @dir.nil?
       summary += " cache: true" unless @cache.nil?
-      summary += " capture_output: false" unless @capture_output.nil?
+      summary += " capture_output: false" unless @capture_output.nil? || @capture_output
       puts summary
       puts @output if !@output.nil?
       warn @error if !@error.nil?
@@ -177,7 +185,7 @@ class SystemCall
       summary = "  [".foreground(:cyan) + "+".foreground(:green) + "]".foreground(:cyan) + " " + @command.foreground(:green) + " " + elapsed_str.foreground(:cyan) 
       summary += " dir: " + @dir unless @dir.nil?
       summary += " cache: true" unless @cache.nil?
-      summary += " capture_output: false" unless @capture_output.nil?
+      summary += " capture_output: false" unless @capture_output.nil? || @capture_output
       puts summary
     end
   end

data/lib/dev/cmd/Clean.rb

@@ -10,11 +10,11 @@ class Clean
       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
+	      if RUBY_PLATFORM.include?("w32")
+	        cmd="del /Q #{Dir.tmpdir.gsub('/','\\')}"
+		    puts_debug cmd
+	        `#{cmd}` if RUBY_PLATFORM.include?("w32")
+	      end
 		end
 	  }
 	rescue

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.159
+  version: 1.0.160
   prerelease: 
 platform: ruby
 authors: