dev 2.0.194 → 2.0.195

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0563d7b60183ac907de34d6e819f28c117acc61e
-  data.tar.gz: b2f16cd208c4b51489f2fff9198675883ef7fda9
+  metadata.gz: 2991a183429492e7bf7c04d35bef2feebd45c24b
+  data.tar.gz: 19754b66567aabc1e2bd4c2eb95466c70e2aafbe
 SHA512:
-  metadata.gz: a167e8793cfe59baef1da3ac1a26e656aca831deabe9e67f11beea733500f203f8ce21d93f8691bb1199ee7d20bebd11c7019ca31f729d0c1b5c5db2c07083dd
-  data.tar.gz: e67af08a04ae5a0e408f1dc59569c16952823833b311af6f6c14b8646df9a221a082adb48ad17c0d20a5172ffafe200a60595036e34fe3a57fc08607891b1093
+  metadata.gz: 54721601d4d67c6a37c9926be84f109d762f5b1f58afdb0cde736046f9c114ad6ed210802432d5597133b579e27fb589e3ed30251bf85babc18185a7b70c7936
+  data.tar.gz: b74b4ebc3cd3b6e240cf606fbe31d8e711bfd33bb8af2a0ae549f943dcafae640bc297676a8dbfe5e502394406b44cb64d5e86a7b8b4c7138cc9cb66308cf439

data/lib/apps/git.rb

@@ -112,7 +112,4 @@ class Git
             end
         end
     end
-
-    # retrieve copy of specific files for a specific tag
-    # self.get source, tag, source_filelist, destination
 end

data/lib/apps/msbuild.rb

@@ -88,7 +88,6 @@ class MSBuild < Hash
             sln_arg="\"#{sln_filename}\"" if sln_filename.include?(' ')
             platform_arg="/p:Platform=#{platform}"
             platform_arg="/p:Platform=\"#{platform}\"" if platform.include?(' ')
-            #build_commands << "#{msbuild_arg} #{sln_arg} /nologo /p:Configuration=#{configuration} #{platform_arg}"
             build_commands << "#{msbuild_arg} #{sln_arg} /p:Configuration=#{configuration} #{platform_arg}"
           }
         }

data/lib/apps/svn.rb

@@ -82,7 +82,6 @@ class Svn
 
 		output = "\n"
 		if(`svn info #{destination} 2>&1`.include?('Revision:'))
-			#raise "Svn.publish: destination #{destination} already exists" 
 			puts "Svn.publish: destination #{destination} already exists" 
 		else
 			# create subversion directory
@@ -95,17 +94,10 @@ class Svn
 				files = source_filelist.to_a
 			end
 			files=source_filelist
-			#Dir.chdir(source_dir) do
-			#	files=FileList.new(source_glob).to_a
-			#end
 			output = output + "\nfiles: "
-			#Dir.chdir(source_dir) do
-				files.each{|f|
-					output = output + f + " "
-				}
-			#end
-			#output = output + "\nfiles: #{files.to_s}"
-
+			files.each{|f|
+				output = output + f + " "
+			}
 			pwd=Dir.pwd
 			Dir.mktmpdir{|dir|
 

data/lib/apps/wix.rb

@@ -10,20 +10,11 @@ class Wix
       	build_commands=Array.new if build_commands.nil?
       	build_commands << "candle #{wxs_file} -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
 
-      	#if(IO.read(wxs_file).include?('<Product'))
-      		if(defined?(VERSION))
-      		  build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -out #{File.basename(wxs_file,'.*')}-#{VERSION}.msi -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
-      	    else
-      		  build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
-      	    end
-      	#end
-      	#elsif(IO.read(wxs_file).include?('<Bundle'))
-      	#	if(defined?(VERSION))
-      	#	  build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -out #{File.basename(wxs_file,'.*')}-#{VERSION}.exe -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
-      	#    else
-      	#	  build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
-      	#    end
-      	#end
+      	if(defined?(VERSION))
+      		build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -out #{File.basename(wxs_file,'.*')}-#{VERSION}.msi -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
+      	else
+      		build_commands << "light #{File.basename(wxs_file,'.*')}.wixobj -ext WixNetFxExtension -ext WixBalExtension -ext WixUtilExtension"
+      	end
       end
       build_commands
     end

data/lib/base/command.rb

@@ -97,8 +97,6 @@ class Command < Hash
     			  self[:end_time] = Time.now
           else
             require_relative 'timeout.rb'
-            #puts run_with_timeout(self[:input], self[:timeout], 1).to_s
-            #self[:output] = run_with_timeout(self[:input], self[:timeout], 1)
             result=run_with_timeout2(self[:directory],self[:input], self[:timeout], 2)
             self[:output]=result[0]
             self[:error]=result[1]
@@ -130,7 +128,7 @@ class Command < Hash
       end
     	if(!self.has_key?(:ignore_failure) || !self[:ignore_failure])
     		raise "#{self[:input]} failed" 
-    	end #unless (self.has_key?(:ignore_failure) && self[:ignore_failure]==true)
+    	end
     end
       
 	end
@@ -164,7 +162,6 @@ class Command < Hash
         return ENV[v].gsub('\\','/') unless ENV[v].nil?
       }
       dir=home
-      #dir=ENV["DEV_ROOT"].gsub('\\','/') unless ENV["DEV_ROOT"].nil?
      return dir
     end
 

data/lib/base/environment.rb

@@ -60,7 +60,6 @@ class Environment < Hash
   end
 
   def self.check
-    #["ruby","svn","git","msbuild","candle","light"].each{|cmd|
     puts 'checking commands...'
     missing_command=false
     ['ruby --version','svn --version --quiet','git --version','msbuild /version','nunit-console','nuget','candle','light','gem --version'].each{|cmd|

data/lib/base/file.rb

@@ -14,7 +14,6 @@ class File
 	def self.publish destination, source_dir, source_glob='**/*', overwrite_existing=false
 
 		output = "\n"
-		# directory
 		FileUtils.mkdir_p destination if !File.exists? destination
 
 		files=nil

data/lib/base/hash.rb

@@ -7,8 +7,6 @@ class Hash
       if(v.is_a?(Array) && v.length==0)
         self.delete k 
       else
-        #puts "executing #{k}"
-
 	  	  v.execute(value) if v.respond_to?(:execute)
       end
 	  }

data/lib/base/internet.rb

@@ -1,7 +1,6 @@
 puts __FILE__ if defined?(DEBUG)
 
 require 'open-uri'
-#require 'net/http'
 require 'timeout'
 class Internet
 

data/lib/base/project.rb

@@ -50,10 +50,6 @@ class Project < Hash
     	parts[parts.length-1]
     	#self[:name]
     end
-    
-	#def get_latest_unique_id 
-	#	'51ed9c9d45ba3979c808740d75ba1831c85aff5d'
-	#end
 
 	def wrk_dir
 		"#{Environment.dev_root}/wrk/#{self.fullname}"
@@ -110,7 +106,6 @@ class Project < Hash
 	def make tag
 		rake_default=nil
 		logfile="#{Environment.dev_root}/log/#{self.fullname}/#{tag}/#{Environment.user}@#{Environment.machine}.json"
-		#logfile="#{Environment.dev_root}/log/#{Environment.machine}/#{Environment.user}/#{self.fullname}/#{tag}.json"
 		if(File.exists?(logfile))
 			# load hash from json
 			return Command.new(JSON.parse(IO.read(logfile)))
@@ -138,6 +133,21 @@ class Project < Hash
 		end
 	end
 
+    def tags
+    	tags=Array.new
+    	if !File.exists? wrk_dir
+    		clone=Command.new({:input=>'git clone #{self[:url]} #{wrk_dir}',:quiet=>true})
+    		clone.execute
+    	end
+    	Dir.chdir(wrk_dir) do
+    		Command.output('git tag').split('\n').each{|line|
+    			tag=line.strip
+    			tags << tag if tag.length < 0
+    		}
+    	end
+    	tags
+    end
+
 	def clobber
 
 	end

data/lib/base/string.rb

@@ -1,6 +1,5 @@
 puts __FILE__ if defined?(DEBUG)
 
-
 class String
 	def fix(size,padstr=' ')
 		self[0...size].rjust(size,padstr)

data/lib/base/version.rb

@@ -1,7 +1,7 @@
 class Version
 	def self.read filename
 		return "#{Gem::Specification.load(filename).version.to_s}" if filename.include?('.gemspec') 
-		return IO.read(assemblyInfo).scan(/Version\(\"[\d.]+\"\)/)[0] if filename.include?('AssemblyInfo.cs')  
+		return IO.read(filename).scan(/Version\(\"[\d.]+\"\)/)[0] if filename.include?('AssemblyInfo.cs')  
 		'0.0.0'
 	end
 end

data/lib/tasks/add.rb

@@ -17,9 +17,6 @@ class Add < Array
 	                        if(status.include?('?') || status.include?('was not found') || error.include?('was not found'))
 								puts "svn add #{f} --parents"
 								add "svn add #{f} --parents"
-							else
-								#puts "#{status}" if status.strip.length > 0
-								#puts "        #{f}" if status.strip.length == 0
 							end
 						end
 					}
@@ -28,12 +25,9 @@ class Add < Array
 					SOURCE.each{|f|
 						if(File.exists?(f) && File.file?(f))
 						  status=`git status #{f} --short`
-						  #if status.include?('untracked') || status.include?('modified:')
 						  if status.include?('??') || status.include?(' M ')
 							puts "git add #{f} -v"
 							add "git add #{f} -v" 
-						  else
-							#puts status if status.strip.length > 0
 						  end
 					    end
 					}

data/lib/tasks/analyze.rb

@@ -3,7 +3,6 @@ puts __FILE__ if defined?(DEBUG)
 desc 'performs analyze commands'
 task :analyze do Tasks.execute_task :analyze;end
 
-
 class Analyze < Array
 	def update
 		if(`gem list countloc`.include?('countloc ('))

data/lib/tasks/commit.rb

@@ -15,7 +15,7 @@ class Commit < Array
 		if(File.exists?('.git') && `git config --list`.include?('user.name='))
 			if(!`git status`.include?('nothing to commit') &&
 			   !`git status`.include?('untracked files present'))
-			  if(message.length==0)#File.exists?('commit.message') && File.read('commit.message').gsub(/\s+/,"").length >0)
+			  if(message.length==0)
 				if(defined?(REQUIRE_COMMIT_MESSAGE))
 					Commit.reset_commit_message
 					raise "commit.message required to perform commit"
@@ -23,11 +23,9 @@ class Commit < Array
 			  		add "git commit -m'all'"
 			  	end
 			  else
-			    #add "git commit -a -v -m \"#{File.read('commit.message')}\""
 			    add "git commit -a -v --file commit.message"
 			    add "<%Commit.reset_commit_message%>"
 			  end
-			 # add "<%File.open('commit.message','w'){|f|f.write('')}%>"
 		    end 		
 		end
 		if(File.exists?('.svn'))

data/lib/tasks/default.rb

@@ -21,7 +21,7 @@ if(!defined?(NO_DEFAULT_TASK))
         Rake::Task["clean"].reenable
         CLEAN.include('rake.default')
         puts `git add -A` if(File.exists?('.gitignore'))
-        if(Git.has_changes?)#  || !RAKE_DEFAULT_EXISTS)
+        if(Git.has_changes?)
           puts 'Git changes detected.'
           puts `git status`
     		  [:setup,:build,:test,:add,:commit,:publish,:clean,:push,:pull].each{|task| Rake::Task[task].invoke}

data/lib/tasks/doc.rb

@@ -3,7 +3,6 @@ puts __FILE__ if defined?(DEBUG)
 desc 'performs documentation commands'
 task :doc do Tasks.execute_task :doc;end
 
-
 class Doc < Array
 	def update
 		if(Command.exit_code('yard --version'))

data/lib/tasks/info.rb

@@ -1,7 +1,5 @@
 puts __FILE__ if defined?(DEBUG)
 
-#require_relative 'array.rb'
-#INFO=Array.new
 desc 'displays project info'
 task :info do
 	Environment.info
@@ -9,9 +7,5 @@ task :info do
 	PROJECT.info
 	puts ' '
 	COMMANDS.info
-	#if(defined?(INFO) && INFO.length > 0)
-	#	puts "[:info]" if(!Tasks.quiet)
-	#	INFO.each{|l|puts l}
-	#end
 end
 

data/lib/tasks/publish.rb

@@ -3,7 +3,6 @@ puts __FILE__ if defined?(DEBUG)
 desc 'performs publish commands'
 task :publish do Tasks.execute_task :publish; end
 
-
 class Publish < Array
 	def update
 

data/lib/tasks/push.rb

@@ -7,7 +7,7 @@ class Push < Array
 	def update
 		if(File.exists?('.git') && `git config --list`.include?('user.name=') && `git branch`.include?('* master'))
 			self <<  'git push'
-			self <<  'git push --tags'# if Git.branch != 'develop' && Internet.available?
+			self <<  'git push --tags'
 		end
 	end
 end

data/lib/tasks/test.rb

@@ -24,7 +24,6 @@ class Test < Array
 				xml_arg="/xml:#{nunit_dll}.TestResults.xml"
 				xml_arg="/xml:\"#{nunit_dll}.TestResults.xml\"" if(nunit_dll.include?(' '))
 				add "#{nunit_arg} #{dll_arg} #{xml_arg}"
-				#add "\"#{Test.nunit_console}\" \"#{Rake.application.original_dir}\\#{nunit_dll}\" /xml:\"#{nunit_dll}.TestResults.xml\""
 			}
 		end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 2.0.194
+  version: 2.0.195
 platform: ruby
 authors:
 - Lou Parslow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-17 00:00:00.000000000 Z
+date: 2015-08-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -111,3 +111,4 @@ signing_key:
 specification_version: 4
 summary: dev
 test_files: []
+has_rdoc: