dev 1.0.229 → 1.0.230

data/lib/dev/BoostBuild.rb

@@ -13,7 +13,10 @@ class BoostBuild
 	end
     return @@default_toolset if !@@default_toolset.nil? 
     begin
-      text=`b2 --debug-configuration` 
+	  text=''
+	  Dir.chdir(DEV_ROOT) { |dir|
+        text=`b2 --debug-configuration`
+	  } 
 	  toolset=''
       text.scan(/<toolset>([\.\w-]+)/).each{ | var_match |
 	   toolset=var_match[0].to_s

data/lib/dev/Commands.rb

@@ -1,4 +1,4 @@
-["Compile","Replace","Setup","Test","Commit","Info","Update","Push","Build"].each{ |f| require_relative("cmd/#{f}.rb") }
+["Compile","Replace","Setup","Test","Commit","Info","Update","Pull","DeepPull","Build"].each{ |f| require_relative("cmd/#{f}.rb") }
 
 module Dev
 class Commands < Hash
@@ -10,12 +10,14 @@ class Commands < Hash
 	self[:test]=Dev::Cmd::Test.new
 	self[:commit]=Dev::Cmd::Commit.new
 	self[:update]=Dev::Cmd::Update.new
-	#self[:pull]=Dev::Cmd::Pull.new
+	self[:pull]=Dev::Cmd::Pull.new
+	self[:deep_pull]=Dev::Cmd::DeepPull.new
     refresh
   end
 
   def refresh
     puts_debug "Dev::Command.refresh"
+	start_time=Time.now
 	self[:setup].refresh(DEV[:dep]) if self[:setup].respond_to?("refresh")
 	self[:replace].refresh(DEV[:dep]) if self[:replace].respond_to?("refresh")
 	self[:compile].refresh if self[:compile].respond_to?("refresh")
@@ -23,6 +25,8 @@ class Commands < Hash
 	self[:commit].refresh if self[:commit].respond_to?("refresh")
 	self[:update].refresh if self[:update].respond_to?("refresh")
 	self[:pull].refresh if self[:pull].respond_to?("refresh")
+	self[:deep_pull].refresh if self[:deep_pull].respond_to?("refresh")
+	puts_debug "Commands refresh elapsed time " + (Time.now-start_time).to_s
   end
 
   def info; Dev::Cmd::Info.execute; end
@@ -30,6 +34,8 @@ class Commands < Hash
   def compile; execute_method "compile"; end
   def test; execute_method "test"; end
   def push; Dev::Cmd::Push.execute; end
+  def pull; Dev::Cmd::Pull.execute; end
+  def deep_pull; Dev::Cmd::DeepPull.execute; end
   def update;execute_method("update");end
   def replace
     self[:replace].execute if self[:replace].respond_to?("execute")

data/lib/dev/Deps.rb

@@ -2,6 +2,7 @@ module Dev
 class Deps < Hash
   def refresh
     puts_debug "Dev::Deps.refresh"
+	start_time=Time.now
     self.each{ |k,v|
 	  if !v.nil? && v.kind_of?(Hash)
 	    v[:dir]=get_dir(v) if !v.has_key?(:dir)
@@ -9,6 +10,7 @@ class Deps < Hash
 		v[:uri]=get_uri(v)
 	  end
 	}
+	puts_debug "Deps refresh elapsed time " + (Time.now-start_time).to_s
   end
 
   def get_dir(h)

data/lib/dev/Project.rb

@@ -58,10 +58,12 @@ class Project < Hash
 
   def refresh
     puts_debug "Dev::Project.refresh"
+	start_time=Time.now
     self[:dep].refresh
     #update_default_values
 	#db = Dev::Database.new
 	#db.set_branch_uri(self[:fullname],self[:scm_uri])
+	puts_debug "DEV refresh elapsed time " + (Time.now-start_time).to_s
   end
 
   def get_default_value_name
@@ -135,5 +137,6 @@ class Project < Hash
 end
 end # module Dev
 
+puts_debug "creating DEV instance"
 DEV=Dev::Project.new#(nil,true)
 DEV[:start_time]=Time.now

data/lib/dev/Scm.rb

@@ -1,15 +1,21 @@
 module Dev
 class Scm
+  @@default=nil
+
   attr_accessor :scm_type
   
   def initialize
-    @scm_type="none"
+    puts_debug "initalizing Scm"
 	call=Dev::SystemCall.new("svn info")
-	@scm_type="svn" if call.output.include?("Last Changed Date:")
-    @scm_type="svn" if File.exists?(".svn")
-	call=Dev::SystemCall.new("git status")
-	@scm_type="git" if call.output.include?("#")
-    @scm_type="git" if File.exists?(".git")
+	@scm_type=nil
+	@scm_type = "svn" if call.output.include?("Last Changed Date:")
+    @scm_type = "svn" if @scm_type.nil? && File.exists?(".svn") 
+	if(@scm_type.nil?)
+	  call=Dev::SystemCall.new("git status")
+	  @scm_type = "git" if call.output.include?("#")
+      @scm_type = "git" if @scm_type.nil? && File.exists?(".git")
+	end
+	puts_debug "scm_type = " + @scm_type.to_s
   end
   
   def file_tracked?(file)
@@ -108,13 +114,11 @@ class Scm
   end
 
    def self.get_default_scm_type
-    call=Dev::SystemCall.new("svn info")
-	return "svn" if call.output.include?("Last Changed Date:")
-    return "svn" if File.exists?(".svn")
-	call=Dev::SystemCall.new("git status")
-	return "git" if call.output.include?("#")
-    return "git" if File.exists?(".git")
-	return nil
+    if @@default.nil?
+	  puts_debug "creating default instance of Scm"
+	  @@default=Scm.new
+	end
+	return @@default.scm_type
   end
   
 end # class Scm

data/lib/dev/Tasks.rb

@@ -26,7 +26,8 @@ def generate_task_hash(project)
     #:test=> { :desc=> 'run unit tests' },
     :loc=> { :desc=> 'count the lines of code' },
     #:setup=> { :desc=> 'setup the project environment' },
-    :pull=> { :desc=> 'rake working copies of dependencies' },
+    :pull=> { :desc=> 'update dependencies in rakefile.rb to latest revision' },
+	:deep_pull=> { :desc=> 'pull and rake dependencies (nested dependencies first)' },
     :check=> { :desc=> 'checks if the project default task may be skipped' }
   }
   if(!CMD[:setup].nil? && CMD[:setup].length > 0)
@@ -99,9 +100,11 @@ module Dev
 class Tasks < Hash
   def refresh
     puts_debug "Dev::Tasks.refresh"
+	start_time=Time.now
     DEV.refresh
     CMD.refresh
     generate_tasks(DEV)
+	puts_debug "Tasks refresh elapsed time " + (Time.now-start_time).to_s
 end
 end # class Tasks
 end # module Dev

data/lib/dev/cmd/Compile.rb

@@ -4,6 +4,7 @@ class Compile < Array
   def refresh
 
     puts_debug "Dev::Cmd::Compile.refresh"
+	start_time=Time.now
 	strip_auto_entries
 	windows=RUBY_PLATFORM.include?("w32")
 
@@ -25,6 +26,8 @@ class Compile < Array
 
 	# gemspec
     Dir.glob("*.gemspec").each { |gs| self << "{:cmd=> 'gem build #{gs}', :capture_output=> false, :auto=> true}" }
+
+	puts_debug "refresh elapsed time " + (Time.now-start_time).to_s
   end
 
 end	# class Compile

data/lib/dev/cmd/DeepPull.rb

@@ -0,0 +1,49 @@
+module Dev
+module Cmd
+class DeepPull
+  def self.execute
+
+    puts "checking dependencies in #{DEV[:directory]}"
+    # loop over each DEP with dir: NAME@REVISION format
+    DEV[:dep].each {|key,value|
+	  if(value.has_key?(:dir) && value[:dir].include?('@'))
+	    
+		# make sure working directory exist
+		dep_wrk_dir="#{DEV[:dev_root]}/wrk/#{value[:dir].gsub(/@[\d]+/,'')}"
+		dep_uri="#{value[:uri].gsub('@REV','')}"
+
+		puts "#{dep_wrk_dir}"
+
+		if(File.exists?(dep_wrk_dir))
+		  Dir.chdir(dep_wrk_dir){|dir|
+		    call=Dev::SystemCall.new('svn update')
+			call.puts_summary
+		  }
+		else
+		  call=Dev::SystemCall.new("svn co #{dep_uri} #{dep_wrk_dir}")
+		  call.puts_summary
+		end
+	    
+		Dir.chdir(dep_wrk_dir){ |dir|
+		   original_text = File.read("#{dep_wrk_dir}/rakefile.rb")
+		   call=Dev::SystemCall.new('rake deep_pull')
+		   call.puts_summary
+		   current_text = File.read("#{dep_wrk_dir}/rakefile.rb")
+		   if(original_text != current_text)
+			 call=Dev::SystemCall.new('rake setup')
+			 call.puts_summary
+		     call=Dev::SystemCall.new('rake default')
+			 call.puts_summary
+		   end
+		}
+	  end
+	}
+
+	# shallow pull in this 
+	puts ""
+	Pull.execute
+
+  end
+end # class DeepPull
+end # module Cmd
+end # module Dev

data/lib/dev/cmd/Pull.rb

@@ -0,0 +1,36 @@
+module Dev
+module Cmd
+class Pull
+  def self.execute
+   puts "checking dependencies in #{DEV[:directory]}"
+
+	text = File.read("#{DEV[:directory]}/rakefile.rb")
+	new_text = text
+
+	DEV[:dep].each {|key,value|
+	  puts_debug "checking dep key #{key}"
+	  if(value.has_key?(:dir) && value[:dir].include?('@'))
+	    cmd="svn info #{value[:uri].gsub(/@[\d\w]+/,'')}"
+		puts_debug cmd
+		call=Dev::SystemCall.new(cmd)
+		call.puts_summary
+	    info =call.output# %x[cmd]
+		#puts_debug info
+		new_revision = info.match(/Last Changed Rev: (?<rev>\d+)/)[:rev]
+		new_dir = value[:dir].gsub(/@[\d]+/,"@#{new_revision}")
+		puts_debug "new_dir=#{new_dir}"
+		if(new_dir != value[:dir])
+		  puts "updating from #{value[:dir]} to #{new_dir}"
+	      new_text = new_text.gsub(value[:dir],new_dir)
+		end
+	  end
+	}
+
+	if(text != new_text)
+	  File.open("#{DEV[:directory]}/rakefile.rb",'w') { |f|f.write(new_text) }
+	end
+
+  end
+end # class Info
+end # module Cmd
+end # module Dev

data/lib/dev/cmd/Replace.rb

@@ -3,6 +3,7 @@ module Cmd
 class Replace < Hash
   def refresh(dep_hash)
     puts_debug "Dev::Cmd::Replace.refresh"
+	refresh_start_time=Time.now
     # remove all auto generated entries
 	self.each { |k,v|
 	  self.delete k if v.kind_of?(Hash) && v.has_key?(:auto) && v[:auto] 
@@ -39,6 +40,9 @@ class Replace < Hash
 		end
 	  }
 	end
+
+	refresh_end_time=Time.now
+	puts_debug "replace refresh elapsed time " + (refresh_end_time-refresh_start_time).to_s
   end
 
   def execute

data/lib/dev/cmd/Update.rb

@@ -3,7 +3,7 @@ module Cmd
 class Update < Array
   def refresh
 	strip_auto_entries
-	self << "{:cmd=>'svn update',:auto=>true,:throw_on_error=>false}" if Scm.get_default_scm_type == "svn" #File.exists?(".svn")
+	self << "{:cmd=>'svn update',:auto=>true,:throw_on_error=>false}" if Scm.get_default_scm_type == "svn" #File.exists?(".svn")
   end
 end	# class Compile
 end # module Cmd

data/lib/dev.rb

@@ -1,5 +1,7 @@
 require 'rubygems'
 
+start_time=Time.now
+
 Encoding.default_external=Encoding::UTF_8
 Encoding.default_internal=Encoding::UTF_8
 
@@ -30,6 +32,9 @@ def puts_debug msg
   end
 end
 
+puts_debug "dev.rb loading, after require 'semver' elapsed time " + (Time.now-start_time).to_s
+start_time=Time.now
+
 # 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))
@@ -39,7 +44,14 @@ end
 
 puts_debug "read " + __FILE__.foreground(:green)
 
+puts_debug "dev.rb loading, before loading ruby files (part 1) elapsed time " + (Time.now-start_time).to_s
+start_time=Time.now 
 ["Environment","Array","Hash","SystemCall","Scm","MsBuild","Paths","Dep","Deps","Database","BoostBuild","Project","Commands","Tasks"].each{ |f| require "#{File.dirname(__FILE__)}/dev/#{f}.rb" }
+
+puts_debug "dev.rb loading, before loading ruby files (part 2) elapsed time " + (Time.now-start_time).to_s
+start_time=Time.now 
+
 Dir["#{File.dirname(__FILE__)}/dev/**/*.rb"].each{ |f| require f }
+puts_debug "dev.rb loading, after loading ruby files elapsed time " + (Time.now-start_time).to_s
 
 DEV_ROOT=Dev::Environment.dev_root

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.229
+  version: 1.0.230
   prerelease: 
 platform: ruby
 authors:
@@ -217,8 +217,9 @@ files:
 - lib/dev/cmd/Build.rb
 - lib/dev/cmd/Commit.rb
 - lib/dev/cmd/Compile.rb
+- lib/dev/cmd/DeepPull.rb
 - lib/dev/cmd/Info.rb
-- lib/dev/cmd/Push.rb
+- lib/dev/cmd/Pull.rb
 - lib/dev/cmd/Replace.rb
 - lib/dev/cmd/Setup.rb
 - lib/dev/cmd/Test.rb

data/lib/dev/cmd/Push.rb

@@ -1,14 +0,0 @@
-module Dev
-module Cmd
-class Push
-  def self.execute
-    puts "Push"
-	DEV[:dep].each { |dep|
-	  #begin
-	  #  dep.rake
-	  #rescue
-	}
-  end
-end # class Info
-end # module Cmd
-end # module Dev