dev 2.0.99 → 2.0.100

data/lib/commands/git.rb

@@ -0,0 +1,22 @@
+class Git
+	def self.branch
+		begin
+		  `git branch`.scan(/\* ([.\w-]+)/)[0][0]
+	    rescue
+	    	''
+	    end
+    end
+
+    def self.remote_origin directory=''
+    	url=''
+    	directory=Dir.pwd if directory.length == 0
+    	Dir.chdir(directory) do
+    		begin
+    			url=`git remote show origin`.scan(/Fetch URL: ([\.\-:\/\w\d]+)/)[0]
+    		rescue
+    			url=''
+    		end
+    	end
+    	url
+    end
+end

data/lib/commands/hash.rb

@@ -0,0 +1,21 @@
+class Hash
+	def execute value=nil
+	  self.each{|k,v|
+      v.update if v.respond_to?(:update)
+      if(v.is_a?(Array) && v.length==0)
+        self.delete k 
+      else
+        #puts "executing #{k}"
+
+	  	  v.execute(value) if v.respond_to?(:execute)
+      end
+	  }
+    end
+	def to_html
+      [
+      	'<div>',
+        map { |k, v| ["<br/><div><strong>#{k}</strong>", v.respond_to?(:to_html) ? v.to_html : "<span>#{v}</span></div><br/>"] },
+        '</div>'
+      ].join
+    end
+end

data/lib/commands/info.rb

@@ -0,0 +1,3 @@
+#require_relative 'array.rb'
+INFO=Array.new
+

data/lib/commands/internet.rb

@@ -0,0 +1,24 @@
+require 'open-uri'
+#require 'net/http'
+require 'timeout'
+class Internet
+
+	@@available=true
+
+	def self.available?
+		return @@available if !@@available.nil?
+
+		begin
+			index=open('http://www.google.com').read 
+			if index.include?('<Title>Google')
+				@@available = true
+			else
+				puts "open('http://www.google.com') returned false"
+			end
+		rescue Exception => e
+			puts "open('http://www.google.com') raised an exception: #{e.to_s}"
+			@@available = false
+		end
+		@@available
+	end
+end

data/lib/commands/msbuild.rb

@@ -0,0 +1,56 @@
+# Visual Studio 2008 version 9.0,  solution format version 10.00
+# Visual Studio 2010 version 10.0, solution format version 11.00
+# Visual Studio 2012 version 11.0, solution format version 12.00
+# Visual Studio 2013 version 12.0, solution format version 12.00
+class MSBuild < Hash
+
+  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[:vs12]="C:\\Program Files (x86)\\MSBuild\\12.0\\bin\\msbuild.exe" if(File.exists?("C:\\Program Files (x86)\\MSBuild\\12.0\\bin\\msbuild.exe"))
+  end
+  
+  def self.has_version? version
+    if(defined?(MSBUILD))
+      MSBUILD.has_key?(version)
+    else
+      msb=MSBuild.new
+      return msb.has_key? version
+    end
+  end
+
+  def self.get_version version
+    if(defined?(MSBUILD))
+      MSBUILD[version]
+    else
+      msb=MSBuild.new
+      return msb[version]
+    end
+  end
+
+	def self.get_vs_version(sln_filename)
+   		sln_text=File.read(sln_filename,:encoding=>'UTF-8')
+    	return :vs9 if sln_text.include?('Format Version 10.00')
+    	return :vs12
+  	end
+
+  	def self.get_configurations(sln_filename)
+    	configs=Array.new
+	  	sln_text=File.read(sln_filename,:encoding=>'UTF-8')
+    	sln_text.scan( /= ([\w]+)\|/ ).each{|m|
+	  	c=m.first.to_s
+	  	configs << c if !configs.include?(c)
+		}
+		return configs
+  	end
+
+  	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
+	    	platforms << p if !platforms.include?(p)
+	  	}
+		return platforms
+  	end
+end
+

data/lib/commands/publish.rb

@@ -0,0 +1,21 @@
+#require_relative('internet.rb')
+class Publish < Array
+	def update
+		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
+					}
+				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
+					}
+				end
+			end
+		end
+	end
+end

data/lib/commands/pull.rb

@@ -0,0 +1,12 @@
+#require_relative('git.rb')
+#require_relative('internet.rb')
+
+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'
+			end
+		end
+	end
+end

data/lib/commands/push.rb

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

data/lib/commands/setup.rb

@@ -0,0 +1,41 @@
+#
+# use the SVN_EXPORTS hash to define svn exports destined for DEV_ROOT/dep
+#
+# 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 update
+		add 'bundle install' if(File.exists?('Gemfile'))
+
+		Dir.glob('*.gemspec').each{|gemspec_file|
+			add "<%Gemspec.update('#{gemspec_file}')%>"
+		}
+
+		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?("@")
+		        end
+			}
+		end
+
+		if(defined?(GIT_EXPORTS))
+			GIT_EXPORTS.each{|k,v|
+				directory = "#{Command.dev_root}/dep/#{k}"
+				if(!File.exists?(directory))
+					if(v.include?('@'))
+						puts `git clone #{v.split('@')[0]} #{directory}`
+						Dir.chdir(directory) do
+							puts `git reset --hard #{v.split('@')[1]}`
+						end
+					else
+						add "git clone #{v} #{directory}"
+					end
+				end
+			}
+		end
+	end
+end

data/lib/commands/tag.rb

@@ -0,0 +1,3 @@
+class Tag < Array
+	
+end

data/lib/commands/test.rb

@@ -0,0 +1,62 @@
+#
+# nunit dlls may be specified with
+# NUNIT=FileList.new('**/*.Test.dll')
+#
+# for nunit dlls that must be run in x86 mode,
+# NUNIT_x86=FileList.new('**/*.x86.Test.dll')
+#
+
+
+class Test < Array
+	def update
+		add 'rspec' if File.exists?('spec')
+
+		if(defined?(NUNIT))
+			NUNIT.each{|nunit_dll|
+				add "\"#{Test.nunit_console}\" \"#{Rake.application.original_dir}\\#{nunit_dll}\" /xml:\"#{nunit_dll}.TestResults.xml\""
+			}
+		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\""
+			}
+		end
+
+		if(defined?(TESTS))
+			TEST.each{|t| add t}
+		end
+	end
+
+    @@nunit_console=''
+	def self.nunit_console
+		if(!File.exists?(@@nunit_console))
+			if(defined?(NUNIT_CONSOLE))
+				@@nunit_console = NUNIT_CONSOLE 
+			end
+			@@nunit_console = "C:\\Program Files (x86)\\NUnit 2.6.4\\bin\\nunit-console.exe" if(!File.exists?(@@nunit_console))
+			@@nunit_console = "C:\\Program Files (x86)\\NUnit 2.6.3\\bin\\nunit-console.exe" if(!File.exists?(@@nunit_console))
+		end
+		if(!File.exists?(@@nunit_console))
+			raise "unable to locate nunit-console.exe, assign NUNIT_CONSOLE to the correct location."
+		end
+		@@nunit_console
+	end
+
+	@@nunit_console_x86=''
+	def self.nunit_console_x86
+		if(!File.exists?(@@nunit_console_x86))
+			if(defined?(NUNIT_CONSOLE_X86))
+				@@nunit_console_x86 = NUNIT_CONSOLE_X86 
+			end
+			@@nunit_console_x86 = "C:\\Program Files (x86)\\NUnit 2.6.4\\bin\\nunit-console-x86.exe" if(!File.exists?(@@nunit_console_x86))
+			@@nunit_console_x86 = "C:\\Program Files (x86)\\NUnit 2.6.3\\bin\\nunit-console-x86.exe" if(!File.exists?(@@nunit_console_x86))
+		end
+		if(!File.exists?(@@nunit_console_x86))
+			raise "unable to locate nunit-console-x86.exe, assign NUNIT_CONSOLE_X86 to the correct location."
+		end
+		@@nunit_console_x86
+	end
+end
+
+NUNIT=FileList.new('bin/**/*.Test.dll')

data/lib/commands/text.rb

@@ -0,0 +1,16 @@
+class Text
+  def self.replace_in_glob(glob,search,replace)
+     Dir.glob(glob).each{ |f| replace_in_file(f,search,replace) }
+   end
+   
+   def self.replace_in_file(filename,search,replace)
+     text1 = IO.read(filename)
+     text2 = text1.gsub(search) { |str| str=replace }
+     unless text1==text2
+       File.open(filename,"w") { |f| f.puts text2 }
+       return true
+     end
+     false
+   end
+
+end

data/lib/commands/timeout.rb

@@ -0,0 +1,81 @@
+############################################################################
+# The following code is based on code originally copied from 
+# https://gist.github.com/lpar/1032297
+# Gist title: lpar/timeout.rb
+############################################################################
+# Runs a specified shell command in a separate thread.
+# If it exceeds the given timeout in seconds, kills it.
+# Returns any output produced by the command (stdout or stderr) as a String.
+# Uses Kernel.select to wait up to the tick length (in seconds) between 
+# checks on the command's status
+#
+# If you've got a cleaner way of doing this, I'd be interested to see it.
+# If you think you can do it with Ruby's Timeout module, think again.
+def run_with_timeout(directory,command, timeout, tick)
+  output = ''
+  exit_code=1
+  begin
+    # Start task in another thread, which spawns a process
+    stdin, stderrout, thread = Open3.popen2e(command, :chdir=>directory)
+    # Get the pid of the spawned process
+    pid = thread[:pid]
+    start = Time.now
+
+    while (Time.now - start) < timeout and thread.alive?
+      # Wait up to `tick` seconds for output/error data
+      Kernel.select([stderrout], nil, nil, tick)
+      # Try to read the data
+      begin
+        output << stderrout.read_nonblock(BUFFER_SIZE)
+      rescue IO::WaitReadable
+        # A read would block, so loop around for another select
+      rescue EOFError
+        # Command has completed, not really an error...
+        break
+      end
+    end
+
+    # Give Ruby time to clean up the other thread
+    sleep 1
+
+    if thread.alive?
+      # We need to kill the process, because killing the thread leaves
+      # the process alive but detached, annoyingly enough.
+      Process.kill("TERM", pid)
+    else
+      exit_code=thread.value
+      sleep 1
+    end
+
+  ensure
+    stdin.close if stdin
+    stderrout.close if stderrout
+  end
+  return [output,exit_code]
+end
+
+require 'timeout'
+def run_with_timeout2(directory,command,timeout)
+  # stdout, stderr pipes
+  rout, wout = IO.pipe
+  rerr, werr = IO.pipe
+  output=''
+  error=''
+  exit_code=1
+  pid = Process.spawn(command, :chdir => directory, :out => wout, :err => werr)
+  begin
+    Timeout.timeout(timeout) do
+      exit_code = Process.wait2(pid)
+      output = rout.readlines.join("\n")
+      error = rerr.readlines.join("\n")
+    end
+  rescue
+    Proces.kill('TERM',pid)
+    output = output + 'timeout occurred.'
+  ensure
+    rout.close
+    rerr.close
+  end
+  [output,exit_code]
+end
+

data/lib/commands/timer.rb

@@ -0,0 +1,43 @@
+class Timer
+  attr_accessor :start_time
+
+  def initialize
+    @start_time=Time.now
+  end
+
+  def elapsed # in seconds
+    return Time.now-@start_time
+  end
+
+  def elapsed_str
+    elapsed_str="[" + "%.0f" %(elapsed) + "s]"
+  end
+
+  def self.elapsed_exceeds?(name,duration_seconds)
+    if(Timer.get_elapsed(name).nil? || Timer.get_elapsed(name) > duration_seconds)
+	  return true
+	end
+	return false
+  end
+
+  def self.get_elapsed(name)
+    timestamp=get_timestamp(name)
+	return Time.now-timestamp if(!timestamp.nil?)
+	nil
+  end
+
+  def self.get_timestamp(name)
+    dir=Rake.application.original_dir
+    if(File.exists?("#{DEV[:dev_root]}/log/#{name}.timestamp"))
+      return Time.parse(File.read("#{DEV[:dev_root]}/log/#{name}.timestamp").strip)
+	end
+	nil
+  end
+
+  def self.set_timestamp(name)
+    Dir.mkdir("#{DEV_TASKS[:dev_root]}/log") if(!Dir.exists?("#{DEV_TASKS[:dev_root]}/log"))
+    File.open("#{DEV_TASKS[:dev_root]}/log/#{name}.timestamp",'w'){|f|f.puts(Time.now.to_s)}
+  end
+end
+
+TIMER=Timer.new

data/lib/commands/update.rb

@@ -0,0 +1,5 @@
+class Update < Array
+	def update
+		self .add 'svn update' if File.exists?('.svn') && Internet.available?
+	end
+end

data/lib/commands/upgrade.rb

@@ -0,0 +1,6 @@
+class Upgrade < Array
+	def update
+		if(File.exists?('Gemfile'))
+		end
+	end
+end

data/lib/dev.rb

@@ -1,6 +1,6 @@
 require 'rake/clean'
 
-Dir.glob("#{File.dirname(__FILE__)}/*.rb").each{|rb| 
+Dir.glob("#{File.dirname(__FILE__)}/**/*.rb").each{|rb| 
   require_relative(rb)
 }
 

data/lib/{dev_environment.rb → environment.rb}

@@ -40,38 +40,4 @@ class Environment < Hash
   end
 
   
-end
-require 'fileutils'
-
-class File
-	def self.amalgamate filename,source
-		File.open(filename,'w'){|file|
-			source.each{|source_file|
-				file.puts IO.read(source_file)
-			}
-		}
-	end
-
-	def self.publish destination, source_dir, source_glob='**/*', overwrite_existing=false
-
-		output = "\n"
-		# directory
-		FileUtils.mkdir_p destination if !File.exists? destination
-
-		files=nil
-		Dir.chdir(source_dir) do
-			files=FileList.new(source_glob).to_a
-		end
-		output = output + "\nfiles: #{files}.to_s"
-
-		Dir.chdir(source_dir) do
-			files.each{|f|
-				file="#{destination}/#{f}"
-				dirname=File.dirname(file)
-				FileUtils.mkdir_p dirname if !File.exists? dirname
-				FileUtils.cp(f,file) if !File.exists? file || overwrite_existing
-			}
-		end
-		output
-	end
-end
+end

data/lib/file.rb

@@ -0,0 +1,34 @@
+require 'fileutils'
+
+class File
+	def self.amalgamate filename,source
+		File.open(filename,'w'){|file|
+			source.each{|source_file|
+				file.puts IO.read(source_file)
+			}
+		}
+	end
+
+	def self.publish destination, source_dir, source_glob='**/*', overwrite_existing=false
+
+		output = "\n"
+		# directory
+		FileUtils.mkdir_p destination if !File.exists? destination
+
+		files=nil
+		Dir.chdir(source_dir) do
+			files=FileList.new(source_glob).to_a
+		end
+		output = output + "\nfiles: #{files}.to_s"
+
+		Dir.chdir(source_dir) do
+			files.each{|f|
+				file="#{destination}/#{f}"
+				dirname=File.dirname(file)
+				FileUtils.mkdir_p dirname if !File.exists? dirname
+				FileUtils.cp(f,file) if !File.exists? file || overwrite_existing
+			}
+		end
+		output
+	end
+end

data/lib/{dev_git.rb → git.rb}

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

data/lib/{dev_msbuild.rb → msbuild.rb}

@@ -1,4 +1,3 @@
-#require_relative 'msbuild.rb'
 # Visual Studio 2008 version 9.0,  solution format version 10.00
 # Visual Studio 2010 version 10.0, solution format version 11.00
 # Visual Studio 2012 version 11.0, solution format version 12.00

data/lib/project.rb

@@ -0,0 +1,64 @@
+require 'json'
+#require 'dev_commands'
+
+class Project < Hash
+attr_accessor :filename
+	def initialize value=''
+		@filename=''
+		self[:url]=''
+		self[:url] = value if value.is_a?(String)
+		if(value.is_a?(Hash))
+			value.each{|k,v|self[k]=v}
+		end
+	end
+
+    def name
+    	self[:name]
+    end
+    
+	def get_latest_unique_id 
+		'51ed9c9d45ba3979c808740d75ba1831c85aff5d'
+	end
+
+	def wrk_dir
+		"#{Environment.dev_root}/wrk/#{self.name}"
+	end
+
+	def pull
+		if(File.exists?(wrk_dir) && File.exists?("#{wrk_dir}/.git"))
+			Dir.chdir(wrk_dir) do
+				puts "git pull (#{wrk_dir})"
+				puts `git pull`
+			end
+		end
+	end
+
+	def clone
+		if(!File.exists?(wrk_dir) && self[:url].include?('.git'))
+			puts "cloning #{self[:url]} to #{self.wrk_dir}"
+			puts `git clone #{self[:url]} #{self.wrk_dir}`
+		end
+	end
+
+	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}`
+		end
+	end
+
+	def rake
+		if(!File.exists?(self.wrk_dir))
+			clone
+			checkout
+		end
+		if(File.exists?(self.wrk_dir))
+			Dir.chdir(self.wrk_dir) do
+				rake = Command.new({ :input => 'rake', :timeout => 300, :ignore_failure => true })
+				rake.execute
+				puts rake.summary
+			end
+		end
+	end
+end
+

data/lib/{dev_projects.rb → projects.rb}

@@ -1,74 +1,3 @@
-#require 'dev_environment'
-#require_relative 'projects.rb'
-#require_relative 'project.rb'
-
-
-#class DevProjects
-#end
-require 'json'
-#require 'dev_commands'
-
-class Project < Hash
-attr_accessor :filename
-	def initialize value=''
-		@filename=''
-		self[:url]=''
-		self[:url] = value if value.is_a?(String)
-		if(value.is_a?(Hash))
-			value.each{|k,v|self[k]=v}
-		end
-	end
-
-    def name
-    	self[:name]
-    end
-    
-	def get_latest_unique_id 
-		'51ed9c9d45ba3979c808740d75ba1831c85aff5d'
-	end
-
-	def wrk_dir
-		"#{Environment.dev_root}/wrk/#{self.name}"
-	end
-
-	def pull
-		if(File.exists?(wrk_dir) && File.exists?("#{wrk_dir}/.git"))
-			Dir.chdir(wrk_dir) do
-				puts "git pull (#{wrk_dir})"
-				puts `git pull`
-			end
-		end
-	end
-
-	def clone
-		if(!File.exists?(wrk_dir) && self[:url].include?('.git'))
-			puts "cloning #{self[:url]} to #{self.wrk_dir}"
-			puts `git clone #{self[:url]} #{self.wrk_dir}`
-		end
-	end
-
-	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}`
-		end
-	end
-
-	def rake
-		if(!File.exists?(self.wrk_dir))
-			clone
-			checkout
-		end
-		if(File.exists?(self.wrk_dir))
-			Dir.chdir(self.wrk_dir) do
-				rake = Command.new({ :input => 'rake', :timeout => 300, :ignore_failure => true })
-				rake.execute
-				puts rake.summary
-			end
-		end
-	end
-end
-
 require 'json'
 require 'rake'
 #require 'dev_git'

data/lib/{dev_svn.rb → svn.rb}

@@ -133,4 +133,4 @@ class Svn
 			}
 		end
 	end
-end
+end