dev_tasks 0.0.114 → 0.0.115

data/lib/commands.rb

@@ -8,6 +8,7 @@ require_relative './push.rb'
 require_relative './setup.rb'
 require_relative './upgrade.rb'
 require_relative './timer.rb'
+require_relative './verify.rb'
 
 class Commands < Hash
   attr_accessor :build
@@ -20,13 +21,16 @@ class Commands < Hash
 	self[:test] = Test.new
 	self[:add] = Add.new
 	self[:commit] = Commit.new
-	self[:publish] = Publish.new
 	self[:push] = Push.new
+	self[:verify] = Verify.new
+	self[:publish] = Publish.new
   end
 
   def update
     self[:upgrade].update
 	self[:setup].update
+	self[:verify].update
+	self[:publish].update
   end
 
   def execute_command command

data/lib/dev_tasks.rb

@@ -22,15 +22,14 @@ class DevTasks < Hash
 
   def initialize
     @timer = Timer.new
-    #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]=pwd.split('/').last#Rake.application.original_dir.split('/').last
 	self[:svn_exports]=SvnExports.new
 	self[:scm]=Environment.scm
+	self[:scm_origin]=Environment.scm_origin
 	self[:branch]=Environment.branch
 	self[:src_glob]="**/{*.{rb,feature,spec,cs,c,m,cpp,cxx,h,hpp,i,jam,csproj,vcproj,snk,vcxproj,xcodeproj,plist,xib,sln,filters,xaml,resx,settings,config},Jamfile,.semver,Gemfile,README,LICENSE}"
 	self[:newest_src_file]=Dir.glob(self[:src_glob]).max_by {|f| File.mtime(f)}
-	self[:command_order]=['pull','upgrade','setup','add','build','test','commit','publish','push']
+	self[:command_order]=['pull','upgrade','setup','add','build','test','commit','push','verify','publish']
 	self[:relative_directory]=Environment.relative_directory
 	self[:working_directory]=Environment.working_directory
 	self[:context]=Environment.context
@@ -79,7 +78,6 @@ class DevTasks < Hash
   def execute_task task
     sym_task = task.to_sym
     timer=Timer.new
-    #start_time=Time.now
     Console.announce_task_start task
     if(!self[:commands].has_key?(sym_task))
       puts "no commands discovered for task " + task
@@ -87,8 +85,6 @@ class DevTasks < Hash
       self[:commands][sym_task].each {|c| self[:commands].execute_command(c) }
     end
 	elapsed = timer.elapsed
-    #end_time=Time.now
-    #elapsed=end_time-start_time
 	if elapsed > 30 
       elapsed_str="[" + "%.0f" %(elapsed) + "s]"
       Console.announce_task_end task, elapsed_str
@@ -110,16 +106,6 @@ class DevTasks < Hash
 	    dev_task_defaults << key
 	  end
 	end
-
-	#if(!Rake::Task.task_defined?('dev_tasks_default'))
-	#  tasklist=""
-	#  dev_task_defaults.each{|t|
-	#    tasklist = tasklist + "," if tasklist.length > 0
-	#    tasklist = tasklist + ":" + t.to_s
-	#  }
-	#  ruby="desc 'dev_tasks_default task [#{tasklist}]';task :dev_tasks_default => [#{tasklist}] do;puts '[:dev_task_default] completed in ' + DEV_TASKS.timer.elapsed_str;end"
-	#  eval(ruby)
-	#end
   end
 
   

data/lib/environment.rb

@@ -10,6 +10,29 @@ class Environment < Hash
 	"none"
   end
 
+  def self.scm_origin
+    if(Dir.exists?(".git"))
+	  `git remote show origin`.scan(/Fetch URL: ([\w:\/.-]+)/).each{|m|
+	    return m.first.to_s
+	  }
+	end
+	if(Dir.exists?(".svn"))
+	  `svn info`.scan(/URL: ([\w:\/.-]+)/).each{|m|
+	    return m.first.to_s
+	  }
+	end
+    ""
+  end
+
+  def self.svn_latest_revision
+    if(Dir.exists?(".svn"))
+	  `svn info`.scan(/Last Changed Rev: ([\d]+)/).each{|m|
+	    return m.first.to_s
+	  }
+	end
+	""
+  end
+
   def self.dev_root
      ["DEV_HOME","DEV_ROOT","USERPROFILE","HOME"].each {|v|
 	  return ENV[v].gsub('\\','/') unless ENV[v].nil?

data/lib/publish.rb

@@ -1,7 +1,6 @@
 require_relative('./environment.rb')
 require_relative('./artifacts.rb')
 
-
 class Publish < Array
 
   def initialize
@@ -17,6 +16,30 @@ class Publish < Array
 	end
   end
 
+  def update
+    if(defined?(DEV_TASKS))
+	  if(DEV_TASKS).has_key?(:publish_path)
+	    if(DEV_TASKS[:publish_path].contains?('svn://'))
+		  lastestRev=Environment.svn_latest_revision
+		  svn_publish_uri="#{DEV_TASKS[:publish_path]}/#{DEV_TASKS[:relative_path]}@latestRev"
+		  local_dir="#{Environment.dev_root}/tmp/#{DEV_TASKS[:relative_path]}@latestRev"
+		  FileUtils.mkdir_p(File.dirname(local_dir)) if(!File.exists(File.dirname(local_dir)))
+		  dep_dir="#{Environment.dev_root}/dep/#{DEV_TASKS[:relative_directory]}@#{latestRev}@"
+		  if(!`svn info #{svn_publish_uri}`.contains?('URL:'))
+		    add "svn mkdir #{svn_publish_uri} --parents"
+			add "svn checkout #{svn_publish_uri} #{local_dir}@"
+			DEV_TASKS[:artifacts].each{|a|
+			  f="#{Environment.dev_root}/tmp/#{a}"
+			  add "<%File.cp('#{dep_dir}/#{a}','#{local_dir}/#{a}'%>"
+			  add "svn add #{local_dir}/#{a} --parents"
+			}
+			add "svn commit #{local_dir} -m\"publish\""
+		  end
+		end
+	  end
+	end
+  end
+
   def add command
     self << command if(!include?(command))
   end

data/lib/spec.json

@@ -1 +1 @@
-{"name":"dev_tasks","version":"0.0.114"}
+{"name":"dev_tasks","version":"0.0.115"}

data/lib/verify.rb

@@ -0,0 +1,26 @@
+require_relative('./environment.rb')
+
+class Verify < Array
+
+  def initialize
+    update
+  end
+
+  def update
+    if(defined?(DEV_TASKS))
+	  if(Environment.scm=='svn')
+	    lastestRev=Environment.svn_latest_revision
+	    uri=DEV_TASKS[:scm_origin]+"@"+latestRev
+		dep_dir="#{Environment.dev_root}/dep/#{DEV_TASKS[:relative_directory]}@#{latestRev}@"
+		if(!File.exists?(dep_dir))
+		  add "svn export #{uri} #{dep_dir}"
+		  add "<%Environment.rake('#{dep_dir}','default',true)%>"
+		end
+	  end
+	end
+  end
+
+  def add command
+    self << command if(!include?(command))
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev_tasks
 version: !ruby/object:Gem::Version
-  version: 0.0.114
+  version: 0.0.115
   prerelease: 
 platform: ruby
 authors:
@@ -118,6 +118,7 @@ files:
 - lib/text.rb
 - lib/timer.rb
 - lib/upgrade.rb
+- lib/verify.rb
 - lib/spec.json
 - spec/dependencies_spec.rb
 - spec/dev_tasks_spec.rb