dev 1.0.131 → 1.0.132

data/lib/dev/Project.rb

@@ -1,5 +1,6 @@
 puts_debug "read " + __FILE__.foreground(:green)
 require 'semver'
+require 'rake' 
 
 UNITTESTS=Array.new
 module Dev
@@ -19,7 +20,7 @@ class Project < Hash
     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_group_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}",
@@ -47,7 +48,7 @@ class Project < Hash
   end 
 
   def get_default_value_name
-    dirs=Rake.original_dir().split('/')
+    dirs=::Rake.original_dir().split('/')
 	return dirs[dirs.length-2] if(dirs.length > 3)
     return nil
   end
@@ -523,4 +524,5 @@ class Project < Hash
 end
 end # module Dev
 
-PROJECT=Dev::Project.new(nil,true)
+PROJECT=Dev::Project.new(nil,true)
+PROJECT.update_default_values

data/lib/dev/Tasks.rb

@@ -20,11 +20,11 @@ task :info do
   PROJECT.info
 end
 
-desc "add files defined by src_glob to source code management"
-task :add do
-  task_start("add")
-  PROJECT.add
-end
+#desc "add files defined by src_glob to source code management"
+#task :add do
+#  task_start("add")
+#  PROJECT.add
+#end
 
 desc "commit changes to source code management"
 task :commit do
@@ -36,7 +36,7 @@ require 'rake/clean'
 CLEAN.include('doc','*.gem','*.taskstamp*','**/*.{suo,sdf}')
 CLOBBER.include('bin','obj')
 
-def generate_tasks(project)
+def generate_task_hash(project)
   task_hash = { 
     #:add=> { :desc=> 'add files defined by src_glob to source code management' },
     #:info=> { :desc=> 'display information about the rakefile' },
@@ -50,34 +50,36 @@ def generate_tasks(project)
     :check=> { :desc=> 'checks if the project default task may be skipped' },
     :update=> { :desc=> 'updates changes from source code management' }
   }
+  if(project[:scm_type]=="svn" || project[:scm_type]=="git")
+    task_hash[:add]={ :desc=> 'add files defined by src_glob to source code management' }
+  end
   if project[:type]=="gem" || project[:type]=="ruby"
     task_hash[:features] = { :desc=> 'tests cucumber features' }
   end
-  
-  if("#{RUBY_VERSION}">"1.9.1")
-    task_hash.each do |k,v|
-      name=k.to_s
-      desc=nil
-      desc=v[:desc] if v.has_key?(:desc)
-      ruby="task :#{name} do; task_start '#{name}'; PROJECT.#{name}; end"
-      ruby="desc '#{desc}'; " + ruby unless desc.nil? 
-      unless Rake::Task.task_defined?(name)
-        puts_debug "defining task " + name
-        eval(ruby)
-      end
+  return task_hash
+end
+
+def generate_tasks(project)
+  hash=generate_task_hash project
+
+  hash.each do |k,v|
+	name=k.to_s
+	desc=nil
+	desc=v[:desc] if v.has_key?(:desc)
+	ruby="task :#{name} do; task_start '#{name}'; PROJECT.#{name}; end"
+	ruby="desc '#{desc}'; " + ruby unless desc.nil? 
+	#unless Rake::Task.task_defined?(name)
+	if !task_exists?(name)
+	  puts_debug "defining task " + name
+	  eval(ruby)
 	end
   end
 end
 
-if("#{RUBY_VERSION}"<="1.9.1")
-    #task :add do; task_start('add'); PROJECT.add; end
-    task :check do; task_start('check'); PROJECT.check; end
-    task :update do; task_start('update'); PROJECT.update; end
-	task :setup do; task_start('setup'); PROJECT.setup; end
-	task :compile do; task_start('compile'); PROJECT.compile; end
-	task :test do; task_start('test'); PROJECT.test; end
-	#task :commit do; task_start('commit'); PROJECT.commit; end
-	task :replace do;  task_start('replace'); PROJECT.replace; end
-	task :loc do; task_start('loc'); PROJECT.loc; end
-    #task :info do; task_start('info'); PROJECT.info; end
-end
+def task_exists?(name)
+  if("#{RUBY_VERSION}">"1.9.1")
+    return Rake::Task.task_defined?(name)
+  else
+    return false
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 1.0.131
+  version: 1.0.132
   prerelease: 
 platform: ruby
 authors: