dev 2.0.219 → 2.0.220

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 2489fb872801c6abe1bcf0eab3733f4f58441619
-  data.tar.gz: bcf26bf01013c6f5c7b183ccf8dde3f858161195
+  metadata.gz: 7909498159a730e69eed2a9075a1965214340e80
+  data.tar.gz: e15106f4ff6445f3e68580a36b9bca7d3fbec03a
 SHA512:
-  metadata.gz: 5fa819fa3bac951b53ca1392e724cd341bd408677f20e0553ced071ec3558663f247a86108ca9f13635d95fb290c5350657f1ec2ced18ead8b06f5a825e9e130
-  data.tar.gz: d369dcb9800653744010cd0dc45ebe37842743993862209611480c26684f90f686616ac22e48744f597c2a93254862b5bb9f9147f93bed4dc6abdd0003281bac
+  metadata.gz: 5e9c839909214227cd96776b51f44ecd607e06e6b3fd885bcf1b22c21bd2c4b08771abf8b3dfe4e8fe181f1bafe4f05edac7f7b7ab98ea60bd46a77c979d8d95
+  data.tar.gz: cb202f257a7cf93d5df45874aa2bb19f3f4b992f544ab83ee6f7e2f4e63ed5bf6f79819c693980b709e60978908e3975fc9d96403977dbd299004f238e4a5f19

data/lib/base/command.rb

@@ -97,7 +97,7 @@ class Command < Hash
     			  self[:end_time] = Time.now
           else
             require_relative 'timeout.rb'
-            result=run_with_timeout2(self[:directory],self[:input], self[:timeout], 2)
+            result=run_with_timeout(self[:directory],self[:input], self[:timeout],2)
             self[:output]=result[0]
             self[:error]=result[1]
             self[:exit_code]=result[2]

data/lib/base/projects.rb

@@ -18,7 +18,7 @@ class Projects < Hash
     	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))
-    		self[k][:name]=k
+    		self[k][:fullname]=k
     	}
     end
 
@@ -65,14 +65,14 @@ class Projects < Hash
 		if(Rake.application.original_dir.include?('/wrk/') &&
 			   url.length > 0)
 			project=Project.new(url)
-			name=Rake.application.original_dir.gsub("#{Environment.dev_root}/wrk/",'')
-			project[:name] = name if(name.length>0 && !name.include?(Environment.dev_root))
+			fullname=Rake.application.original_dir.gsub("#{Environment.dev_root}/wrk/",'')
+			project[:fullname] = name if(name.length>0 && !name.include?(Environment.dev_root))
 			if(defined?(PROJECTS))
 				PROJECTS[name]=project if(!PROJECTS.has_key?(name))
 				project.each{|k,v|PROJECTS[name][k]=v}
 				PROJECTS.save
 			else
-				project[:name]=name
+				project[:fullname]=name
 			end
 		end			
 		project
@@ -86,10 +86,8 @@ class Projects < Hash
 	end
 end
 
-current=Projects.current # this makes sure the current project is added to PROJECTS
-
 PROJECTS=Projects.new
 PROJECTS.open Projects.user_projects_filename if File.exists? Projects.user_projects_filename
+current=Projects.current # this makes sure the current project is added to PROJECTS
+PROJECTS[current.fullname]=current if !current.nil? && !PROJECTS.has_key?(current.fullname) && current.wrk_dir == Rake.application.original_dir
 PROJECTS.save Projects.user_projects_filename if !File.exists? Projects.user_projects_filename
-
-

data/lib/tasks/publish.rb

@@ -26,7 +26,10 @@ class Publish < Array
 				end
 			end
 		end
-		Dir.glob('**/*.{nupkg,msi,gem}').each{|publish_file|
+
+		puts 'publish glob, checking...' if defined? DEBUG
+		Dir.glob("#{Rake.application.original_dir}/**/*.{nupkg,msi,gem}").each{|publish_file|
+			puts "checking #{publish_file}" if defined? DEBUG
 			dest="#{Environment.dev_root}/publish/#{File.basename(publish_file)}"
 			FileUtils.mkdir_p("#{Environment.dev_root}/publish") if !File.exists?("#{Environment.dev_root}/publish")
 			add "<%FileUtils.cp('#{publish_file}','#{dest}')%>" if(!File.exists?(dest))

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 2.0.219
+  version: 2.0.220
 platform: ruby
 authors:
 - Lou Parslow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-18 00:00:00.000000000 Z
+date: 2015-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake