dev 2.0.142 → 2.0.143

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8941069f3e1bce300d13daba736a8655e4963a97
-  data.tar.gz: 23b2a2b555d551c8802aca588b613e54da0f1d92
+  metadata.gz: 840244f9fd78a8a6491e1ceed9d1812e14aa5f00
+  data.tar.gz: 0143a39ee6597dcb22c4f38b2fae156fd1c151e8
 SHA512:
-  metadata.gz: 2c9ae0f5ef13ae47a30371ee5bf3e3a35e27981c85a08ade4738567542dffe4baf59785d1db26e5398489e5a1ba5029886aa4d0d050165979546bbb8e8619eb8
-  data.tar.gz: 056e6405beeefaf4f68c3c026034e600b6d02d94ab08ced249e7d8fa804409ab56e8704deb68eb1d555bfaaea1b7da0f88fc2c110a09315c344c4c3be2c24f3b
+  metadata.gz: e65fcff5d8897c3091985ad55b799d4051b97c11457333a2f4f33067c07d5f26481f479c29faa2d0ae5294c803703d02655e5a313577629e14fba9580eb49e96
+  data.tar.gz: 32181e2b56e5ab93ccb397ee5f876540b4b2f5dfa9c92424cddb559d5d9d05c6a083159e0e899fb0b524ec10a001ad2d82c94b9f83b5d61f3cf3f2cc18477a8c

data/lib/apps.rb

@@ -0,0 +1 @@
+['git','msbuild','nuget','svn','wix'].each{|name| require_relative("apps/#{name}.rb")}

data/lib/{command.rb → base/command.rb}

@@ -1,5 +1,8 @@
 require 'open3'
-
+require_relative('timeout.rb')
+require_relative('timer.rb')
+require_relative('array.rb')
+require_relative('hash.rb')
 BUFFER_SIZE=1024 if(!defined?(BUFFER_SIZE))
             
 # = Command

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

@@ -62,4 +62,27 @@ class Environment < Hash
   def self.get_version text
     text.match(/(\d+\.\d+\.[\d\w]+)/)
   end
+
+  def self.info 
+    puts "Environment"
+    puts "  ruby version: #{`ruby --version`}"
+    puts " ruby platform: #{RUBY_PLATFORM}"
+    puts "      dev_root: #{Environment.dev_root}"
+    puts "       machine: #{Environment.machine}"
+    puts "          user: #{Environment.user}"
+    puts " "
+    puts "Path Commands"
+    ['svn --version --quiet','git --version','msbuild /version','nuget','candle','light','gem --version'].each{|cmd|
+      command=Command.new(cmd)
+      command[:quiet]=true
+      command[:ignore_failure]=true
+      command.execute
+      if(command[:exit_code] == 0)
+        puts "#{cmd.split(' ')[0]} #{get_version(command[:output])}"
+      else
+        puts "#{cmd.split(' ')[0]} not found."
+          missing_command=true
+      end
+    }
+  end
 end

data/lib/{project.rb → base/project.rb}

@@ -1,26 +1,47 @@
 require 'json'
 
 class Project < Hash
-attr_accessor :filename
+	attr_accessor :filename
+
+	def self.get_url
+	  return `git config --get remote.origin.url` if(File.exists?('.git'))
+	  return Svn.url if(File.exists?('.svn'))
+	  ''
+	end
+
+	def self.get_fullname
+	  Rake.application.original_dir.gsub(Environment.dev_root,'').gsub('/trunk','') 
+	end
+
 	def initialize value=''
 		@filename=''
-		self[:url]=''
-		self[:url] = value if value.is_a?(String)
-		if(value.is_a?(Hash))
+		self[:url]=Project.get_url
+		self[:fullname]=Project.get_fullname
+		if value.is_a?(String)
+		    self[:url] = value if value.is_a?(String)
+		elsif(value.is_a?(Hash))
 			value.each{|k,v|self[k]=v}
+		else
+			self[:fullname]=Project.get_fullname
 		end
 	end
 
+    def fullname
+    	self[:fullname]
+    end
+
     def name
-    	self[:name]
+    	parts=fullname.split('/')
+    	parts[parts.length-1]
+    	#self[:name]
     end
     
-	def get_latest_unique_id 
-		'51ed9c9d45ba3979c808740d75ba1831c85aff5d'
-	end
+	#def get_latest_unique_id 
+	#	'51ed9c9d45ba3979c808740d75ba1831c85aff5d'
+	#end
 
 	def wrk_dir
-		"#{Environment.dev_root}/wrk/#{self.name}"
+		"#{Environment.dev_root}/wrk/#{self.fullname}"
 	end
 
 	def pull
@@ -59,5 +80,11 @@ attr_accessor :filename
 			end
 		end
 	end
+
+	def info
+		puts "Project #{name}"
+		puts " fullname: #{self.fullname}"
+		puts "      url: #{self[:url]}"
+	end
 end
 

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

@@ -1,5 +1,7 @@
 require 'json'
 require 'rake'
+require_relative('environment.rb')
+require_relative('project.rb')
 
 class Projects < Hash
 	attr_accessor :filename
@@ -13,7 +15,6 @@ class Projects < Hash
     		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
 

data/lib/base.rb

@@ -0,0 +1,3 @@
+Dir.glob('base/*.rb').each{|f|
+	require_relative(f)
+}

data/lib/commands.rb

@@ -32,7 +32,7 @@ end
 #Dir.glob("#{File.dirname(__FILE__)}/commands/*.rb").each{|rb| 
 #  require(rb)
 #}
-require_relative('./apps/msbuild.rb')
+#require_relative('./apps/msbuild.rb')
 
 COMMANDS=Commands.new
 MSBUILD=MSBuild.new

data/lib/dev.rb

@@ -1,60 +1,12 @@
-require 'rake/clean'
-
-Dir.glob("#{File.dirname(__FILE__)}/**/*.rb").each{|rb| 
-  require_relative(rb)
-}
-
-RAKE_DEFAULT_EXISTS=File.exists?('rake.default')
-
-
-
-current=Projects.current
-if(!current.nil?)
-  INFO.add "#{current[:name]} #{current[:url]}"
+Dir.chdir(File.dirname(__FILE__)) do
+  Dir.glob('**/*.rb').each{|f|
+	require_relative(f)
+  }
 end
 
-if(!defined?(NO_DEFAULT_TASK)) 
-  desc 'perform project commands to push gem development'
-  task :default do
-    if(defined?(DEFAULT_TASKS))
-      DEFAULT_TASKS.each{|task| Rake::Task[task].invoke}
-    else
-    	if(File.exists?('.git'))
-        CLEAN.exclude('rake.default')
-        Rake::Task["clean"].invoke
-        Rake::Task["clean"].reenable
-        CLEAN.include('rake.default')
-        puts `git add -A` if(File.exists?('.gitignore'))
-        if(Git.has_changes?)#  || !RAKE_DEFAULT_EXISTS)
-          puts 'Git changes detected.'
-          puts `git status`
-    		  [:setup,:build,:test,:publish,:clean,:add,:commit,:push,:pull,:info].each{|task| Rake::Task[task].invoke}
-        elsif !RAKE_DEFAULT_EXISTS
-          puts 'rake.default does not exist.'
-          [:setup,:build,:test,:publish,:clean,:add,:commit,:push,:pull,:info].each{|task| Rake::Task[task].invoke}
-        else
-          puts 'no changes detected.'
-          #[:pull].each{|task| Rake::Task[task].invoke}
-        end
-    	else
-  	  	if(File.exists?('.svn'))
-          if(Svn.has_changes? || !File.exists?('rake.default'))
-  	  		  [:setup,:build,:test,:publish,:clean,:add,:commit,:update,:info].each{|task| Rake::Task[task].invoke}
-          else
-            puts 'no changes detected.'
-            #[:update].each{|task| Rake::Task[task].invoke}
-          end
-  	  	else
-          [:setup,:build,:test,:publish,:info].each{|task| Rake::Task[task].invoke}
-  	  	end
-  	 end
-    end
-    
-    puts "[:default] completed in #{TIMER.elapsed_str}"
-    File.open('rake.default','w'){|f|f.puts "[:default] completed in #{TIMER.elapsed_str}"}
-  end # :default
-end
+PROJECT=Project.new()
 
 class Dev
+
 end
 

data/lib/tasks/default.rb

@@ -0,0 +1,53 @@
+require_relative('info.rb')
+require_relative('../base/array.rb')
+require_relative('../base/projects.rb')
+require_relative('../base/timer.rb')
+
+RAKE_DEFAULT_EXISTS=File.exists?('rake.default')
+
+current=Projects.current
+#if(!current.nil?)
+#  INFO.add "#{current[:name]} #{current[:url]}"
+#end
+
+if(!defined?(NO_DEFAULT_TASK)) 
+  desc 'perform project commands to push gem development'
+  task :default do
+    if(defined?(DEFAULT_TASKS))
+      DEFAULT_TASKS.each{|task| Rake::Task[task].invoke}
+    else
+    	if(File.exists?('.git'))
+        CLEAN.exclude('rake.default')
+        Rake::Task["clean"].invoke
+        Rake::Task["clean"].reenable
+        CLEAN.include('rake.default')
+        puts `git add -A` if(File.exists?('.gitignore'))
+        if(Git.has_changes?)#  || !RAKE_DEFAULT_EXISTS)
+          puts 'Git changes detected.'
+          puts `git status`
+    		  [:setup,:build,:test,:publish,:clean,:add,:commit,:push,:pull,:info].each{|task| Rake::Task[task].invoke}
+        elsif !RAKE_DEFAULT_EXISTS
+          puts 'rake.default does not exist.'
+          [:setup,:build,:test,:publish,:clean,:add,:commit,:push,:pull,:info].each{|task| Rake::Task[task].invoke}
+        else
+          puts 'no changes detected.'
+          #[:pull].each{|task| Rake::Task[task].invoke}
+        end
+    	else
+  	  	if(File.exists?('.svn'))
+          if(Svn.has_changes? || !File.exists?('rake.default'))
+  	  		  [:setup,:build,:test,:publish,:clean,:add,:commit,:update,:info].each{|task| Rake::Task[task].invoke}
+          else
+            puts 'no changes detected.'
+            #[:update].each{|task| Rake::Task[task].invoke}
+          end
+  	  	else
+          [:setup,:build,:test,:publish,:info].each{|task| Rake::Task[task].invoke}
+  	  	end
+  	 end
+    end
+    
+    puts "[:default] completed in #{TIMER.elapsed_str}"
+    File.open('rake.default','w'){|f|f.puts "[:default] completed in #{TIMER.elapsed_str}"}
+  end # :default
+end

data/lib/tasks/doc.rb

@@ -1,3 +1,7 @@
+desc 'performs documentation commands'
+task :doc do Tasks.execute_task :doc;end
+
+
 class Doc < Array
 	def update
 		if(Command.exit_code('yard --version'))

data/lib/tasks/info.rb

@@ -1,3 +1,12 @@
 #require_relative 'array.rb'
-INFO=Array.new
+#INFO=Array.new
+desc 'displays project info'
+task :info do
+	Environment.info
+	PROJECT.info
+	#if(defined?(INFO) && INFO.length > 0)
+	#	puts "[:info]" if(!Tasks.quiet)
+	#	INFO.each{|l|puts l}
+	#end
+end
 

data/lib/tasks.rb

@@ -1,5 +1,4 @@
 require 'rake'
-#require 'rake/clean'
 
 class Tasks
 	@@quiet=false
@@ -33,53 +32,7 @@ class Tasks
 	end
 end
 
-['add','analyze','build','clobber','commit','doc','publish','pull','push','setup','test','update'].each{|name| require_relative("tasks/#{name}.rb")}
-#require 'rake/clean'
+['add','analyze','build','clobber','commit',
+ 'doc','info','publish','pull','push','setup','test',
+ 'update','default'].each{|name| require_relative("tasks/#{name}.rb")}
 
-
-#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,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 2.0.142
+  version: 2.0.143
 platform: ruby
 authors:
 - Lou Parslow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-06 00:00:00.000000000 Z
+date: 2015-08-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -31,23 +31,28 @@ extensions: []
 extra_rdoc_files: []
 files:
 - LICENSE
+- lib/apps.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/base.rb
+- lib/base/array.rb
+- lib/base/command.rb
+- lib/base/environment.rb
+- lib/base/file.rb
+- lib/base/gemspec.rb
+- lib/base/hash.rb
+- lib/base/internet.rb
+- lib/base/project.rb
+- lib/base/projects.rb
+- lib/base/source.rb
+- lib/base/text.rb
+- lib/base/timeout.rb
+- lib/base/timer.rb
 - lib/commands.rb
 - lib/dev.rb
-- lib/environment.rb
-- lib/file.rb
-- lib/gemspec.rb
-- lib/hash.rb
-- lib/internet.rb
-- lib/project.rb
-- lib/projects.rb
-- lib/source.rb
 - lib/tasks.rb
 - lib/tasks/add.rb
 - lib/tasks/analyze.rb
@@ -55,6 +60,7 @@ files:
 - lib/tasks/clean.rb
 - lib/tasks/clobber.rb
 - lib/tasks/commit.rb
+- lib/tasks/default.rb
 - lib/tasks/doc.rb
 - lib/tasks/info.rb
 - lib/tasks/publish.rb
@@ -63,9 +69,6 @@ files:
 - lib/tasks/setup.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