dev 2.0.256 → 2.0.257

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 034e461620d6e604f82b05d52361130b65c499ae
-  data.tar.gz: d83fa2c6a08218c228133bb4e13aac3f0a6543d4
+  metadata.gz: 4abc575d0261a33e95b19290cf73bc799bb4849e
+  data.tar.gz: cd15b676018cb81d1c6d736c24e7c1b47f56bcc4
 SHA512:
-  metadata.gz: d221b2d2e42217758b507b3078df5b2d0f19a5a5f7c3251a0657d6dcd948d73f70adb220cf1c716f6c5b03d8bc98aa70cdac3cb7d5f7fc8cddbe9466132e09bb
-  data.tar.gz: 6f09df3e24528ac94a14e1c6823f4addf4dcdc956e05892356cdccacb457dd9e0862eb296fc8047fb5723c1f9a05b8a4df70ac7d896d412fa7f2eb0eaa20a884
+  metadata.gz: 8f941a74f8891a99ea469d04ebea807e56ea13caf2e6c4ff85d55bc5c69d935efc2e9b705b0bdfead23e212119c9c2cf2228e2be88eb0bba22c9c42ab7d474ed
+  data.tar.gz: f2763abae0b51cebc149e88edf79ccf59f6d08dd697eb31e9a924fbb790a7c9eb68b245cb60cb57af88b0c01ba62a7e2bf05c391be0fe0c070639f250b279f68

data/lib/base/project.rb

@@ -140,7 +140,8 @@ class Project < Hash
 		logfile="#{Environment.dev_root}/log/#{self.fullname}/#{tag}/#{Environment.user}@#{Environment.machine}.json"
 		if(File.exists?(logfile))
 			# load hash from json
-			return Command.new(JSON.parse(IO.read(logfile)))
+			rake_default=Command.new(JSON.parse(IO.read(logfile)))
+			#puts rake_default.summary
 		else
 			FileUtils.mkdir("#{Environment.dev_root}/make") if !File.exists? "#{Environment.dev_root}/make"
 			makedir="#{Environment.dev_root}/make/#{self.fullname}-#{tag}"
@@ -152,6 +153,7 @@ class Project < Hash
 			    end
 				if(File.exists?(makedir))
 				  Dir.chdir(makedir) do
+				  	#puts "making #{self.fullname}"
 					checkout=Command.new({:input=>"git checkout #{tag}",:quiet=>true})
 					checkout.execute
 					FileUtils.rm_r '.git'
@@ -162,6 +164,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
 					rake_default
 				  end
 			   end
@@ -210,6 +213,23 @@ class Project < Hash
     	end
     end
 
+    def update
+    	clone
+    	checkout
+    	if(File.exists?(wrk_dir))
+    		Dir.chdir(wrk_dir) do
+    			rake_default=Command.new('git pull')
+				rake_default[:quiet]=true
+				rake_default[:ignore_failure]=true
+				rake_default.execute
+				rake_default=Command.new('svn update')
+				rake_default[:quiet]=true
+				rake_default[:ignore_failure]=true
+				rake_default.execute
+    		end
+    	end
+    end
+
     def tags
     	tags=Array.new
     	if !File.exists? wrk_dir

data/lib/base/projects.rb

@@ -14,7 +14,7 @@ class Projects < Hash
 		@filename=''
 	end
 
-    def update
+    def update_state
     	self.each{|k,v|
     		self[k]=Project.new(v) if(v.is_a?(String))
     		self[k]=Project.new(v) if(!v.is_a?(Project) && v.is_a?(Hash))
@@ -30,7 +30,7 @@ class Projects < Hash
 	def open filename=''
 		@filename=filename if filename.length > 0
 		JSON.parse(IO.read(@filename)).each{|k,v| self[k]=v}
-		update
+		update_state
 	end
 
     def list filter=''
@@ -46,7 +46,8 @@ class Projects < Hash
 			if filter.nil? || filter.length==0 || k.include?(filter)
 				tag=v.latest_tag
 				if(tag.length > 0)
-				   puts "making #{k} #{tag}"
+				   logfile="#{Environment.dev_root}/log/#{v.fullname}/#{tag}/#{Environment.user}@#{Environment.machine}.json"
+				   puts "making #{k} #{tag}" if(!File.exists?(logfile))
 			 	   rake_default=v.make tag
 			 	   puts rake_default.summary if !rake_default.nil?
 			    end
@@ -59,14 +60,23 @@ class Projects < Hash
 		filter=args[1] if !args.nil? && args.length > 0
 		self.each{|k,v|
 			if filter.nil? || filter.length==0 || k.include?(filter)
-				log_filename=
 				last_work_time=nil
-				#puts "working #{k}"
 			 	v.work
 		    end
 		}
 	end
 
+	def update args
+		filter=''
+		filter=args[1] if !args.nil? && args.length > 0
+		self.each{|k,v|
+			if filter.nil? || filter.length==0 || k.include?(filter)
+				puts "updating #{v.fullname}"
+			 	v.update
+		    end
+		}
+	end
+
 	def self.user_projects_filename
 		FileUtils.mkdir("#{Environment.dev_root}/data") if(!File.exists?("#{Environment.dev_root}/data"))
 		"#{Environment.dev_root}/data/PROJECTS.json"

data/lib/dev.rb

@@ -17,6 +17,7 @@ class Dev
 		PROJECTS.list(args.length>1 ? args[1]:'') if args.length > 0 && args[0] == 'list'
 		PROJECTS.make(args) if args.length > 0 && args[0] == 'make'
 		PROJECTS.work(args) if args.length > 0 && args[0] == 'work'
+		PROJECTS.update(args) if args.length > 0 && args[0] == 'update'
 		usage if args.length == 0
 	end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 2.0.256
+  version: 2.0.257
 platform: ruby
 authors:
 - Lou Parslow