dev 2.0.258 → 2.0.259

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c5d3d0f0c93b7a5fe47925dd8c48fc4a6b44f9b
-  data.tar.gz: b1234a565c3ff71e0911d80d5266c96810b78df6
+  metadata.gz: a20f1522a1f274c796c05fe9e1199549639f8fa1
+  data.tar.gz: ce149981f48e6bd5820e1c3d1237456a8b7da153
 SHA512:
-  metadata.gz: 3b460ee9b9f6876449bb36f05211cf9c9dcf8bb91f8b9f3eac0390b1324cf20fd608b154999df81b7f560895eb129746433fa50a2d11adb564e37117c0cfc57f
-  data.tar.gz: f77051c7b994dc2d5af89590f4541bc5715f31b4f15d572b70139449bd61fc83b55dafaee886259f7b831a5d552980982f1ee0885cc831858b1d7a94c012445a
+  metadata.gz: 36ebdf53a878d56408b7f235456d6cf6baecff1a3d77c6f9df812ef05a0651a4f288d7f3f4bd08c10f2b5e46b665abb4a29befa61ca8f87e1afe9ebd9a808c3b
+  data.tar.gz: 677a863c8e77ec5ae5ed10c5081db146bfb64b54cc40938851fa158732a7f370a59ac07ff1e342894874c859922c0565aed4a44fd2a94b2e39aa445a5c585ba9

data/lib/base/environment.rb

@@ -6,6 +6,7 @@ class Environment < Hash
 
   @@debug=true if defined?(DEBUG)
   @@debug=false if !defined?(DEBUG)
+  @@development_root=nil
 
   def initialize
     self[:home]=Environment.home
@@ -13,6 +14,16 @@ class Environment < Hash
     self[:user]=Environment.user
   end
 
+  def self.set_development_root value
+    @@development_root=value
+    if(!value.nil?)
+      FileUtils.mkdir_p value if(!File.exists?(value))
+      ['bin','data','log','make','publish','test'].each{|dir|
+        FileUtils.mkdir_p("#{value}/#{dir}") if !File.exists? "#{value}/#{dir}"
+      }
+    end
+  end
+
   def self.debug
     @@debug
   end
@@ -62,6 +73,9 @@ class Environment < Hash
   end
 
   def self.dev_root
+    if(!@@development_root.nil?)
+      return @@development_root
+    end
     ["DEV_HOME","DEV_ROOT"].each {|v|
       return ENV[v].gsub('\\','/') unless ENV[v].nil?
     }

data/lib/base/project.rb

@@ -157,7 +157,7 @@ class Project < Hash
 					checkout=Command.new({:input=>"git checkout #{tag}",:quiet=>true})
 					checkout.execute
 					FileUtils.rm_r '.git'
-					rake_default=Command.new('rake default --trace')
+					rake_default=Command.new('rake default')
 					rake_default[:quiet]=true
 					rake_default[:ignore_failure]=true
 					#rake_default[:timeout]=5*60*1000
@@ -207,7 +207,7 @@ class Project < Hash
     	    	if(File.exists?(logfile))
     	    		rake_default=Command.new('rake default')
     	    		rake_default.open logfile
-    	    		puts rake_default.summary
+    	    		puts rake_default.summary if(rake_default.summary.include?('Error'))
     	    	end
     	    end
     	end

data/lib/base/projects.rb

@@ -47,9 +47,14 @@ class Projects < Hash
 				tag=v.latest_tag
 				if(tag.length > 0)
 				   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?
+				   if(!File.exists?(logfile))
+				     puts "making #{k} #{tag}" if(!File.exists?(logfile))
+				     rake_default=v.make tag
+				     puts rake_default.summary if !rake_default.nil?
+				   else
+				   	 rake_default=v.make tag
+				   	 puts rake_default.summary if !rake_default.nil? && rake_default.summary.include?('Error')
+				   end
 			    end
 		    end
 		}
@@ -78,7 +83,7 @@ class Projects < Hash
 	end
 
 	def self.user_projects_filename
-		FileUtils.mkdir("#{Environment.dev_root}/data") if(!File.exists?("#{Environment.dev_root}/data"))
+		FileUtils.mkdir_p("#{Environment.dev_root}/data") if(!File.exists?("#{Environment.dev_root}/data"))
 		"#{Environment.dev_root}/data/PROJECTS.json"
 	end
 
@@ -109,6 +114,18 @@ class Projects < Hash
 		self.each{|k,v| v.rake if v.respond_to?("rake".to_sym)}
 	end
 
+    def add args
+    	if(args.length > 1)
+    	  project=Project.new(args[1])
+    	  project[:fullname] = args[2] if args.length > 2
+    	  if(project.fullname.length > 0 && !self.has_key?(project.fullname))
+		   	puts "adding #{project.fullname}"
+		   	self[project.fullname]=project
+		   	self.save Projects.user_projects_filename
+		  end
+		end
+    end
+
 	def import pattern=''
 		wrk="#{Environment.dev_root}/wrk"
 		if File.exists?(wrk)

data/lib/dev.rb

@@ -13,11 +13,16 @@ PROJECT=Project.new()
 
 class Dev
 	def self.execute args
-		PROJECTS.import(args.length>1 ? args[1]:'') if args.length > 0 && args[0] == 'import'
-		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'
+		if(args.kind_of?(String))
+			args=args.split(' ')
+		end
+		projects=Projects.new
+		projects.add(args) if args.length > 0 && args[0] == 'add'
+		projects.import(args.length>1 ? args[1]:'') if args.length > 0 && args[0] == 'import'
+		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
 

data/lib/tasks/setup.rb

@@ -12,7 +12,7 @@ class Setup < Array
 	def update
 		add 'bundle install' if(File.exists?('Gemfile'))
 
-		['bin','data','log','make','publish'].each{|dir|
+		['bin','data','log','make','publish','test'].each{|dir|
 			add "<%FileUtils.mkdir('#{Environment.dev_root}/#{dir}')%>" if !File.exists? "#{Environment.dev_root}/#{dir}"
 		}
 		

metadata

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