tbgit 1.0.4 → 1.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c48220747b8b8469cb020d5157afeed832a3871
-  data.tar.gz: 22048d8dd2d68fa0359e1866d8f586cb89bbcb4e
+  metadata.gz: bc190fce7c3defc7df4c29ebc7f0ed09c76365de
+  data.tar.gz: 6c5ec3f084df04208c75c30c77655e4a2506a0db
 SHA512:
-  metadata.gz: 416be789a42ff7ebc57619d0569b76dcd2545d0c8c2d0cc24e32192b1f391665e04c7866ad05f30be1a4c180ce6e8ef46c3519c95ccac3b31c890abd6bdd0964
-  data.tar.gz: 4f2b8b9c7f76a8c5bbf57c7624a33b6b8b259a72ec897c6c36e3c0c06d1c2db1ca720cb8a677dd0168589548e92b9cbecef853b9f5da3d2dbd02388cab1ce51a
+  metadata.gz: 236c2f3c28a0a54c77a1688380689ea77730095a9c6e3fe308d440fdaeaa3585c20f7a690aeb8166d713d9920f0e6fb7ccc3fd3cd9b948f603c27262e3350722
+  data.tar.gz: e0d93db6c08c334a27bcd118c240d914b87bc09cecf5172a1bce711cecba58af240dbb674ee900d1efa93f404e3b2c8f320cf01582399bfc1a6464e8cb01cb4c

data/bin/tbgit

@@ -8,7 +8,7 @@ helptext = HelpText.new
 
 case ARGV[0] 
 when "setup"
-	tbgit.gather
+	tbgit.gather(ARGV[1],ARGV[2],ARGV[3])
 
 	tbgit.add_remotes
 	tbgit.spacer
@@ -26,24 +26,26 @@ when "setup"
 	tbgit.git_branch
 	tbgit.spacer
 when "pull"
-	tbgit.update_repos(ARGV[0])	
+	tbgit.update_repos(ARGV[0],ARGV[1])	
 when "push"
-	tbgit.update_repos(ARGV[0])	
+	tbgit.update_repos(ARGV[0],ARGV[1])	
+when "push-origin"
+	tbgit.push_origin(ARGV[1])
 when "merge"
-	tbgit.merge_and_commit
+	tbgit.merge_and_commit(ARGV[1],ARGV[2],ARGV[3])
 when "status"
 	tbgit.git_status
 when "each"
 	tbgit.on_each_gather
 when "spec"
-	tbgit.spec
+	tbgit.spec(ARGV[1],ARGV[2],ARGV[3],ARGV[4],ARGV[5])
 when "add-remotes"
-	tbgit.gather
+	tbgit.gather(ARGV[1],ARGV[2],ARGV[3])
 	tbgit.spacer
 
 	tbgit.add_remotes
 when "create-locals"
-	tbgit.gather
+	tbgit.gather(ARGV[1],ARGV[2],ARGV[3])
 	tbgit.spacer
 	
 	tbgit.create_local_tracking_remotes

data/lib/score_parser.rb

@@ -0,0 +1,38 @@
+require 'rubygems'
+require 'json'
+
+class Parser
+
+def json_parse(string)
+	JSON.parse(string)
+end
+
+def score_parse(masterfolder)	#main parsing method
+	# Open master scoresheet file for writing
+	ss = File.new(masterfolder + "/scoresheet.txt", "w")
+
+	# Open each .rb file in directory and add username and failure count to scoresheet
+	Dir.glob(masterfolder + '/*') do |student_result|
+		if File.basename(student_result) != "scoresheet.txt"
+			# Parse file into JSON and extract failure count
+			file = File.open(student_result, "r")
+			contents = file.read
+			json = json_parse(contents)
+			failure_count = json['summary']['failure_count']
+			
+			# Set filename to just username of student		
+			filename = File.basename(student_result)
+			filename.chomp(File.extname(filename))
+
+			# Write username and failure count to score sheet
+			ss << filename
+			ss << ' '
+			ss << failure_count
+			ss << "\n"
+			file.close
+		end
+	end
+
+	ss.close
+end
+end

data/lib/scoresheet.txt

@@ -0,0 +1,3 @@
+2 0
+1 0
+3 0

data/lib/tbgit/version.rb

@@ -1,3 +1,3 @@
 module Tbgit
-  VERSION = "1.0.4"
+  VERSION = "1.0.5"
 end

data/lib/tbgit.rb

@@ -1,5 +1,6 @@
 require "tbgit/version"
 require "tempfile"
+require "score_parser"
 
 module Main
 
@@ -10,14 +11,16 @@ module Main
   	end
 
   	#confirms a given message
-  	def confirm(message)
-  		print message + " (y/n)  "
-  		response = $stdin.gets.chomp
-  		if response == 'y'
-  			#do nothing
-  		else
-  			exit
-  		end
+  	def confirm(flag,message)
+  		if flag != '-y'
+	  		print message + " (y/n)  "
+	  		response = $stdin.gets.chomp
+	  		if response == 'y'
+	  			#do nothing
+	  		else
+	  			exit
+	  		end
+	  	end
   	end
 
   	#three simple git methods
@@ -35,24 +38,36 @@ module Main
 	end
 
 	#gather necessary information
-    def gather
-    	puts 'Students file |../students|:'
-    	@students_file = $stdin.gets.chomp
-    	if @students_file == ""
-    		@students_file = "../students"
-    	end
-
-    	puts 'Organization name |yale-stc-developer-curriculum|:'
-    	@organization = $stdin.gets.chomp
-    	if @organization == ""
-    		@organization = "yale-stc-developer-curriculum"
-    	end
-
-    	puts 'Student Repo Name |TechBootcampHomework|:'
-    	@reponame = $stdin.gets.chomp
-    	if @reponame == ""
-    		@reponame = "TechBootcampHomework"
-    	end
+    def gather(students_file, organization, reponame)
+    	if students_file == ""
+	    	puts 'Students file |../students|:'
+	    	@students_file = $stdin.gets.chomp
+	    	if @students_file == ""
+	    		@students_file = "../students"
+	    	end
+	    else
+	    	@students_file = students_file
+	    end
+
+	    if organization == ""
+	    	puts 'Organization name |yale-stc-developer-curriculum|:'
+	    	@organization = $stdin.gets.chomp
+	    	if @organization == ""
+	    		@organization = "yale-stc-developer-curriculum"
+	    	end
+	    else
+	    	@organization = organization
+	    end
+
+	    if reponame == ""
+	    	puts 'Student Repo Name |TechBootcampHomework|:'
+	    	@reponame = $stdin.gets.chomp
+	    	if @reponame == ""
+	    		@reponame = "TechBootcampHomework"
+	    	end
+	    else
+	    	@reponame = reponame
+	    end
     end
 
     #update remotes
@@ -63,7 +78,6 @@ module Main
 
     #add each student repository as a remote
     def add_remotes
-    	confirm("Each student repository will be added as a remote. Continue?")
     	students = IO.readlines(@students_file)
     	students.each do |username|
 			username.delete!("\n")
@@ -77,7 +91,6 @@ module Main
 
 	#create local branches to track remote student repositories
  	def create_local_tracking_remotes
- 		confirm("Local branches will be created to track remote student repositories. Continue?")
  	    students = IO.readlines(@students_file)
  		students.each do |username|
 			username.delete!("\n")
@@ -102,25 +115,35 @@ module Main
 	end
 
 	#used for push / pull
-  	def update_repos(pushpull)
+  	def update_repos(pushpull,flag)
   		if pushpull == "push"
-  			confirm("Each local student branch will be pushed to their remote master branch. Continue?")
+  			confirm(flag,"Each local student branch will be pushed to their remote master branch. Continue?")
 			on_each_exec(["git push <branch> <branch>:master"])
   		else
-  			confirm("Each remote student master branch will be pulled to the local branch. Continue?")
+  			confirm(flag,"Each remote student master branch will be pulled to the local branch. Continue?")
 			on_each_exec(["git pull <branch> master"])
 		end
   	end
 
+  	def push_origin(flag) #push all student branches to our origin
+  		confirm(flag,"Each local student branch will be pushed to the the origin remote. Continue?")
+  		on_each_exec(["git push origin <branch>"])
+  	end
+
   	#merges from master (or another branch) to each student branch and commits the changes
-  	def merge_and_commit
+  	def merge_and_commit(flag,merge_branch,message)
 
-  		confirm("A merge and commit will be performed on each local student branch (from the branch you specify). Continue?")
-  		puts "Merge from branch: "
-  		merge_branch = $stdin.gets.chomp
+  		confirm(flag,"A merge and commit will be performed on each local student branch (from the branch you specify). Continue?")
+  		
+  		if merge_branch != ""
+	  		puts "Merge from branch: "
+	  		merge_branch = $stdin.gets.chomp
+	  	end
 
-  		puts "Commit Message: "
-  		message = $stdin.gets.chomp
+	  	if message != ""
+	  		puts "Commit Message: "
+	  		message = $stdin.gets.chomp
+	  	end
 
 		commands = ["git merge --no-commit " + merge_branch.to_s,
 	  		  		"git add --all",
@@ -177,25 +200,34 @@ module Main
   		on_each_exec(["git status <branch>"])
   	end
   	
-  	def spec
-  		puts "Please specify the relative path from your pwd to the rspec file you would like to spec, eg. 'hw1/spec/spec.rb'"
-  		specfile = $stdin.gets.chomp
+  	def spec(flag,specfile,studentcopy,mastercopy,commit_message)
+
+  		if 	specfile==""
+	  		puts "Please specify the relative path from your pwd to the rspec file you would like to spec, eg. 'hw1/spec/spec.rb'"
+	  		specfile = $stdin.gets.chomp
+	  	end
 
-  		puts "Where would you like to save each student's individual results?"
-  		puts "**Must be inside the student's repo directory, eg. 'hw1/spec/results.txt'**"
-  		studentcopy = $stdin.gets.chomp
+	  	if studentcopy==""
+	  		puts "Where would you like to save each student's individual results?"
+	  		puts "**Must be inside the student's repo directory, eg. 'hw1/spec/results.txt'**"
+	  		studentcopy = $stdin.gets.chomp
+	  	end
 
-  		puts "In which folder would you like to save a copy of all results?"
-  		puts "**Must be outside the student's repo directory, eg. '../results'**"
-  		mastercopy = $stdin.gets.chomp
+	  	if mastercopy==""
+	  		puts "In which folder would you like to save a copy of all results?"
+	  		puts "**Must be outside the student's repo directory, eg. '../results'**"
+	  		mastercopy = $stdin.gets.chomp
+	  	end
 
   		puts "mkdir " + mastercopy
   		system "mkdir " + mastercopy
 
-  		puts "Commit message (commiting each student's results to their repo):"
-  		commit_message = $stdin.gets.chomp
+  		if commit_message==""
+	  		puts "Commit message (commiting each student's results to their repo):"
+	  		commit_message = $stdin.gets.chomp
+	  	end
 
-  		confirm("'rspec " + specfile + "' will be executed on each student's local branch. \
+  		confirm(flag,"'rspec " + specfile + "' will be executed on each student's local branch. \
   			Individual results will be saved to " + studentcopy + " and master results to " + mastercopy + ". Continue?")
 
   		on_each_exec(["rspec " +specfile + " > " + studentcopy,   	#overwrite
@@ -204,6 +236,9 @@ module Main
   		 	"git commit -am '" + commit_message + "'",
   		 	"git push <branch> <branch>:master"])
 
+  	 	my_parser = Parser.new
+  	 	my_parser.score_parse(mastercopy)
+
   	end
 
   end #class

data/tbgit.gemspec

@@ -21,4 +21,6 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency "bundler", "~> 1.6"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "json"
+  spec.add_development_dependency "rubygems"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tbgit
 version: !ruby/object:Gem::Version
-  version: 1.0.4
+  version: 1.0.5
 platform: ruby
 authors:
 - Charlie Proctor
@@ -38,6 +38,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubygems
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: ''
 email:
 - charlie@charlieproctor.com
@@ -53,6 +81,8 @@ files:
 - Rakefile
 - bin/tbgit
 - lib/helptext.rb
+- lib/score_parser.rb
+- lib/scoresheet.txt
 - lib/tbgit.rb
 - lib/tbgit/version.rb
 - tbgit.gemspec