projmgr 0.0.7 → 0.0.8

data/NEWS.markdown

@@ -1,3 +1,7 @@
+# 0.0.8 (May 10, 2011)
+- Add CVS support Checkin/Checkout/Local Changes
+- Fixed a few output issues
+
 # 0.0.7 (February 24, 2011)
 - Moved to OptionParser instead of Choice. Choice seems to be abandoned and has issues with ruby 1.9.2+
 

data/README.markdown

@@ -1,25 +1,20 @@
-ProjMgr
-===
+# ProjMgr
+
 
 ProjMgr is a simple source code project manager for updating and checking local changes on multiple projects at once.
 
-The current version is v0.0.6
+The current version is v0.0.8
 
-Requirements
----
+## Requirements
 
-* ruby 
-* rubygems
-* choice
+* ruby / rubygems
 
-Installation
----
+## Installation
 Installation is really easy just gem install!
 
-	% sudo gem install projmgr
+	% gem install projmgr
 	
-Usage
----
+## Usage
 Using ProjMgr is fairly simple. Once installation is complete type to create a skeleton config file:
 
 	% projmgr --create-file
@@ -40,6 +35,18 @@ This will create a empty skeleton config file, ~/.projmgr, edit this file. The f
 	  type: git
 		url: git@github.com:hammackj/nessusdb.git
 
+	metasploit:
+   name: metasploit
+   path: ~/Projects/public/metasploit
+   type: svn
+   url: https://www.metasploit.com/svn/framework3/trunk/
+
+	cvstest:
+	  name: cvstest
+	  path: ~/Projects/public/cvstest
+	  type: cvs
+		url: hammackj@hammackj.com:/usr/local/cvs
+
 	projectname: 
 		name: 
 		path: 
@@ -58,16 +65,14 @@ Once the config file is edited everything is ready to go.
 
 Simple usage is as follows:
 
-Checking for local changes
-----
+### Checking for local changes
 
 	% projmgr -c
 	[!] ProjMgr has local changes
 	[!] nessusdb has local changes
 	
 
-Updating each project
-----
+### Updating each project
 
 	% projmgr -u
 	[*] Updating ProjMgr...
@@ -77,6 +82,5 @@ Updating each project
 
 That covers all of the basic usage of ProjMgr.
 	
-Contact
----
+## Contact
 You can reach me at jacob[dot]hammack[at]hammackj[dot]com.

data/Rakefile

@@ -11,6 +11,7 @@ end
  
 task :release => :build do
   system "gem push projmgr-#{ProjMgr::VERSION}.gem"
+	puts "Just released Projmgr v#{ProjMgr::VERSION}. Projmgr is always available in RubyGems!"
 end
 
 task :clean do

data/TODO.markdown

@@ -1,9 +1,8 @@
 # TODO
 
-## 0.0.8 (March 25, 2011)
+## 0.0.9 (July 01, 2011)
 - Add a detect option, to find projects in a directory not managed
 - Add support for other SCM's
-	- CVS
 	- Mercurial	
 - Add more rspec tests		
 	- Git Class

data/bin/projmgr

@@ -1,5 +1,4 @@
 #!/usr/bin/env ruby
-# encoding: utf-8
 
 # projmgr - ProjMgr is a simple source code project manager for updating and checking local changes on multiple projects at once.
 # Jacob Hammack <jacob.hammack@hammackj.com>
@@ -11,6 +10,8 @@
 # hammackj - 01-09-2011 - Version 0.0.4
 # hammackj - 02-07-2011 - Version 0.0.5
 # hammackj - 02-17-2011 - Version 0.0.6
+# hammackj - 03-17-2011 - Version 0.0.7
+# hammackj - 05-10-2011 - Version 0.0.8
 #
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '/../lib'))
@@ -63,7 +64,7 @@ module ProjMgr
 					if File.exists?(File.expand_path(CONFIG_FILE)) == false
 						File.open(File.expand_path(CONFIG_FILE), 'w+') do |f| 
 							3.times do
-								f.write("projectname: \n	name: \n	path: \n	type: \n	url: \n\n") 
+								f.write("projectname: \n  name: \n  path: \n  type: \n  url: \n\n") 
 							end
 						end
 
@@ -113,8 +114,8 @@ module ProjMgr
 							repo = Svn.new @repos[key]['name'], @repos[key]['path'], @root, @repos[key]['url']
 						elsif @repos[key]['type'] == "git"
 							repo = Git.new @repos[key]['name'], @repos[key]['path'], @root, @repos[key]['url']
-						#elsif @repos[key]['type'] == "cvs"
-						# repo = Cvs.new @repos[key]['name'], @repos[key]['path'], @repos[key]['root'], @repos[key]['url']
+						elsif @repos[key]['type'] == "cvs"
+						 repo = Cvs.new @repos[key]['name'], @repos[key]['path'], @repos[key]['root'], @repos[key]['url']
 						end
 
 						if repo == nil
@@ -131,7 +132,7 @@ module ProjMgr
 							# print "[!] #{@repos[key]['name']} #{status[1]}\n"
 							end
 						elsif @options[:update] != nil
-							print "[*] Updating #{@repos[key]['name']}...\n #{repo.update}\n"
+							print "[*] Updating #{@repos[key]['name']}...#{repo.update}\n"
 						elsif @options[:checkout] != nil
 							print "[*] Checking out #{@repos[key]['name']}...#{repo.checkout}\n"
 						end

data/lib/projmgr.rb

@@ -2,7 +2,7 @@
 
 module ProjMgr
 	APP_NAME = "projmgr"
-	VERSION = "0.0.7"
+	VERSION = "0.0.8"
 	CONFIG_FILE = "~/.projmgr"
 end
 

data/lib/projmgr/cvs.rb

@@ -13,39 +13,56 @@ module ProjMgr
 		#
 		# @return [String] The results from the 'cvs co' command
 		def checkout
-			results = `cd #{@path} && cd .. && cvs co #{@url} && cd #{@root}`
-			
-			return results
+			if path_exists? == true
+				return "path exists, cannot checkout onto an existing repo"
+			else
+				parent = project_parent_directory
+				
+				cmd = IO.popen "cd #{parent} && CVSROOT=#{@url} cvs co #{@project} &> /dev/null && cd #{@root}"
+				results = cmd.readlines
+				cmd.close
+
+				return "project checked out to #{parent}/#{@project}"
+			end
 		end
 
 		# Checks for updates in the target repo
 		# 
-		# @return [String] the results of 'git pull' on the target repository
+		# @return [String] the results of 'cvs update' on the target repository
 		def update
-	  	results = `cd #{@path} && cvs update -dPA && cd #{@root}`
-
-	  	if results =~ /Already up-to-date./
-	  	  return "Already up-to-date!\n"
-	  	else
-	  	  return results  	  
-		  end
+			if path_exists? == false
+				return "path does not exists, cannot update repository"
+			else
+				results = `cd #{@path} && cvs update 2>&1 && cd #{@root}`
+				results = results.split("\n")
+				
+				results.delete_if do |x|
+					x =~ /cvs update: /
+				end
+						
+				if results.empty?
+					return "Already up-to-date!"
+				else
+					return results
+				end
+			end
 		end
 		
 		# Checks for local changes in the target repository
 		#
 		# @return [Boolean] if there is local changes or not
 		def has_local_changes?
-		  results = `cd #{@path} && cvs status && cd #{@root}`
+			if path_exists? == false
+				return false, "path does not exists, please check the path or check it out"
+			else
+		  	results = `cd #{@path} && cvs -q status | grep ^[?F] | grep -v \"to-date\" && cd #{@root}`
 
-		  #if results !~ /nothing to commit/ 
-			#	return true
-			#elsif results =~ /Your branch is ahead of/
-			#	return true
-			#elsif results =~ /Untracked files/
-			#	return true
-		  #else
-				return false
-			#end
+			  if results =~ /\? (.*)/ 
+					return true, "has local changes"
+				else
+					return false, "has no local changes"
+				end
+			end
 		end
 	end	
 end

data/lib/projmgr/git.rb

@@ -3,7 +3,7 @@
 require 'projmgr/scm'
 
 module ProjMgr
-	
+
 	# A wrapper class for interacting with a git repository
 	#
 	# @author Jacob Hammack <jacob.hammack@hammackj.com>
@@ -18,51 +18,51 @@ module ProjMgr
 				return "path exists, cannot checkout onto an existing repo"
 			else
 				parent = project_parent_directory
-				
+
 				cmd = IO.popen "cd #{parent} && git clone #{@url} &> /dev/null && cd #{@root}"
 				results = cmd.readlines
 				cmd.close
-				
+
 				return "project checked out to #{parent}/#{@project}"
 			end
 		end
 
 		# Checks for updates in the target repository
-		# 
+		#
 		# @return [String] the results of 'git pull' on the target repository
 		def update
 			if path_exists? == false
 				return "path does not exists, cannot update repository"
 			else
-	  		results = `cd #{@path} && git pull && cd #{@root}`
-			
-		  	if results =~ /Already up-to-date./
-		  	  return "Already up-to-date!\n"
-		  	else
-		  	  return results  	  
-			  end
+				results = `cd #{@path} && git pull && cd #{@root}`
+
+				if results =~ /Already up-to-date./
+					return "Already up-to-date!"
+				else
+					return results
+				end
 			end
 		end
-		
+
 		# Checks for local changes in the target repository
 		#
 		# @return [Boolean] if there is local changes or not
 		def has_local_changes?
-			if path_exists? == false				
+			if path_exists? == false
 				return false, "path does not exists, please check the path or check it out"
 			else
-			  results = `cd #{@path} && git status && cd #{@root}`
+				results = `cd #{@path} && git status && cd #{@root}`
 
-			  if results !~ /nothing to commit/ 
+				if results !~ /nothing to commit/
 					return true, "has local changes"
 				elsif results =~ /Your branch is ahead of/
 					return true, "has local changes"
 				elsif results =~ /Untracked files/
 					return true, "has local changes"
-			  else
+				else
 					return false, "has no local changes"
 				end
 			end
 		end
-	end	
+	end
 end

data/lib/projmgr/svn.rb

@@ -3,23 +3,23 @@
 require 'projmgr/scm'
 
 module ProjMgr
-	
+
 	# A parent class for interacting with a source code repository
 	#
 	# @author Jacob Hammack <jacob.hammack@hammackj.com>
 	class Svn < Scm
-		
+
 		# Checks out a svn repo and places it, in the path specified by the @path variable
 		#
 		# @return [String] The results from the 'svn checkout' command
 		def checkout
 			if path_exists? == true
 				return "path exists, cannot checkout onto an existing repo"
-			else		
-				parent = project_parent_directory	
-				
+			else
+				parent = project_parent_directory
+
 				results = `cd #{parent} && svn checkout #{@url} #{@project} && cd #{@root}`
-				
+
 				if results =~ /Could not resolve hostname/
 					return "unable to resolve hostname"
 				else
@@ -27,18 +27,22 @@ module ProjMgr
 				end
 			end
 		end
-		
+
 		# Checks for updates in the target repo
-		# 
+		#
 		# @return [String] the results of 'git pull' on the target repository
 		def update
 			if path_exists? == true
-		  	results = `cd #{@path} && svn stat && svn update && cd #{@root}`
-			else		
+				results = `cd #{@path} && svn stat && svn update && cd #{@root}`
+			else
 				return "path does not exists, cannot update repository"
-		  end
-		
-			return results
+			end
+			
+			if results.split("\n").size == 1
+				return results.chomp
+			else
+				return "\n" + results
+			end
 		end
 
 		# Checks for local changes in the target repository
@@ -47,9 +51,9 @@ module ProjMgr
 		def has_local_changes?
 			if path_exists? == false
 				return false, "Path does not exists, please check the path or check it out"
-			else 
+			else
 				results = `cd #{@path} && svn stat && cd #{@root}`
-								
+
 				if results.length > 0
 					return true, "has local changes"
 				else

data/projmgr.gemspec

@@ -6,28 +6,27 @@ $:.unshift(File.join(File.dirname(base), 'lib'))
 require 'projmgr'
 
 Gem::Specification.new do |s|
-	s.name 									= ProjMgr::APP_NAME
-	s.version 							= ProjMgr::VERSION
-	s.homepage 							= "http://github.com/hammackj/projmgr/"
-	s.summary 							= ProjMgr::APP_NAME
-	s.description 					= "#{ProjMgr::APP_NAME} is a source code managment tool for automating project managment"
+	s.name									= ProjMgr::APP_NAME
+	s.version								= ProjMgr::VERSION
+	s.homepage							= "http://github.com/hammackj/projmgr/"
+	s.summary								= ProjMgr::APP_NAME
+	s.description						= "#{ProjMgr::APP_NAME} is a source code managment tool for automating project managment"
 	s.license								= "BSD"
-	
-	s.author 								= "Jacob Hammack"
-	s.email 								= "jacob.hammack@hammackj.com"
-	
-	s.files 								= Dir['[A-Z]*'] + Dir['lib/**/*'] + ['projmgr.gemspec']
-	s.default_executable 		= ProjMgr::APP_NAME
-	s.executables 					= [ProjMgr::APP_NAME]
-	s.require_paths 				= ["lib"]
-	
-	s.required_rubygems_version = ">= 1.3.6"
-	s.rubyforge_project         = ProjMgr::APP_NAME
-	
+
+	s.author								= "Jacob Hammack"
+	s.email									= "jacob.hammack@hammackj.com"
+
+	s.files									= Dir['[A-Z]*'] + Dir['lib/**/*'] + ['projmgr.gemspec']
+	s.default_executable		= ProjMgr::APP_NAME
+	s.executables						= [ProjMgr::APP_NAME]
+	s.require_paths					= ["lib"]
+
+	s.required_rubygems_version = ">= 1.5.2"
+	s.rubyforge_project					= ProjMgr::APP_NAME
+
 	s.add_development_dependency("rspec", ">= 2.5.0")
 	s.add_development_dependency("rcov", ">= 0.9.9")
-	
-	s.has_rdoc 							= 'yard'
-	s.extra_rdoc_files 			= ["README.markdown", "LICENSE", "NEWS.markdown", "TODO.markdown"]
-	
+
+	s.has_rdoc							= 'yard'
+	s.extra_rdoc_files			= ["README.markdown", "LICENSE", "NEWS.markdown", "TODO.markdown"]
 end

metadata

@@ -2,7 +2,7 @@
 name: projmgr
 version: !ruby/object:Gem::Version 
   prerelease: 
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors: 
 - Jacob Hammack
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-02-24 00:00:00 -06:00
+date: 2011-05-10 00:00:00 -05:00
 default_executable: projmgr
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -79,7 +79,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: 1.3.6
+      version: 1.5.2
 requirements: []
 
 rubyforge_project: projmgr