dev_commands 0.0.25 → 0.0.26

data/lib/add.rb

@@ -1,7 +1,7 @@
 class Add < Array
 	def update
 		if(File.exists?('.gitignore'))
-			add 'git add --all' 
+			add 'git add --all :/' 
 		else
 			if(defined?(SOURCE))
 				if(File.exists?('.svn'))
@@ -9,7 +9,6 @@ class Add < Array
 
 						add "svn add #{f} --parents" if Command.output("svn status #{f}").include?('?')
 						add "svn add #{f} --parents" if Command.exit_code("svn status #{f}") != 0
-						#add "svn add #{f} --parents" if status.include?('?') || status.include?(n)
 					}
 				end
 				if(File.exists?('.git'))

data/lib/analyze.rb

@@ -0,0 +1,8 @@
+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'
+		end
+	end
+end

data/lib/array.rb

@@ -1,25 +1,25 @@
-class Array
-    def execute
-      i=0
-      while i < self.length
-        self[i]=Command.new(self[i]) if(self[i].is_a?(String))
-        self[i]=Command.new(self[i]) if(self[i].is_a?(Hash) && !self[i].is_a?(Command))
-        self[i].execute if(self[i].is_a?(Command))
-        i=i+1
-      end
-    end
-
-    def add command
-      self << command if(!include?(command))
-    end
-
-    def to_html
-      html=Array.new
-      html << '<div>'
-      self.each{|e|
-        html << e.to_html if e.respond_to?(:to_html)
-      }
-      html << '</div>'
-      html.join
-    end
+class Array
+    def execute
+      i=0
+      while i < self.length
+        self[i]=Command.new(self[i]) if(self[i].is_a?(String))
+        self[i]=Command.new(self[i]) if(self[i].is_a?(Hash) && !self[i].is_a?(Command))
+        self[i].execute if(self[i].is_a?(Command))
+        i=i+1
+      end
+    end
+
+    def add command
+      self << command if(!include?(command))
+    end
+
+    def to_html
+      html=Array.new
+      html << '<div>'
+      self.each{|e|
+        html << e.to_html if e.respond_to?(:to_html)
+      }
+      html << '</div>'
+      html.join
+    end
 end

data/lib/build.rb

@@ -1,3 +1,5 @@
+require_relative('msbuild.rb')
+
 class Build < Array
 	def update
 		Dir.glob('*.gemspec'){|gemspec|
@@ -5,16 +7,16 @@ class Build < Array
     	}
     	Dir.glob('**/*.sln'){|sln_file|
     		vs_version=MSBuild.get_vs_version(sln_file)
-    		if(defined?(MSBUILD))
-    			if(MSBUILD.has_key?(vs_version))
-    				MSBuild.get_configurations(f).each{ |configuration|
-		      			MSBuild.get_platforms(f).each{|platform|
-			    			Console.debug "configuration='#{configuration}', platform='#{platform}'"
-		        			self.add "\"#{MSBUILD[vs_version]}\" \"#{f}\" /nologo /p:Configuration=#{configuration} /p:Platform=\"#{platform}\""
-		      			}
-		    		}
-    			end
-    		end
+			if(MSBuild.has_version?(vs_version))
+				MSBuild.get_configurations(sln_file).each{ |configuration|
+	      			MSBuild.get_platforms(sln_file).each{|platform|
+		    			#Console.debug "configuration='#{configuration}', platform='#{platform}'"
+	        			self.add "\"#{MSBuild.get_version(vs_version)}\" \"#{sln_file}\" /nologo /p:Configuration=#{configuration} /p:Platform=\"#{platform}\""
+	      			}
+	    		}
+            else
+                "puts version #{vs_version} not found for MsBuild"
+			end
     	}
 	end
 end

data/lib/command.rb

@@ -1,133 +1,152 @@
-require 'open3'
-require_relative('./array.rb')
-require_relative('./hash.rb')
-require_relative('./timer.rb')
-
-class Command < Hash
-	def initialize command
-
-        self[:input] = ''
-		self[:timeout] = 0
-		self[:directory] = ''
-		self[:exit_code] = 0
-		self[:output] = ''
-		self[:error] = ''
-		self[:machine] = ''
-		self[:user] = ''
-		self[:start_time] = nil
-		self[:end_time] = nil
-
-		if(command.kind_of?(String))
-		  self[:input] = command
-        end
-
-        if(command.kind_of?(Hash))
-        	command.each{|k,v|
-        		self[k.to_sym]=v
-        	}
-        end
-	end
-
-	def execute
-		puts "#{self[:input]}" if(!self.has_key?(:quiet) || !self[:quiet])
-		pwd=Dir.pwd
-		Dir.chdir(self[:directory]) if(self.has_key?(:directory) && File.exists?(self[:directory]))
-		self[:directory] = pwd if(self[:directory].length==0)
-		
-		self[:machine] = Command.machine
-		self[:user] = Command.user
-
-		self[:start_time]=Time.now
-		timer=Timer.new
-		if self[:input].include?('<%') && self[:input].include?('%>')
-		  ruby = self[:input].gsub("<%","").gsub("%>","")
-
-		  begin
-		    self[:output]=eval(ruby)
-		  rescue 
-		  	self[:exit_code]=1
-		  	self[:error]="unable to eval(#{ruby})"
-		  end
-
-		  self[:elapsed] = timer.elapsed_str
-		  self[:end_time] = Time.now
-		else
-			begin
-        self[:output],self[:error],status= Open3.capture3(self[:input])
-        self[:exit_code]=status.to_i
-			  self[:elapsed] = timer.elapsed_str
-			  self[:end_time] = Time.now
-			rescue Exception => e
-			  self[:elapsed] = timer.elapsed_str
-			  self[:end_time] = Time.now
-			  self[:error] = "Exception: " + e.to_s
-			  self[:exit_code]=1
-		    end
-		end
-
-        Dir.chdir(pwd) if pwd != Dir.pwd
-
-        if(self[:exit_code] != 0)
-          if(!self.has_key?(:quiet) || !self[:quiet])
-        	  puts ' '
-        	  puts "exit_code=#{self[:exit_code]}"
-        	  puts ' '
-        	  puts self[:output]
-        	  puts self[:error]
-        	  puts ' '
-          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
-
-    def self.machine
-      if !ENV['COMPUTERNAME'].nil? 
-	   return ENV['COMPUTERNAME']
-	  end
-
-      machine = `hostname`
-      machine = machine.split('.')[0] if machine.include?('.')
-	  return machine.strip
-    end
-
-    def self.user
-      ENV['USER'].nil? ? ENV['USERNAME'] : ENV['USER']
-    end 
-
-    def self.exit_code command
-    	cmd = Command.new(command)
-    	cmd[:ignore_failure]=true
-      cmd[:quiet]=true
-    	cmd.execute
-    	cmd[:exit_code]
-    end
-
-    def self.output command
-    	cmd = Command.new(command)
-    	cmd[:ignore_failure]=true
-      cmd[:quiet]=true
-    	cmd.execute
-    	cmd[:output]
-    end
-
-    def to_html
-      if self[:exit_code] == 0
-      [
-      	'<div><table><tr><td width="20"></td><td><pre>',
-      	self[:input],
-      	'</pre></td></tr></table></div>'
-      ].join
-      else
-      [
-      	'<div><table><tr><td width="20"></td><td><pre>',
-      	self[:input],
-        '</pre><table><tr><td width="20"></td><td><table>',
-        map { |k, v| ["<tr><td><strong>#{k}</strong></td>", v.respond_to?(:to_html) ? v.to_html : "<td><span><pre>#{v}</pre></span></td></tr>"] },
-        '</table>',
-        '</td></tr></table></td></tr></table></div>'
-      ].join
-      end
-    end
+require 'open3'
+require_relative('./array.rb')
+require_relative('./hash.rb')
+require_relative('./timer.rb')
+
+class Command < Hash
+	def initialize command
+
+        self[:input] = ''
+		self[:timeout] = 0
+		self[:directory] = ''
+		self[:exit_code] = 0
+		self[:output] = ''
+		self[:error] = ''
+		self[:machine] = ''
+		self[:user] = ''
+		self[:start_time] = nil
+		self[:end_time] = nil
+
+		if(command.kind_of?(String))
+		  self[:input] = command
+        end
+
+        if(command.kind_of?(Hash))
+        	command.each{|k,v|
+        		self[k.to_sym]=v
+        	}
+        end
+	end
+
+	def execute
+		puts "#{self[:input]}" if(!self.has_key?(:quiet) || !self[:quiet])
+		pwd=Dir.pwd
+		Dir.chdir(self[:directory]) if(self.has_key?(:directory) && File.exists?(self[:directory]))
+		self[:directory] = pwd if(self[:directory].length==0)
+		
+		self[:machine] = Command.machine
+		self[:user] = Command.user
+
+		self[:start_time]=Time.now
+		timer=Timer.new
+		if self[:input].include?('<%') && self[:input].include?('%>')
+		  ruby = self[:input].gsub("<%","").gsub("%>","")
+
+		  begin
+		    self[:output]=eval(ruby)
+		  rescue 
+		  	self[:exit_code]=1
+		  	self[:error]="unable to eval(#{ruby})"
+		  end
+
+		  self[:elapsed] = timer.elapsed_str
+		  self[:end_time] = Time.now
+		else
+			begin
+        self[:output],self[:error],status= Open3.capture3(self[:input])
+        self[:exit_code]=status.to_i
+			  self[:elapsed] = timer.elapsed_str
+			  self[:end_time] = Time.now
+			rescue Exception => e
+			  self[:elapsed] = timer.elapsed_str
+			  self[:end_time] = Time.now
+			  self[:error] = "Exception: " + e.to_s
+			  self[:exit_code]=1
+		    end
+		end
+
+        Dir.chdir(pwd) if pwd != Dir.pwd
+
+        if(self[:exit_code] != 0)
+          if(!self.has_key?(:quiet) || !self[:quiet])
+        	  puts ' '
+        	  puts "exit_code=#{self[:exit_code]}"
+        	  puts ' '
+        	  puts self[:output]
+        	  puts self[:error]
+        	  puts ' '
+          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
+
+    def self.machine
+      if !ENV['COMPUTERNAME'].nil? 
+	   return ENV['COMPUTERNAME']
+	  end
+
+      machine = `hostname`
+      machine = machine.split('.')[0] if machine.include?('.')
+	  return machine.strip
+    end
+
+    def self.user
+      ENV['USER'].nil? ? ENV['USERNAME'] : ENV['USER']
+    end 
+
+    def self.home 
+      ["USERPROFILE","HOME"].each {|v|
+        return ENV[v].gsub('\\','/') unless ENV[v].nil?
+      }
+      dir="~"
+      dir=ENV["HOME"] unless ENV["HOME"].nil?
+      dir=ENV["USERPROFILE"].gsub('\\','/') unless ENV["USERPROFILE"].nil?
+      return dir
+    end
+
+    def self.dev_root
+      ["DEV_HOME","DEV_ROOT"].each {|v|
+        return ENV[v].gsub('\\','/') unless ENV[v].nil?
+      }
+      dir=home
+      #dir=ENV["DEV_ROOT"].gsub('\\','/') unless ENV["DEV_ROOT"].nil?
+     return dir
+    end
+
+    def self.exit_code command
+    	cmd = Command.new(command)
+    	cmd[:ignore_failure]=true
+      cmd[:quiet]=true
+    	cmd.execute
+    	cmd[:exit_code]
+    end
+
+    def self.output command
+    	cmd = Command.new(command)
+    	cmd[:ignore_failure]=true
+      cmd[:quiet]=true
+    	cmd.execute
+    	cmd[:output]
+    end
+
+    def to_html
+      if self[:exit_code] == 0
+      [
+      	'<div><table><tr><td width="20"></td><td><pre>',
+      	self[:input],
+      	'</pre></td></tr></table></div>'
+      ].join
+      else
+      [
+      	'<div><table><tr><td width="20"></td><td><pre>',
+      	self[:input],
+        '</pre><table><tr><td width="20"></td><td><table>',
+        map { |k, v| ["<tr><td><strong>#{k}</strong></td>", v.respond_to?(:to_html) ? v.to_html : "<td><span><pre>#{v}</pre></span></td></tr>"] },
+        '</table>',
+        '</td></tr></table></td></tr></table></div>'
+      ].join
+      end
+    end
 end

data/lib/commands.rb

@@ -4,6 +4,7 @@ require_relative('update.rb')
 require_relative('setup.rb')
 require_relative('build.rb')
 require_relative('test.rb')
+require_relative('analyze.rb')
 require_relative('publish.rb')
 require_relative('doc.rb')
 require_relative('clean.rb')
@@ -21,6 +22,7 @@ class Commands < Hash
 		  self[:setup]=Setup.new
 		  self[:build]=Build.new
 		  self[:test]=Test.new
+		  self[:analyze]=Analyze.new
 		  self[:doc]=Doc.new
 		  self[:clean]=Clean.new
 		  self[:publish]=Publish.new

data/lib/commit.rb

@@ -1,3 +1,5 @@
+require_relative('internet.rb')
+
 class Commit < Array
 	def update
 		if(File.exists?('.git') && `git config --list`.include?('user.name='))
@@ -11,7 +13,7 @@ class Commit < Array
 			  add "<%FileUtils.rm('commit.message')%>" if File.exists?('commit.message')
 		    end 		
 		end
-		if(File.exists?('.svn'))
+		if(File.exists?('.svn') && Internet.available?)
 			add 'svn commit -m"commit all"'
 		end
 	end

data/lib/dev_commands.rb

@@ -1,9 +1,10 @@
 require 'json'
 require 'rake/clean'
 
-#CLEAN.include('.yardoc','log','tmp','*.gem','obj')
-#CLEAN.include('**/*.{suo,sdf}')
-CLOBBER.include('bin','doc')
+CLEAN.include('obj')
+CLEAN.include('**/*.{sdf,sud,ncb,cache,user}')
+CLOBBER.include('bin','doc','*.gem','tmp')
+CLOBBER.include('**/*.{dll,pdb}')
 
 SOURCE=FileList.new('LICENSE','README','README.md',"Gemfile")
 SOURCE.include('**/*.{gitignore,yml,gemspec,rb}')
@@ -20,4 +21,4 @@ require_relative('git.rb')
 require_relative('msbuild.rb')
 
 COMMANDS=Commands.new
-MSBUILD=MSBuild.new
+MSBUILD=MSBuild.new

data/lib/doc.rb

@@ -1,9 +1,9 @@
-class Doc < Array
-	def update
-		#cmd=Command.new ({ :input => 'yard --version', :ignore_failure => true})
-		#cmd.execute
-		if(Command.exit_code('yard --version'))
-		  add 'yard doc - LICENSE' if File.exists?('README.md') && File.exists?('LICENSE')
-		end
-	end
+class Doc < Array
+	def update
+		#cmd=Command.new ({ :input => 'yard --version', :ignore_failure => true})
+		#cmd.execute
+		if(Command.exit_code('yard --version'))
+		  add 'yard doc - LICENSE' if File.exists?('README.md') && File.exists?('LICENSE')
+		end
+	end
 end