dev 2.0.139 → 2.0.140

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 03dbd0206069539aff9ab21bdff101ecb7085686
-  data.tar.gz: 0c40c997381f033e871762066e8a78a170e42343
+  metadata.gz: 257c38bbc2f26f92b4959dedc7baec5075b54857
+  data.tar.gz: 31c73655da50d2c6ce5447fb32daa18d987123f6
 SHA512:
-  metadata.gz: efce37fb6f3341eba81c87eb91edc117d95c1113c2f76cdc3edbae21917151a4ccda00710e6df783c8cced13e5403526ef911634044aa5e7428e8356e749744b
-  data.tar.gz: 9a5cbab4dde2c1ebcd727a284ee364dc1d65fc1e568c15570b7b9847f189734e0edaad8927e4f4a15fccf0de12cdfd28b4952f404ea67c810e340b2cc3f5df07
+  metadata.gz: a29e6db02c1e3dc6065d836fa8a30aaf0c1c84ccf6458bdc0b47cfdfe1ac5c08933b50a2a54fad63fa14e6c6a8969b7de44e9ae94e351971e5bc8a6e52df665d
+  data.tar.gz: 98a6a11db064608b9187f76bdce23e0c2784609311234107002691ca1db91d78d4707b9ba14b8ff48b2ecd7560c165a63a346e1e87a614a900e8c1255eb389fb

data/lib/command.rb

@@ -188,7 +188,7 @@ class Command < Hash
 
     def summary
       duration=""
-      duration=getFormattedTimeSpan(self[:end_time]-[:start_time]) + " - " if(!self[:end_time].nil?)
+      duration=getFormattedTimeSpan(self[:end_time]-self[:start_time]) + " - " if(!self[:end_time].nil?)
       duration + "#{self[:exit_code].to_s} #{self[:input]} (#{self[:directory]})"
     end
 

data/lib/commands.rb

@@ -1,12 +1,38 @@
 require 'json'
 require 'rake/clean'
 
-
-
 Dir.glob("#{File.dirname(__FILE__)}/commands/*.rb").each{|rb| 
   require(rb)
 }
-require_relative('./msbuild.rb')
+Dir.glob("#{File.dirname(__FILE__)}/tasks/*.rb").each{|rb| 
+  require(rb)
+}
+class Commands < Hash
+
+	def initialize directory=Dir.pwd
+		Dir.chdir(directory) do
+		  self[:pull]=Pull.new
+		  self[:update]=Update.new
+		  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
+		  #self[:clobber]=Clobber.new
+		  self[:add]=Add.new
+		  self[:commit]=Commit.new
+		  self[:push]=Push.new
+	    end
+	end
+
+end
+
+#Dir.glob("#{File.dirname(__FILE__)}/commands/*.rb").each{|rb| 
+#  require(rb)
+#}
+require_relative('./apps/msbuild.rb')
 
 COMMANDS=Commands.new
 MSBUILD=MSBuild.new

data/lib/dev.rb

@@ -6,21 +6,7 @@ Dir.glob("#{File.dirname(__FILE__)}/**/*.rb").each{|rb|
 
 RAKE_DEFAULT_EXISTS=File.exists?('rake.default')
 
-# Clean Files
-CLEAN.include('**/*.{sdf,sud,ncb,cache,user}')
-CLEAN.include('rake.default')
 
-# Clean Folders
-CLEAN.include('obj') if File.exists?('obj')
-CLEAN.include('tmp') if File.exists?('tmp')
-
-# CLOBBER Files
-CLOBBER.include('**/*.gem')
-CLOBBER.include('bin/*.{dll,pdb}')
-
-# CLOBBER Folders
-CLOBBER.include('bin') if File.exists?('bin')
-CLOBBER.include('doc') if File.exists?('doc')
 
 current=Projects.current
 if(!current.nil?)

data/lib/project.rb

@@ -1,5 +1,4 @@
 require 'json'
-#require 'dev_commands'
 
 class Project < Hash
 attr_accessor :filename

data/lib/projects.rb

@@ -1,9 +1,5 @@
 require 'json'
 require 'rake'
-#require 'dev_git'
-#require 'dev_svn'
-#require 'dev_msbuild'
-#require 'dev_environment'
 
 class Projects < Hash
 	attr_accessor :filename

data/lib/{commands → tasks}/add.rb

@@ -1,3 +1,6 @@
+desc 'adds source files to git or subversion'
+task :add do Tasks.execute_task :add;end
+
 class Add < Array
 	def update
 		if(File.exists?('.git') && File.exists?('.gitignore'))
@@ -36,4 +39,4 @@ class Add < Array
 			end
 		end
 	end
-end
+end

data/lib/{commands → tasks}/build.rb

@@ -1,4 +1,5 @@
-require 'rake'
+desc 'performs build commands'
+task :build do Tasks.execute_task :build;end
 
 SLN_FILES=FileList.new('*.sln','*/*.sln','*/*/*.sln')
 
@@ -6,8 +7,6 @@ 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)

data/lib/tasks/clean.rb

@@ -0,0 +1,8 @@
+
+# Clean Files
+CLEAN.include('**/*.{sdf,sud,ncb,cache,user,wixobj}')
+CLEAN.include('rake.default')
+
+# Clean Folders
+CLEAN.include('obj') if File.exists?('obj')
+CLEAN.include('tmp') if File.exists?('tmp')

data/lib/{clobber.rb → tasks/clobber.rb}

@@ -1,3 +1,4 @@
+require 'rake/clean'
 # CLOBBER Files
 CLOBBER.include('**/*.gem')
 CLOBBER.include('bin/*.{dll,pdb}')
@@ -10,3 +11,5 @@ CLOBBER.include('*.gem')
 CLOBBER.include('bin','obj','packages')
 
 
+desc 'performs clobber commands'
+task :clobber => [:clean] do Tasks.execute_task :clobber;end

data/lib/{commands → tasks}/commit.rb

@@ -1,5 +1,3 @@
-#require_relative('internet.rb')
-
 class Commit < Array
 	def update
 		message=""

data/lib/{commands → tasks}/doc.rb

@@ -1,7 +1,5 @@
 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

data/lib/{commands → tasks}/publish.rb

@@ -17,4 +17,4 @@ class Publish < Array
 			end
 		end
 	end
-end
+end

data/lib/{commands → tasks}/pull.rb

@@ -1,5 +1,5 @@
-#require_relative('git.rb')
-#require_relative('internet.rb')
+desc 'performs a git pull'
+task :pull do Tasks.execute_task :pull; end
 
 class Pull < Array
 	def update

data/lib/{commands → tasks}/setup.rb

@@ -1,3 +1,6 @@
+desc 'performs setup commands'
+task :setup do Tasks.execute_task :setup;end
+
 #
 # use the SVN_EXPORTS hash to define svn exports destined for DEV_ROOT/dep
 #

data/lib/tasks/tasks.rb

@@ -0,0 +1,81 @@
+require 'rake'
+
+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
+
+['add','clobber','pull'].each{|name| require_relative("#{name}.rb")}
+require 'rake/clean'
+
+
+
+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 '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

data/lib/{commands → tasks}/update.rb

@@ -1,3 +1,6 @@
+desc 'performs svn update'
+task :update do Tasks.execute_task :update; end
+
 class Update < Array
 	def update
 		self .add 'svn update' if File.exists?('.svn') && Internet.available?

data/lib/tasks.rb

@@ -2,7 +2,6 @@ require 'rake'
 require 'rake/clean'
 
 class Tasks
-	#@@commands=nil
 	@@quiet=false
 
     def self.quiet

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 2.0.139
+  version: 2.0.140
 platform: ruby
 authors:
 - Lou Parslow
@@ -31,47 +31,42 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
-- lib/clean.rb
-- lib/clobber.rb
+- lib/apps/git.rb
+- lib/apps/msbuild.rb
+- lib/apps/nuget.rb
+- lib/apps/svn.rb
+- lib/apps/wix.rb
+- lib/array.rb
 - lib/command.rb
 - lib/commands.rb
-- lib/commands/add.rb
-- lib/commands/analyze.rb
-- lib/commands/array.rb
-- lib/commands/build.rb
-- lib/commands/clean.rb
-- lib/commands/clobber.rb
-- lib/commands/command.rb
-- lib/commands/commands.rb
-- lib/commands/commit.rb
-- lib/commands/doc.rb
-- lib/commands/gemspec.rb
-- lib/commands/git.rb
-- lib/commands/hash.rb
-- lib/commands/info.rb
-- lib/commands/internet.rb
-- lib/commands/publish.rb
-- lib/commands/pull.rb
-- lib/commands/push.rb
-- lib/commands/setup.rb
-- lib/commands/tag.rb
-- lib/commands/test.rb
-- lib/commands/text.rb
-- lib/commands/timeout.rb
-- lib/commands/timer.rb
-- lib/commands/update.rb
-- lib/commands/upgrade.rb
 - lib/dev.rb
 - lib/environment.rb
 - lib/file.rb
-- lib/git.rb
-- lib/msbuild.rb
+- lib/gemspec.rb
+- lib/hash.rb
+- lib/internet.rb
 - lib/project.rb
 - lib/projects.rb
 - lib/source.rb
-- lib/svn.rb
 - lib/tasks.rb
-- lib/wix.rb
+- lib/tasks/add.rb
+- lib/tasks/analyze.rb
+- lib/tasks/build.rb
+- lib/tasks/clean.rb
+- lib/tasks/clobber.rb
+- lib/tasks/commit.rb
+- lib/tasks/doc.rb
+- lib/tasks/info.rb
+- lib/tasks/publish.rb
+- lib/tasks/pull.rb
+- lib/tasks/push.rb
+- lib/tasks/setup.rb
+- lib/tasks/tasks.rb
+- lib/tasks/test.rb
+- lib/tasks/update.rb
+- lib/text.rb
+- lib/timeout.rb
+- lib/timer.rb
 homepage: http://rubygems.org/gems/dev
 licenses:
 - Apache 2.0
@@ -92,9 +87,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.2.3
 signing_key: 
 specification_version: 4
 summary: dev
 test_files: []
-has_rdoc: 

data/lib/commands/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/commands/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

data/lib/commands/command.rb

@@ -1,230 +0,0 @@
-require 'open3'
-#require_relative('./array.rb')
-#require_relative('./hash.rb')
-#require_relative('./timer.rb')
-
-BUFFER_SIZE=1024 if(!defined?(BUFFER_SIZE))
-            
-# = Command
-#
-# execution of system commands
-#
-# = Keys
-#
-# - :input The input of the commands.
-# - :timeout The timeout in seconds.
-#          a value of zero is to infinite timeout.
-#          defaults to zero
-# - :directory The working directory for the command.
-#             defaults to the current directory
-# - :exit_code The exit code of the command
-# - :output The output contains the stdout output of the command
-# - :error The error contains stderr output of the command
-# - :machine The name of the machine the command executed on
-# - :user The user name
-# - :start_time
-# - :end_time
-#
-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 quiet?
-    (self.has_key?(:quiet) && self[:quiet])
-  end
-
-	def execute value=nil
-
-    if(!value.nil? && value.is_a?(Hash))
-      value.each{|k,v|self[k]=v}
-    end
-
-		pwd=Dir.pwd
-		self[:directory] = pwd if(!self.has_key?(:directory) || self[:directory].length==0)
-
-    if(self[:timeout] > 0)
-      puts "#{self[:input]} (#{self[:directory]}) timeout #{self[:timeout].to_s}" if(!quiet?)
-    else
-		  puts "#{self[:input]} (#{self[:directory]})" if(!quiet?)
-    end
-
-		self[:machine] = Command.machine
-		self[:user] = Command.user
-
-		self[:start_time]=Time.now
-		timer=Timer.new
-
-    Dir.chdir(self[:directory]) do
-  		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
-          if(self[:timeout] <= 0)
-            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
-          else
-            require_relative 'timeout.rb'
-            #puts run_with_timeout(self[:input], self[:timeout], 1).to_s
-            #self[:output] = run_with_timeout(self[:input], self[:timeout], 1)
-            result=run_with_timeout2(self[:directory],self[:input], self[:timeout], 2)
-            self[:output]=result[0]
-            self[:error]=result[1]
-            self[:exit_code]=result[2]
-
-            self[:elapsed] = timer.elapsed_str
-            self[:end_time] = Time.now
-            
-            if(timer.elapsed >= self[:timeout])
-              self[:exit_code]=1 
-              self[:error] = self[:error] + "timed out"
-            end
-          end
-  			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
-    end
-       
-
-    if(self[:exit_code] != 0)
-      if(!quiet?)
-    	  puts "exit_code=#{self[:exit_code]}"
-    	  puts self[:output]
-    	  puts self[:error]
-      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 self.error command
-      cmd = Command.new(command)
-      cmd[:ignore_failure]=true
-      cmd[:quiet]=true
-      cmd.execute
-      cmd[:error]
-    end
-
-    def getFormattedTimeSpan timespan
-      seconds = timespan
-      seconds.to_s + " sec"
-    end
-
-    def self.execute command
-      cmd = Command.new(command)
-      cmd.execute
-      cmd[:exit_code]
-    end
-
-    def summary
-      duration=""
-      duration=getFormattedTimeSpan(self[:end_time]-self[:start_time]) + " - " if(!self[:end_time].nil?)
-      duration + "#{self[:exit_code].to_s} #{self[:input]} (#{self[:directory]})"
-    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/commands.rb

@@ -1,36 +0,0 @@
-#require_relative('hash.rb')
-#require_relative('pull.rb')
-#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')
-#require_relative('clobber.rb')
-#require_relative('add.rb')
-#require_relative('commit.rb')
-#require_relative('push.rb')
-
-class Commands < Hash
-
-	def initialize directory=Dir.pwd
-		Dir.chdir(directory) do
-		  self[:pull]=Pull.new
-		  self[:update]=Update.new
-		  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
-		  self[:clobber]=Clobber.new
-		  self[:add]=Add.new
-		  self[:commit]=Commit.new
-		  self[:push]=Push.new
-	    end
-	end
-
-end

data/lib/commands/git.rb

@@ -1,22 +0,0 @@
-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/tag.rb

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

data/lib/commands/upgrade.rb

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