dev 2.0.46 → 2.0.47

data/lib/dev_environment.rb

@@ -1 +1,42 @@
-require_relative 'environment.rb'
+#require_relative 'environment.rb'
+class Environment < Hash
+
+  def initialize
+    self[:home]=Environment.home
+    self[:machine]=Environment.machine
+    self[:user]=Environment.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.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
+  	return ENV['USER'] if !ENV['USER'].nil?  #on Unix
+    ENV['USERNAME']
+  end
+
+  def self.dev_root
+    ["DEV_HOME","DEV_ROOT"].each {|v|
+      return ENV[v].gsub('\\','/') unless ENV[v].nil?
+    }
+    dir=home
+   return dir
+  end
+end

data/lib/dev_git.rb

@@ -1,4 +1,51 @@
-require_relative 'git.rb'
+class Git
+	def self.branch directory=''
+        directory=Dir.pwd if directory.length == 0
+        Dir.chdir(directory) do
+    		begin
+    		  `git branch`.scan(/\* ([.\w-]+)/)[0][0] if(File.exists?('.git'))
+    	    rescue
+    	    	''
+    	    end
+        end
+    end
 
-class DevGit
-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][0] if(File.exists?('.git'))
+    		rescue
+    			url=''
+    		end
+    	end
+    	url
+    end
+
+    def self.has_changes? directory=''
+        directory=Dir.pwd if directory.length==0
+        Dir.chdir(directory) do
+            if(File.exists?('.git'))
+                return true if `git status`.include?('modified:')
+            end
+        end
+        false
+    end
+
+    def self.init directory=''
+        directory=Dir.pwd if directory.length==0
+        FileUtils.mkpath directory if !File.exists?(directory)
+        if(!File.exists?("#{directory}/.git"))
+            Dir.chdir(directory) do
+               `git init`
+               File.open('.gitignore','w'){|f|
+                   f.puts '### Mac ###'
+                   f.puts '*.DS_Store'
+               }
+               `git add .gitignore`
+               `git commit -m'added .gitignore'`
+            end
+        end
+    end
+end

data/lib/dev_msbuild.rb

@@ -0,0 +1,72 @@
+#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
+# 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[: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"))
+  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
+
+    def self.get_build_commands sln_filename
+      build_commands=nil
+      vs_version=MSBuild.get_vs_version(sln_filename)
+      if(MSBuild.has_version?(vs_version))
+        MSBuild.get_configurations(sln_filename).each{ |configuration|
+          MSBuild.get_platforms(sln_filename).each{|platform|
+            build_commands=Array.new if build_commands.nil?
+            build_commands << "\"#{MSBuild.get_version(vs_version)}\" \"#{sln_filename}\" /nologo /p:Configuration=#{configuration} /p:Platform=\"#{platform}\""
+          }
+        }
+      end
+      build_commands
+    end
+end
+

data/lib/dev_projects.rb

@@ -1,10 +1,141 @@
 #require 'dev_environment'
-require_relative 'projects.rb'
-require_relative 'project.rb'
+#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'
+#require 'dev_svn'
+#require 'dev_msbuild'
+#require 'dev_environment'
+
+class Projects < Hash
+	attr_accessor :filename
+
+	def initialize
+		@filename=''
+	end
+
+    def update
+    	self.each{|k,v|
+    		self[k]=Project.new(v) if(v.is_a?(String))
+    		self[k]=Project.new(v) if(!v.is_a?(Project) && v.is_a?(Hash))
+    		self[k][:name]=k
+    		#self[k].update if self[k].respond_to?("update".to_sym)
+    	}
+    end
+
+	def save filename=''
+		@filename=filename if !filename.nil? && filename.length > 0
+		File.open(@filename,'w'){|f|f.write(JSON.pretty_generate(self))} if @filename.length > 0
+	end
+
+	def open filename=''
+		@filename=filename if filename.length > 0
+		JSON.parse(IO.read(@filename)).each{|k,v| self[k]=v}
+		update
+	end
+
+	def self.user_projects_filename
+		FileUtils.mkdir("#{Environment.dev_root}/data") if(!File.exists?("#{Environment.dev_root}/data"))
+		"#{Environment.dev_root}/data/PROJECTS.json"
+	end
+
+	def self.current
+		project=nil
+		url=Git.remote_origin
+		url=Svn.url if url.length==0
+		if(Rake.application.original_dir.include?('/wrk/') &&
+			   url.length > 0)
+			project=Project.new(url)
+			name=Rake.application.original_dir.gsub("#{Environment.dev_root}/wrk/",'')
+			project[:name] = name if(name.length>0 && !name.include?(Environment.dev_root))
+			if(defined?(PROJECTS))
+				PROJECTS[name]=project if(!PROJECTS.has_key?(name))
+				project.each{|k,v|PROJECTS[name][k]=v}
+				PROJECTS.save
+			else
+				project[:name]=name
+			end
+		end			
+		project
+	end
+
+	def pull
+		self.each{|k,v| v.pull if v.respond_to?("pull".to_sym)}
+	end
+	def rake
+		self.each{|k,v| v.rake if v.respond_to?("rake".to_sym)}
+	end
+end
 
 PROJECTS=Projects.new
 PROJECTS.open Projects.user_projects_filename if File.exists? Projects.user_projects_filename
 PROJECTS.save Projects.user_projects_filename if !File.exists? Projects.user_projects_filename
-
-class DevProjects
-end

data/lib/dev_svn.rb

@@ -1,2 +1,99 @@
+require 'fileutils'
+require 'tmpdir'
+class Svn
 
-require_relative 'svn.rb'
+	def self.latest_revision
+	    if(Dir.exists?(".svn"))
+	      `svn update`
+		  `svn info`.scan(/Last Changed Rev: ([\d]+)/).each{|m|
+		    return m.first.to_s
+		  }
+		end
+		"0"
+	end
+
+	def self.url
+		if(Dir.exists?(".svn"))
+		  `svn info`.scan(/URL: ([:\/\.\-\d\w]+)/).each{|m|
+		    return m.first.to_s
+		  }
+		end
+		''
+	end
+
+	def self.export url, destination
+		if(!File.exists?(destination.chomp('@')))
+			`svn export #{url} #{destination}`
+		end
+	end
+
+	def self.has_changes? directory=''
+        directory=Dir.pwd if directory.length==0
+        Dir.chdir(directory) do
+            if(File.exists?('.svn'))
+                return true if `svn status`.scan(/^[MA]/).length>0
+            end
+        end
+        false
+    end
+
+	# publish a directory to a new subversion path
+	# source_dir is the directory with the files to be published
+	# destination is the new subversion path URL
+	# source_glob is a string or array of glob directives to specify files in source_dir to be publish
+	# source_glob defaults to '**/*' to publish all files in the source_dir
+	def self.publish source_dir, destination, source_glob='**/*'
+
+		output = "\n"
+		raise "Svn.publish: destination #{destination} already exists" if(`svn info #{destination} 2>&1`.include?('Revision:'))
+
+		# create subversion directory
+		output = output + "svn mkdir #{destination} --parents --message mkdir_for_publishing"
+		if(!`svn mkdir #{destination} --parents --message mkdir_for_publishing`.include?('Committed'))
+			raise "failure 'svn mkdir #{destination} --parents --message mkdir_for_publishing'"
+		end
+
+		files=nil
+		Dir.chdir(source_dir) do
+			files=FileList.new(source_glob).to_a
+		end
+		output = output + "\nfiles: #{files}.to_s"
+
+		pwd=Dir.pwd
+		Dir.mktmpdir{|dir|
+
+			# checkout new subversion directory
+			output = output + "\nsvn checkout #{destination} #{dir}/to_publish_checkout"
+			if(!`svn checkout #{destination} #{dir}/to_publish_checkout`.include?('Checked out'))
+				raise "failure 'svn checkout #{destination} #{dir}/to_publish_checkout'"
+			end
+
+			# copy files into the checkout out subversion directory to_publish
+			raise "#{dir}/to_publish_checkout does not exist" if(!File.exists?("#{dir}/to_publish_checkout"))
+			Dir.chdir("#{dir}/to_publish_checkout") do
+				File.open('add.txt','w'){|add_file|
+
+					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
+					}
+					add_file.close
+				}
+
+				output = output + "\nsvn add --parents --targets add.txt 2>&1"
+                `svn add --parents --targets add.txt 2>&1`
+				commit_output = `svn commit -m"add" 2>&1`
+				output = output + "\n#{commit_output}"
+				if(!commit_output.include?("Committed"))
+					raise "failure 'svn commit -m'added files''" + output
+				end
+			end
+			
+			#begin
+			FileUtils.rm_r "#{dir}/to_publish_checkout"
+			output
+		}
+	end
+end

data/lib/dev_tasks.rb

@@ -1,4 +1,86 @@
-require_relative('tasks.rb')
+
 
 class DevTasks
-end
+end
+require 'rake'
+require 'rake/clean'
+
+class Tasks
+	#@@commands=nil
+	@@quiet=false
+
+    def self.quiet
+    	@@quiet
+    end
+
+    def self.execute value
+	  if(value.respond_to?(:execute))
+	    value.update if value.respond_to?(:update)
+	    value.execute
+	  else
+	    if(value.is_a?(String))
+	      puts `#{value}`
+	    else
+	      if(value.is_a?(Array))
+	        value.each{|e| execute(e)}
+	      end
+	    end
+	    end
+	end
+
+	def self.execute_task task
+		if(defined?(COMMANDS))
+			if(COMMANDS.has_key?(task))
+				puts "[:#{task}]" if(!Tasks.quiet)
+		  		Tasks.execute(COMMANDS[task])
+		    end
+		end
+	end
+end
+
+desc 'performs a git pull'
+task :pull do Tasks.execute_task :pull; end
+
+desc 'performs svn update'
+task :update do Tasks.execute_task :update; end
+
+desc 'performs setup commands'
+task :setup do Tasks.execute_task :setup;end
+
+desc 'performs build commands'
+task :build do Tasks.execute_task :build;end
+
+desc 'performs test commands'
+task :test => [:build] do Tasks.execute_task :test;end
+
+desc 'performs analyze commands'
+task :analyze do Tasks.execute_task :analyze;end
+
+desc 'performs documentation commands'
+task :doc do Tasks.execute_task :doc;end
+
+desc 'performs clean commands'
+task :clean do Tasks.execute_task :clean;end
+
+desc 'performs publish commands'
+task :publish do Tasks.execute_task :publish; end
+
+desc 'performs clobber commands'
+task :clobber => [:clean] do Tasks.execute_task :clobber;end
+
+desc 'adds source files to git or subversion'
+task :add do Tasks.execute_task :add;end
+
+desc 'commits source files to git or subversion'
+task :commit do Tasks.execute_task :commit;end
+
+desc 'performs a git push'
+task :push do Tasks.execute_task :push;end
+
+desc 'displays project info'
+task :info do
+	if(defined?(INFO) && INFO.length > 0)
+		puts "[:info]" if(!Tasks.quiet)
+		INFO.each{|l|puts l}
+	end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 2.0.46
+  version: 2.0.47
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-06 00:00:00.000000000 Z
+date: 2015-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -34,15 +34,6 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
-- lib/add.rb
-- lib/analyze.rb
-- lib/array.rb
-- lib/build.rb
-- lib/clean.rb
-- lib/clobber.rb
-- lib/command.rb
-- lib/commands.rb
-- lib/commit.rb
 - lib/dev.rb
 - lib/dev_commands.rb
 - lib/dev_environment.rb
@@ -51,28 +42,6 @@ files:
 - lib/dev_projects.rb
 - lib/dev_svn.rb
 - lib/dev_tasks.rb
-- lib/doc.rb
-- lib/environment.rb
-- lib/gemspec.rb
-- lib/git.rb
-- lib/hash.rb
-- lib/info.rb
-- lib/internet.rb
-- lib/msbuild.rb
-- lib/project.rb
-- lib/projects.rb
-- lib/publish.rb
-- lib/pull.rb
-- lib/push.rb
-- lib/setup.rb
-- lib/svn.rb
-- lib/tasks.rb
-- lib/test.rb
-- lib/text.rb
-- lib/timeout.rb
-- lib/timer.rb
-- lib/update.rb
-- lib/upgrade.rb
 homepage: http://rubygems.org/gems/dev
 licenses:
 - Apache 2.0

data/lib/add.rb

@@ -1,22 +0,0 @@
-class Add < Array
-	def update
-		if(File.exists?('.git') && File.exists?('.gitignore'))
-			add 'git add --all' 
-		else
-			if(defined?(SOURCE))
-				if(File.exists?('.svn'))
-					SOURCE.each{|f|
-
-						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
-					}
-				end
-				if(File.exists?('.git'))
-					SOURCE.each{|f|
-						add "git add #{f} -v" if `git status #{f}`.include?('untracked')
-					}
-				end
-			end
-		end
-	end
-end

data/lib/analyze.rb

@@ -1,8 +0,0 @@
-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,30 +0,0 @@
-class Array
-    def execute value=nil
-      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))
-
-        if(!value.nil? && value.is_a?(Hash))
-          value.each{|k,v|self[i][k]=v}
-        end
-
-        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,33 +0,0 @@
-require_relative('msbuild.rb')
-require_relative('gemspec.rb')
-require 'rake'
-
-SLN_FILES=FileList.new('*.sln','*/*.sln','*/*/*.sln')
-
-class Build < Array
-	def update
-
-		changed = true
-		#changed = Git.has_changes? if(File.exists?('.git') && defined?(Git))
-		#changed = Svn.has_changes? if(File.exists?('.svn') && defined?(Svn))
-        if(changed)
-			Dir.glob('*.gemspec'){|gemspec|
-	    		add "gem build #{gemspec}" if !File.exist?(Gemspec.gemfile gemspec)
-	    	}
-	    	
-	    	SLN_FILES.each{|sln_file|
-	    		vs_version=MSBuild.get_vs_version(sln_file)
-				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
-end

data/lib/clean.rb

@@ -1,12 +0,0 @@
-class Clean < Array
-	def update
-		['.yardoc','log','tmp','obj'].each{|dir| 
-			CLEAN.include(dir) if File.exists?(dir)
-		}	
-		
-        CLEAN.include('*.{suo,sdf}')
-
-        #add '<%Rake::Task[:clean].reenable%>'
-        add '<%Rake::Task[:clean].invoke%>'
-	end
-end

data/lib/clobber.rb

@@ -1,15 +0,0 @@
-class Clobber < Array
-	def update
-		['bin'].each{|dir| 
-			CLOBBER.include(dir) if File.exists?(dir)
-		}	
-		
-		clean=Clean.new
-		clean.update
-
-		CLOBBER.include('*.gem')
-
-        #add '<%Rake::Task[:clobber].reenable%>'
-        add '<%Rake::Task[:clobber].invoke%>'
-	end
-end