lib/dev_tasks.rb in dev_tasks-0.0.19 vs lib/dev_tasks.rb in dev_tasks-0.0.20

@@ -2,10 +2,11 @@
 require 'rake' 
 require 'rake/clean'
 require 'json'
 include Rake::DSL
 
+require_relative './environment.rb'
 require_relative './commands.rb'
 require_relative './dependencies.rb'
 require_relative './artifacts.rb'
 require_relative './console.rb'
 
@@ -16,31 +17,29 @@
   def initialize
     #hash = JSON.parse File.read("#{File.dirname(__FILE__)}/spec.json")
 	#self[:dev_tasks_gem]=JSON.parse File.read("#{File.dirname(__FILE__)}/spec.json")
 	
 	self[:name]=Rake.application.original_dir.split('/').last
-	self[:scm]=DevTasks.scm
-	if(self[:scm]=='git')
-	  branches=`git branch`.split(/\n/)
-	  branches.each{|b|
-	    self[:branch]=b.gsub('*','').strip if b.include?('*')
-	  }
-	end
-	self[:dev_root]=DevTasks.dev_root
+	self[:scm]=Environment.scm
+	self[:branch]=Environment.branch
+	self[:relative_directory]=Environment.relative_directory
+	self[:working_directory]=Environment.working_directory
+	self[:context]=Environment.context
+	self[:dev_root]=Environment.dev_root
 	update
   end 
 
   def add hash
     hash.each do |key,value|
 	  self[key]=value if !has_key?(key)
 	end
   end
 
   def update
-	self[:commands]=Commands.new if !has_key?(:commands)
-	self[:dependencies]=Dependencies.new if !has_key?(:dependencies)
+    self[:dependencies]=Dependencies.new if !has_key?(:dependencies)
 	self[:artifacts]=Artifacts.new if !has_key?(:artifacts)
+	self[:commands]=Commands.new if !has_key?(:commands)
 	update_tasks
   end
 
   def execute_task task
     start_time=Time.now
@@ -74,33 +73,19 @@
 
 	if(!Rake::Task.task_defined?('dev_tasks_default'))
 	  tasklist=""
 	  dev_task_defaults.each{|t|
 	    tasklist = tasklist + "," if tasklist.length > 0
-	    tasklist = tasklist + ":" + t
+	    tasklist = tasklist + ":" + t.to_s
 	  }
-	  ruby="desc 'dev_tasks_default task';task :dev_tasks_default => [#{tasklist}] do;end"
+	  ruby="desc 'dev_tasks_default task [#{tasklist}]';task :dev_tasks_default => [#{tasklist}] do;end"
 	  eval(ruby)
 	end
   end
 
-  def self.dev_root
-     ["DEV_HOME","DEV_ROOT","USERPROFILE","HOME"].each {|v|
-	  return ENV[v].gsub('\\','/') unless ENV[v].nil?
-	 }
-     dir="~"
-     dir=ENV["HOME"] unless ENV["HOME"].nil?
-     dir=ENV["USERPROFILE"].gsub('\\','/') unless ENV["USERPROFILE"].nil?
-     dir=ENV["DEV_ROOT"].gsub('\\','/') unless ENV["DEV_ROOT"].nil?
+  
 
-	 return dir
-  end
-
-  def self.scm
-    return "git" if(Dir.exists?(".git"))
-	return "svn" if(Dir.exists?(".svn"))
-	"none"
-  end
+  
 end
 
 DEV_TASKS=DevTasks.new
 
 desc 'displays information about current rake directory'