dev 1.0.146 → 1.0.147

data/lib/dev/Array.rb

@@ -0,0 +1,17 @@
+class Array
+  # remove all auto generated entries
+  def strip_auto_entries
+    keep=Array.new
+    puts_debug "Array.strip_auto_entries"
+	self.each { |e| 
+	 if(!e.nil?)
+	   h=nil
+	   h=e if e.kind_of?(Hash)
+	   h=Dev::Environment.s_to_hash(e)
+	   keep << e if(!h.nil? && (!h.has_key?(:auto) || !h[:auto]))
+	 end
+	}
+	self.clear
+	keep.each{|e| self << e}
+  end
+end

data/lib/dev/Commands.rb

@@ -1,129 +1,38 @@
-require_relative 'cmd/Compile.rb'
+["Compile","Replace","Setup","Test","Commit","Info","Update","Pull"].each{ |f| require_relative("cmd/#{f}.rb") }
+
 module Dev
 class Commands < Hash
 
   def initialize
+    self[:setup]=Dev::Cmd::Setup.new
+    self[:replace]=Dev::Cmd::Replace.new
+	self[:compile]=Dev::Cmd::Compile.new
+	self[:test]=Dev::Cmd::Test.new
+	self[:commit]=Dev::Cmd::Commit.new
+	self[:update]=Dev::Cmd::Update.new
+	self[:pull]=Dev::Cmd::Pull.new
     refresh
   end
 
   def refresh
     puts_debug "Dev::Command.refresh"
-	self.delete :setup if self.has_key? :setup
-	#self.delete :compile if self.has_key? :compile
-    ["add","pull","setup","compile","test","features","commit","update"].each { |key|
-	  if self.has_key?(key.to_sym)
-	    puts_debug "CMD has key #{key}"
-	  else
-	    value=get_default_value(key.to_sym)
-		self[key.to_sym]=value if !value.nil?
-		puts_debug "CMD[#{(key.to_sym).to_s}]=#{value.to_s}" if !value.nil?
-		puts_debug "default value for #{key} was nil"
-	  end
-	}
-  end
-
-  def get_default_value(key)
-    return get_default_value_setup if key==:setup
-    return get_default_value_commit if key==:commit
-	return get_default_value_test if key==:test
-	return Dev::Cmd::Compile.get_auto_compile_directives if key==:compile
-	return get_default_value_update if key==:update
-	return get_default_value_pull if key==:pull
-    nil
-  end
-
-  def get_default_value_commit
-    array=Array.new
-	array << 'git commit -a -m "rake commit all"' if File.exists?(".git")
-    array << 'svn commit -m "rake commit all"' if File.exists?(".svn")
-	array=nil if array.empty?
-	return array
-  end
-
-  def get_default_value_update
-    array=Array.new
-    array << 'svn update' if File.exists?(".svn")
-	array=nil if array.empty?
-    return array
-  end
-  def get_default_value_setup
-    array=Array.new
-	puts_debug "assigning default values for setup"
-    #array << "bundle install" if File.exists?("Gemfile")
-    array << "{ :cmd=> 'bundle install', :capture_output=> false}" if File.exists?("Gemfile") && "#{RUBY_VERSION}">="1.8.7"
-      
-    # dep,svn directives
-	puts_debug "checking for :dep hash...."
-    dep_hash=DEV.get_value(:dep)
-	puts_debug "dep_hash is nil" if dep_hash.nil?
-    unless dep_hash.nil?
-	  puts_debug "dep_hash is not nil"
-	  puts_debug "dep_hash is empty" if dep_hash.empty?
-      dep_hash.each do |key,value|
-		puts_debug ":dep[#{key.to_s}]"
-        if value.kind_of?(Hash)
-        dep=Dev::Dep.new(value)
-        dep.setup_commands.each{|cmd| array << cmd}
-        end
-      end
-    end
-      
-	puts_debug "mkdir directives..."
-    if(!Dir.glob("*.csproj").nil? && Dir.glob("*.csproj").length > 0)
-      array << "<%Dir.mkdir 'bin' unless File.exist?('bin')%>"
-      array << "<%Dir.mkdir 'bin/Debug' unless File.exist?('bin/Debug')%>"
-      array << "<%Dir.mkdir 'bin/Release' unless File.exist?('bin/Release')%>"
-    end
-	array=nil if array.empty?
-    return array
-  end
-
-  def get_default_value_pull
-    array=Array.new
-      # dep,svn directives
-      dep_hash=DEV.get_value("dep")
-      unless dep_hash.nil?
-        dep_hash.each do |key,value|
-          if value.kind_of?(Hash)
-            dep=Dev::Dep.new(value)
-            dep.pull_commands.each{|cmd| array << cmd}
-            #puts_debug "pull array: " + array.to_s
-          end
-        end
-      end
-    array=nil if array.empty?
-	return array
-  end
-
-  def get_default_value_test
-    puts_debug "Dev::Commands.get_default_value_test"
-	array=Array.new
-      
-
-	  array << "rspec --pattern='**/*.spec'" if DEV[:file_count].has_key?(:spec) && DEV[:file_count][:spec] > 0
-      
-	  Dir.glob("*.gemspec").each { |gs| 
-	    array << "{cmd: 'gem install ./#{gs.gsub('.gemspec','')}-#{DEV[:version]}.gem', capture_output: true}"
-        #array << "{cmd: 'gem install ./#{gs.gsub('.gemspec','')}-#{DEV[:version]}.gem', capture_output: false}"
-        #array << "{:cmd=> 'gem install #{gs.gsub('.gemspec','')}-#{DEV[:version]}.gem', :capture_output=> false}"
-        #array << "gem install ./#{gs.gsub('.gemspec','')}-#{DEV[:version]}.gem" 
-      } #if DEV[:type]=="gem"
-
-      #if self[:type]=="C#"
-        Dir.glob("*.{Test.csproj,Features.csproj}").each { |cs|
-          dll_name="bin/x86/Release/#{File.basename(cs,'.csproj')}.dll"
-          array << "\"<paths,nunit>\" /nologo #{dll_name} /xml:#{dll_name}.nunit-results.xml" if RUBY_PLATFORM.include?("w32")
-		  array << "mono \"<paths,nunit>\" #{dll_name}" if !RUBY_PLATFORM.include?("w32")
-        }
-      #end
-    return array
+	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")
+	self[:test].refresh if self[:test].respond_to?("refresh")
+	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")
   end
 
+  def info; Dev::Cmd::Info.execute; end
   def setup; execute_method "setup"; end
   def compile; execute_method "compile"; end
   def test; execute_method "test"; end
   def update;execute_method("update");end
-  def replace; DEV.replace; end
+  def replace
+    self[:replace].execute if self[:replace].respond_to?("execute")
+  end
 
   def execute_method(name)
     string_name=name.to_s
@@ -164,27 +73,22 @@ class Commands < Hash
     end
   end
 
-  def info
-    puts "DEV"
-	Hash.print_hash("",DEV)
-    puts " "
-	puts "CMD"
-	Hash.print_hash("",CMD)
-    puts " "
-  end
+  
+
+  
 
   def add
-    unless self[:src_glob].nil?
+    unless DEV[:src_glob].nil?
       scm = Dev::Scm.new
       return if scm.scm_type == "none"
-      if self[:src_glob].kind_of?(Hash)
-        self[:src_glob].each do |name,value|
+      if DEV[:src_glob].kind_of?(Hash)
+        DEV[:src_glob].each do |name,value|
           puts "  adding files " + value.to_s
           scm.add_file_glob(value)
         end
       else
-        puts "  adding files " + self[:src_glob].to_s
-        scm.add_file_glob(self[:src_glob])
+        puts "  adding files " + DEV[:src_glob].to_s
+        scm.add_file_glob(DEV[:src_glob])
       end
     end
   end

data/lib/dev/Dep.rb

@@ -22,7 +22,7 @@ module Dev
 class Dep < Hash
 
   # constructor that accepts a hash
-  def initialize(hash,init_defaults=true)
+  def initialize(hash)
     hash.each { |name,value| self[name]=value }
   end
   
@@ -87,8 +87,8 @@ class Dep < Hash
     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?
+      array << "{cmd: 'rake #{self.get_value("rake").to_s}', dir: '#{get_dep_dir}', cache:'true', capture_output: false, auto: true}" unless self.get_value("cache").nil?
+      array << "{cmd: 'rake #{self.get_value("rake").to_s}', dir: '#{get_dep_dir}', capture_output: false, auto: true}" if self.get_value("cache").nil?
     end
     
     return array

data/lib/dev/Deps.rb

@@ -0,0 +1,30 @@
+module Dev
+class Deps < Hash
+  def refresh
+    puts_debug "Dev::Project.refresh"
+    self.each{ |k,v|
+	  if !v.nil? && v.kind_of?(Hash)
+	    v[:dir]=get_dir(v) if !v.has_key?(:dir)
+		v[:rev]=get_rev(v) if !v.has_key?(:rev) && !get_rev(v).nil?
+	  end
+	}
+  end
+
+  def get_dir(h)
+    uri=Dev::Environment.expand_string_variables(h[:uri])
+    uri_words=uri.split('/')
+    while(uri_words.length > 3) do
+      uri_words.shift 
+    end
+    return uri_words.join('/')
+  end
+
+  def get_rev(h)
+    if(h.has_key?(:uri) && h[:uri].include?('@'))
+	  return h[:uri].split('@')[1]
+	end
+	nil
+  end
+
+end # class Deps
+end # module Dev

data/lib/dev/Hash.rb

@@ -1,6 +1,9 @@
 class Hash
 
-
+  # remove all auto generated entries
+  def strip_auto_entries
+	self.each { |k,v| self.delete k if !v.nil? && v.kind_of?(Hash) && v.has_key?(:auto) && v[:auto]  }
+  end
 
   def get_value(key)
     return Hash.get_hash_value(self,key)

data/lib/dev/Paths.rb

@@ -0,0 +1,23 @@
+module Dev
+class Paths < Hash
+  def initialize
+    ["v4.0.30319","v3.5","v3.0","v2.0.50727"].each { |v|
+	  f="C:/WINDOWS/Microsoft.NET/Framework/#{v}/MSBuild.exe"
+	  self[:msbuild]=f if File.exists?(f) && self[:msbuild].nil?
+	  f="C:/WINDOWS/Microsoft.NET/Framework/#{v}/RegAsm.exe"
+	  self[:regasm]=f if File.exists?(f) && self[:regasm].nil?
+	}
+
+	["2.6.0.12051","2.5.10.11092"].each{ |v|
+	  Dir.glob("#{Dev::Environment.dev_root}/dep/*/NUnit/#{v}/bin/nunit-console-x86.exe").each{|f|
+	    self[:nunit]=f if File.exists?(f) && self[:nunit].nil?
+	  }
+	  if( !self.has_key?(:nunit) )
+	    Dir.glob("#{Dev::Environment.dev_root}/dep/*/NUnit/#{v}/bin/*/nunit-console-x86.exe").each{|f|
+	      self[:nunit]=f if File.exists?(f) && self[:nunit].nil?
+	    }
+	  end
+	}
+  end
+end # class Paths
+end # module Dev

data/lib/dev/Project.rb

@@ -2,17 +2,13 @@ puts_debug "read " + __FILE__.foreground(:green)
 require 'semver'
 require 'rake' 
 
-UNITTESTS=Array.new
 module Dev
-
 class Project < Hash
 
-  def initialize(hash,init_defaults=true)
-    hash = Hash.new if hash.nil?
-    hash = defaults.merge(hash)
-    puts_debug "initialize, copying hash values"
-    hash.each { |name,value| self[name]=value } if !hash.nil?
-    update_default_values if init_defaults
+  def initialize
+	defaults.each { |name,value| self[name]=value }
+	db = Dev::Database.new
+	db.set_branch_uri(self[:fullname],self[:scm_uri])
   end
 
   def defaults
@@ -39,38 +35,18 @@ class Project < Hash
 	  h[:file_count][ext.to_sym]=count if count > 0
 	}
 
-	tmp=get_default_value_paths
-	h[:paths] = tmp if !tmp.nil?
+	h[:paths] = Dev::Paths.new
+	h[:dep]=Deps.new
 	return h
   end
 
   def refresh
-    update_default_values
-	db = Dev::Database.new
-	db.set_branch_uri(self[:fullname],self[:scm_uri])
-	
+    puts_debug "Dev::Project.refresh"
+    self[:dep].refresh
+    #update_default_values
+	#db = Dev::Database.new
+	#db.set_branch_uri(self[:fullname],self[:scm_uri])
   end
-  def update_default_values
-    puts_debug "update_default_values"
-	#newValues=Hash.new
-	#self.each{ |k,v| 
-	#  newValues[k.to_s]=v if !self.has_key?(k.to_s)
-	#}
-	#self.merge(newValues)
-    
-	if !self.has_key?(:dep) || self[:dep].nil?
-	  puts_debug "assigning self[:dep] to Hash.new"
-	  self[:dep]=Hash.new 
-	end
-
-    ["features" ].each do |k| 
-      puts_debug "set_default_value(#{k})"
-      set_default_value(k) 
-    end
-	#CMD.refresh
-    generate_auto_replace_directives
-    #generate_tasks(self)
-  end 
 
   def get_default_value_name
     dirs=::Rake.original_dir().split('/')
@@ -118,62 +94,6 @@ class Project < Hash
 	return nil
   end
 
-  def get_default_value_paths
-    hash=Hash.new
-
-	["v4.0.30319","v3.5","v3.0","v2.0.50727"].each { |v|
-	  f="C:/WINDOWS/Microsoft.NET/Framework/#{v}/MSBuild.exe"
-	  hash[:msbuild]=f if File.exists?(f) && hash[:msbuild].nil?
-	  f="C:/WINDOWS/Microsoft.NET/Framework/#{v}/RegAsm.exe"
-	  hash[:regasm]=f if File.exists?(f) && hash[:regasm].nil?
-	}
-
-	["2.6.0.12051","2.5.10.11092"].each{ |v|
-	  Dir.glob("#{Dev::Environment.dev_root}/dep/*/NUnit/#{v}/bin/nunit-console-x86.exe").each{|f|
-	    hash[:nunit]=f if File.exists?(f) && hash[:nunit].nil?
-	  }
-	  if( !hash.has_key?(:nunit) )
-	    Dir.glob("#{Dev::Environment.dev_root}/dep/*/NUnit/#{v}/bin/*/nunit-console-x86.exe").each{|f|
-	      hash[:nunit]=f if File.exists?(f) && hash[:nunit].nil?
-	    }
-	  end
-	}
-
-	hash=nil if hash.length < 1
-	return hash
-  end
-
-  def update_keys
-    self.each{ |name,value| self[name]=value }
-  end
- 
-  def array_method(name)
-   
-    # prefer CMD.execute_method
-	puts "routing call to array_method(#{name}) to CMD.execute_method" if !CMD.get_value(name.to_s).nil?
-	return CMD.execute_method(name) if !CMD.get_value(name.to_s).nil?
-
-	puts "array_method(#{name}) executing on Dev::Project class, #{name} should be moved to CMD hash"
-    string_name=name.to_s
-    puts_debug "method_missing name=" + string_name
-    
-    puts "  no directives defined for #{string_name}" if self.get_value(string_name).nil? && string_name=="pull"
-    return if(self.get_value(string_name).nil?)
-    puts "  no directives defined for #{string_name}" if self.get_value(string_name).length < 1
-    return if self.get_value(string_name).length < 1
-    
-	value=self.get_value(string_name)
-	if value.kind_of?(Hash)
-      value.each { |name,value| execute_cmd(value); sleep(0.5) }
-    else
-	  value.each { |c| execute_cmd(c); sleep(0.5) }
-	end
-  end
-  
-  def execute_cmd(c); Dev::Commands.execute_cmd(c); end
-  
-  def method_missing( name, *args ); array_method(name); end
-  
   def loc_cmd
     cmd="countloc --recurse ."
     cmd="countloc --recurse --mode ruby ." if self[:type]=="ruby" || self[:type]=="gem"
@@ -186,8 +106,6 @@ class Project < Hash
     system(loc_cmd)
   end
   
-  
-  
   def loc_total
     # parse the output for TOTAL LOC
     call=Dev::SystemCall.new(loc_cmd)
@@ -203,147 +121,13 @@ class Project < Hash
     Dev::Environment.user + "." + Dev::Environment.machine
   end
 
-  
-  
   def stamp_task(name)
     File.open("#{name}.taskstamp." + context,"w") { |f| f.write(Time.now.to_s) }
   end
   
-  def generate_auto_replace_directives
-	# only generate replace directives if a commit may be made...
-	if(self[:scm_type]=="svn" || self[:scm_type]=="git")
-	  ["vcxproj","csproj"].each { |ext|
-	    if(self[:file_count].has_key?(ext.to_sym) && self[:file_count][ext.to_sym] > 0)
-		  self[:replace]=Hash.new if self[:replace].nil?
-		  self[:dep].each{ |k,v|
-		    if !self[:dep][k].has_key?(:rev) && self[:dep][k].has_key?(:uri)
-			  words=self[:dep][k][:uri].split('@')
-			  self[:dep][k][:rev]=words[1] if words.count==2
-			end
-			if self[:dep][k].has_key?(:rev) && self[:dep][k].has_key?(:dir) && !self[:replace].has_key?(k)
-			  group=self[:dep][k][:dir].split('/')[0]
-			  searchRegex=Regexp.new "#{group}\\\\#{k}\\\\[\\d]+"
-			  self[:replace][k]={ glob: "**/*.#{ext}", search: searchRegex, replace: "#{group}\\#{k}\\#{v[:rev]}" }
-			end
-		  }
-		end
-	  }
-	end
-  end
-
-  def replace
-    generate_auto_replace_directives
-    #puts " "
-    #puts "replace".foreground(:yellow).bright
-    hash=self[:replace] 
-    if hash.nil?
-      puts "  no replace directives"
-    end
-    unless hash.nil?
-      hash.each do |k,v| 
-        unless v.nil?
-          file=v[:file]
-          search=v[:search]
-          replace=v[:replace]
-          glob=v[:glob]
-          unless search.nil? || replace.nil?
-            unless file.nil?
-              Dev::Environment.replace_text_in_file(file,search,replace)
-            end
-            unless glob.nil?
-              Dev::Environment.replace_text_in_glob(glob,search,replace)
-            end
-          end
-        end
-      end
-    end
-  end
-  
-  def features
-    if self[:type]=="C#" && File.exists?("bin/x86/Release/#{self[:name]}.Features.dll")
-      call=Dev::SystemCall.new(expand_project_variables("<paths,nunit> /nologo bin/x86/Release/#{self[:name]}.Features.dll"))
-      puts call.command
-      puts call.output
-      raise "exit_code=#{call.status.to_s}" + call.error unless call.status==0
-    end
-    
-    array_method("features")
-  end
-  
-  def has_build_products
-  end
-  
-  
-  
-  
-  
-  
-  
-  def rake_working_deps
-    unless dep_hash.nil?
-      dep_hash.each do |key,value|
-        if value.kind_of?(Hash)
-          # potential hash keys: uri, dir, rake
-          # uri is required
-          unless value.get_value("uri").nil?
-            uri=expand_project_variables(value.get_value("uri"))
-            uri_words=uri.split('/')
-            while(uri_words.length > 3) do
-              uri_words.shift 
-            end
-            dir=self[:dev_root] + "/wrk/" + uri_words.join('/')
-            unless value.get_value("rake").nil?
-              if(File.exist?(dir))
-                rake_task=value.get_value("rake") 
-                cmd_hash = {:cmd=> "rake #{rake_task}", :dir=> "#{dir}"}
-              end
-            end
-          end
-        end # unless value.get_value("uri").nil?
-      end
-    end # unless dep_hash.nil?
-  end
-  
-  def pull
-    update unless has_diff
-    array_method("pull")
-    filename=Dir.pwd + "/rakefile.rb"
-    puts "  updating revision variables for " + filename
-    Dev::Svn::update_revision_variables(filename)
-  end
-  
-  
-  
-  def set_default_value(key)
-    set_value(key,get_default_value(key)) if get_value(key).nil? && !get_default_value(key).nil?
-  end
-  
-  def get_default_value(key)
- 
-    value=loc_total if key=="loc"
-      
-    array=Array.new
-    
-    if(key=="features")
-      array << "cucumber features" if File.exists?("features") && Dir.glob("features/**/*.rb").length > 0
-    end
-    if(key=="has_diff")
-      array << 'git diff' if File.exists?(".git")
-      array << "{ :cmd=> 'svn diff', :capture_output=> false}" if File.exists?(".svn")
-    end
-    
-    
-    value=array if array.length > 0
-    
-    return value
-  end
-  
-  
-
-  
 end
 end # module Dev
 
-DEV=Dev::Project.new(nil,true)
+DEV=Dev::Project.new#(nil,true)
 DEV.refresh
-PROJECT=DEV
+PROJECT=DEV

data/lib/dev/SystemCall.rb

@@ -154,36 +154,6 @@ class SystemCall
     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)

data/lib/dev/Tasks.rb

@@ -34,7 +34,7 @@ def generate_task_hash(project)
   end
   
   task_hash[:compile] = { :desc=> 'compile source code' } if CMD.has_key?(:compile) || project.has_key?(:compile)
-  task_hash[:replace] = { :desc=> 'replace text' } if project.has_key?(:replace)
+  task_hash[:replace] = { :desc=> 'replace text' } if CMD.has_key?(:replace)
  
   if project[:type]=="gem" || project[:type]=="ruby"
     task_hash[:features] = { :desc=> 'tests cucumber features' }
@@ -85,6 +85,7 @@ end
 module Dev
 class Tasks < Hash
   def refresh
+    puts_debug "Dev::Tasks.refresh"
     DEV.refresh
     CMD.refresh
     generate_tasks(DEV)

data/lib/dev/cmd/Commit.rb

@@ -0,0 +1,12 @@
+module Dev
+module Cmd
+class Commit < Array
+  def refresh
+	strip_auto_entries
+	File.open('commit.message','w'){|f|f.puts "commit all"} if !File.exists?('commit.message')
+	self << "{:cmd=>'git commit -a -F commit.message',:auto=>true}" if File.exists?(".git")
+    self << "{:cmd=>'svn commit -F commit.message',:auto=>true}" if File.exists?(".svn")
+  end
+end	# class Compile
+end # module Cmd
+end # module Dev

data/lib/dev/cmd/Compile.rb

@@ -1,14 +1,16 @@
 module Dev
 module Cmd
-class Compile
-  def self.get_auto_compile_directives
-    array=Array.new
+class Compile < Array
+  def refresh
+
+    puts_debug "Dev::Cmd::Compile.refresh"
+	strip_auto_entries
 	windows=RUBY_PLATFORM.include?("w32")
 
 	# jamfiles
 
 	# vcxproj
-    Dir.glob('**/*.vcxproj').each { |vcxproj| array << "<paths,msbuild> #{vcxproj} /property:Configuration=Release /property:Platform=Win32" } if windows
+    Dir.glob('**/*.vcxproj').each { |vcxproj| self << "{:cmd=> '<paths,msbuild> #{vcxproj} /property:Configuration=Release /property:Platform=Win32', :auto=>true}" } if windows
 
 	# csproj
 	csbuild="<paths,msbuild>"
@@ -17,15 +19,12 @@ class Compile
 	  platforms=Dev::Cmd::Compile.extract_platforms(csproj)
 	  platforms.each { |platform|
 	    skip=(!RUBY_PLATFORM.include?("w32") && platform=="x64")
-	    array << "#{csbuild} #{csproj} /property:Configuration=Release /property:Platform=\"#{platform}\" /p:OutputPath=./bin/#{platform}/Release" if !skip
+	    array << "{:cmd=> '#{csbuild} #{csproj} /property:Configuration=Release /property:Platform=\"#{platform}\" /p:OutputPath=./bin/#{platform}/Release', :auto=>true}" if !skip
 	  }
 	}
 
 	# gemspec
-    Dir.glob("*.gemspec").each { |gs| array << "{ :cmd=> 'gem build #{gs}', :capture_output=> false}" }
-   
-	array=nil if array.empty?
-    return array
+    Dir.glob("*.gemspec").each { |gs| self << "{:cmd=> 'gem build #{gs}', :capture_output=> false, :auto=> true}" }
   end
 
   def self.extract_platforms(filename)

data/lib/dev/cmd/Info.rb

@@ -1,6 +1,14 @@
 module Dev
 module Cmd
 class Info
+  def self.execute
+    puts "DEV"
+	Hash.print_hash("",DEV)
+    puts " "
+	puts "CMD"
+	Hash.print_hash("",CMD)
+    puts " "
+  end
 end # class Info
 end # module Cmd
 end # module Dev

data/lib/dev/cmd/Pull.rb

@@ -0,0 +1,33 @@
+module Dev
+module Cmd
+class Pull < Array
+  def refresh
+	strip_auto_entries
+  end
+end	# class Compile
+end # module Cmd
+end # module Dev
+
+#def pull
+#    update unless has_diff
+#    array_method("pull")
+#    filename=Dir.pwd + "/rakefile.rb"
+#    puts "  updating revision variables for " + filename
+#    Dev::Svn::update_revision_variables(filename)
+#  end
+# def get_default_value_pull
+#    array=Array.new
+#      # dep,svn directives
+#      dep_hash=DEV.get_value("dep")
+#      unless dep_hash.nil?
+#        dep_hash.each do |key,value|
+#          if value.kind_of?(Hash)
+#            dep=Dev::Dep.new(value)
+#            dep.pull_commands.each{|cmd| array << cmd}
+#            #puts_debug "pull array: " + array.to_s
+#          end
+#        end
+#      end
+#    array=nil if array.empty?
+#	return array
+#  end

data/lib/dev/cmd/Replace.rb

@@ -0,0 +1,49 @@
+module Dev
+module Cmd
+class Replace < Hash
+  def refresh(dep_hash)
+    puts_debug "Dev::Cmd::Replace.refresh"
+    # remove all auto generated entries
+	self.each { |k,v|
+	  self.delete k if v.kind_of?(Hash) && v.has_key?(:auto) && v[:auto] 
+	}
+
+	# auto generate replace entry based on dep values
+	if File.exists?(".svn") || File.exists?(".git")
+	  ["vcxproj","csproj"].each { |ext|
+	    if(Dir.glob("**/*.#{ext}").count > 0)
+		  dep_hash.each{ |k,v|
+		    if !v.nil? && v.kind_of?(Hash) && v.has_key?(:rev) && v.has_key?(:dir) && !has_key?(k)
+			  group=v[:dir].split('/')[0]
+			  searchRegex=Regexp.new "#{group}\\\\#{k}\\\\[\\d]+"
+			  self[k]={ glob: "**/*.#{ext}", search: searchRegex, replace: "#{group}\\#{k}\\#{v[:rev]}", auto: true }
+			  #self[k][:auto]=true
+			end
+		  }
+		end
+	  }
+	end
+  end
+
+  def execute
+    self.each do |k,v| 
+	unless v.nil?
+		file=v[:file]
+		search=v[:search]
+		replace=v[:replace]
+		glob=v[:glob]
+		unless search.nil? || replace.nil?
+		unless file.nil?
+			Dev::Environment.replace_text_in_file(file,search,replace)
+		end
+		unless glob.nil?
+			Dev::Environment.replace_text_in_glob(glob,search,replace)
+		end
+		end
+	end
+    end
+  end
+
+end # class Replace
+end # module Cmd
+end # module Dev

data/lib/dev/cmd/Setup.rb

@@ -0,0 +1,19 @@
+module Dev
+module Cmd
+class Setup < Array
+
+  def refresh(dep_hash)
+    puts_debug "Dev::Cmd::Setup.get_auto_setup_directives"
+	strip_auto_entries
+	# auto generate setup entry based on dep values
+    dep_hash.each{ |k,v|
+	  if !v.nil? && v.kind_of?(Hash)
+        dep=Dev::Dep.new(v)
+        dep.setup_commands.each{|cmd| self << cmd}
+	  end
+	}
+  end
+
+end # class Setup
+end # module Cmd
+end # module Dev

data/lib/dev/cmd/Test.rb

@@ -0,0 +1,25 @@
+module Dev
+module Cmd
+class Test < Array
+  def refresh
+    strip_auto_entries
+
+	if(Dir.glob("**/*.spec").count > 0) #if DEV.has_key?(:file_count) && DEV[:file_count].has_key?(:spec) && DEV[:file_count][:spec] > 0
+	  rspec_cmd='rspec --pattern="**/*.spec"'
+	  self << "{:cmd=>'#{rspec_cmd}', :auto=>true}"
+	end
+      
+	Dir.glob("*.gemspec").each { |gs| 
+	  self << "{:cmd=>'gem install ./#{gs.gsub('.gemspec','')}-#{DEV[:version]}.gem', :capture_output=>true, :auto=>true}"
+    } 
+
+    Dir.glob("*.{Test.csproj,Features.csproj}").each { |cs|
+        dll_name="bin/x86/Release/#{File.basename(cs,'.csproj')}.dll"
+        self << "\"<paths,nunit>\" /nologo #{dll_name} /xml:#{dll_name}.nunit-results.xml" if RUBY_PLATFORM.include?("w32")
+		self << "mono \"<paths,nunit>\" #{dll_name}" if !RUBY_PLATFORM.include?("w32")
+    }
+
+  end
+end # class Test
+end # module Cmd
+end # module Dev

data/lib/dev/cmd/Update.rb

@@ -0,0 +1,10 @@
+module Dev
+module Cmd
+class Update < Array
+  def refresh
+	strip_auto_entries
+	self << "{:cmd=>'svn update',:auto=>true}" if File.exists?(".svn")
+  end
+end	# class Compile
+end # module Cmd
+end # module Dev

data/lib/dev.rb

@@ -39,10 +39,7 @@ end
 
 puts_debug "read " + __FILE__.foreground(:green)
 
-#require "#{File.dirname(__FILE__)}/dev/Environment.rb"
-#require "#{File.dirname(__FILE__)}/dev/Hash.rb"
-#require "#{File.dirname(__FILE__)}/dev/SystemCall.rb"
-["Environment","Hash","SystemCall","Database","BoostBuild","Project","Commands","Tasks"].each{ |f| require "#{File.dirname(__FILE__)}/dev/#{f}.rb" }
+["Environment","Array","Hash","SystemCall","Paths","Dep","Deps","Database","BoostBuild","Project","Commands","Tasks"].each{ |f| require "#{File.dirname(__FILE__)}/dev/#{f}.rb" }
 Dir["#{File.dirname(__FILE__)}/dev/**/*.rb"].each{ |f| require f }
 
 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.146
+  version: 1.0.147
   prerelease: 
 platform: ruby
 authors:
@@ -164,15 +164,24 @@ extra_rdoc_files: []
 files:
 - LICENSE
 - README
+- lib/dev/Array.rb
 - lib/dev/BoostBuild.rb
+- lib/dev/cmd/Commit.rb
 - lib/dev/cmd/Compile.rb
 - lib/dev/cmd/Info.rb
+- lib/dev/cmd/Pull.rb
+- lib/dev/cmd/Replace.rb
+- lib/dev/cmd/Setup.rb
+- lib/dev/cmd/Test.rb
+- lib/dev/cmd/Update.rb
 - lib/dev/Commands.rb
 - lib/dev/Database.rb
 - lib/dev/Dep.rb
+- lib/dev/Deps.rb
 - lib/dev/Environment.rb
 - lib/dev/Hash.rb
 - lib/dev/MsBuild.rb
+- lib/dev/Paths.rb
 - lib/dev/Project.rb
 - lib/dev/Scm.rb
 - lib/dev/Svn.rb