tbgit 1.1.5 → 1.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f8b95081e1b70cc31da11403e85e0ecbe13c42d5
-  data.tar.gz: 9176dd591015efa7ae6909b0bd714ef7463a8c50
+  metadata.gz: 3175b1685364c4d7f14c1a8fa7744eb1f65fa619
+  data.tar.gz: a729b0d91a35f9374ca29c91a3bd22e613eb574f
 SHA512:
-  metadata.gz: afb5b7d42201cfb573eaf55c3f546ceda08c522342a77c6dea19743d024850d82d89be2e0bf2a2ed451f8675902d8a5ca3cc432ca4d06b0e810cf8d77f978358
-  data.tar.gz: b349af5525ab0545f0fb031ce3d09d197efc884687d291fa09a236f29fe8761c10e07ef565c05129d9f88c3f9f588eb1cfa968975c66c1b28ec4580ea25c328b
+  metadata.gz: b646920d45e8101e8d88c4b8d8432a0cd5099de29f89fb9ef8f98e049e246ce5869472b731223052129f132159eae9a803791bc7658127ed7c749528f86edad8
+  data.tar.gz: c852f35101f107b257f9a3fc542b73ec0335cafb0485ec2448d858e244b2d9abfd4de481c3b9dbb2d6b9ce49041db2b79c1a312c9a259af2dc49037534d5a1ad

data/lib/tbgit/version.rb

@@ -1,3 +1,3 @@
 module Tbgit
-  VERSION = "1.1.5"
+  VERSION = "1.1.6"
 end

data/lib/tbspec.rb

@@ -126,24 +126,28 @@ class TBSpec
 			 	"git push <branch> <branch>:master"])
 		else
 			system("git checkout " + student)
+			output = ""
 			if options[:check]!=nil
-				output = system("git log -1 | egrep " + options[:check])
-				if output!=nil && output != ""
-					#do nothing
-				else 
-					puts "rspec " + specfile + " > " + studentcopy
-					system("rspec " + specfile + " > " + studentcopy)
-					puts "rspec --format json --out " + mastercopy + "/"+student+" " + specfile
-					system("rspec --format json --out " + mastercopy + "/"+student+" " + specfile)
-					puts "git add --all"
-					system("git add --all")
-					puts "git commit -am '" + commit_message + "'"
-					system("git commit -am '" + commit_message + "'")
-					puts "git push "+student+" "+student+":master"
-					system("git push "+student+" "+student+":master")
-					
-					tbgit.switch_to_master
-				end
+				puts "Checking to make sure last commit was not authored by: " + options[:check]
+				egrep = "git log -1 | egrep " + options[:check]
+				puts egrep
+				output = system(egrep)
+			end
+			if output
+				#do nothing
+			else 
+				puts "rspec " + specfile + " > " + studentcopy
+				system("rspec " + specfile + " > " + studentcopy)
+				puts "rspec --format json --out " + mastercopy + "/"+student+" " + specfile
+				system("rspec --format json --out " + mastercopy + "/"+student+" " + specfile)
+				puts "git add --all"
+				system("git add --all")
+				puts "git commit -am '" + commit_message + "'"
+				system("git commit -am '" + commit_message + "'")
+				puts "git push "+student+" "+student+":master"
+				system("git push "+student+" "+student+":master")
+				
+				tbgit.switch_to_master
 			end
 		end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tbgit
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
 platform: ruby
 authors:
 - Charlie Proctor