dev 1.0.100 → 1.0.101

data/lib/dev/Project.rb

@@ -31,7 +31,7 @@ class Project < Hash
   def execute_cmd(c)
     # expand the command here....
     command=expand_command(c)
-    puts_debug "command: " + command.to_s
+    puts_debug "command: " + command.to_s + " (in Project.execute_cmd)"
     if c.include?('<%') && c.include?('%>')
       #puts "Command: " + c
       eval(c.gsub("<%","").gsub("%>",""))
@@ -111,7 +111,8 @@ class Project < Hash
   def loc_total
     # parse the output for TOTAL LOC
     call=Dev::SystemCall.new(loc_cmd)
-    words=call.output.split
+    words=Array.new
+	words=call.output.split if !call.nil? && !call.output.nil?
     if(words.length>6)
       return words[words.length-6]
     end

data/lib/dev/SystemCall.rb

@@ -90,10 +90,12 @@ class SystemCall
         capture_error=true if capture_error.nil?
         capture_error=false unless capture_output
         capture_error=false if capture_error == "false"
+		puts_debug "system2('#{@dir}','#{@command}',#{@capture_output.to_s},#{@capture_error.to_s})  (in SystemCall.execute)"
         @status,@output,@error=system2(@dir,@command,@capture_output,@capture_error)
+		puts_debug "system2 call complete"
         @end_time=Time.now
     rescue
-        puts "error executing ruby code"
+        puts "error executing ruby code: #{@command}" 
         @status="1"
         @end_time=Time.now
     ensure
@@ -103,6 +105,7 @@ 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?
@@ -111,11 +114,13 @@ class SystemCall
         
     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}"
     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 + ")"
+    #puts_debug "  Dir.chdir(" + working_dir + ")"
     Dir.chdir(working_dir) do
       if(capture_output)
         if(capture_error)
@@ -146,7 +151,7 @@ class SystemCall
     end
     status=$?.exitstatus 
       
-    puts_debug("status = " + status.to_s)
+    puts_debug "status = " + status.to_s
     return status,output,error
   end
   

data/lib/dev/Tasks.rb

@@ -43,7 +43,7 @@ def generate_tasks(project)
       desc=v[:desc] if v.has_key?(:desc)
       ruby="task :#{name} do; task_start '#{name}'; PROJECT.#{name}; end"
       ruby="desc '#{desc}'; " + ruby unless desc.nil? 
-      unless task_defined(name)
+      unless Rake::Task.task_defined?(name)
         puts_debug "defining task " + name
         eval(ruby)
       end

data/lib/dev.rb

@@ -33,6 +33,13 @@ def puts_debug msg
   end
 end
 
+# if DEV_DEBUG_VERBOSE is defined, puts_debug_verbose will send message to the console
+def puts_debug_verbose msg
+  if(defined?(DEV_DEBUG_VERBOSE))
+    puts msg
+  end
+end
+
 puts_debug "read " + __FILE__.foreground(:green)
 
 require "#{File.dirname(__FILE__)}/dev/Environment.rb"

metadata

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