dev_tasks 0.0.146 → 0.0.147

data/lib/environment.rb

@@ -10,6 +10,29 @@ class Environment < Hash
 	"none"
   end
 
+  def self.copy src,dest
+    FileUtils.mkdir_p File.dirname(dest) if !File.exists?(File.dirname(dest))
+	FileUtils.cp(src,dest)
+  end
+
+  def self.copy_files files,dest
+    Console.debug("Environment.copy_files([#{files.to_s}],'#{dest}'')")
+    files.each{|f|
+	  if(File.directory?(dest))
+	    Console.debug "copying #{f} to #{dest}/#{f}"
+	    FileUtils.cp(f,dest + "/" + f)
+	  end
+	}
+  end
+
+  def self.svn_add_all dir
+	Dir.chdir(dir) do
+	  Dir.glob('**/*').each{|f|
+	    puts `svn add #{f}`
+	  }
+	end
+  end
+
   def self.scm_origin
     if(Dir.exists?(".git"))
 	  `git remote show origin`.scan(/Fetch URL: ([\w:\/.-]+)/).each{|m|
@@ -30,7 +53,7 @@ class Environment < Hash
 	    return m.first.to_s
 	  }
 	end
-	""
+	"0"
   end
 
   def self.dev_root

data/lib/publish.rb

@@ -17,9 +17,10 @@ class Publish < Array
   end
 
   def update
+    Console.debug "Publish.update"
     if(defined?(DEV_TASKS))
 	  if(DEV_TASKS).has_key?(:publish_path)
-	    if(DEV_TASKS[:publish_path].include?('svn://'))
+	    if(DEV_TASKS[:publish_path].include?('svn://') || DEV_TASKS[:publish_path].include?('file:///'))
 		  latestRev=Environment.svn_latest_revision 
 		  svn_publish_uri="#{DEV_TASKS[:publish_path]}/#{DEV_TASKS[:relative_directory]}-#{latestRev}"
 		  local_dir="#{Environment.dev_root}/tmp/#{DEV_TASKS[:relative_directory]}@#{latestRev}"
@@ -32,15 +33,10 @@ class Publish < Array
 		    Console.debug "adding publish commands.."
 		    add "svn mkdir #{svn_publish_uri} --parents -m\"publish\""
 			add "svn checkout #{svn_publish_uri} #{local_dir}"
-			Dir.glob(DEV_TASKS[:files][:artifact]).each{|a|
-			  f="#{Environment.dev_root}/tmp/#{a}"
-			  dest_dir=File.dirname("#{local_dir}/#{a}")
-			  Console.debug "dest_dir=#{dest_dir}"
-			  add "<%FileUtils.mkdir_p('#{dest_dir}') if !File.exists?('#{dest_dir}')%>"
-			  add "<%FileUtils.cp('#{dep_dir}/#{a}','#{local_dir}/#{a}') if File.exists?('#{dep_dir}/#{a}')%>"
-			  add "svn add #{local_dir}/#{a} --parents"
-			}
-			add "svn commit #{local_dir} -m\"publish\""
+			add "<%Environment.copy_files(DEV_TASKS[:files][:artifact],'#{local_dir}')%>"
+			add "<%Environment.svn_add_all('#{local_dir}')%>"
+			add "svn commit #{local_dir}@ -m\"publish\""
+			#add "<%FileUtils.rm_r('#{local_dir}')%>"
 		  end
 		end
 	  end

data/lib/spec.json

@@ -1 +1 @@
-{"name":"dev_tasks","version":"0.0.146"}
+{"name":"dev_tasks","version":"0.0.147"}

data/spec/test_data/cpp_projects/helloLib/rakefile.rb

@@ -1 +1,6 @@
-require_relative '../../../../lib/dev_tasks.rb'
+require_relative '../../../../lib/dev_tasks.rb'
+
+DEV[:debug]=true
+DEV[:commands][:setup] << "svnadmin create repo" if(!File.exists?('repo'))
+DEV[:publish_path]="file:///#{DEV[:working_directory]}/repo"
+CLOBBER.include("repo")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev_tasks
 version: !ruby/object:Gem::Version
-  version: 0.0.146
+  version: 0.0.147
   prerelease: 
 platform: ruby
 authors: