dev 2.0.274 → 2.0.275

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 82f596b6c1fdc8b3071b9bd5870a0b5ed9115b59
-  data.tar.gz: dcf156cda89ba6c58b039131d1e952dfe5e65121
+  metadata.gz: a1f0a12a0c19a4df49a831a37710482b0a9f72c7
+  data.tar.gz: f16fe292586527a62273d85f0d3f383261a4f2f6
 SHA512:
-  metadata.gz: 931b75993398afce25c6748e00954ab005463bac7e6696c02817f23e161117b2c9d687e30056e03de5ebec2880e5a04d93a84fe30094a8b336248e553f624119
-  data.tar.gz: 382e149b44471660de2a027ab73b33a29bcce5789f229d051c95940250669735eb800d26c276d70cfd0752672a98823801ce67828cb8fdfe7435774d00ddd392
+  metadata.gz: bad24baf86cabd1148e14854eb5c8bedf2b54018fbc6f1ad2ff40e7be66a95b1960a3da0d7648924f9a9ba0dc636a6afbe3dc4c4fabb4ed36403bfb7ace8d6d9
+  data.tar.gz: 7ee1dd082d56018762df374e9ed321ef95552cf21b6cbfcdfcea38772d98d45ace3b22242c5967b0798de2853337b7868e06b871109dcc9f244ac4aec5882cac

data/lib/apps/git.rb

@@ -20,6 +20,26 @@ class Git
         url=`git config --get remote.origin.url` if(File.exists?('.git'))
     end
 
+    def self.user_email
+        email=''
+        begin
+            email=`git config --list`.scan(/user.email=([\d\w.@\-\+]+)/)[0][0]
+        rescue
+            email=''
+        end
+        email
+    end
+
+    def self.user_name
+        name=''
+        begin
+            name=`git config --list`.scan(/user.name=([\d\w.@\-\+]+)/)[0][0]
+        rescue
+            name=''
+        end
+        name
+    end
+
     def self.remote_origin directory=''
     	url=''
     	directory=Dir.pwd if directory.length == 0

data/lib/base/environment.rb

@@ -186,7 +186,8 @@ class Environment < Hash
     puts "       machine: #{self.machine}"
     puts "          user: #{self.user}"
     #puts " configuration: #{self.configuration}"
-    puts "         debug: #{self.debug}"
+    puts "         debug: #{self.debug?}"
+    puts "git user.email: #{Git.user_email}" 
     puts " "
     puts "Path Commands"
     ['svn --version --quiet','git --version','msbuild /version','nuget','candle','light','gem --version'].each{|cmd|
@@ -195,7 +196,7 @@ class Environment < Hash
       command[:ignore_failure]=true
       command.execute
       if(command[:exit_code] == 0)
-        puts "#{cmd.split(' ')[0].fix(14)} #{get_version(command[:output])}"
+        puts "#{cmd.split(' ')[0].fix(14)} #{Environment.get_version(command[:output])}"
       else
         puts "#{cmd.split(' ')[0].fix(14)} not found."
           missing_command=true

data/lib/tasks/commit.rb

@@ -12,7 +12,7 @@ class Commit < Array
 		message=""
 		message=IO.read('commit.message').strip if File.exists?('commit.message')
 
-		if(File.exists?('.git') && `git config --list`.include?('user.name='))
+		if(File.exists?('.git') && `git config --list`.include?('user.name=') && Git.user_email.length > 0)
 			if(!`git status`.include?('nothing to commit') &&
 			   !`git status`.include?('untracked files present'))
 			  if(message.length==0)

data/lib/tasks/info.rb

@@ -2,8 +2,8 @@ desc 'displays project info'
 task :info do
 	Environment.default.info
 	puts ' '
-	PROJECT.info
+	#PROJECT.info
 	puts ' '
-	COMMANDS.info
+	#COMMANDS.info
 end
 

data/lib/tasks/pull.rb

@@ -3,10 +3,8 @@ task :pull do Tasks.execute_task :pull; end
 
 class Pull < Array
 	def update
-		if(Internet.available?)
-			if(File.exists?('.git') && `git config --list`.include?('user.name='))
-				add_quiet('git pull') if Git.branch == 'master'
-			end
+		if(File.exists?('.git') && `git config --list`.include?('user.name=') )
+			add_quiet('git pull') if Git.branch == 'master'
 		end
 	end
 end

data/lib/tasks/push.rb

@@ -3,7 +3,7 @@ task :push do Tasks.execute_task :push;end
 
 class Push < Array
 	def update
-		if(File.exists?('.git') && `git config --list`.include?('user.name=') && `git branch`.include?('* master'))
+		if(File.exists?('.git') && `git config --list`.include?('user.name=') && `git branch`.include?('* master') )
 			add_quiet 'git push'
 			add_quiet 'git push --tags'
 		end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 2.0.274
+  version: 2.0.275
 platform: ruby
 authors:
 - Lou Parslow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-21 00:00:00.000000000 Z
+date: 2015-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake