dev 2.0.263 → 2.0.264

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60788e92cae420726705aef6b6e32e3cf00051df
-  data.tar.gz: 7e2f63f358b5ed50189bbe2f4b38e45227905ac6
+  metadata.gz: 61faa5fc525d37466d14fba52fc17ba73258e244
+  data.tar.gz: 8ec479770a6062d4192bcfc9c7a1ab09a63dd3d9
 SHA512:
-  metadata.gz: 8270741d1790120a46fb8bb1ea412b6df38fdbc7724f833d92e56c960ef4f7b675222a26d3056ac44d0c603f615501dc281a8f4a10d24ead46794651a6ebf4cb
-  data.tar.gz: 848c5bc5f9d74f9d699a0049ea9851ea7133bb5d1fb2377d7187b2cf16b197a9c2d7ae107d94bc3654fac0fede1c87d6c36e896881f3590d9856df45dc3dc1db
+  metadata.gz: aebda3e608d75142ffc08585d7f8420b682553fdf9db77cffa02c0528becf5477247f807fdfc55a9dcae875058946e7f8a8e56eecdaa1cbfde066352d1bf58c2
+  data.tar.gz: a9646d547ea0391ac8ebae56d88e0dd240bade413cca05393639ffa7bc4bd0f07f98d5a5b41ec70ea17f04f6649133ce043feaa49c64a176e306c6e901b71058

data/lib/apps/svn.rb

@@ -131,7 +131,7 @@ class Svn
 				end
 				
 				#begin
-				FileUtils.rm_r "#{dir}/to_publish_checkout"
+				Environment.remove "#{dir}/to_publish_checkout"
 				output
 			}
 		end

data/lib/base/project.rb

@@ -101,7 +101,7 @@ class Project < Hash
 		puts "#{'version'.fix(13)}: #{VERSION}" if defined? VERSION
 	end
 
-    def latest_tag
+    def latest_tag update=false
 		FileUtils.mkdir("#{Environment.dev_root}/make") if !File.exists? "#{Environment.dev_root}/make"
 		makedir="#{Environment.dev_root}/make/#{self.fullname}"
     	FileUtils.mkdir_p(File.dirname(makedir)) if !File.exists?(File.dirname(makedir))
@@ -110,10 +110,12 @@ class Project < Hash
         	  Command.exit_code('git pull')
             end
         else
-        	clone=Command.new("git clone #{self.url} #{makedir}")
-			clone[:quiet]=true
-			clone[:ignore_failure]=true
-			clone.execute
+        	if(update)
+        	   clone=Command.new("git clone #{self.url} #{makedir}")
+			   clone[:quiet]=true
+			   clone[:ignore_failure]=true
+			   clone.execute
+		    end
         end
         if(File.exists?(makedir))
         	Dir.chdir(makedir) do
@@ -164,7 +166,7 @@ class Project < Hash
 					rake_default.execute
 					FileUtils.mkdir_p(File.dirname(logfile)) if !File.exists?(File.dirname(logfile))
 					File.open(logfile,'w'){|f|f.write(rake_default.to_json)}
-					#puts rake_default.summary
+					update_status
 					rake_default
 				  end
 			   end
@@ -185,23 +187,53 @@ class Project < Hash
     	nil
     end
 
-    def status
-    	status='?'
+    def update_status
+    	status_logfile="#{Environment.dev_root}/log/#{self.fullname}/#{Environment.user}@#{Environment.machine}.status.json"
+    	status=Hash.new({'status'=>'?'})
     	wrk_logfile="#{Environment.dev_root}/log/#{self.fullname}/#{Environment.user}@#{Environment.machine}.json"
     	if(File.exists?(wrk_logfile))
     		rake_default=Command.new(JSON.parse(IO.read(wrk_logfile)))
-    		status='0'
-    		return 'X' if rake_default[:exit_code] != 0
-    	end
+    		status[:work_logfile]=wrk_logfile 
+    		status['status']='0' 
+    		status['status']='X' if rake_default[:exit_code] != 0
+        end
     	make_logfile="#{Environment.dev_root}/log/#{self.fullname}/#{latest_tag}/#{Environment.user}@#{Environment.machine}.json"
     	if(File.exists?(make_logfile))
     		rake_default=Command.new(JSON.parse(IO.read(make_logfile)))
-    		status='0'
-    		return 'X' if rake_default[:exit_code] != 0
+    		status[:make_logfile]=make_logfile 
+    		status['status']='0' 
+    		status['status']='X' if rake_default[:exit_code] != 0
     	else
-    		return '?' # outstanding make
+    		status['status']='?'
+    	end
+    	FileUtils.mkdir_p(File.dirname(status_logfile)) if !File.exists?(File.dirname(status_logfile))
+    	File.open(status_logfile,'w'){|f|f.write(status.to_json)}
+    end
+
+    def status
+    	status_logfile="#{Environment.dev_root}/log/#{self.fullname}/#{Environment.user}@#{Environment.machine}.status.json"
+    	update_status if !File.exists? status_logfile
+    	if(File.exists?(status_logfile))
+    	  statusHash=JSON.parse(IO.read(status_logfile))
+    	  return statusHash['status'] if(statusHash.has_key?('status'))
     	end
-    	status
+    	'?'
+    	#status='?'
+    	#wrk_logfile="#{Environment.dev_root}/log/#{self.fullname}/#{Environment.user}@#{Environment.machine}.json"
+    	#if(File.exists?(wrk_logfile))
+    	#	rake_default=Command.new(JSON.parse(IO.read(wrk_logfile)))
+    	#	status='0'
+    	#	return 'X' if rake_default[:exit_code] != 0
+    	#end
+    	#make_logfile="#{Environment.dev_root}/log/#{self.fullname}/#{latest_tag}/#{Environment.user}@#{Environment.machine}.json"
+    	#if(File.exists?(make_logfile))
+    	#	rake_default=Command.new(JSON.parse(IO.read(make_logfile)))
+    	#	status='0'
+    	#	return 'X' if rake_default[:exit_code] != 0
+    	#else
+    	#	return '?' # outstanding make
+    	#end
+    	#status
     end
 
     def report
@@ -222,6 +254,7 @@ class Project < Hash
     			logfile="#{Environment.dev_root}/log/#{self.fullname}/#{Environment.user}@#{Environment.machine}.json"
     			FileUtils.mkdir_p(File.dirname(logfile)) if !File.exists?(File.dirname(logfile))
 				File.open(logfile,'w'){|f|f.write(rake_default.to_json)}
+				update_status
 				puts rake_default.summary
     	      end
     	    else

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 2.0.263
+  version: 2.0.264
 platform: ruby
 authors:
 - Lou Parslow
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: rainbow
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 description: development tasks
 email: lou.parslow@gmail.com
 executables: