dev 2.0.270 → 2.0.271

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7248978e9485e170b6131017226eac544530bca6
-  data.tar.gz: 2c4152f5040c40985aeaf736114eeeccc6c3657a
+  metadata.gz: 250e5de38be7903ba22278d1ae3400999f92605e
+  data.tar.gz: 940a8b48b3fa546a9b5e323a1dc67c10b738f2bb
 SHA512:
-  metadata.gz: 16928d3ab7e5a7173c68e7d3deb8aba002e99ab85c62118fff688bc204aa8c37df6d4476af7ba631d3986b063de4aa387e54089eb7dd2d9ef98841c4f413b968
-  data.tar.gz: cb72c3f82c26e5650d39b769b0518f6295bd1538a3bf72d8a6a92be25980b719ffd8d8f03286c52f13dc18083f632090d9b8dea3879ca14e08f108af42584ce8
+  metadata.gz: a60ff501e785bb155f2ff94b558accdfe84d01c8ab9903caecf16b1d6fdbd9cbbb46d8c38cd7886c719cc8aba3b19ee71a52b382f924540f6ad5b7ec5f0cee9a
+  data.tar.gz: 17805bc0adffe5ac02facea81e77fa023b550613df4511ecc69a08f5ad4c2971c249522014b5fa082444bb9305a81dbe131ae3cf0df8f6325e66d1f841028e4e

data/lib/apps/msbuild.rb

@@ -68,8 +68,9 @@ class MSBuild < Hash
   	def self.get_platforms(sln_filename)
     	platforms=Array.new
 	  	sln_text=File.read(sln_filename,:encoding=>"UTF-8")
-    	sln_text.scan( /= [\w]+\|([\w ]+)/ ).each{|m|
-	    	p=m.first.to_s
+    	#sln_text.scan( /= [\w]+\|([\w ]+)/ ).each{|m|
+      sln_text.scan(/\|([\w\d\s]+)\s*=/).each{|m|
+	    	p=m.first.to_s.strip
 	    	platforms << p if !platforms.include?(p)
 	  	}
 		  return platforms

data/lib/apps/svn.rb

@@ -113,6 +113,7 @@ class Svn
 
 						files.each{|f|
 							fdir=File.dirname(f)
+
 							FileUtils.mkdir_p(fdir) if(fdir.length > 0 && !File.exists?(fdir))
 							FileUtils.cp("#{source_dir}/#{f}","#{f}")
 							add_file.puts f

data/lib/base/array.rb

@@ -11,6 +11,9 @@ class Array
       @env=Environment.new() if @env.nil? 
       i=0
       while i < self.length
+        #puts "Array[#{i.to_s}]'=nil" if @env.debug? && self[i].nil?
+        #puts "Array[#{i.to_s}].class=#{self[i].class.to_s}" if @env.debug? && !self[i].nil?
+        #puts "Array[#{i.to_s}].to_s=#{self[i].to_s}" if @env.debug? && !self[i].nil?
         self[i]=Command.new({ :input => self[i], :quiet => true }) if(self[i].is_a?(String))
         self[i]=Command.new(self[i]) if(self[i].is_a?(Hash) && !self[i].is_a?(Command))
 
@@ -18,7 +21,6 @@ class Array
           value.each{|k,v|self[i][k]=v}
         end
 
-        #self[i].execute if(self[i].is_a?(Command))
         if(self[i].is_a?(Command))
           self[i].execute
           @env.out self[i].summary

data/lib/base/environment.rb

@@ -172,15 +172,15 @@ class Environment < Hash
     text.match(/(\d+\.\d+\.[\d\w]+)/)
   end
 
-  def self.info 
+  def info 
     puts "Environment"
     puts "  ruby version: #{`ruby --version`}"
     puts " ruby platform: #{RUBY_PLATFORM}"
-    puts "      dev_root: #{Environment.dev_root}"
-    puts "       machine: #{Environment.machine}"
-    puts "          user: #{Environment.user}"
-    puts " configuration: #{Environment.configuration}"
-    puts "         debug: #{Environment.debug}"
+    puts "      dev_root: #{self.root_dir}"
+    puts "       machine: #{self.machine}"
+    puts "          user: #{self.user}"
+    #puts " configuration: #{self.configuration}"
+    puts "         debug: #{self.debug}"
     puts " "
     puts "Path Commands"
     ['svn --version --quiet','git --version','msbuild /version','nuget','candle','light','gem --version'].each{|cmd|

data/lib/base/project.rb

@@ -35,7 +35,7 @@ class Project < Hash
 
 	def self.get_url directory=Rake.application.original_dir
 	  url=''
-	  Dir.chdir(directory) do#Rake.application.original_dir) do
+	  Dir.chdir(directory) do
 	    url=`git config --get remote.origin.url`.strip if(File.exists?('.git'))
 	    url= Svn.url.strip if(File.exists?('.svn'))
 	  end
@@ -83,8 +83,6 @@ class Project < Hash
 
 	def checkout
 		if(!File.exists?(wrk_dir) && self[:url].include?('svn'))
-			#puts "checkout #{self.url} to #{self.wrk_dir}"
-			#puts `svn checkout #{self.url} #{self.wrk_dir}`
             cmd=Command.new({ :input => "svn checkout #{self.url} #{self.wrk_dir}", :quiet => true,:ignore_failure => true})
             cmd.execute
             @env.out cmd.summary
@@ -178,8 +176,11 @@ class Project < Hash
                 CLEAN.include logfile
                 return true
             else
+                puts "   deleting #{logfile}" if @env.debug?
                 File.delete(logfile)
             end
+          else
+            puts "logfile #{logfile} does NOT exist." if @env.debug?
           end
         else
             puts "wrk_dir does not match Rake.application.original_dir" if @env.debug?
@@ -190,6 +191,7 @@ class Project < Hash
     def mark_work_up_to_date
         if wrk_dir == Rake.application.original_dir
           logfile=get_logfile ['up2date']
+          puts "   writing #{logfile}" if Environment.default.debug?
           File.open(logfile,'w'){|f|f.write(' ')}
         else
             puts "wrk_dir does not match Rake.application.original_dir" if @env.debug?
@@ -253,12 +255,6 @@ class Project < Hash
         end
     end
 
-    #def info
-    #    @env.out "Project #{name}"
-    #    @env.out "#{'fullname'.fix(13)}: #{self.fullname}"
-    #    @env.out "#{'url'.fix(13)}: #{self[:url]}"
-    #    @env.out "#{'version'.fix(13)}: #{VERSION}" if defined? VERSION
-    #end
     def info
         infoCmd=Command.new({ :input => 'info', :exit_code => 0 })
         #out_cyan '========================================================='
@@ -429,23 +425,14 @@ class Project < Hash
     		Dir.chdir(wrk_dir) do
                 if(File.exists?('.git'))
                   pull=Command.execute(Command.new({:input => 'git pull', :quiet => true, :ignore_failure => true}))
-                  @env.out pull.summary
+                  @env.out pull.summary true
                   return pull
-    			  #pull=Command.new('git pull')
-				  #rake_default[:quiet]=true
-				  #rake_default[:ignore_failure]=true
-				  #rake_default.execute
-                  #return rake_defa
                 end
                 if(File.exists?('svn'))
                     updateCmd=Command.execute(Command.new({:input => 'svn update', :quiet => true, :ignore_failure => true}))
-                    @env.out updateCmd.summary
+                    @env.out updateCmd.summary true
                     return updateCmd
                 end
-				#rake_default=Command.new('svn update')
-				#rake_default[:quiet]=true
-				#rake_default[:ignore_failure]=true
-				#rake_default.execute
     		end
     	end
         return Command.new({:exit_code => 1})

data/lib/base/projects.rb

@@ -25,7 +25,13 @@ class Projects < Hash
       if(self.has_key? fullname)
         self[fullname]
       else
-        nil
+      	project=nil
+      	begin
+    		project=Project.new(Project.get_url,fullname)
+    	rescue
+        	project=nil
+        end
+        project
       end
     end
 

data/lib/tasks/add.rb

@@ -21,10 +21,8 @@ class Add < Array
 	                   	    end
 	                        if(status.include?('?') || status.include?('was not found') || error.include?('was not found'))
 	                        	if(f.include?(' '))
-								  #puts "svn add \"#{f}\" --parents"
-								  add_quiet add "svn add \"#{f}\" --parents"
+								  add_quiet "svn add \"#{f}\" --parents"
 							    else
-							      #puts "svn add #{f} --parents"
 								  add_quiet "svn add #{f} --parents"
 							    end
 							end
@@ -36,7 +34,6 @@ class Add < Array
 						if(File.exists?(f) && File.file?(f))
 						  status=Command.output("git status #{f} --short")
 						  if status.include?('??') || status.include?(' M ')
-							#puts "git add #{f} -v"
 							add_quiet "git add #{f} -v" 
 						  end
 					    end

data/lib/tasks/info.rb

@@ -1,6 +1,6 @@
 desc 'displays project info'
 task :info do
-	Environment.info
+	Environment.default.info
 	puts ' '
 	PROJECT.info
 	puts ' '

data/lib/tasks/setup.rb

@@ -78,7 +78,7 @@ class Setup < Array
 		if(defined?(VERSION))
 			Dir.glob('*.nuspec').each{|nuspec|
 				current_version=IO.read(nuspec).scan(/<version>[\d.]+<\/version>/)[0]
-				puts "#{nuspec} current version=#{current_version}" if defined?(DEBUG)
+				puts "#{nuspec} current version=#{current_version}" if env.debug?
 				if(current_version.include?('<version>'))
 					target_version="<version>#{VERSION}</version>"
 					if(current_version != target_version)
@@ -88,17 +88,19 @@ class Setup < Array
 			}
 			Dir.glob('**/AssemblyInfo.cs').each{|assemblyInfo|
 				current_version=IO.read(assemblyInfo).scan(/Version\(\"[\d.]+\"\)/)[0]
-				puts "#{assemblyInfo} current version=#{current_version}" if defined?(DEBUG)
-				if(current_version.include?('Version('))
+				if(!current_version.nil?)
+				  puts "#{assemblyInfo} current version=#{current_version}" if env.debug?
+				  if(current_version.include?('Version('))
 					target_version="Version(\"#{VERSION}\")"
 					if(current_version != target_version)
 						add "<%Text.replace_in_file('#{assemblyInfo}','#{current_version}','#{target_version}')%>"
 					end
-				end
+				  end
+			    end
 			}
 			Dir.glob('**/*.wxs').each{|wxs|
 				current_version=IO.read(wxs).scan(/Version=\"([\d.]+)\"/)[0][0]
-				puts "#{wxs} current version=#{current_version}" if defined?(DEBUG)
+				puts "#{wxs} current version=#{current_version}" if env.debug?
 				if(current_version.include?('Version='))
 					target_version="Version=\"#{VERSION}\")="
 					if(current_version != target_version)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 2.0.270
+  version: 2.0.271
 platform: ruby
 authors:
 - Lou Parslow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-02 00:00:00.000000000 Z
+date: 2015-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake