tbgit 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9c8b1fa30525c2f20426afcef7c6df1b4a84157e
-  data.tar.gz: 04a1c270214b68765861dad3fa086c11c594ab2a
+  metadata.gz: 0cfbbff80dc9f1e03335253f8bbd6d519ce6f746
+  data.tar.gz: 9cbbd01fe4c0162aacf11b585868dcdf43fd55de
 SHA512:
-  metadata.gz: edfeffd1c96cc9524aab31547c7e7e1d61da06697dc5c611f01dccb91c56e632b94e14fe6e98320d84a84a0fd6283fdf9430b408c14fef938dbff4f19d992385
-  data.tar.gz: a0c2b7c9d1f0dfb03b41ccf4c62e9fc9cf473108276c92c2c3d07ef27df83b8f6e3d6df0844342a29ffba45579b1a27ab5d68a18232747e05fae1afbe79e932b
+  metadata.gz: 641e35604aed563d2a57d7c808ec9af2d473ddeb6f35d9f74e311cba49bc334b889bf90138e586454530e38af612a22ae43bd77e7425643ba06ca4058fb41a77
+  data.tar.gz: b6f2cc86546cfa42e966175c729d5420cd16df714596fb65180e1aa5bc40f766210ddc67e509a5586774ed4c950f14cd448d5cc59e122ae461380ccdfc84441b

data/bin/tbgit

@@ -1,8 +1,10 @@
 #!/usr/bin/env ruby
 
 require 'tbgit'
+require 'helptext'
 
 tbgit = Main::TBGit.new
+helptext = HelpText.new
 
 case ARGV[0] 
 when "setup"
@@ -46,5 +48,5 @@ when "create-locals"
 	
 	tbgit.create_local_tracking_remotes
 else
-	tbgit.help
+	helptext.helpme
 end

data/lib/helptext.rb

@@ -0,0 +1,51 @@
+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 "	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 ""
+  		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 ""
+  		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 ""
+  		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 ""
+  		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 ""
+  	end
+end

data/lib/tbgit/version.rb

@@ -1,3 +1,3 @@
 module Tbgit
-  VERSION = "1.0.2"
+  VERSION = "1.0.3"
 end

data/lib/tbgit.rb

@@ -105,33 +105,11 @@ module Main
   	def update_repos(pushpull)
   		if pushpull == "push"
   			confirm("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?")
+			on_each_exec(["git pull <branch> master"])
 		end
-
-		all_remotes = all_remotes_list
-  		all_remotes.each do |branch|
-  			branch.delete!("\n")
-
-  			if branch != "origin"
-	  			checkout_command = "git checkout " + branch 
-	  			if pushpull == "push"
-	  				pushpull_command = "git push " + branch + " " + branch + ":master"
-	  			else
-	  				pushpull_command = "git pull " + branch + " master"
-	  			end
-
-	  			puts checkout_command
-	  			system checkout_command
-
-	  			puts pushpull_command
-	  			system pushpull_command
-	  		end
-
-  		end
-	
-	  		switch_to_master
-  	
   	end
 
   	#merges from master (or another branch) to each student branch and commits the changes
@@ -144,32 +122,10 @@ module Main
   		puts "Commit Message: "
   		message = $stdin.gets.chomp
 
-  		all_remotes = all_remotes_list
-  		all_remotes.each do |branch|
-  			branch.delete!("\n")
-
-  			if branch != "origin"
-	  			checkout_command = "git checkout " + branch 
-	  			merge_command = "git merge --no-commit " + merge_branch.to_s
-	  		  	stage_changes = "git add --all"		
-	  			commit_command = "git commit -am '" + message + "'"
-
-	  			puts checkout_command
-	  			system checkout_command
-
-	  			puts merge_command
-	  			system merge_command
-
-	  			puts stage_changes
-	  			system stage_changes
-
-	  			puts commit_command
-	  			system commit_command
-	  		end
-
-  		end
-
-	  		switch_to_master
+		commands = ["git merge --no-commit " + merge_branch.to_s,
+	  		  		"git add --all",
+	  				"git commit -am '" + message + "'"]
+	  	on_each_exec(commands)
 
   	end
 
@@ -244,59 +200,5 @@ module Main
 
   	end
 
-  	def help
-  		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 "	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 ""
-  		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 ""
-  		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 ""
-  		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 ""
-  		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 ""
-  	end
-
-
-
-
-
   end #class
 end #module

data/tbgit.gemspec

@@ -14,6 +14,7 @@ Gem::Specification.new do |spec|
   spec.license       = "MIT"
 
   spec.files         = `git ls-files -z`.split("\x0")
+  spec.files         += Dir['lib/*.rb']  #add in any .rb files in lib
   spec.executables   = ["tbgit"]
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tbgit
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Charlie Proctor
@@ -52,6 +52,7 @@ files:
 - README.md
 - Rakefile
 - bin/tbgit
+- lib/helptext.rb
 - lib/tbgit.rb
 - lib/tbgit/version.rb
 - tbgit.gemspec