dev 1.0.19 → 1.0.20

data/lib/dev/Dep.rb

@@ -62,8 +62,8 @@ class Dep < Hash
     array << "<%puts ' #{get_dep_dir} exists.' if File.exist?('#{get_dep_dir}')%>"
     
     unless self[:rake].nil?
-      array << "{cmd: 'rake #{self.get_value("rake").to_s}', dir: '#{get_dep_dir}', cache:'true'}" unless self.get_value("cache").nil?
-      array << "{cmd: 'rake #{self.get_value("rake").to_s}', dir: '#{get_dep_dir}'}" if self.get_value("cache").nil?
+      array << "{cmd: 'rake #{self.get_value("rake").to_s}', dir: '#{get_dep_dir}', cache:'true', capture_output: false}" unless self.get_value("cache").nil?
+      array << "{cmd: 'rake #{self.get_value("rake").to_s}', dir: '#{get_dep_dir}', capture_output: false}" if self.get_value("cache").nil?
     end
     
     return array
@@ -73,11 +73,11 @@ class Dep < Hash
     array = Array.new
     if(File.exists?(get_wrk_dir))
       unless self[:rake].nil?
-        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}'}"
+        array << "{cmd: 'rake #{self.get_value("rake").to_s}', dir: '#{get_wrk_dir}', capture_output: false}"
       end
     end
     

data/lib/dev/Project.rb

@@ -277,8 +277,12 @@ class Project < Hash
       Dir.glob("*.csproj").each{|cs|array<<"<paths,msbuild> #{cs} <x86_release_compile_flags>"}
     end
     if(key=="test")
-      #Dir.glob("*.gemspec").each { |gs| array << "gem uninstall #{gs.gsub('.gemspec','')} -v #{self[:version]}" } if self[:type]=="gem"
-      Dir.glob("*.gemspec").each { |gs| array << "gem install ./#{gs.gsub('.gemspec','')}-#{self[:version]}.gem" } if self[:type]=="gem"
+
+      Dir.glob("*.gemspec").each { |gs| 
+        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"
+      
       if self[:type]=="C#"
         Dir.glob("*.{Test.csproj,Features.csproj}").each { |cs|
           dll_name="bin/x86/Release/#{File.basename(cs,'.csproj')}.dll"

data/lib/dev/SystemCall.rb

@@ -1,17 +1,17 @@
 puts_debug "read " + __FILE__.foreground(:green)
 
 require 'tmpdir'
+require 'open3'
+require 'systemu'
 
 module Dev
 
 class SystemCall
-  attr_accessor :output,:error,:status,:command,:start_time,:end_time,:timed_out,:dir,:cache
+  attr_accessor :output,:error,:status,:command,:start_time,:end_time,:timed_out,:dir,:cache, :capture_output
 
   def initialize(cmd)
     if(cmd.kind_of?(Hash))
-      @command=cmd[:cmd]
-      @dir=cmd[:dir] unless cmd[:dir].nil?
-      @cache=cmd[:cache] unless[:cache].nil?
+      set_hash(cmd)
     else
       @command=cmd
     end
@@ -41,6 +41,7 @@ class SystemCall
     hash[:end_time]=@end_time
     hash[:timed_out]=@timed_out
     hash[:cache]=@cache
+    hash[:capture_output]=@capture_output
     return hash
   end
   
@@ -54,6 +55,7 @@ class SystemCall
     @end_time=hash[:end_time] unless hash[:end_time].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?
   end
   
   def write_cache
@@ -82,20 +84,34 @@ class SystemCall
     filename=Dir.tmpdir + "/" + (0...8).map{65.+(rand(25)).chr}.join
     begin
         if(@dir.nil?)
-          if(!@outfile.nil?)
-            system("#{@command} > #{outfile}")
+          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
-            system("#{@command} >#{filename}.out 2>#{filename}.err")
+            puts_debug "not capturing output...."
+            system(@command)
+            #status,@output,@error=systemu(@command)
           end
         else
+          puts_debug "  changing directory to " + dir
           Dir.chdir(dir) do
-            if(!@outfile.nil?)
-              system("#{@command} > #{outfile}")
+            if(@capture_output.nil?)
+              if(!@outfile.nil?)
+                system("#{@command} > #{outfile}")
+              else
+                system("#{@command} >#{filename}.out 2>#{filename}.err")
+              end
             else
-              system("#{@command} >#{filename}.out 2>#{filename}.err")
+              system(@command)
             end
           end
         end
+        puts_debug "  command execution completed"
         if(File.exist?("#{filename}.out"))
           File.open("#{filename}.out",'r') {|f|
 	        @output = f.read
@@ -128,6 +144,7 @@ class SystemCall
       summary =  "  [".foreground(:cyan) + "X".foreground(:red).bright + "]".foreground(:cyan) + " system(\"" + @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?
       puts summary
       puts @output if !@output.nil?
       warn @error if !@error.nil?
@@ -137,6 +154,7 @@ class SystemCall
       summary = "  [".foreground(:cyan) + "+".foreground(:green) + "]".foreground(:cyan) + " system(\"" + @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?
       puts summary
     end
   end

data/lib/dev/Tasks.rb

@@ -51,11 +51,11 @@ def generate_tasks(project)
 end
 
 if("#{RUBY_VERSION}"<="1.9.1")
-	task :setup do; puts "upgrade to ruby 1.9.3!" ; end
-	task :compile do; puts "upgrade to ruby 1.9.3!"; end
-	task :test do; puts "upgrade to ruby 1.9.3!"; end
-	task :commit do; puts "upgrade to ruby 1.9.3!"; end
-	task :replace do; puts "upgrade to ruby 1.9.3!"; end
-	task :loc do; puts "upgrade to ruby 1.9.3!"; end
-	task :setup do; puts "upgrade to ruby 1.9.3!"; end
+	task :setup do; task_start('setup'); PROJECT.setup; end
+	task :compile do; task_start('compile'); PROJECT.compile; end
+	task :test do; task_start('test'); PROJECT.test; end
+	task :commit do; task_start('commit'); PROJECT.commit; end
+	task :replace do;  task_start('replace'); PROJECT.replace; end
+	task :loc do; task_start('loc'); PROJECT.loc; end
+    task :info do; task_start('info'); PROJECT.info; end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.20
   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: &22132200 !ruby/object:Gem::Requirement
+  requirement: &24798144 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22132200
+  version_requirements: *24798144
 - !ruby/object:Gem::Dependency
   name: semver
-  requirement: &22131756 !ruby/object:Gem::Requirement
+  requirement: &24813108 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22131756
+  version_requirements: *24813108
 - !ruby/object:Gem::Dependency
   name: countloc
-  requirement: &22131048 !ruby/object:Gem::Requirement
+  requirement: &24808404 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22131048
+  version_requirements: *24808404
 - !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &22130232 !ruby/object:Gem::Requirement
+  requirement: &24820260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *22130232
+  version_requirements: *24820260
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &22129800 !ruby/object:Gem::Requirement
+  requirement: &24816312 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22129800
+  version_requirements: *24816312
 - !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &22129284 !ruby/object:Gem::Requirement
+  requirement: &24814488 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22129284
+  version_requirements: *24814488
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &22128720 !ruby/object:Gem::Requirement
+  requirement: &24828648 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,7 +87,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *22128720
+  version_requirements: *24828648
 description: development tasks
 email: lou.parslow@gmail.com
 executables: