dev 1.0.143 → 1.0.144

data/lib/dev/Database.rb

@@ -0,0 +1,55 @@
+require 'sqlite3'
+
+module Dev
+# 
+# Branches table
+#   Name text		e.g. google/devgem/trunk
+#   Uri  text       e.g. https://devgem.googlecode.com/svn/trunk
+#
+# create table Branches(Name text,Uri text,UNIQUE(Name));
+#
+class Database
+  attr_accessor :db
+  
+  def self.filename
+    return Dev::Environment.dev_root + "/dev.db"
+  end
+
+  def self.get_table_names(filename)
+    names=Array.new
+    db = SQLite3::Database.new filename
+	db.execute("select name from sqlite_master where type='table' ORDER BY name") do |row|
+	  names << row[0]
+	end
+	return names
+  end
+
+  def initialize
+    filename=Dev::Database.filename
+    table_names=Dev::Database.get_table_names(filename)
+	@db = SQLite3::Database.new filename
+	@db.execute("create table Branches(Name text,Uri text,UNIQUE(Name));") if !table_names.include? "Branches"
+  end
+
+  def set_branch_uri(name,uri)
+    @db.execute("insert or replace into Branches (Name,Uri) VALUES ('#{name}','#{uri}');")
+  end
+
+  def get_branch_uri(name,uri)
+    @db.execute("select Uri from Branches where Name='#{name}';") do |row|
+	  return row[0]
+	end
+	return ""
+  end
+
+  def find_branches(pattern)
+    names=Array.new
+	sql="select Name from Branches where Name LIKE '#{pattern}';"
+	sql="select Name from Branches;" if pattern.nil? || pattern.length==0
+	@db.execute(sql) do |row|
+	  names << row[0]
+	end
+	return names
+  end
+end # class Database
+end # module Dev

data/lib/dev/Project.rb

@@ -17,20 +17,28 @@ class Project < Hash
 
   def defaults
     system_call = Dev::SystemCall.new("semver init") if(!File.exist?(".semver"))  
-    h={
-	  :src_glob => "**/{*.{rb,feature,spec,cs,c,cpp,h,hpp,csproj,vcproj,snk,vcxproj,sln,filters,xaml,xml,resx,settings,txt,png,bmp,ico},Jamfile,.semver,Gemfile,README,LICENSE}",
-	  :name => get_default_value_name,
-	  :group => get_default_value_group,
-	  :directory => Rake.original_dir(),
-	  :type => get_default_value_type,
-	  :version => "#{SemVer.find.major}.#{SemVer.find.minor}.#{SemVer.find.patch}",
-	  :dev_root => "#{Dev::Environment.dev_root}"
-	}
+	h=Hash.new
+	h[:scm_uri] = get_default_scm_uri if !get_default_scm_uri.nil?
+	h[:scm_type] = get_default_scm_type if !get_default_scm_type.nil?
+	h[:directory]=Rake.original_dir()
+	h[:fullname]=get_default_value_fullname
+	h[:group]=get_default_value_group
+	h[:name]=get_default_value_name
+	h[:version]= "#{SemVer.find.major}.#{SemVer.find.minor}.#{SemVer.find.patch}"
+	h[:src_glob]="**/{*.{rb,feature,spec,cs,c,cpp,h,hpp,csproj,vcproj,snk,vcxproj,sln,filters,xaml,xml,resx,settings,txt,png,bmp,ico},Jamfile,.semver,Gemfile,README,LICENSE}"
+	h[:type]=get_default_value_type
+	h[:dev_root]= "#{Dev::Environment.dev_root}"
 	if !Dev::BoostBuild.defaultToolset.nil?
 	  h[:toolset] = Dev::BoostBuild.defaultToolset 
 	  ENV["VisualStudioVersion"]="11.0" if h[:toolset]=="msvc-11.0"
 	end
-	h[:scm_type] = get_default_scm_type if !get_default_scm_type.nil?
+	
+	h[:file_count]=Hash.new
+	["rb","spec","feature","cs","cpp","h","hpp","vcxproj","csproj"].each{ |ext|
+	  count=Dir.glob("**/*.#{ext}").count
+	  h[:file_count][ext.to_sym]=count if count > 0
+	}
+
 	tmp=get_default_value_paths
 	h[:paths] = tmp if !tmp.nil?
 	return h
@@ -38,6 +46,8 @@ class Project < Hash
 
   def 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"
@@ -66,6 +76,15 @@ class Project < Hash
     return nil
   end
 
+  def get_default_value_fullname
+    wrk="#{Dev::Environment.dev_root}/wrk/"
+	if(Rake.original_dir.include?(wrk))
+	  name=Rake.original_dir.gsub(wrk,"")
+	  return name if(name.split('/').count==3)
+	end
+	nil
+  end
+
   def get_default_value_group
     dirs=Rake.original_dir().split('/')
 	return dirs[dirs.length-3] if(dirs.length > 3)
@@ -86,6 +105,17 @@ class Project < Hash
 	return nil
   end
 
+  def get_default_scm_uri
+
+	if File.exists?(".svn")
+	  text=`svn info`
+	  text.scan(/URL: ([\w:\/.-]+)/).each { |m|
+	    return m
+	  }
+	end
+	return nil
+  end
+
   def get_default_value_paths
     hash=Hash.new
 
@@ -96,10 +126,15 @@ class Project < Hash
 	  hash[:regasm]=f if File.exists?(f) && hash[:regasm].nil?
 	}
 
-	["2.5.10.11092","2.6.0.12051"].each{ |v|
+	["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
@@ -257,23 +292,22 @@ class Project < Hash
   end
   
   def generate_auto_replace_directives
-    if(Dir.glob("**/*.vcxproj").count > 0 && !self[:dep].nil? && !self[:dep].empty?)
-	  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?(:dir) && !self[:replace].has_key?(k)
-	      group=self[:dep][k][:dir].split('/')[0]
-	      searchRegex=Regexp.new "#{group}\\\\#{k}\\\\[\\d]+"
-          self[:replace][k]={ glob: '**/*.vcxproj', search: searchRegex, replace: "#{group}\\#{k}\\#{v[:rev]}" }
-		end
-	  }
-	end
-	if((Dir.glob("**/*.csproj").count > 0 || Dir.glob("*.csproj").count > 0) && !self[:dep].nil? && !self[:dep].empty?)
-	  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?(:dir) && !self[:replace].has_key?(k)
-	      group=self[:dep][k][:dir].split('/')[0]
-	      searchRegex=Regexp.new "#{group}\\\\#{k}\\\\[\\d]+"
-          self[:replace][k]={ glob: '**/*.csproj', search: searchRegex, replace: "#{group}\\#{k}\\#{v[:rev]}" }
+	# 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
@@ -555,3 +589,4 @@ end # module Dev
 
 PROJECT=Dev::Project.new(nil,true)
 PROJECT.refresh
+DEV=PROJECT

data/lib/dev.rb

@@ -42,7 +42,7 @@ 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"
-["Tasks","Environment","Hash","SystemCall"].each{ |f| require "#{File.dirname(__FILE__)}/dev/#{f}.rb" }
+["Tasks","Environment","Hash","SystemCall","Database"].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.143
+  version: 1.0.144
   prerelease: 
 platform: ruby
 authors:
@@ -165,6 +165,7 @@ files:
 - LICENSE
 - README
 - lib/dev/BoostBuild.rb
+- lib/dev/Database.rb
 - lib/dev/Dep.rb
 - lib/dev/Environment.rb
 - lib/dev/Hash.rb