tbgit 1.0.6 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0eb15c5320ffda2798b568ff362e5048a9056970
-  data.tar.gz: c10caeb230277b6e3f2968b11ae264582852972a
+  metadata.gz: e8bba5a81f9d15e8ddf62a5588599be8d8dc20bd
+  data.tar.gz: 06006d1182bf97073237ed11519cc68fe93ddb42
 SHA512:
-  metadata.gz: 784640d659c9c8b9aef4bea90bf55caf775c76a91aaa0cb9a4c9276eda8597878e0e27bb384fec4aabe77dd7cbcbb981c6769e84d44a34b707c13c052bd36656
-  data.tar.gz: c003f1d1af994c744518a857628b95221d3b4e336575eeefaa797222118b551cbd029104a3c17e57aeb5ae0cbdc7351c78d46176da10897366601f2bc66ff676
+  metadata.gz: b0cb40f51daa2c3e955c0dabf07691754190917ad975fa7c5a40d76dcafa4cbb385c68679b5da4548978b4737932627c09ae6c65345e3f3142f5b82f66e06b81
+  data.tar.gz: 326413c17f9f36162955555aac79e810837e0454daba65b917c7954cecd1788e07659c53b94950bd838c1a519dc86f749f515e60e1c6a03ae3c7bf66c0e218cc

data/bin/tbgit

@@ -2,13 +2,19 @@
 
 require 'tbgit'
 require 'helptext'
+require 'tbspec'
 
-tbgit = Main::TBGit.new
+tbgit = TBGit.new
 helptext = HelpText.new
+tbspec = TBSpec.new
+
+def version
+	puts "tbgit " + Gem.loaded_specs['tbgit'].version.to_s
+end
 
 case ARGV[0] 
 when "setup"
-	tbgit.gather(ARGV[1],ARGV[2],ARGV[3])
+	tbgit.gather(ARGV[0],ARGV.drop(1))
 
 	tbgit.add_remotes
 	tbgit.spacer
@@ -26,31 +32,35 @@ when "setup"
 	tbgit.git_branch
 	tbgit.spacer
 when "pull"
-	tbgit.update_repos(ARGV[0],ARGV[1])	
+	tbgit.update_repos(ARGV[0],ARGV.drop(1))	
 when "push"
-	tbgit.update_repos(ARGV[0],ARGV[1])	
+	tbgit.update_repos(ARGV[0],ARGV.drop(1))	
 when "push-origin"
-	tbgit.push_origin(ARGV[1])
+	tbgit.push_origin(ARGV.drop(1))
 when "merge"
-	tbgit.merge_and_commit(ARGV[1],ARGV[2],ARGV[3])
+	tbgit.merge_and_commit(ARGV.drop(1))
 when "status"
 	tbgit.git_status
 when "each"
-	tbgit.on_each_gather
+	tbgit.on_each_gather(ARGV.drop(1))
 when "spec"
-	tbgit.spec(ARGV[1],ARGV[2],ARGV[3],ARGV[4],ARGV[5])
+	tbspec.spec(ARGV.drop(1))
 when "add-remotes"
-	tbgit.gather(ARGV[1],ARGV[2],ARGV[3])
+	tbgit.gather(ARGV[0],ARGV.drop(1))
 	tbgit.spacer
 
 	tbgit.add_remotes
 when "create-locals"
-	tbgit.gather(ARGV[1],ARGV[2],ARGV[3])
+	tbgit.gather(ARGV[0],ARGV.drop(1))
 	tbgit.spacer
 	
 	tbgit.create_local_tracking_remotes
 when "add-webhooks"
-	tbgit.add_webhooks(ARGV[1],ARGV[2],ARGV[3],ARGV[4],ARGV[5])
+	tbgit.add_webhooks(ARGV.drop(1))
+when "-v"
+	version
+when "--version"
+	version
 else
 	helptext.helpme
 end

data/lib/helptext.rb

@@ -1,51 +1,55 @@
 class HelpText
   	def helpme
   		puts ""
-  		puts "TBGit is a command-line utility to facilitate the management of multiple GitHub student repositories."
-  		puts "			~ created by Charlie Proctor at 2014 YEI Tech Bootcamp"
-  		puts "						~ partly based off of https://github.com/education/teachers_pet"
+  		puts "\tTBGit is a command-line utility to facilitate the management of multiple GitHub student repositories."
+  		puts "\t\t\t~ created by the teaching staff at 2014 YEI Tech Bootcamp"
+  		puts "\t\t\t\t~ partly based off of https://github.com/education/teachers_pet"
   		puts "	Commands:"
-  		puts "		~ setup   	sets up a tbgit environment. See decription below"
-  		puts "		~ push  	pushes all local student branches to their remote master branches"
-  		puts "		~ pull   	pulls all remote master branches to local student branches"
-  		puts "		~ merge   	merges a specified branch with each student branch and then commits the changes"
-  		puts "		~ status 	runs `git status` on each students branch and displays the results"
-  		puts "		~ each 		executes a specified series of commands on each local student branch"
-  		puts "		~ spec 		runs rspec on specified files in a students repo"
+  		puts "\t\t~ setup   	sets up a tbgit environment. See decription below"
+  		puts "\t\t~ push  	pushes all local student branches to their remote master branches"
+  		puts "\t\t~ pull   	pulls all remote master branches to local student branches"
+  		puts "\t\t~ merge   	merges a specified branch with each student branch and then commits the changes"
+  		puts "\t\t~ status 	runs `git status` on each students branch and displays the results"
+  		puts "\t\t~ each 		executes a specified series of commands on each local student branch"
+  		puts "\t\t~ spec 		runs rspec on specified files in a students repo"     
+      puts ""    
+      puts "\t\t~ add-webhooks    adds webhooks (on push events) to all student repositories"
+      puts ""
+  		puts "\t\t~ add-remotes  	adds each student's repository as a remote"
+  		puts "\t\t~ create-locals 	creates a local branch to track the students remote master branch"
+  		puts "\t\t	^----> these are both part of the setup process"
   		puts ""
-  		puts "		~ add-remotes  	adds each student's repository as a remote"
-  		puts "		~ create-locals 	creates a local branch to track the students remote master branch"
-  		puts "			^----> these are both part of the setup process"
+      puts "\t\t** Run `tbgit COMMAND --help` to view specific options for each command **"
+      puts "" 
+  		puts "\tTBGit Environment"
+  		puts "\t\t~ it's a regular git repository -- with lots of fancy features!"
+  		puts "\t\t~ there is a master branch for teachers to work off of (create hw files, etc..)"
+  		puts "\t\t\t--> teachers can obviously create and work off other branches if desired"
+  		puts "\t\t~ each student's repository is a remote of the git repo"
+  		puts "\t\t~ there is a local branch to track each student's remote master branches"
   		puts ""
-  		puts "	TBGit Environment"
-  		puts "		~ it's a regular git repository -- with lots of fancy features!"
-  		puts "		~ there is a master branch for teachers to work off of (create hw files, etc..)"
-  		puts "				--> teachers can obviously create and work off other branches if desired"
-  		puts "		~ each student's repository is a remote of the git repo"
-  		puts "		~ there is a local branch to track each student's remote master branches"
+  		puts "\tSetup"
+  		puts "\t\t1. Teachers create the student repositories (https://github.com/education/teachers_pet works perfectly well for this)"
+  		puts "\t\t\t--> make sure the repos are all private, but that you have access to them!"
+  		puts "\t\t\t--> initialize these repos with a README or push out a starter file."
+  		puts "\t\t\t--> create a file with a list of the students github usernames (one on each line)" 
+  		puts "\t\t\t\t--- you will need this during the setup process"
+  		puts "\t\t2. Teachers create a repo for themselves. This will serve as the base for the tbgit environment."
+  		puts "\t\t3. Change to that repo's directory, execute `tbgit setup`, and follow the instructions."
   		puts ""
-  		puts "	Setup"
-  		puts "		1. Teachers create the student repositories (https://github.com/education/teachers_pet works perfectly well for this)"
-  		puts "				--> make sure the repos are all private, but that you have access to them!"
-  		puts "				--> initialize these repos with a README or push out a starter file."
-  		puts "				--> create a file with a list of the students github usernames (one on each line)" 
-  		puts "						--- you will need this during the setup process"
-  		puts "		2. Teachers create a repo for themselves. This will serve as the base for the tbgit environment."
-  		puts "		3. Change to that repo's directory, execute `tbgit setup`, and follow the instructions."
+  		puts "\tA Typical Workflow"
+  		puts "\t\t1. Teachers create the assignment (on the master branch) and make a final commit when they're ready to deploy it"
+  		puts "\t\t2. Teachers pull all the students' repos to make sure they're up to date."
+  		puts "\t\t\t--> `tbgit pull`"
+  		puts "\t\t3. Teachers merge their master branch with each student's local branch"
+  		puts "\t\t\t--> `tbgit merge`"
+  		puts "\t\t4. At this point, teachers should check to make sure their were no merge conflicts. If there were, go in and fix them."
+  		puts "\t\t\t--> feel free to `git checkout <username>` a few different branches"
+  		puts "\t\t4. Teachers push each students local branch to the student's remote master branch"
+  		puts "\t\t\t--> `tbgit push`"
+  		puts "\t\t5. Make sure it worked.  Do a victory lap."
   		puts ""
-  		puts "	A Typical Workflow"
-  		puts "		1. Teachers create the assignment (on the master branch) and make a final commit when they're ready to deploy it"
-  		puts "		2. Teachers pull all the students' repos to make sure they're up to date."
-  		puts "				--> `tbgit pull`"
-  		puts "		3. Teachers merge their master branch with each student's local branch"
-  		puts "				--> `tbgit merge`"
-  		puts "		4. At this point, teachers should check to make sure their were no merge conflicts. If there were, go in and fix them."
-  		puts "				--> feel free to `git checkout <username>` a few different branches"
-  		puts "		4. Teachers push each students local branch to the student's remote master branch"
-  		puts "				--> `tbgit push`"
-  		puts "		5. Make sure it worked.  Do a victory lap."
-  		puts ""
-  		puts "		To view student solutions at any point, just `tbgit pull` and `git checkout <username>`"
+  		puts "\t\tTo view student solutions at any point, just `tbgit pull` and `git checkout <username>`"
   		puts ""
   	end
 end

data/lib/tbgit/version.rb

@@ -1,3 +1,3 @@
 module Tbgit
-  VERSION = "1.0.6"
+  VERSION = "1.1.1"
 end

data/lib/tbgit.rb

@@ -1,281 +1,409 @@
 require "tbgit/version"
 require "tempfile"
-require "score_parser"
 require "add_webhooks"
 require 'highline/import'
+require "optparse"
 
-module Main
+class TBGit
 
-  class TBGit
-
-  	def spacer
-  		puts "********************************************************************************"
-  	end
+	def spacer
+		puts "********************************************************************************"
+	end
 
-  	#confirms a given message
-  	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
+	#confirms a given message
+	def confirm(flag,message)
+		if !flag
+			print message + " (y/n)  "
+			response = $stdin.gets.chomp
+			if response == 'y'
+				#do nothing
+			else
+				exit
+			end
+		end
+	end
 
-  	#three simple git methods
+	#three simple git methods
 	def switch_to_master
-		puts "git checkout master"
-		system "git checkout master"
+	puts "git checkout master"
+	system "git checkout master"
 	end
 	def git_remote
-		puts "git remote"
-		system "git remote"
+	puts "git remote"
+	system "git remote"
 	end
 	def git_branch
-		puts "git branch"
-		system "git branch"
+	puts "git branch"
+	system "git branch"
 	end
 
 	#gather necessary information
-    def gather(students_file, organization, reponame)
-    	if students_file == nil
-	    	puts 'Students file |../students|:'
-	    	@students_file = $stdin.gets.chomp
-	    	if @students_file == ""
-	    		@students_file = "../students"
-	    	end
-	    else
-	    	@students_file = students_file
-	    end
-
-	    if organization == nil
-	    	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 == nil
-	    	puts 'Student Repo Name |TechBootcampHomework|:'
-	    	@reponame = $stdin.gets.chomp
-	    	if @reponame == ""
-	    		@reponame = "TechBootcampHomework"
-	    	end
-	    else
-	    	@reponame = reponame
-	    end
-    end
-
-    #update remotes
-	def git_update
-		puts "git remote update"
- 		system "git remote update"
- 	end
-
-    #add each student repository as a remote
-    def add_remotes
-    	students = IO.readlines(@students_file)
-    	students.each do |username|
-			username.delete!("\n")
-			
-			puts "Adding Remote: " + username 
-			remote_command = "git remote add " + username + " https://github.com/"+@organization+"/" + username + "-"+@reponame+".git" 
-			puts remote_command
-			system 	remote_command
+	def gather(command, args)
+	options = {}
+	opt_parser = OptionParser.new do |opts|
+		if command == "setup"
+	  		opts.banner = "Usage: tbgit setup [options]"
+	  	elsif command == "add-remotes"
+	  		opts.banner = "Usage: tbgit add-remotes [options]"
+	  	else
+	  		opts.banner = "Usage: tbgit create-locals [options]"
+	  	end
+
+
+	  opts.on("-s", "--studentfile FILEPATH","Specify the file containing the list of students.") do |f|
+	    options[:studentfile] = f
+	  end
+	  
+	  opts.on("-o", "--organization NAME","Specify the name of the GitHub organization.") do |o|
+	    options[:organization] = o
+	  end
+
+	  opts.on("-r", "--repo NAME","Specify the name of the student repositories.") do |r|
+	    options[:repo] = r
+	  end
+
+	  opts.on_tail("-h", "--help", "Show this message") do
+	    puts opts
+	    exit
+	  end
+	end
+
+	opt_parser.parse!(args)
+
+	if options[:studentfile] == nil
+		puts 'Students file |../students|:'
+		@students_file = $stdin.gets.chomp
+		if @students_file == ""
+			@students_file = "../students"
+		end
+	else
+		@students_file = options[:studentfile]
+	end
+
+	if options[:organization] == nil
+		puts 'Organization name |yale-stc-developer-curriculum|:'
+		@organization = $stdin.gets.chomp
+		if @organization == ""
+			@organization = "yale-stc-developer-curriculum"
+		end
+	else
+		@organization = options[:organization]
+	end
+
+	if options[:repo] == nil
+		puts 'Student Repo Name |TechBootcampHomework|:'
+		@reponame = $stdin.gets.chomp
+		if @reponame == ""
+			@reponame = "TechBootcampHomework"
 		end
+	else
+		@reponame = options[:repo]
+	end
+	end
+
+	#update remotes
+	def git_update
+	puts "git remote update"
+		system "git remote update"
+	end
+
+	#add each student repository as a remote
+	def add_remotes
+	students = IO.readlines(@students_file)
+	students.each do |username|
+		username.delete!("\n")
+		
+		puts "Adding Remote: " + username 
+		remote_command = "git remote add " + username + " https://github.com/"+@organization+"/" + username + "-"+@reponame+".git" 
+		puts remote_command
+		system 	remote_command
+	end
 	end
 
 	#create local branches to track remote student repositories
- 	def create_local_tracking_remotes
- 	    students = IO.readlines(@students_file)
- 		students.each do |username|
-			username.delete!("\n")
+	def create_local_tracking_remotes
+	    students = IO.readlines(@students_file)
+		students.each do |username|
+		username.delete!("\n")
 
-			puts "Creating Local Branch to Track Remote: " + username 
-			checkout_command = "git checkout --track -b " + username + " remotes/" + username + "/master"
-			puts checkout_command
-			system  checkout_command
+		puts "Creating Local Branch to Track Remote: " + username 
+		checkout_command = "git checkout --track -b " + username + " remotes/" + username + "/master"
+		puts checkout_command
+		system  checkout_command
 
-		end
+	end
 
 	end
 
 	#returns a list of students
-  	def all_remotes_list
-  		remote_file = Tempfile.new("remotes")
-  		system "git remote >> " + remote_file.path
+	def all_remotes_list
+		remote_file = Tempfile.new("remotes")
+		system "git remote >> " + remote_file.path
 
-  		puts "git remote >> " + remote_file.path
+		puts "git remote >> " + remote_file.path
 
-  		return IO.readlines(remote_file)
+		return IO.readlines(remote_file)
 	end
 
 	#used for push / pull
-  	def update_repos(pushpull,flag)
-  		if pushpull == "push"
-  			confirm(flag,"Each local student branch will be pushed to their remote master branch. Continue?")
+	def update_repos(pushpull,args)
+
+		options = {}
+	opt_parser = OptionParser.new do |opts|
+		if pushpull == "push"
+	  		opts.banner = "Usage: tbgit push [options]"
+	  	else
+	  		opts.banner = "Usage: tbgit pull [options]"
+	  	end
+
+	  opts.on("-y", "--yes","Proceed without asking for confirmation") do |y|
+	    options[:yes] = y
+	  end
+
+	  opts.on_tail("-h", "--help", "Show this message") do
+	    puts opts
+	    exit
+	  end
+
+	end
+
+	opt_parser.parse!(args)
+
+
+		if pushpull == "push"
+			confirm(options[:yes],"Each local student branch will be pushed to their remote master branch. Continue?")
 			on_each_exec(["git push <branch> <branch>:master"])
-  		else
-  			confirm(flag,"Each remote student master branch will be pulled to the local branch. Continue?")
+		else
+			confirm(options[:yes],"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(args) #push all student branches to our origin
+
+		options = {}
+	opt_parser = OptionParser.new do |opts|
+	  	opts.banner = "Usage: tbgit push-origin [options]"
+
+	  opts.on("-y", "--yes","Proceed without asking for confirmation") do |y|
+	    options[:yes] = y
+	  end
+
+	  opts.on_tail("-h", "--help", "Show this message") do
+	    puts opts
+	    exit
+	  end
+	end
+	opt_parser.parse!(args)
+
+		confirm(options[:yes],"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(args)
+
+	options = {}
+	opt_parser = OptionParser.new do |opts|
+	  	opts.banner = "Usage: tbgit push-origin [options]"
+
+	  opts.on("-y", "--yes","Proceed without asking for confirmation") do |y|
+	    options[:yes] = y
+	  end
+
+	  opts.on("-b", "--branch BRANCH", "Specify the branch to merge from") do |b|
+	  	options[:branch] = b
+	  end
+
+	  opts.on("-m", "--message MESSAGE", "Specify the commit message for the merge.") do |m|
+	  	options[:message] = m 
+	  end
+
+	  opts.on_tail("-h", "--help", "Show this message") do
+	    puts opts
+	    exit
+	  end
+	end
+	opt_parser.parse!(args)
+		
+		if options[:branch] == nil
+			puts "Merge from branch: "
+			merge_branch = $stdin.gets.chomp
+		else
+			merge_branch = options[:branch]
 		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
+		if options[:message] == nil
+			puts "Commit Message: "
+			message = $stdin.gets.chomp
+		else
+			message = options[:message]
+		end
 
-  	#merges from master (or another branch) to each student branch and commits the changes
-  	def merge_and_commit(flag,merge_branch,message)
+		confirm(options[:yes],"A merge and commit will be performed on each local student branch (from the branch you specify). Continue?")
 
-  		confirm(flag,"A merge and commit will be performed on each local student branch (from the branch you specify). Continue?")
-  		
-  		if merge_branch == nil
-	  		puts "Merge from branch: "
-	  		merge_branch = $stdin.gets.chomp
-	  	end
+	commands = ["git merge --no-commit " + merge_branch.to_s,
+			  		"git add --all",
+					"git commit -am '" + message + "'"]
+		on_each_exec(commands)
 
-	  	if message == nil
-	  		puts "Commit Message: "
-	  		message = $stdin.gets.chomp
-	  	end
+	end
 
-		commands = ["git merge --no-commit " + merge_branch.to_s,
-	  		  		"git add --all",
-	  				"git commit -am '" + message + "'"]
-	  	on_each_exec(commands)
-
-  	end
-
-  	#gathers the commands to be executed, and then calls on_each_exec(input)
-  	def on_each_gather
-  		puts "Enter the commands you would like to have executed on each branch, one on each line."
-  		puts "'<branch>' will be replaced by the current checked-out branch. Enter a blank line to finish."
-  		done = false
-  		input = Array.new
-  		while !done
-  			text = $stdin.gets.chomp
-  			if text == ""
-  				done = true
-  			else
-  				input << text
-  			end
-  		end
-
-  		on_each_exec(input)
-
-  	end
-
-  	#takes an array of commands, and executes a ruby command on each student branch
-  	def on_each_ruby(input)   
-  		all_remotes = all_remotes_list
-  		all_remotes.each do |branch|
-  			branch.delete!("\n")
-
-  			if branch != "origin"
-		  		checkout_command = "git checkout " + branch 
-
-		  		puts checkout_command
-		  		system checkout_command
-
-	  			input.each do |command|
-	  				final_command = command.gsub("<branch>", branch)
-
-	  				puts final_command
-	  				eval(final_command)
-	  			end
-  			end
-
-  		end
-  		switch_to_master
-  	end
-
-  	#takes an array of commands, and executes a system command on each student branch
-  	def on_each_exec(input)
-  		input.map! { |a| "system '" + a.gsub("'"){"\\'"} + "'"}
-  		on_each_ruby(input)
-  	end
-
-  	def git_status
-  		on_each_exec(["git status <branch>"])
-  	end
-  	
-  	def spec(flag,specfile,studentcopy,mastercopy,commit_message)
-
-  		if 	specfile==nil
-	  		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
+	#gathers the commands to be executed, and then calls on_each_exec(input)
+	def on_each_gather(args)
 
-	  	if studentcopy==nil
-	  		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
+		options = {}
+		opt_parser = OptionParser.new do |opts|
 
-	  	if mastercopy==nil
-	  		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
+		  opts.on("-f", "--file FILENAME", "Execute the commands specified in a certain file. One command per line. '<branch>' will be replaced by the name of the current student branch checked out.") do |f|
+		  	options[:file] = f
+		  end
 
-  		puts "mkdir " + mastercopy
-  		system "mkdir " + mastercopy
+		  opts.on("-y", "--yes","Proceed without asking for confirmation") do |y|
+		    options[:yes] = y
+		  end
 
-  		if commit_message==nil
-	  		puts "Commit message (commiting each student's results to their repo):"
-	  		commit_message = $stdin.gets.chomp
-	  	end
+		  opts.on_tail("-h", "--help", "Show this message") do
+		    puts opts
+		    exit
+		  end
+
+		end
+
+		opt_parser.parse!(args)
+
+		if options[:file] == nil
+			puts "Enter the commands you would like to have executed on each branch, one on each line."
+			puts "'<branch>' will be replaced by the current checked-out branch. Enter a blank line to finish."
+			done = false
+			input = Array.new
+			while !done
+				text = $stdin.gets.chomp
+				if text == ""
+					done = true
+				else
+					input << text
+				end
+			end
+		else
+			input = IO.readlines(options[:file])
+		end
 
-  		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?")
+		confirm(options[:yes], "The commands specified will be executed on each student branch. Continue?")
 
-  		on_each_exec(["rspec " +specfile + " > " + studentcopy,   	#overwrite
-  			"rspec --format json --out " + mastercopy + "/<branch> " + specfile,
-  		 	"git add --all",
-  		 	"git commit -am '" + commit_message + "'",
-  		 	"git push <branch> <branch>:master"])
+		on_each_exec(input)
 
-  	 	my_parser = Parser.new
-  	 	my_parser.score_parse(mastercopy)
+	end
+
+	#takes an array of commands, and executes a ruby command on each student branch
+	def on_each_ruby(input)   
+		all_remotes = all_remotes_list
+		all_remotes.each do |branch|
+			branch.delete!("\n")
 
-  	end
+			if branch != "origin"
+	  		checkout_command = "git checkout " + branch 
 
-  	def add_webhooks(organization,reponame,user,pass,url)
-  		if organization == nil
-  			puts "Organization Name:"
-  			organization = $stdin.gets.chomp
-  		end
+	  		puts checkout_command
+	  		system checkout_command
 
-  		if reponame == nil
-  			puts "Student Repository Name:"
-  			reponame = $stdin.gets.chomp
-  		end
+				input.each do |command|
+					final_command = command.gsub("<branch>", branch)
 
-  		if user == nil
-  			print "Username:"
-  			user = $stdin.gets.chomp
-  		end
+					puts final_command
+					eval(final_command)
+				end
+			end
 
-  		if pass == nil
-  			pass = ask("Password: ") { |q| q.echo = false }
-  		end
+		end
+		switch_to_master
+	end
 
-  		if url == nil
-  			puts "Webhook url:"
-  			url = $stdin.gets.chomp
-  		end
+	#takes an array of commands, and executes a system command on each student branch
+	def on_each_exec(input)
+		input.map! { |a| "system '" + a.gsub("'"){"\\'"} + "'"}
+		on_each_ruby(input)
+	end
 
-  		on_each_ruby(['create = CreateWebhooks.new; create.post(\''+ organization.to_s + '\',\'<branch>\',\''+reponame.to_s+'\',
-  				\''+user.to_s+'\',\''+pass.to_s+'\',\''+url.to_s+'\')'])
+	def git_status
+		on_each_exec(["git status <branch>"])
+	end
 
-  	end
-  end #class
-end #module
+	def add_webhooks(args)
+
+		options = {}
+		opt_parser = OptionParser.new do |opts|
+		  	opts.banner = "Usage: tbgit add-webhooks [options]"
+
+		  opts.on("-y", "--yes","Proceed without asking for confirmation") do |y|
+		    options[:yes] = y
+		  end
+
+		  opts.on("-o", "--organization NAME","Specify the name of the GitHub organization.") do |o|
+		    options[:organization] = o
+		  end
+
+		  opts.on("-r", "--repo NAME","Specify the name of the student repositories.") do |r|
+		    options[:reponame] = r
+		  end
+
+		  opts.on("-u", "--user USERNAME", "Your GitHub username.") do |u|
+		  	options[:username] = u
+		  end
+
+		  opts.on("-p", "--pass PASSWORD", "Your GitHub password.") do |p|
+		  	options[:password] = p
+		  end
+
+		  opts.on("-l", "--url URL", "Webhook URL") do |l|
+		  	options[:url] = l
+		  end
+
+		  opts.on_tail("-h", "--help", "Show this message") do
+		    puts opts
+		    exit
+		  end
+		end
+		opt_parser.parse!(args)
+
+		if options[:organization] == nil
+			puts "Organization Name:"
+			organization = $stdin.gets.chomp
+		else
+			organization = options[:organization]
+		end
+
+		if options[:reponame] == nil
+			puts "Student Repository Name:"
+			reponame = $stdin.gets.chomp
+		else
+			reponame = options[:reponame]
+		end
+
+		if options[:username] == nil
+			print "Username:"
+			user = $stdin.gets.chomp
+		else 
+			user = options[:username]
+		end
+
+		if options[:password] == nil
+			pass = ask("Password: ") { |q| q.echo = false }
+		else 
+			pass = options[:password]
+		end
+
+		if options[:url] == nil
+			puts "Webhook url:"
+			url = $stdin.gets.chomp
+		else
+			url = options[:url]
+		end
+
+		confirm(options[:yes],"Webhooks will be added to each student's GitHub repository. Continue?")
+
+		on_each_ruby(['create = CreateWebhooks.new; create.post(\''+ organization.to_s + '\',\'<branch>\',\''+reponame.to_s+'\',
+				\''+user.to_s+'\',\''+pass.to_s+'\',\''+url.to_s+'\')'])
+
+	end
+end #class

data/lib/tbspec.rb

@@ -0,0 +1,130 @@
+require "score_parser"
+require "tbgit"
+require "optparse"
+
+class TBSpec
+
+	def spec(args)
+
+	options = {}
+	opt_parser = OptionParser.new do |opts|
+  	opts.banner = "Usage: tbgit spec [options]"
+
+	  opts.on("-y", "--yes","Proceed without asking for confirmation") do |y|
+	    options[:yes] = y
+	  end
+
+	  opts.on("-f", "--specfile FILE", "Specify the relative path from your pwd to the rspec file you would like to spec, eg. 'hw1/spec/spec.rb'") do |f|
+	  	options[:specfile] = f
+	  end
+
+	  opts.on("-s", "--studentcopy FILE", "Specify where you would like to save each student's individual results. Must be inside the student's repo directory, eg. 'hw1/spec/results.txt'") do |s|
+	  	options[:studentcopy] = s 
+	  end
+
+	  opts.on("-t", "--teachercopy FILE", "Specify where you would like to save a copy of all results. Must be outside the student's repo directory, eg. '../results'") do |t|
+	  	options[:mastercopy] = t
+	  end
+
+	  opts.on("-m", "--message MESSAGE", "Specify the commit message (commiting each student's results to their repo)") do |m|
+	  	options[:message] = m 
+	  end
+
+	  opts.on("-n", "--studentname NAME", "If you would like to spec an individual student, please specify their name. Otherwise, use the --all option to spec all students.") do |n|
+	  	options[:student] = n 
+	  end
+
+	  opts.on("-a", "--all", "Use this option to spec all student homework.") do|a|
+	  	options[:all] = a
+	  end
+
+	  opts.on_tail("-h", "--help", "Show this message") do
+	    puts opts
+	    exit
+	  end
+	end
+
+	opt_parser.parse!(args)
+
+		if 	options[:specfile]==nil
+			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
+		else
+			specfile = options[:specfile]
+		end
+
+		if options[:studentcopy]==nil
+			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
+		else
+			studentcopy = options[:studentcopy]
+		end
+
+		if options[:mastercopy]==nil
+			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
+		else
+			mastercopy = options[:mastercopy]
+		end
+
+		puts "mkdir " + mastercopy
+		system "mkdir " + mastercopy
+
+		if options[:message]==nil
+			puts "Commit message (commiting each student's results to their repo):"
+			commit_message = $stdin.gets.chomp
+		else
+			commit_message = options[:message]
+		end
+
+		all = false
+		student = ""
+		if options[:student]==nil && !options[:all]
+			puts "Please specify a student to spec. Type 'all' to spec all students"
+			student = $stdin.gets.chomp
+		elsif options[:student]!=nil && !options[:all]
+			student = options[:student]
+		elsif options[:student]!=nil && options[:all]
+			raise "--student and --all cannot be used at the same time!"
+		else
+			all = true
+		end
+
+		if student == "all"
+			all = true
+		end
+
+		tbgit = TBGit.new
+
+		if  all
+			tbgit.confirm(options[:yes],"'rspec " + specfile + "' will be executed on each student's local branch. 
+				Individual results will be saved to " + studentcopy + " and master results to " + mastercopy + ". Continue?")
+
+			tbgit.on_each_exec(["rspec " +specfile + " > " + studentcopy,   	#overwrite
+				"rspec --format json --out " + mastercopy + "/<branch> " + specfile,
+			 	"git add --all",
+			 	"git commit -am '" + commit_message + "'",
+			 	"git push <branch> <branch>:master"])
+		else
+			system("git checkout " + student)
+			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
+
+	 	my_parser = Parser.new
+	 	my_parser.score_parse(mastercopy)
+
+	end #method
+end #class

data/tbgit.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "json"
   spec.add_development_dependency "rubygems"
   spec.add_development_dependency "highline/import"
+  spec.add_development_dependency "optparse"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tbgit
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.1.1
 platform: ruby
 authors:
 - Charlie Proctor
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-24 00:00:00.000000000 Z
+date: 2014-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,6 +80,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: optparse
+  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
@@ -97,10 +111,10 @@ files:
 - lib/add_webhooks.rb
 - lib/helptext.rb
 - lib/score_parser.rb
-- lib/scoresheet.txt
 - lib/tbgit.rb
 - lib/tbgit/version.rb
 - lib/tbgit/version.rb~
+- lib/tbspec.rb
 - tbgit.gemspec
 homepage: ''
 licenses:

data/lib/scoresheet.txt

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