dev 2.0.268 → 2.0.269

data/lib/tasks.rb

@@ -1,15 +1,14 @@
-puts __FILE__ if defined?(DEBUG)
-
-require 'rake'
-
 class Tasks
-	@@quiet=false
+	attr_accessor :env
+	@@default=nil
 
-    def self.quiet
-    	@@quiet
-    end
+	def initialize env=nil
+		@@default=self
+		@env=env
+		@env=Environment.new if @env.nil?
+	end
 
-    def self.execute value
+    def execute value
 	  if(value.respond_to?(:execute))
 	    value.update if value.respond_to?(:update)
 	    value.execute
@@ -24,14 +23,23 @@ class Tasks
 	    end
 	end
 
-	def self.execute_task task
+	def execute_task task
 		if(defined?(COMMANDS))
 			if(COMMANDS.has_key?(task))
-				puts "[:#{task}]" if(!Tasks.quiet)
-		  		Tasks.execute(COMMANDS[task])
+				puts ":#{task}" if !@env.colorize?
+				if @env.colorize?
+					require 'ansi/code'
+				   puts  ANSI.white + ANSI.bold + ":#{task}" + ANSI.reset if @env.colorize?
+			    end
+		  		execute(COMMANDS[task])
 		    end
 		end
 	end
+
+	def self.execute_task task
+		@@default=Tasks.new if @@default.nil?
+		@@default.execute_task task
+	end
 end
 
 ['add','analyze','build','clobber','commit',

data/lib/tasks/add.rb

@@ -6,7 +6,7 @@ task :add do Tasks.execute_task :add;end
 class Add < Array
 	def update
 		if(File.exists?('.git') && File.exists?('.gitignore'))
-			add 'git add --all' 
+			add_quiet 'git add --all' 
 		else
 			if(defined?(SOURCE))
 				if(File.exists?('.svn'))
@@ -21,11 +21,11 @@ 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 "svn add \"#{f}\" --parents"
+								  #puts "svn add \"#{f}\" --parents"
+								  add_quiet add "svn add \"#{f}\" --parents"
 							    else
-							    puts "svn add #{f} --parents"
-								  add "svn add #{f} --parents"
+							      #puts "svn add #{f} --parents"
+								  add_quiet "svn add #{f} --parents"
 							    end
 							end
 						end
@@ -34,10 +34,10 @@ class Add < Array
 				if(File.exists?('.git'))
 					SOURCE.each{|f|
 						if(File.exists?(f) && File.file?(f))
-						  status=`git status #{f} --short`
+						  status=Command.output("git status #{f} --short")
 						  if status.include?('??') || status.include?(' M ')
-							puts "git add #{f} -v"
-							add "git add #{f} -v" 
+							#puts "git add #{f} -v"
+							add_quiet "git add #{f} -v" 
 						  end
 					    end
 					}

data/lib/tasks/analyze.rb

@@ -7,7 +7,7 @@ class Analyze < Array
 	def update
 		if(`gem list countloc`.include?('countloc ('))
 			FileUtils.mkdir('doc') if(!File.exists?('doc'))
-			add 'countloc -r * --html doc/countloc.html'
+			add_quiet 'countloc -r * --html doc/countloc.html'
 		end
 	end
 end

data/lib/tasks/build.rb

@@ -1,7 +1,10 @@
 puts __FILE__ if defined?(DEBUG)
 
+require_relative('../base/environment.rb')
+
 desc 'performs build commands'
 task :build do Tasks.execute_task :build;end
+#task :build do Tasks.execute_task :build;end
 
 SLN_FILES=FileList.new('*.sln','*/*.sln','*/*/*.sln')
 NUGET_FILES=FileList.new('**/*.nuspec')
@@ -10,51 +13,64 @@ WXS_FILES=FileList.new('**/*.wxs')
 class Build < Array
 	def update
 
-		changed = true
-        if(changed)
+		#changed = true
+        #if(changed)
+        	puts "Build scanning for gemspec files" if Environment.default.debug?
 			Dir.glob('*.gemspec'){|gemspec|
-	    		add "gem build #{gemspec}" if !File.exist?(Gemspec.gemfile gemspec)
+	    		add_quiet("gem build #{gemspec}") if !File.exist?(Gemspec.gemfile gemspec)
 	    	}
 	    	
+	    	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
 	    		if(!build_commands.nil?)
 	    			build_commands.each{|c|
-	    				self.add c
+	    				puts "  build command #{c} discovered." if Environment.default.debug?
+	    				#self.add c
+	    				add_quiet(c)
 	    			}
+	    		else
+	    			puts "  no build command discovered." if Environment.default.debug?
 	    		end
 	    	}
 
+            puts "Build scanning for nuget files" if Environment.default.debug?
 	    	NUGET_FILES.each{|nuget_file|
 	    		build_commands = Nuget.get_build_commands nuget_file
 	    		if(!build_commands.nil?)
 	    			build_commands.each{|c|
-	    				self.add c
+	    				add_quiet(c)
+	    				#self.add c
 	    			}
 	    		end
 	    	}
 
+            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
 	    		  if(!build_commands.nil?)
 	    			build_commands.each{|c|
-	    				self.add c
+	    				#self.add c
+	    				add_quiet(c)
 	    			}
 	    		  end
 	    	    end
 	    	}
+
+	    	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
 	    		  if(!build_commands.nil?)
 	    			build_commands.each{|c|
-	    				self.add c
+	    				#self.add c
+	    				add_quiet(c)
 	    			}
 	    		  end
 	    	    end
 	    	}
-	    end
+	    #end
 	end
 end

data/lib/tasks/commit.rb

@@ -4,7 +4,7 @@ desc 'commits source files to git or subversion'
 if(File.exists?('git'))
   task :commit=>[:add] do Tasks.execute_task :commit; end
 else
-  task :commit do Tasks.execute_task :commit;end
+  task :commit=>[:add] do Tasks.execute_task :commit;end
 end
 
 class Commit < Array
@@ -20,11 +20,11 @@ class Commit < Array
 					Commit.reset_commit_message
 					raise "commit.message required to perform commit"
 				else
-			  		add "git commit -m'all'"
+			  		add_quiet "git commit -m'all'"
 			  	end
 			  else
-			    add "git commit -a -v --file commit.message"
-			    add "<%Commit.reset_commit_message%>"
+			    add_quiet "git commit -a -v --file commit.message"
+			    add_quiet "<%Commit.reset_commit_message%>"
 			  end
 		    end 		
 		end
@@ -34,11 +34,11 @@ class Commit < Array
 					Commit.reset_commit_message
 					raise "commit.message required to perform commit"
 				else
-					add 'svn commit -m"commit all"'
+					add_quiet 'svn commit -m"commit all"'
 				end
 			else
-				add 'svn commit --file commit.message'
-				add "<%Commit.reset_commit_message%>"
+				add_quiet 'svn commit --file commit.message'
+				add_quiet "<%Commit.reset_commit_message%>"
 			end
 		end
 	end

data/lib/tasks/default.rb

@@ -2,6 +2,7 @@ puts __FILE__ if defined?(DEBUG)
 
 require_relative('info.rb')
 require_relative('../base/array.rb')
+require_relative('../base/environment.rb')
 require_relative('../base/projects.rb')
 require_relative('../base/timer.rb')
 
@@ -22,6 +23,11 @@ if(!defined?(NO_DEFAULT_TASK))
   	 end
     end
     
-    puts "[:default] completed in #{TIMER.elapsed_str}"
+    puts "[:default] completed in #{TIMER.elapsed_str}" if !Environment.default.colorize?
+    if Environment.default.colorize?
+      require 'ansi/code'
+      puts ANSI.white + ANSI.bold + ":default"  + " completed in " + ANSI.yellow + "#{TIMER.elapsed_str}" + ANSI.reset
+    end
+
   end # :default
 end

data/lib/tasks/doc.rb

@@ -6,7 +6,7 @@ task :doc do Tasks.execute_task :doc;end
 class Doc < Array
 	def update
 		if(Command.exit_code('yard --version'))
-		  add 'yard doc - LICENSE' if File.exists?('README.md') && File.exists?('LICENSE')
+		  add_quiet 'yard doc - LICENSE' if File.exists?('README.md') && File.exists?('LICENSE')
 		end
 	end
 end

data/lib/tasks/publish.rb

@@ -1,39 +1,35 @@
 puts __FILE__ if defined?(DEBUG)
-
+require_relative '../base/array.rb'
 desc 'performs publish commands'
 task :publish do Tasks.execute_task :publish; end
 
 class Publish < Array
-	def update
 
-        FileUtils.mkdir_p("#{Environment.dev_root}/publish") if !File.exists?("#{Environment.dev_root}/publish")
+	def update
 		if(File.exists?('.git') && defined?(VERSION))
-			add "<%Git.tag('#{Rake.application.original_dir}','#{VERSION}')%>"
+			add_quiet "<%Git.tag('#{Rake.application.original_dir}','#{VERSION}')%>"
 		end
 
 		if(Internet.available?)
 			if(File.exists?('.git'))
 				if(`git branch`.include?('* master'))
 					Dir.glob('*.gemspec').each{|gemspec_file|
-						add "gem push #{Gemspec.gemfile(gemspec_file)}" if !Gemspec.published? gemspec_file
+						add_passive "gem push #{Gemspec.gemfile(gemspec_file)}" if !Gemspec.published? gemspec_file
 					}
 				end
 			end
 			if(File.exists?('.svn'))
 				if(`svn info`.include?('/trunk'))
 					Dir.glob('*.gemspec').each{|gemspec_file|
-						add "gem push #{Gemspec.gemfile(gemspec_file)}" if !Gemspec.published? gemspec_file
+						add_quiet "gem push #{Gemspec.gemfile(gemspec_file)}" if !Gemspec.published? gemspec_file
 					}
 				end
 			end
 		end
 
-		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))
+			dest="#{Environment.default.publish_dir}/#{File.basename(publish_file)}"
+			add_quiet "<%FileUtils.cp('#{publish_file}','#{dest}')%>" if(!File.exists?(dest))
 		}
 	end
 end

data/lib/tasks/pull.rb

@@ -1,6 +1,3 @@
-puts __FILE__ if defined?(DEBUG)
-
-
 desc 'performs a git pull'
 task :pull do Tasks.execute_task :pull; end
 
@@ -8,7 +5,7 @@ class Pull < Array
 	def update
 		if(Internet.available?)
 			if(File.exists?('.git') && `git config --list`.include?('user.name='))
-				self <<  'git pull' if Git.branch != 'develop'
+				add_quiet('git pull') if Git.branch == 'master'
 			end
 		end
 	end

data/lib/tasks/push.rb

@@ -6,8 +6,8 @@ task :push do Tasks.execute_task :push;end
 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'
+			add_quiet 'git push'
+			add_quiet 'git push --tags'
 		end
 	end
 end

data/lib/tasks/setup.rb

@@ -1,5 +1,3 @@
-puts __FILE__ if defined?(DEBUG)
-
 desc 'performs setup commands'
 task :setup do Tasks.execute_task :setup;end
 
@@ -9,32 +7,55 @@ task :setup do Tasks.execute_task :setup;end
 # SVN_EXPORT={ 'System.Data.SQLite/1.0.93.0' => 'https://third-party.googlecode.com/svn/trunk/System.Data.SQLite/1.0.93.0' }
 #
 class Setup < Array
+
+	def initialize value=nil
+		env=value if value.kind_of? Environment
+	end
+
 	def update
-		add 'bundle install' if(File.exists?('Gemfile'))
+		env=Environment.new if env.nil?
 
-		['bin','data','log','make','publish','test'].each{|dir|
-			add "<%FileUtils.mkdir('#{Environment.dev_root}/#{dir}')%>" if !File.exists? "#{Environment.dev_root}/#{dir}"
-		}
+		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 "<%Gemspec.update('#{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)
 			Dir.glob('*.sln').each{|sln_file|
-				add "nuget restore #{sln_file}"
+				add_quiet "nuget restore #{sln_file}"
 			}
 		end
 
+		puts 'Setup checking SVN_EXPORTS...' if env.debug?
 		if(defined?(SVN_EXPORTS))
 			SVN_EXPORTS.each{|k,v|
-				if(!File.exists?("#{Command.dev_root}/dep/#{k}"))
-			      FileUtils.mkdir_p(File.dirname("#{Command.dev_root}/dep/#{k}")) if !File.exists?("#{Command.dev_root}/dep/#{k}")
-				  dest="#{Command.dev_root}/dep/#{k}"
-			      add "svn export #{v} #{Command.dev_root}/dep/#{k}" if !dest.include?("@")
-				  add "svn export #{v} #{Command.dev_root}/dep/#{k}@" if dest.include?("@")
+				dest="#{Command.dev_root}/dep/#{k}"
+				if(!File.exists?(dest))
+				  puts "#{Command.dev_root}/dep/#{k} does not exists" if env.debug?
+			      FileUtils.mkdir_p(File.dirname(dest)) if !File.exists?(File.dirname(dest))
+			      if(!dest.include?("@"))
+			      	puts "adding svn export #{v} #{dest}" if env.debug?
+			      	add_quiet "svn export #{v} #{dest}"
+			      end
+			      if(dest.include?("@"))
+			      	puts "adding svn export #{v} #{dest}@" if env.debug?
+			      	add_quiet "svn export #{v} #{dest}@"
+			      end
+			      #add "svn export #{v} #{dest}" if !dest.include?("@")
+				  #add "svn export #{v} #{dest}@" if dest.include?("@")
+				else
+					puts "#{Command.dev_root}/dep/#{k} exists." if env.debug?
 		        end
 			}
+		else
+			puts 'SVN_EXPORTS is not defined' if env.debug?
 		end
 
 		if(defined?(GIT_EXPORTS))
@@ -47,7 +68,7 @@ class Setup < Array
 							puts `git reset --hard #{v.split('@')[1]}`
 						end
 					else
-						add "git clone #{v} #{directory}"
+						add_quiet "git clone #{v} #{directory}"
 					end
 				end
 			}
@@ -75,7 +96,7 @@ class Setup < Array
 				end
 			}
 			Dir.glob('**/*.wxs').each{|wxs|
-				current_version=IO.read(wxs).scan(/Version=\"([\d.]+)\"/)[0]
+				current_version=IO.read(wxs).scan(/Version=\"([\d.]+)\"/)[0][0]
 				puts "#{wxs} current version=#{current_version}" if defined?(DEBUG)
 				if(current_version.include?('Version='))
 					target_version="Version=\"#{VERSION}\")="

data/lib/tasks/test.rb

@@ -10,10 +10,9 @@ puts __FILE__ if defined?(DEBUG)
 desc 'performs test commands'
 task :test => [:build] do Tasks.execute_task :test;end
 
-
 class Test < Array
 	def update
-		add 'rspec --format documentation' if File.exists?('spec')
+		add_quiet 'rspec --format documentation' if File.exists?('spec')
 
 		if(defined?(NUNIT))
 			NUNIT.each{|nunit_dll|
@@ -23,18 +22,18 @@ class Test < Array
 				dll_arg="\"#{nunit_dll}\"" if(nunit_dll.include?(' '))
 				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_quiet "#{nunit_arg} #{dll_arg} #{xml_arg}"
 			}
 		end
 
 		if(defined?(NUNIT_X86))
 			NUNIT_X86.each{|nunit_dll|
-				add "\"#{Test.nunit_console_x86}\" \"#{Rake.application.original_dir}\\#{nunit_dll}\" /xml:\"#{nunit_dll}.TestResults.xml\""
+				add_quiet "\"#{Test.nunit_console_x86}\" \"#{Rake.application.original_dir}\\#{nunit_dll}\" /xml:\"#{nunit_dll}.TestResults.xml\""
 			}
 		end
 
 		if(defined?(TESTS))
-			TEST.each{|t| add t}
+			TEST.each{|t| add_quiet t}
 		end
 	end