dev 1.0.21 → 1.0.22

data/lib/dev.rb

@@ -1,6 +1,12 @@
 require 'rubygems'
 #require 'bundler/setup'
-require 'rainbow'
+
+begin
+ require 'rainbow'
+rescue
+ puts "require 'rainbow' threw an exception"
+end
+
 require 'semver'
 
 # if DEV_DEBUG is defined, puts_debug will send message to the console

data/lib/dev/Dep.rb

@@ -75,11 +75,13 @@ class Dep < Hash
     array = Array.new
     if(File.exists?(get_wrk_dir))
       unless self[:rake].nil?
-        array << "{cmd: 'rake pull', dir: '#{get_wrk_dir}', capture_output: false}"
+        array << "{cmd: 'rake pull', dir: '#{get_wrk_dir}'}"
+        #array << "{cmd: 'rake pull', dir: '#{get_wrk_dir}', capture_output: false}"
         #array << "{cmd: 'rake #{self.get_value("rake").to_s}', dir: '#{get_wrk_dir}'}"
         rakefile="#{get_wrk_dir}/rakefile.rb"
         array << "<%Dev::Svn::update_revision_variables('#{rakefile}')%>"
-        array << "{cmd: 'rake #{self.get_value("rake").to_s}', dir: '#{get_wrk_dir}', capture_output: false}"
+        array << "{cmd: 'rake #{self.get_value("rake").to_s}', dir: '#{get_wrk_dir}'}"
+        #array << "{cmd: 'rake #{self.get_value("rake").to_s}', dir: '#{get_wrk_dir}', capture_output: false}"
       end
     end
     

data/lib/dev/Project.rb

@@ -79,13 +79,30 @@ class Project < Hash
   end
  
   def check
-    if !has_diff and File.exists?("default.taskstamp") 
-      puts "  no differences detected."
-      puts "  default.taskstamp exists."
+    puts "  default.taskstamp exists." if File.exists?("default.taskstamp") 
+    puts "  default.taskstamp does not exist" unless File.exists?("default.taskstamp")
+    
+    begin
+     hasdiff = has_diff
+    rescue
+      puts "has_diff threw an exception."
+    end
+    
+    puts "  no differences detected." unless hasdiff
+    puts "  detected differences." if hasdiff
+    
+    if File.exists?("default.taskstamp") && !hasdiff
+      puts "  nothing to do"
       exit
     end
-    puts "  detected differences" if has_diff
-    puts "  default.taskstamp does not exist" unless File.exists?("default.taskstamp")
+    
+    #if !has_diff and File.exists?("default.taskstamp") 
+    #  puts "  no differences detected."
+    #  puts "  default.taskstamp exists."
+    #  exit
+    #end
+    #puts "  detected differences" if has_diff
+    #puts "  default.taskstamp does not exist" unless File.exists?("default.taskstamp")
   end
   
   def stamp_task(name)
@@ -135,8 +152,15 @@ class Project < Hash
   
   def has_diff
     call=nil
-    call=Dev::SystemCall.new('git diff') if File.exists?(".git")
+    call=Dev::SystemCall.new('git diff --name-only') if File.exists?(".git")
     call=Dev::SystemCall.new('svn diff') if File.exists?(".svn")
+    #if File.exists?(".svn")
+    #  puts_debug "calling svn diff"
+    #  #call=Dev::SystemCall.new('svn diff') 
+    #  call=Dev::SystemCall.new("{ cmd: 'svn diff', capture_error: false}")
+    #  puts_debug "  svn diff status = " + call.status.to_s
+    #end
+    #call=Dev::SystemCall.new("{ cmd: 'svn diff', capture_output: false}") if File.exists?(".svn")
     unless call.nil? || call.output.length==0
       return true  # differences detected
     else
@@ -237,7 +261,8 @@ class Project < Hash
     
     array=Array.new
     if(key=="setup")
-      array << "bundle install" if File.exists?("Gemfile")
+      #array << "bundle install" if File.exists?("Gemfile")
+      array << "{ cmd: 'bundle install', capture_output: false}" if File.exists?("Gemfile")
       
       # dep,svn directives
       dep_hash=self.get_value("dep")
@@ -267,7 +292,10 @@ class Project < Hash
       end
     end
     if(key=="compile")
-      Dir.glob("*.gemspec").each { |gs| array << "gem build #{gs}" } if self[:type]=="gem"
+      Dir.glob("*.gemspec").each { |gs| 
+        #array << "gem build #{gs}" 
+        array << "{ cmd: 'gem build #{gs}', capture_output: false}"
+      } if self[:type]=="gem"
       
       if self[:type]=="C#"
         if(!has_key?(:x86_release_compile_flags))
@@ -279,7 +307,8 @@ class Project < Hash
     if(key=="test")
 
       Dir.glob("*.gemspec").each { |gs| 
-        array << "{cmd: 'gem install ./#{gs.gsub('.gemspec','')}-#{self[:version]}.gem', capture_output: false}"
+        #array << "{cmd: 'gem install ./#{gs.gsub('.gemspec','')}-#{self[:version]}.gem', capture_output: false}"
+        array << "{cmd: 'gem install #{gs.gsub('.gemspec','')}-#{self[:version]}.gem', capture_output: false}"
         #array << "gem install ./#{gs.gsub('.gemspec','')}-#{self[:version]}.gem" 
       } if self[:type]=="gem"
       
@@ -295,7 +324,7 @@ class Project < Hash
     end
     if(key=="has_diff")
       array << 'git diff' if File.exists?(".git")
-      array << 'svn diff' if File.exists?(".svn")
+      array << "{ cmd: 'svn diff', capture_output: false}" if File.exists?(".svn")
     end
     if(key=="commit")
       array << 'git commit -a -m "rake commit all"' if File.exists?(".git")

data/lib/dev/SystemCall.rb

@@ -7,13 +7,15 @@ require 'systemu'
 module Dev
 
 class SystemCall
-  attr_accessor :output,:error,:status,:command,:start_time,:end_time,:timed_out,:dir,:cache, :capture_output
+  attr_accessor :output,:error,:status,:command,:start_time,:end_time,:timed_out,:dir,:cache, :capture_output, :capture_error
 
   def initialize(cmd)
     if(cmd.kind_of?(Hash))
       set_hash(cmd)
     else
-      @command=cmd
+      hash=Dev::Environment.s_to_hash(cmd)
+      set_hash(hash) unless hash.nil?
+      @command=cmd if hash.nil?
     end
     execute(@command);
   end
@@ -42,6 +44,7 @@ class SystemCall
     hash[:timed_out]=@timed_out
     hash[:cache]=@cache
     hash[:capture_output]=@capture_output
+    hash[:capture_error]=@capture_error
     return hash
   end
   
@@ -56,6 +59,7 @@ class SystemCall
     @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?
+    @capture_error=hash[:capture_error] unless hash[:capture_error].nil?
   end
   
   def write_cache
@@ -73,74 +77,109 @@ class SystemCall
   end
   
   def execute(cmd) 
-    
     if !@cache.nil? && has_cache
       load_cache
       return
     end
-    puts_debug "SystemCall.execute"
-    puts_debug "  " + @command
+
+    pwd=Dir.pwd
     @start_time=Time.now
-    filename=Dir.tmpdir + "/" + (0...8).map{65.+(rand(25)).chr}.join
     begin
-        if(@dir.nil?)
-          puts_debug "capture_output is nil" if @capture_output.nil?
-          if(@capture_output.nil?)
-            if(!@outfile.nil?)
-              system("#{@command} > #{outfile}")
-            else
-              puts_debug "  executing: #{@command} >>#{filename}.out 2>>#{filename}.err"
-              system("#{@command} >>#{filename}.out 2>>#{filename}.err")
-            end
-          else
-            puts_debug "not capturing output...."
-            system(@command)
-            #system("logcmd #{filename} #{@command}")
-            #status,@output,@error=systemu(@command)
-          end
-        else
-          puts_debug "  changing directory to " + dir
-          Dir.chdir(dir) do
-            if(@capture_output.nil?)
-              if(!@outfile.nil?)
-                system("#{@command} > #{outfile}")
-              else
-                system("#{@command} >#{filename}.out 2>#{filename}.err")
-              end
-            else
-              #system("logcmd #{filename} #{@command}")
-              system(@command)
-            end
-          end
-        end
-        puts_debug "  command execution completed"
-        if(File.exist?("#{filename}.out"))
-          File.open("#{filename}.out",'r') {|f|
-	        @output = f.read
-	        f.close
-          }
-        end
-        if(File.exist?("#{filename}.err"))
-          File.open("#{filename}.err",'r') {|f|
-	        @error = f.read
-	        f.close
-          }
-        end
-        @status=$?.exitstatus 
+        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"
+        @status,@output,@error=system2(@dir,@command,@capture_output,@capture_error)
         @end_time=Time.now
     rescue
         puts "error executing ruby code"
+        @status="1"
+        @end_time=Time.now
     ensure
+        Dir.chdir(pwd) if Dir.pwd != pwd
         write_cache if !@cache.nil?
-        begin
-         File.delete("#{filename}.out") if File.exists?("#{filename}.out")
-         File.delete("#{filename}.err") if File.exists?("#{filename}.err")
-        rescue
-         puts "temp directory file was not cleaned up."
+    end
+  end
+  
+  def system2(working_dir,command,capture_output,capture_error)
+    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
+    working_dir = Dir.pwd if working_dir.nil? || working_dir.empty?
+    status=0
+    output=""
+    error=""
+    puts_debug "  Dir.chdir(" + working_dir + ")"
+    Dir.chdir(working_dir) do
+      if(capture_output)
+        if(capture_error)
+          system("#{@command} >#{filename}.out 2>#{filename}.err")
+        else
+          system("#{@command} >#{filename}.out")
+        end
+      else
+        if(capture_error)
+          system("#{@command} 2>#{filename}.err")
+        else
+          system(@command)
         end
+      end
     end
+      
+    if(File.exist?("#{filename}.out"))
+      File.open("#{filename}.out",'r') {|f|
+	    output = f.read
+	    f.close
+      }
+    end
+    if(File.exist?("#{filename}.err"))
+      File.open("#{filename}.err",'r') {|f|
+	    error = f.read
+	    f.close
+      }
+    end
+    status=$?.exitstatus 
+      
+    puts_debug("status = " + status.to_s)
+    return status,output,error
   end
   
+  def system3(working_dir,command,capture_output,capture_error)
+    puts_debug "system3(" + working_dir.to_s + "," + command + ")"
+    status = 0
+    output = ""
+    error = ""
+    working_dir = Dir.pwd if working_dir.nil? || working_dir.empty?
+    puts_debug "  Dir.chdir(" + working_dir + ")"
+    Dir.chdir(working_dir) do
+      if(capture_output && capture_error)
+        puts_debug "  calling status,output,error=systemu(" + command + ")"
+        status,output,error=systemu(command)
+      else
+        error=""
+        if(capture_error)
+          puts_debug "  calling system(" + command + ")"
+          system(command)
+          status=$?.exitstatus 
+          output=""
+        else
+          puts_debug "  calling output=`#{command}`"
+          output=`#{command}`
+          status=$?.exitstatus 
+        end
+      end
+    end
+    
+    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) + " system(\"" + @command.foreground(:green) + "\") has exit status of " + @status.to_s

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.21
+  version: 1.0.22
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &23963196 !ruby/object:Gem::Requirement
+  requirement: &24130800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23963196
+  version_requirements: *24130800
 - !ruby/object:Gem::Dependency
   name: semver
-  requirement: &23962308 !ruby/object:Gem::Requirement
+  requirement: &24130092 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23962308
+  version_requirements: *24130092
 - !ruby/object:Gem::Dependency
   name: countloc
-  requirement: &23961900 !ruby/object:Gem::Requirement
+  requirement: &24129216 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,51 +43,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *23961900
-- !ruby/object:Gem::Dependency
-  name: rainbow
-  requirement: &23961060 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: *23961060
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &23960604 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *23960604
-- !ruby/object:Gem::Dependency
-  name: cucumber
-  requirement: &23960196 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *23960196
-- !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &23959764 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *23959764
+  version_requirements: *24129216
 description: development tasks
 email: lou.parslow@gmail.com
 executables: