dev 1.0.126 → 1.0.128

data/lib/dev.rb

@@ -1,5 +1,4 @@
 require 'rubygems'
-#require 'bundler/setup'
 
 Encoding.default_external=Encoding::UTF_8
 Encoding.default_internal=Encoding::UTF_8
@@ -40,10 +39,10 @@ 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"
-
+#require "#{File.dirname(__FILE__)}/dev/Environment.rb"
+#require "#{File.dirname(__FILE__)}/dev/Hash.rb"
+#require "#{File.dirname(__FILE__)}/dev/SystemCall.rb"
+["Environment","Hash","SystemCall"].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

data/lib/dev/Project.rb

@@ -15,15 +15,36 @@ class Project < Hash
   end
 
   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}",
-	  :toolset  => Dev::BoostBuild.defaultToolset,
 	  :name => get_default_value_name,
 	  :directory => Rake.original_dir(),
-	  :type => get_default_value_type
+	  :type => get_default_value_type,
+	  :version => "#{SemVer.find.major}.#{SemVer.find.minor}.#{SemVer.find.patch}",
+	  :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?
+	tmp=get_default_value_paths
+	h[:paths] = tmp if !tmp.nil?
+	return h
   end
 
+  def update_default_values
+    puts_debug "update_default_values"
+    
+    ["add","pull","setup","compile","test","features","commit","update" ].each do |k| 
+      puts_debug "set_default_value(#{k})"
+      set_default_value(k) 
+    end
+    
+    generate_tasks(self)
+  end 
+
   def get_default_value_name
     dirs=Rake.original_dir().split('/')
 	return dirs[dirs.length-2] if(dirs.length > 3)
@@ -38,6 +59,32 @@ class Project < Hash
 	return "ruby"
   end
 
+  def get_default_scm_type
+    return "svn" if File.exists?(".svn")
+    return "git" if File.exists?(".git")
+	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.5.10.11092","2.6.0.12051"].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?
+	  }
+	}
+
+	hash=nil if hash.length < 1
+	return hash
+  end
+
   def update_keys
     self.each{ |name,value| self[name]=value }
   end
@@ -316,61 +363,9 @@ class Project < Hash
   end
   
   def get_default_value(key)
-    system_call = Dev::SystemCall.new("semver init") if(!File.exist?(".semver"))  
-    version = SemVer.find
  
-    value="#{Dev::Environment.dev_root}" if key=="dev_root"
-    #value="C#" if key=="type"
-
-	#defaults = Defaults.new
-	#merge(defaults)
-	#value=defaults.get_default_value(key) if key=="src_glob"
-    #value=defaults.get_default_value(key) if key=="toolset"
-	#value=defaults.get_default_value(key) if key=="name"
-	#value=defaults.get_default_value(key) if key=="directory"
-	#value=defaults.get_default_value(key) if key=="type"
-
     value=loc_total if key=="loc"
-    value="svn" if key=="scm_type" && File.exists?(".svn")
-    value="git" if key=="scm_type" && File.exists?(".git")
-    value="#{version.major}.#{version.minor}.#{version.patch}" if key=="version"
-  
-    if key=="file_count" 
-      unless self[:src_glob].nil?
-        if self[:src_glob].kind_of?(Hash)
-          length=0
-          self[:src_glob].each do |name,value|
-            length+=Dir.glob(self[:src_glob][name]).length
-          end
-          value=length.to_s
-        else
-          value=Dir.glob(self[:src_glob]).length.to_s
-        end
-      end
-    end
-    
-    hash=Hash.new
-    
-    if(key=="paths")
-      #if(self[:type]=="C#")
-        hash.set_value("msbuild_vs9","C:/WINDOWS/Microsoft.NET/Framework/v3.5/MSBuild.exe")
-        hash.set_value("msbuild","C:/WINDOWS/Microsoft.NET/Framework/v4.0.30319/MSBuild.exe")
-        nunit_exe="#{Dev::Environment.dev_root}/dep/google/third-party/NUnit/2.6.0.12051/bin/nunit-console-x86.exe"
-        ["2.5.10.11092","2.6.0.12051"].each{ |v|
-          tmp="#{Dev::Environment.dev_root}/dep/github-third-party/NUnit/#{v}/bin/nunit-console-x86.exe"
-          nunit_exe=tmp if File.exist?(tmp) && !File.exist?(nunit_exe)
-          tmp="#{Dev::Environment.dev_root}/dep/google/third-party/NUnit/#{v}/bin/nunit-console-x86.exe"
-          nunit_exe=tmp if File.exist?(tmp) && !File.exist?(nunit_exe)
-		  tmp="#{Dev::Environment.dev_root}/dep/ThirdParty/NUnit/2.5.10.11092/bin/net-2.0/nunit-console-x86.exe"
-		  nunit_exe=tmp if File.exist?(tmp) && !File.exist?(nunit_exe)
-        }
-        hash.set_value("nunit",nunit_exe)
-        hash.set_value("regasm","C:/WINDOWS/Microsoft.NET/Framework/v2.0.50727/RegAsm.exe") if File.exists?("C:/WINDOWS/Microsoft.NET/Framework/v2.0.50727/RegAsm.exe")
-        hash.set_value("regasm","C:/Windows/Microsoft.NET/Framework/v4.0.30319/RegAsm.exe") if File.exists?("C:/Windows/Microsoft.NET/Framework/v4.0.30319/RegAsm.exe")
-      #end
-    end
-    value=hash if hash.length > 0
-    
+      
     array=Array.new
     if(key=="setup")
       #array << "bundle install" if File.exists?("Gemfile")
@@ -496,19 +491,7 @@ class Project < Hash
     return value
   end
   
-  def update_default_values
-    puts_debug "update_default_values"
-    
-    #self[:type]="C#" if self[:type].nil?
-    
-    [ "directory","name","type","version","src_glob","scm_type","dev_root",
-      "paths","add","pull","setup","compile","test","features","commit","update", "toolset" ].each do |k| 
-      puts_debug "set_default_value(#{k})"
-      set_default_value(k) 
-    end
-    
-    generate_tasks(self)
-  end 
+  
 
   def self.extract_platforms(filename)
     results = Array::new

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.126
+  version: 1.0.128
   prerelease: 
 platform: ruby
 authors:
@@ -165,7 +165,6 @@ files:
 - LICENSE
 - README
 - lib/dev/BoostBuild.rb
-- lib/dev/Defaults.rb
 - lib/dev/Dep.rb
 - lib/dev/Environment.rb
 - lib/dev/Hash.rb

data/lib/dev/Defaults.rb

@@ -1,60 +0,0 @@
-module Dev
-class Defaults < Hash
- 
-  def initialize(args)
-    args = defaults.merge(args)
-  end
-
-  def defaults
-    {
-	  :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}",
-	  :toolset  => Dev::BoostBuild.defaultToolset,
-	  :name => get_default_value_name,
-	  :directory => Rake.original_dir(),
-	  :type => get_default_value_type
-	}
-  end
-
-  #attr_accessor :project
-
- # def get_default_value(key)
-  #  begin
- #     return get_default_value_src_glob if key=="src_glob"
-#	  return get_default_value_toolset if key=="toolset"
-#	  return get_default_value_name if key=="name"
-#	  return get_default_value_directory if key=="directory"
-#	  return get_default_value_type if key=="type"
-#	rescue
-#	  return nil
-#	end
- # end
-
-  #def get_default_value_src_glob
-	#value="**/{*.{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}"
-	#return value
-  #end
-
-  #def get_default_value_toolset
-  #  return Dev::BoostBuild.defaultToolset
-  #end
-
-  def get_default_value_name
-    dirs=Rake.original_dir().split('/')
-	return dirs[dirs.length-2] if(dirs.length > 3)
-    return nil
-  end
-
-  #def get_default_value_directory
-  #  return Rake.original_dir()
-  #end
-
-  def get_default_value_type
-    Dir.glob("**/*.{cpp,hpp}").each { |f| return "c++" }
-	Dir.glob("**/*.{c,h}").each { |f| return "c" }
-	Dir.glob("**/*.{cs}").each { |f| return "C#" }
-	Dir.glob("**/*.{gemspec}").each { |f| return "gem" }
-	return "ruby"
-  end
-
-end # class Defaults
-end # module Dev