dev 2.1.58 → 2.1.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d91b534e895402f9095d3ed1167366f291d4e3a8
-  data.tar.gz: fe978c0fa5e80a5413fa173bef2ba2b626683149
+  metadata.gz: 670e43ff54de7c6c7720fb45143c6bc405476751
+  data.tar.gz: 68e94d20d454440a8ba99780857d69b89c63df9c
 SHA512:
-  metadata.gz: cda2b756bb749e8e9d8e39e66202f5d8f9cee7951cf9730b508fef4ac127b3c7efca8f4c6ce0eb31d893824798b9e463fcbc3650d84a95270329179cd09fa063
-  data.tar.gz: 9ed789ffb78c43ae8219e07d9f3daacbb8f8389dabc7fffb43cf05579030f8716503b8379318a2a971f1e8b9f5b44119938b226a47a5b57fd7675dfb3288beb8
+  metadata.gz: 594210f9ddaac4380dfa851d74505880c88009d43ca30807accef570766fd78368ab876f84aa4aee0de17346224d1285edc69fc9bbcb9a5ec949f51f7ca167ea
+  data.tar.gz: 5a40bdd6cb6c9e2ae134932c72d0333dffbb6fcce381aa310353882aaa7273ab2d3949510ba9230d586e18c697a035d53e1d9a6ae526291a22a409d89ff823e3

data/lib/apps/git.rb

@@ -1,4 +1,10 @@
-puts __FILE__ if defined?(DEBUG)
+if defined?(DEBUG)
+    puts DELIMITER
+    puts __FILE__
+    puts
+    puts 'git not found' if(!Command.executes?('git --version')) 
+    puts
+end
 
 require 'tmpdir'
 require 'rake'

data/lib/apps/msbuild.rb

@@ -1,3 +1,4 @@
+puts DELIMITER if defined?(DEBUG)
 puts __FILE__ if defined?(DEBUG)
 # Visual Studio 2008 version 9.0,  solution format version 10.00
 # Visual Studio 2010 version 10.0, solution format version 11.00
@@ -5,34 +6,25 @@ puts __FILE__ if defined?(DEBUG)
 # Visual Studio 2013 version 12.0, solution format version 12.00
 # Visual Studio 2015 version 14.0, solution format version 12.00
 # Visual Studio 2017 version 15.0
+require 'pp'
 class MSBuild < Hash
 
   #@@ignore_configurations=Array.new
   def initialize
-    
-    
-
-    self[:vs9]="C:\\Windows\\Microsoft.NET\\Framework\\v3.5\\msbuild.exe"  if(File.exists?("C:\\Windows\\Microsoft.NET\\Framework\\v3.5\\msbuild.exe"))
-    self[:vs10]="C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\msbuild.exe" if(File.exists?("C:\\Windows\\Microsoft.NET\\Framework\\v4.0.30319\\msbuild.exe"))
-    self[:vs12]="C:\\Program Files (x86)\\MSBuild\\12.0\\bin\\msbuild.exe" if(File.exists?("C:\\Program Files (x86)\\MSBuild\\12.0\\bin\\msbuild.exe"))
-    self[:vs14]="C:\\Program Files (x86)\\MSBuild\\14.0\\bin\\msbuild.exe" if(File.exists?("C:\\Program Files (x86)\\MSBuild\\14.0\\bin\\msbuild.exe"))
-    self[:vs15]="C:\\Program Files (x86)\\MSBuild\\15.0\\bin\\msbuild.exe" if(File.exists?("C:\\Program Files (x86)\\MSBuild\\15.0\\bin\\msbuild.exe"))
-    self[:vs15]="C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\MSBuild\\15.0\Bin\\msbuild.exe" if(File.exists?("C:\\Program Files (x86)\\Microsoft Visual Studio\\2017\\Enterprise\\MSBuild\\15.0\Bin\\msbuild.exe"))
+    add(:vs9,"C:/Windows/Microsoft.NET/Framework/v3.5/msbuild.exe")
+    add(:vs10,"C:/Windows/Microsoft.NET/Framework/v4.0.30319/msbuild.exe")
+    add(:vs12,"C:/Program Files (x86)/MSBuild/12.0/bin/msbuild.exe")
+    add(:vs14,"C:/Program Files (x86)/MSBuild/14.0/bin/msbuild.exe")
+    add(:vs15,"C:/Program Files (x86)/MSBuild/15.0/bin/msbuild.exe")
+    add(:vs15,"C:/Program Files (x86)/Microsoft Visual Studio/2017/Enterprise/MSBuild/15.0/Bin/MSBuild.exe")
+  end
 
-    if(File.exists?("C:\\Program Files (x86)\\MSBuild\\14.0\\bin\\msbuild.exe"))
-      self[:vs14]="C:\\Program Files (x86)\\MSBuild\\14.0\\bin\\msbuild.exe" 
-    else
-      if(Environment.windows?)
-        puts "C:\\Program Files (x86)\\MSBuild\\14.0\\bin\\msbuild.exe was not found." 
-        puts "MSBUILD[:vs14]='PATH_TO_MSBUILD' may be used to specify msbuild path."
-      end
+  def add(key,name)
+    if(File.exists?(name))
+      self[key] = name
     end
   end
 
-  #def self.ignore_configuration(configuration)
-  #  @@ignore_configurations.add(configuration) if(!@@ignore_configurations.include?(configuration))
-  #end
-
   def self.has_version? version
     if(defined?(MSBUILD))
       MSBUILD.has_key?(version)
@@ -123,3 +115,10 @@ class MSBuild < Hash
     end
 end
 
+if defined?(DEBUG)
+  puts
+  puts "MSBuild"
+  msb = MSBuild.new
+  pp msb
+  puts
+end

data/lib/apps/nuget.rb

@@ -1,4 +1,12 @@
-puts __FILE__ if defined?(DEBUG)
+if defined?(DEBUG)
+  puts DELIMITER
+  puts __FILE__
+  puts
+  puts 'nuget not found' if(!Command.executes?('nuget')) 
+  puts
+end
+#puts DELIMITER if defined?(DEBUG)
+#puts __FILE__ if defined?(DEBUG)
 
 class Nuget
 	  def self.get_build_commands nuspec_file

data/lib/apps/wix.rb

@@ -1,4 +1,11 @@
-puts __FILE__ if defined?(DEBUG)
+if defined?(DEBUG)
+      puts DELIMITER
+      puts __FILE__
+      puts
+      puts 'candle not found' if(!Command.executes?('candle')) 
+      puts 'light not found' if(!Command.executes?('light')) 
+      puts
+    end
 
 #
 # 

data/lib/base/array.rb

@@ -10,10 +10,10 @@ class Array
     def execute value=nil
       @env=Environment.new() if @env.nil? 
       i=0
-      puts "Array.execute length=#{self.length}" if defined?(DEBUG)
+      #puts "Array.execute length=#{self.length}" if defined?(DEBUG)
       while i < self.length
 
-        puts self[i].to_s if defined?(DEBUG)
+        #puts self[i].to_s if defined?(DEBUG)
         #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?
@@ -37,6 +37,16 @@ class Array
       self << command if !has_command? command
     end
 
+    def log_debug_info(title)
+      if defined?(DEBUG) && self.length > 0
+        puts
+        puts title
+        self.each{|c| puts "  #{c[:input]}" }
+        #pp self 
+        puts
+      end
+    end
+
     def has_command? command
       return true if(command.kind_of?(String) && !include?(command))
       if(command.kind_of?(Command))

data/lib/base/command.rb

@@ -1,3 +1,6 @@
+puts DELIMITER if defined?(DEBUG)
+puts __FILE__ if defined?(DEBUG)
+
 require 'time'
 require 'open3'
 require_relative('timeout.rb')
@@ -79,6 +82,15 @@ class Command < Hash
   def error
     self[:error]
   end
+  def self.executes?(command)
+    cmd = Command.new({ :input => command, :quiet => true,:ignore_failure => true})
+    cmd.execute
+    if(cmd[:exit_code] == 0)
+      true
+    else
+      false
+    end
+  end
 
 	def execute value=nil
 

data/lib/base/environment.rb

@@ -1,3 +1,4 @@
+puts DELIMITER if defined?(DEBUG)
 puts __FILE__ if defined?(DEBUG)
 
 require_relative('string.rb')
@@ -111,7 +112,7 @@ class Environment < Hash
   end
 
   def debug?
-    return true if get_env('DEBUG')=='true'
+    return true if defined?(DEBUG)
     false
   end
 
@@ -210,22 +211,26 @@ class Environment < Hash
     puts "      dev_root: #{self.root_dir}"
     puts "       machine: #{self.machine}"
     puts "          user: #{self.user}"
+    puts "            os: #{Environment.OS}"
     #puts " configuration: #{self.configuration}"
     puts "         debug: #{self.debug?}"
-    puts "git user.email: #{Git.user_email}" 
+    #puts "git user.email: #{Git.user_email}" 
     puts " "
-    puts "Path Commands"
-    ['svn --version --quiet','git --version','msbuild /version','nuget','candle','light','gem --version'].each{|cmd|
-      command=Command.new(cmd)
-      command[:quiet]=true
-      command[:ignore_failure]=true
-      command.execute
-      if(command[:exit_code] == 0)
-        puts "#{cmd.split(' ')[0].fix(14)} #{Environment.get_version(command[:output])}"
-      else
-        puts "#{cmd.split(' ')[0].fix(14)} not found."
-          missing_command=true
-      end
-    }
-  end
-end
+    #puts "Path Commands"
+    #['svn --version --quiet','git --version','msbuild /version','nuget','candle','light','gem --version'].each{|cmd|
+    #  command=Command.new(cmd)
+    #  command[:quiet]=true
+    #  command[:ignore_failure]=true
+    #  command.execute
+    #  if(command[:exit_code] == 0)
+    #    puts "#{cmd.split(' ')[0].fix(14)} #{Environment.get_version(command[:output])}"
+    #  else
+    #    puts "#{cmd.split(' ')[0].fix(14)} not found."
+    #      missing_command=true
+    #  end
+    #}
+  end
+end
+
+puts "" if defined?(DEBUG)
+puts Environment.default.info if defined?(DEBUG)

data/lib/base/projects.rb

@@ -1,3 +1,4 @@
+puts DELIMITER if defined?(DEBUG)
 puts __FILE__ if defined?(DEBUG)
 
 require 'json'

data/lib/commands.rb

@@ -1,9 +1,13 @@
-puts __FILE__ if ENV.has_key?('DEBUG')
+if defined?(DEBUG)
+    puts DELIMITER
+    puts __FILE__
+end
 
 require_relative('apps.rb')
 
 require 'json'
 require 'rake/clean'
+require 'pp'
 
 Dir.glob("#{File.dirname(__FILE__)}/tasks/*.rb").each{|rb| 
   require(rb) if !rb.include?('default')
@@ -36,7 +40,7 @@ class Commands < Hash
 			if v.length > 0
 				puts " #{k}"
 				v.each{|c|
-					puts "  #{c}" if(!c.kind_of?(Hash))
+					puts "  #{c[:input]}" if(!c.kind_of?(Hash))
 				}
 			end
 		}

data/lib/dev.rb

@@ -1,5 +1,9 @@
-puts __FILE__ if ENV.has_key?('DEBUG')
+DELIMITER='==================================================================================='
+puts DELIMITER if defined?(DEBUG)
+puts __FILE__ if defined?(DEBUG)
 
+require_relative('base.rb')
+require_relative('base/string.rb')
 require_relative('base/environment.rb')
 require_relative('base/projects.rb')
 require_relative('commands.rb')

data/lib/tasks/add.rb

@@ -1,4 +1,7 @@
-puts __FILE__ if defined?(DEBUG)
+if defined?(DEBUG)
+	puts DELIMITER
+	puts __FILE__
+end
 
 desc 'adds source files to git or subversion'
 task :add do Tasks.execute_task :add;end
@@ -23,21 +26,6 @@ class Add < Array
 			          end
 		          end
             end
-						#	if(f.include?(' '))
-	          #    status=Command.output("svn status \"#{f}\"") 
-	          #    error=Command.error("svn status \"#{f}\"")
-	          #  else
-	          #    status=Command.output("svn status #{f}") 
-	          #    error=Command.error("svn status #{f}")
-	          #  end
-	          #  if(status.include?('?') || status.include?('was not found') || error.include?('was not found'))
-	          #    if(f.include?(' '))
-						#		  add_quiet "svn add \"#{f}\" --parents"
-						#	  else
-						#		  add_quiet "svn add #{f} --parents"
-						#	  end
-						#	end
-						#end
 					}
 				end
 				if(File.exists?('.git'))
@@ -52,5 +40,7 @@ class Add < Array
 				end
 			end
 		end
+
+		log_debug_info("Add") if defined?(DEBUG)
 	end
 end

data/lib/tasks/analyze.rb

@@ -9,5 +9,12 @@ class Analyze < Array
 			FileUtils.mkdir('doc') if(!File.exists?('doc'))
 			add_quiet 'countloc -r * --html doc/countloc.html'
 		end
+
+		if defined?(DEBUG)
+			puts
+			puts "Analyze"
+			pp self 
+			puts
+		end
 	end
 end

data/lib/tasks/build.rb

@@ -13,7 +13,7 @@ SMARTASSEMBLY_FILES=FileList.new('**/*.saproj')
 class Build < Array
 	def update
 
-		puts "SLN_FILES: #{SLN_FILES}" if(Environment.default.debug?)
+		#puts "SLN_FILES: #{SLN_FILES}" if(Environment.default.debug?)
 
     	update_gemspec
     	update_dotnet
@@ -23,28 +23,25 @@ class Build < Array
     	update_wix if Environment.windows?
 		update_xcode if Environment.mac?
 		
-		if(Environment.default.debug?)
-			puts "Build commands: #{self.to_s}"
-			
-		end
+		log_debug_info("Build") if defined?(DEBUG)
 	end
 
     def update_gemspec
-    	puts "Build scanning for gemspec files" if Environment.default.debug?
+    	#puts "Build scanning for gemspec files" if Environment.default.debug?
 		Dir.glob('*.gemspec'){|gemspec|
 	    	add_quiet("gem build #{gemspec}") if !File.exist?(Gemspec.gemfile gemspec)
 	    }
     end
 
     def update_dotnet
-    	puts "Build scanning for project.json" if Environment.default.debug?
+    	#puts "Build scanning for project.json" if Environment.default.debug?
     	if(File.exists?('project.json'))
 			add_quiet "dotnet build"
 		end
     end
 
 	def update_sln
-		puts "Build scanning for sln files" if Environment.default.debug?
+		#puts "Build scanning for sln files" if Environment.default.debug?
 		SLN_FILES.each{|sln_file|
 			puts "  #{sln_file}" if Environment.default.debug?
 			build_commands = MSBuild.get_build_commands sln_file
@@ -60,7 +57,7 @@ class Build < Array
 	end
 
 	def update_smartassembly
-		puts "Build scanning for sa (smart assembly) files" if Environment.default.debug?
+		#puts "Build scanning for sa (smart assembly) files" if Environment.default.debug?
 		sa = 'C:/Program Files/Red Gate/SmartAssembly 6/SmartAssembly.com'
 		SMARTASSEMBLY_FILES.each{|saproj_file|
 			puts "  #{saproj_file}" if Environment.default.debug?
@@ -75,7 +72,7 @@ class Build < Array
 
 
 	def update_wix
-		puts "Build scanning for wxs <Product> files" if Environment.default.debug?
+		#puts "Build scanning for wxs <Product> files" if Environment.default.debug?
 		WXS_FILES.each{|wxs_file|
 			if(IO.read(wxs_file).include?('<Product'))
 			  build_commands = Wix.get_build_commands wxs_file
@@ -87,7 +84,7 @@ class Build < Array
 			end
 		}
 
-		puts "Build scanning for wxs <Bundle> files" if Environment.default.debug?
+		#puts "Build scanning for wxs <Bundle> files" if Environment.default.debug?
 		WXS_FILES.each{|wxs_file|
 			if(IO.read(wxs_file).include?('<Bundle'))
 			  build_commands = Wix.get_build_commands wxs_file
@@ -100,7 +97,7 @@ class Build < Array
 		}
 	end
 	def update_xcode
-		puts "Build scanning for xcodeproj folders" if Environment.default.debug?
+		#puts "Build scanning for xcodeproj folders" if Environment.default.debug?
 	    Dir.glob('**/*.xcodeproj').each{|dir|
 	        puts dir if Environment.default.debug?
 	        build_commands = XCodeBuild.get_build_commands dir

data/lib/tasks/commit.rb

@@ -42,6 +42,8 @@ class Commit < Array
 				add_quiet "<%Commit.reset_commit_message%>"
 			end
 		end
+
+		log_debug_info("Commit") if defined?(DEBUG)
 	end
 
 	def self.reset_commit_message

data/lib/tasks/setup.rb

@@ -13,19 +13,11 @@ class Setup < Array
 	end
 
 	def update
-		puts "Setup.update" if Environment.default.debug?
 		env=Environment.new if env.nil?
-
 		add_quiet 'bundle install' if File.exists? 'Gemfile'
-		#add Command.new( { :input => 'bundle install', :quiet => true}) if(File.exists?('Gemfile'))
-
-		#['bin','data','log','make','publish','test'].each{|dir|
-		#	add "<%FileUtils.mkdir('#{Environment.default.devroot}/#{dir}')%>" if !File.exists? "#{Environment.dev_root}/#{dir}"
-		#}
 		
 		Dir.glob('*.gemspec').each{|gemspec_file|
 			add_quiet "<%Gemspec.update('#{gemspec_file}')%>"
-			#add Command.new( { :input => "<%Gemspec.update('#{gemspec_file}')%>", :quiet => true} )
 		}
 
 		if(Dir.glob('**/packages.config').length > 0)
@@ -38,7 +30,7 @@ class Setup < Array
 			add_quiet "dotnet restore"
 		end
 
-		puts 'Setup checking SVN_EXPORTS...' if env.debug?
+		#puts 'Setup checking SVN_EXPORTS...' if env.debug?
 		if(defined?(SVN_EXPORTS))
 			SVN_EXPORTS.each{|k,v|
 				dest="#{Command.dev_root}/dep/#{k}"
@@ -60,7 +52,7 @@ class Setup < Array
 		        end
 			}
 		else
-			puts 'SVN_EXPORTS is not defined' if env.debug?
+			#puts 'SVN_EXPORTS is not defined' if env.debug?
 		end
 
 		if(defined?(GIT_EXPORTS))
@@ -80,7 +72,7 @@ class Setup < Array
 		end
 
 		if(defined?(VERSION))
-			puts "updating nuspec files for VERSION #{VERSION}" if env.debug?
+			#puts "updating nuspec files for VERSION #{VERSION}" if env.debug?
 			Dir.glob('*.nuspec').each{|nuspec|
 				current_version=IO.read(nuspec).scan(/<version>[\d.]+<\/version>/)[0]
 				puts "#{nuspec} current version=#{current_version}" if env.debug?
@@ -117,5 +109,6 @@ class Setup < Array
 				end
 			}
 		end
+		log_debug_info("Setup")
 	end
 end

data/lib/tasks.rb

@@ -26,6 +26,7 @@ class Tasks
 	def execute_task task
 		if(defined?(COMMANDS))
 			if(COMMANDS.has_key?(task))
+				puts DELIMITER if defined?(DEBUG)
 				puts ":#{task}" if !@env.colorize?
 				if @env.colorize?
 					require 'ansi/code'

metadata

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