dev 2.0.289 → 2.0.290

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8ac8a0fd3c04ee928209949764e4ecaa9807cad8
-  data.tar.gz: bbfa8b6317794317ffa366ef315807265e393688
+  metadata.gz: 5384a3b0921ae08670ed7c1ebadef5808f6f0d73
+  data.tar.gz: f2a9c0d248e843f43b1b8873111f785f902f7727
 SHA512:
-  metadata.gz: 44c3b34594bbe14156b09fc43644f2b439480d53817de44acd627be30bf097007183e8563f69e953c6591b65bc6136e15501c109e9bb2c2906144c232e923f8a
-  data.tar.gz: 415fdab0cebfb6233238dbec966d9dbd88c87ce8a798ae5e336b6ee913ecbb565686de1dd2852f77f619bc205601265ffce36c9a9c370753ddecfaaa8582c410
+  metadata.gz: aa9fd06c291ebac01df2e55f3f6c621cbcd1e23a6d0f96f9b26c6c3aa61f2380fe4f86df3404b8c99253de5c07ff3619ad6d8f8b19030fdc824cbaaf0fe1d3e4
+  data.tar.gz: 4ba85242996d29f825b941f2435e3d1ae329b2003ec44653f81c4ba92f8f56387e19d1b171aaec43136e7de8c5febd0a33e3b3c86c126240ef2eb94751b3f31a

data/lib/apps/git.rb

@@ -152,12 +152,19 @@ class Git
             puts "git clone #{src_url} #{src_directory}"
             puts `git clone #{src_url} #{src_directory}`
         else
+            puts "chdir #{src_directory}"
             Dir.chdir(src_directory) do
                 puts "git pull"
-                puts `git pull`
+                git_pull=Command.new('git pull')
+                git_pull[:directory]=src_directory
+                git_pull[:timeout] = 30
+                git_pull[:ignore_failure] =true
+                git_pull.execute
+                
             end
         end
 
+        puts "chdir #{src_directory}"
         Dir.chdir(src_directory) do
             puts "git checkout #{branch}"
             puts `git checkout #{branch}`

data/lib/tasks/commit.rb

@@ -14,13 +14,14 @@ class Commit < Array
 
 		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'))
+			   !`git status`.include?('untracked files present') &&
+			   !`git status`.include?('no changes add to commit'))
 			  if(message.length==0)
 				if(defined?(REQUIRE_COMMIT_MESSAGE))
 					Commit.reset_commit_message
 					raise "commit.message required to perform commit"
 				else
-			  		add_quiet "git commit -m'all'"
+			  		add_passive "git commit -m'all'"
 			  	end
 			  else
 			    add_quiet "git commit -a -v --file commit.message"

data/lib/tasks/push.rb

@@ -3,9 +3,11 @@ 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') )
-			add_quiet 'git push'
-			add_quiet 'git push --tags'
+		if(File.exists?('.git') && `git config --list`.include?('user.name='))
+		    if(`git branch`.include?('* master') || `git branch`.include?('* develop'))
+				add_quiet 'git push'
+				add_quiet 'git push --tags'
+			end
 		end
 	end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dev
 version: !ruby/object:Gem::Version
-  version: 2.0.289
+  version: 2.0.290
 platform: ruby
 authors:
 - Lou Parslow
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-25 00:00:00.000000000 Z
+date: 2015-11-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake