dev 1.0.214 → 1.0.217

data/lib/dev/Paths.rb

@@ -30,7 +30,7 @@ class Paths < Hash
     nunit=""
 	nunitx86=""
 
-	["2.6.0.12051/bin","2.5.10.11092/bin/net-2.0"].each{ |v|
+	["2.6.3/bin","2.6.0.12051/bin","2.5.10.11092/bin/net-2.0"].each{ |v|
 	  if nunit.length==0
 	    Dir.glob("#{Dev::Environment.dev_root}/dep/*/NUnit/#{v}/nunit-console.exe").each{|f|
 		  if nunit.length==0

data/lib/dev/Project.rb

@@ -16,9 +16,9 @@ class Project < Hash
     system_call = Dev::SystemCall.new("semver init") if(!File.exist?(".semver"))  
 	h=Hash.new
 	puts_debug "Dev::Project.defaults :scm_uri"
-	h[:scm_uri] = get_default_scm_uri if !get_default_scm_uri.nil?
+	h[:scm_uri] = Scm.get_default_scm_uri if !Scm.get_default_scm_uri.nil?
 	puts_debug "Dev::Project.defaults :scm_type"
-	h[:scm_type] = get_default_scm_type if !get_default_scm_type.nil?
+	h[:scm_type] = Scm.get_default_scm_type if !Scm.get_default_scm_type.nil?
 	h[:directory]=Rake.original_dir()
 	h[:fullname]=get_default_value_fullname
 	h[:group]=get_default_value_group
@@ -92,27 +92,6 @@ class Project < Hash
 	return "ruby"
   end
 
-  def 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
-  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 loc_cmd
     cmd="countloc --recurse ."
     cmd="countloc --recurse --mode ruby ." if self[:type]=="ruby" || self[:type]=="gem"

data/lib/dev/Scm.rb

@@ -95,6 +95,27 @@ class Scm
   
   def self.update(local)
   end
+
+  def self.get_default_scm_uri
+
+    text=`svn info`
+	if(!text.include?("not a working copy"))
+	  text.scan(/URL: ([\w:\/.-]+)/).each { |m|
+	    return m
+	  }
+	end
+	return nil
+  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
+  end
   
 end # class Scm
 end # module Dev

data/lib/dev/cmd/Commit.rb

@@ -4,7 +4,7 @@ class Commit < Array
   def refresh
 	strip_auto_entries
 	File.open('commit.message','w'){|f|f.puts "commit all"} if !File.exists?('commit.message')
-	scm_type = get_default_scm_type
+	scm_type = Scm.get_default_scm_type
 	if scm_type == "svn" 
 	  self << "{:cmd=>'svn commit -F commit.message',:auto=>true}" 
 	else
@@ -15,15 +15,6 @@ class Commit < Array
     end
   end
 
-  def 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
-  end
 end	# class Compile
 end # module Cmd
 end # module Dev

data/lib/dev/cmd/Replace.rb

@@ -9,7 +9,8 @@ class Replace < Hash
 	}
 
 	# auto generate replace entry based on dep values
-	if File.exists?(".svn") || File.exists?(".git")
+	#if File.exists?(".svn") || File.exists?(".git")
+	if(Scm.get_default_scm_type == "svn" || Scm.get_default_scm_type =="git")
 	  ["vcxproj","csproj"].each { |ext|
 	    if(Dir.glob("**/*.#{ext}").count > 0)
 		  puts_debug "Dev::Cmd::Replace.refresh found file with extension #{ext}"

data/lib/dev/cmd/Test.rb

@@ -13,10 +13,11 @@ class Test < Array
 	  self << "{:cmd=>'gem install #{gs.gsub('.gemspec','')}-#{DEV[:version]}.gem', :capture_output=>true, :auto=>true}"
     } 
 
-    Dir.glob("*.{Test.csproj,Features.csproj}").each { |cs|
+    Dir.glob("**/*.{Test.csproj,Features.csproj}").each { |cs|
 	  platforms=Dev::MsBuild.extract_platforms(cs)
 	  platforms.each { |platform|
-	    dll_name="#{DEV[:directory]}/bin/#{platform}/Release/#{File.basename(cs,'.csproj')}.dll"
+	    proj_path=File.dirname(cs)
+	    dll_name="#{proj_path}/bin/#{platform}/Release/#{File.basename(cs,'.csproj')}.dll"
 		if platform=="x86"
           self << "{:cmd=> '<paths,nunitx86> /xml:#{dll_name}.nunit-results.xml #{dll_name}', :auto=>true, :capture_output=>true, :capture_error=>true}" if RUBY_PLATFORM.include?("w32")
 		  self << "{:cmd-> 'mono <paths,nunitx86> #{dll_name}', :auto=>true}" if !RUBY_PLATFORM.include?("w32")

data/lib/dev.rb

@@ -39,7 +39,7 @@ end
 
 puts_debug "read " + __FILE__.foreground(:green)
 
-["Environment","Array","Hash","SystemCall","MsBuild","Paths","Dep","Deps","Database","BoostBuild","Project","Commands","Tasks"].each{ |f| require "#{File.dirname(__FILE__)}/dev/#{f}.rb" }
+["Environment","Array","Hash","SystemCall","Scm","MsBuild","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.214
+  version: 1.0.217
   prerelease: 
 platform: ruby
 authors: