tbgit 1.1.5 → 1.1.6

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (4) hide show
  1. checksums.yaml +4 -4
  2. data/lib/tbgit/version.rb +1 -1
  3. data/lib/tbspec.rb +21 -17
  4. metadata +1 -1
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: f8b95081e1b70cc31da11403e85e0ecbe13c42d5
4
- data.tar.gz: 9176dd591015efa7ae6909b0bd714ef7463a8c50
3
+ metadata.gz: 3175b1685364c4d7f14c1a8fa7744eb1f65fa619
4
+ data.tar.gz: a729b0d91a35f9374ca29c91a3bd22e613eb574f
5
5
  SHA512:
6
- metadata.gz: afb5b7d42201cfb573eaf55c3f546ceda08c522342a77c6dea19743d024850d82d89be2e0bf2a2ed451f8675902d8a5ca3cc432ca4d06b0e810cf8d77f978358
7
- data.tar.gz: b349af5525ab0545f0fb031ce3d09d197efc884687d291fa09a236f29fe8761c10e07ef565c05129d9f88c3f9f588eb1cfa968975c66c1b28ec4580ea25c328b
6
+ metadata.gz: b646920d45e8101e8d88c4b8d8432a0cd5099de29f89fb9ef8f98e049e246ce5869472b731223052129f132159eae9a803791bc7658127ed7c749528f86edad8
7
+ data.tar.gz: c852f35101f107b257f9a3fc542b73ec0335cafb0485ec2448d858e244b2d9abfd4de481c3b9dbb2d6b9ce49041db2b79c1a312c9a259af2dc49037534d5a1ad
data/lib/tbgit/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module Tbgit
2
- VERSION = "1.1.5"
2
+ VERSION = "1.1.6"
3
3
  end
data/lib/tbspec.rb CHANGED
@@ -126,24 +126,28 @@ class TBSpec
126
126
  "git push <branch> <branch>:master"])
127
127
  else
128
128
  system("git checkout " + student)
129
+ output = ""
129
130
  if options[:check]!=nil
130
- output = system("git log -1 | egrep " + options[:check])
131
- if output!=nil && output != ""
132
- #do nothing
133
- else
134
- puts "rspec " + specfile + " > " + studentcopy
135
- system("rspec " + specfile + " > " + studentcopy)
136
- puts "rspec --format json --out " + mastercopy + "/"+student+" " + specfile
137
- system("rspec --format json --out " + mastercopy + "/"+student+" " + specfile)
138
- puts "git add --all"
139
- system("git add --all")
140
- puts "git commit -am '" + commit_message + "'"
141
- system("git commit -am '" + commit_message + "'")
142
- puts "git push "+student+" "+student+":master"
143
- system("git push "+student+" "+student+":master")
144
-
145
- tbgit.switch_to_master
146
- end
131
+ puts "Checking to make sure last commit was not authored by: " + options[:check]
132
+ egrep = "git log -1 | egrep " + options[:check]
133
+ puts egrep
134
+ output = system(egrep)
135
+ end
136
+ if output
137
+ #do nothing
138
+ else
139
+ puts "rspec " + specfile + " > " + studentcopy
140
+ system("rspec " + specfile + " > " + studentcopy)
141
+ puts "rspec --format json --out " + mastercopy + "/"+student+" " + specfile
142
+ system("rspec --format json --out " + mastercopy + "/"+student+" " + specfile)
143
+ puts "git add --all"
144
+ system("git add --all")
145
+ puts "git commit -am '" + commit_message + "'"
146
+ system("git commit -am '" + commit_message + "'")
147
+ puts "git push "+student+" "+student+":master"
148
+ system("git push "+student+" "+student+":master")
149
+
150
+ tbgit.switch_to_master
147
151
  end
148
152
  end
149
153
 
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: tbgit
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.1.5
4
+ version: 1.1.6
5
5
  platform: ruby
6
6
  authors:
7
7
  - Charlie Proctor