gill 0.0.5 → 0.0.7

data/.gitignore

@@ -11,6 +11,11 @@ tmtags
 ## PROJECT::GENERAL
 coverage
 rdoc
+doc
+.yardoc
 pkg
 
 ## PROJECT::SPECIFIC
+.bundle/
+.document
+gill.gemspec

data/Gemfile

@@ -1,16 +1,13 @@
 source 'https://rubygems.org'
 
-group(:runtime) do
-  gem 'rainbow', '~> 1.1'
-end
-
 group(:development) do
   gem 'rake',			'~> 0.8.7'
-  gem 'jeweler',		'~> 1.4.0', :git => 'git://github.com/technicalpickles/jeweler.git'
+  gem 'bluecloth', '~> 2.0.7'
+  gem 'jeweler', '~> 1.4.0'
 end
 
 group(:doc) do
-  gem 'yard',		'~> 0.5.3'
+  gem 'yard', '~> 0.5.3'
 end
 
-gem 'rspec',	'~> 1.3.0', :group => [:development]
+gem 'rspec', '~> 1.3.0', :group => [:development]

data/README.rdoc

@@ -10,51 +10,68 @@ Files created by gill:
 
  gem install gill
  
-* NOTE: if you are using gill <= 0.0.3 please upgrade to version >= 0.0.4.
+* NOTE: if you are using gill <= 0.0.3 please upgrade to version >= 0.0.6.
 
 == Example
 
 Gill Usage:
 
  $ gill --help
- Gill - Version: 0.0.1 - Git, Clone, Cleanliness.
- Usage: gill [TYPE]:[FOLDER]:[URI]
- Example: gill ruby:somelib:http://example.com/some_lib.git
+ Gill - Git, Clone, Cleanliness.
+ Usage: gill git://host/repository.git#category/sub-category/...
 
-     -l, --list                       List Gilled Repos.
-     -r, --remove                     Remove a Gilled Repo. ie. -r ruby:somelib
+     -l, --list                       List all cloned repositories.
+     -r, --remove                     Remove a cloned repository. ie. -r category#folder
      -h, --help                       This help summary page.
      -v, --version                    Version number
 
-Cloning a git repo with gill:
 
- $ gill rails:snorby:git@github.com:mephux/Snorby.git 
- Initialized empty Git repository in /Users/mephux/Source/rails/snorby/.git/
+Cloning a git repository with gill:
+
+ $ gill https://mephux@github.com/mephux/Snorby.git#rails#snorby-dev
+ Initialized empty Git repository in /Users/mephux/Source/rails/snorby-dev/.git/
  remote: Counting objects: 7958, done.
  remote: Compressing objects: 100% (3367/3367), done.
  remote: Total 7958 (delta 4199), reused 7946 (delta 4193)
  Receiving objects: 100% (7958/7958), 8.59 MiB | 568 KiB/s, done.
  Resolving deltas: 100% (4199/4199), done.
 
-This will create a folder called 'rails' and clone the repo inside a folder called 'snorby'. ie: '/Users/mephux/Source/rails/snorby/'
-
-  gill jruby:jruby:http://github.com/jruby/jruby.git
-  gill security:ronin:http://github.com/ronin-ruby/ronin.git
-  gill work:project:uri_to_work_proejct
-  etc...
+This will create a folder called 'rails' and clone the repo inside a folder called 'snorby'. ie: '/Users/mephux/Source/rails/snorby-dev/'
+  
+  gill https://mephux@github.com/mephux/gill.git#ruby
+  gill http://github.com/jruby/jruby.git#jruby
+  gill http://github.com/ronin-ruby/ronin.git#security#ronin-dev
+  gill http://github.com/postmodern/spidr.git#security#spidr-dev
+  gill https://mephux@github.com/mephux/Snorby.git#rails/3.0#snorby/dev/beta2.0
+  
+etc...
 
 Listing cloned repositories:
 
  $ gill --list
- Listing Cloned Repositories:
 
- 	rails:
- 		snorby => git@github.com:mephux/Snorby.git
- 		
+ *** Listing Cloned Repositories ***
+
+ 	vim:
+ 	  neocomplcache => http://github.com/Shougo/neocomplcache.git
+
+ 	jruby:
+ 	  jruby => http://github.com/jruby/jruby.git
+
+ 	ruby:
+ 	  gill => git@github.com:mephux/gill.git
+
+ 	security:
+ 	  ronin-dev => http://github.com/ronin-ruby/ronin.git
+ 	  spidr-dev => http://github.com/postmodern/spidr.git
+
+ 	rails/3.0:
+ 	  snorby/dev/beta2.0 => https://mephux@github.com/mephux/Snorby.git
+
 Removing cloned repositories:
 
- $ gill -r rails:snorby
- Removing: rails => snorby
+ $ gill -r rails/3.0#snorby/dev/beta2.0
+ Removing: rails/3.0 => snorby/dev/beta2.0
  Repository Removed Successfully.
  Updating Cache...
  

data/Rakefile

@@ -13,16 +13,22 @@ require 'rake'
 require 'jeweler'
 require './lib/gill/version.rb'
 
-Jeweler::Tasks.new do |gem|
-  gem.name = 'gill'
-  gem.version = Gill::VERSION
-  gem.license = 'MIT'
-  gem.summary = %Q{Gill- Git, Clone, Cleanliness.}
-  gem.description = %Q{Gill is a simple Ruby app to help keep your git clones clean and organized.}
-  gem.email = 'dustin.webber@gmail.com'
-  gem.homepage = 'http://github.com/mephux/gill'
-  gem.authors = ['Dustin Willis Webber']
-  gem.has_rdoc = 'yard'
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = 'gill'
+    gem.version = Gill::VERSION
+    gem.license = 'MIT'
+    gem.summary = %Q{Gill- Git, Clone, Cleanliness.}
+    gem.description = %Q{Gill is a simple Ruby app to help keep your git clones clean and organized.}
+    gem.email = 'dustin.webber@gmail.com'
+    gem.homepage = 'http://github.com/mephux/gill'
+    gem.authors = ['Dustin Willis Webber']
+    gem.has_rdoc = 'yard'
+  end
+  Jeweler::GemcutterTasks.new
+rescue LoadError
+  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
 end
 
 require 'spec/rake/spectask'

data/gill.gemspec

@@ -5,51 +5,56 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gill}
-  s.version = "0.0.5"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dustin Willis Webber"]
-  s.date = %q{2010-06-27}
+  s.date = %q{2010-07-01}
   s.default_executable = %q{gill}
   s.description = %q{Gill is a simple Ruby app to help keep your git clones clean and organized.}
   s.email = %q{dustin.webber@gmail.com}
   s.executables = ["gill"]
   s.extra_rdoc_files = [
     "LICENSE",
-    "README.rdoc"
+     "README.rdoc"
   ]
   s.files = [
-    ".bundle/config",
-    ".document",
     ".gitignore",
-    ".specopts",
-    ".yardopts",
-    "Gemfile",
-    "LICENSE",
-    "README.rdoc",
-    "Rakefile",
-    "bin/gill",
-    "gill.gemspec",
-    "lib/gill.rb",
-    "lib/gill/app.rb",
-    "lib/gill/config.rb",
-    "lib/gill/git.rb",
-    "lib/gill/parse.rb",
-    "lib/gill/remove.rb",
-    "lib/gill/version.rb",
-    "spec/gill_spec.rb",
-    "spec/spec.opts",
-    "spec/spec_helper.rb"
+     ".specopts",
+     ".yardopts",
+     "Gemfile",
+     "LICENSE",
+     "README.rdoc",
+     "Rakefile",
+     "bin/gill",
+     "gill.gemspec",
+     "lib/gill.rb",
+     "lib/gill/app.rb",
+     "lib/gill/config.rb",
+     "lib/gill/exceptions/argument_error.rb",
+     "lib/gill/exceptions/directory_error.rb",
+     "lib/gill/exceptions/error.rb",
+     "lib/gill/exceptions/repository_error.rb",
+     "lib/gill/git.rb",
+     "lib/gill/parse.rb",
+     "lib/gill/remove.rb",
+     "lib/gill/version.rb",
+     "spec/gill_spec.rb",
+     "spec/parse_spec.rb",
+     "spec/spec.opts",
+     "spec/spec_helper.rb"
   ]
   s.has_rdoc = %q{yard}
   s.homepage = %q{http://github.com/mephux/gill}
   s.licenses = ["MIT"]
+  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
   s.rubygems_version = %q{1.3.6}
   s.summary = %q{Gill- Git, Clone, Cleanliness.}
   s.test_files = [
     "spec/gill_spec.rb",
-    "spec/spec_helper.rb"
+     "spec/parse_spec.rb",
+     "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
@@ -57,21 +62,9 @@ Gem::Specification.new do |s|
     s.specification_version = 3
 
     if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<rainbow>, ["~> 1.1"])
-      s.add_development_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_development_dependency(%q<jeweler>, ["~> 1.4.0"])
-      s.add_development_dependency(%q<rspec>, ["~> 1.3.0"])
     else
-      s.add_dependency(%q<rainbow>, ["~> 1.1"])
-      s.add_dependency(%q<rake>, ["~> 0.8.7"])
-      s.add_dependency(%q<jeweler>, ["~> 1.4.0"])
-      s.add_dependency(%q<rspec>, ["~> 1.3.0"])
     end
   else
-    s.add_dependency(%q<rainbow>, ["~> 1.1"])
-    s.add_dependency(%q<rake>, ["~> 0.8.7"])
-    s.add_dependency(%q<jeweler>, ["~> 1.4.0"])
-    s.add_dependency(%q<rspec>, ["~> 1.3.0"])
   end
 end
 

data/lib/gill/app.rb

@@ -1,43 +1,65 @@
 require 'gill/config'
 require 'gill/git'
-require 'fileutils'
 require 'gill/remove'
 require 'gill/parse'
 require 'gill/version'
-require 'rainbow'
+
+require 'gill/exceptions/error'
+require 'gill/exceptions/argument_error'
+require 'gill/exceptions/repository_error'
+require 'gill/exceptions/directory_error'
+
+require 'fileutils'
 require 'yaml'
 require 'optparse'
 
 module Gill
 
+  #
   # Load Gill Configuration
+  #
   GILL_CONFIG = Gill::Config.new.yaml
 
+  #
+  # Run Gill
+  #
   def Gill.run
+    Gill.check_cache
     Gill.optparse(*ARGV)
     begin
 
-      path = Parse.new(@options[:uri])
-            
-      if path.valid?
-        gillgit = Git.new(path.type, path.folder, path.repo)
-        gillgit.clone
-      else
-        STDERR.puts "Gill - Version: #{Gill::VERSION}\n"
-        STDERR.puts "Error: Not a valid git repository \"#{path.repo}\" or is currently not supported."
-      end
-      
-    rescue TypeError
-      STDERR.puts "Gill - Version: #{Gill::VERSION}\n"
-      STDERR.puts "Error: Please make sure to remove all whitespace from types and folder names."
+      uri = Parse.new(@options[:uri])
+      git = Git.new(uri.category, uri.folder, uri.repo)
+      git.clone
+
+    rescue TypeError => e
+      STDERR.puts "Error: #{e}\nError: Please make sure to remove all whitespace from the category and/or folder name."
     rescue => e
-      STDERR.puts "Gill - Version: #{Gill::VERSION}\n"
       STDERR.puts "Error: #{e}"
     end
   end
 
   private
 
+
+    def Gill.check_cache
+      cache = GILL_CONFIG[:cache]
+      @new_cache = YAML.load_file(GILL_CONFIG[:cache])
+      source_dir = GILL_CONFIG[:source]
+      @new_cache.each do |key,value|
+        if File.directory?("#{source_dir}/#{key}")
+          value.each do |skey,svalue|
+            unless File.directory?("#{source_dir}/#{key}/#{skey}")
+              @new_cache[:"#{key}"].delete(:"#{skey}")
+            end
+          end
+        else
+          @new_cache.delete(:"#{key}")
+        end
+      end
+      Gill::Config.rebuild_cache(cache, @new_cache)
+    end
+
     def Gill.error
       STDERR.puts "#{@opts}\n"
       exit -1
@@ -49,7 +71,7 @@ module Gill
       cache.each do |type,repos|
         STDERR.puts "\t#{type}:"
         repos.each do |repo|
-          STDERR.puts "\t  #{repo[0]} => " + "#{repo[1]}".foreground(:green)
+          STDERR.puts "\t  #{repo[0]} => " + "#{repo[1]}"
         end
         STDERR.puts "\n"
       end
@@ -57,9 +79,13 @@ module Gill
     end
 
     def Gill.remove
-      remove = @options[:remove].split(':', 2)
-      removerepo = Remove.new(remove[0], remove[1]).remove_repo
-      STDERR.puts "\n"
+      begin
+        Remove.new(@options[:remove]).remove_repo
+      rescue Gill::DirectoryError => e
+        STDERR.puts "Error: #{e}"
+      rescue => e
+        STDERR.puts "Error: #{e}"
+      end
       exit -1
     end
 
@@ -68,13 +94,13 @@ module Gill
 
       @options = {}
 
-      @opts.banner = "Gill - Version: #{Gill::VERSION} - Git, Clone, Cleanliness.\nUsage: gill [TYPE]:[FOLDER]:[URI]\nExample: gill ruby:somelib:http://example.com/some_lib.git\n\n"
+      @opts.banner = "Gill - Git, Clone, Cleanliness.\nUsage: gill git://host/repository.git#category/sub-category/...\n\n"
 
       @opts.on('-l','--list','List all cloned repositories.') do |list|
         @options[:list] = list
       end
 
-      @opts.on('-r ','--remove ','Remove a cloned repository. ie. -r ruby:somelib') do |remove|
+      @opts.on('-r ','--remove ','Remove a cloned repository. ie. -r category#folder') do |remove|
         @options[:remove] = remove
       end
 
@@ -83,7 +109,7 @@ module Gill
       end
 
       @opts.on('-v','--version','Version number') do |version|
-        STDERR.puts "Gill - Version: #{Gill::VERSION}"
+        STDERR.puts "Version: #{Gill::VERSION}"
         exit -1
       end
 

data/lib/gill/config.rb

@@ -5,12 +5,15 @@ module Gill
     attr_accessor :config
 
     def initialize
-      @home ||= File.expand_path('~')
-      @path ||= File.join(@home, '.gillrc')
-      @cache ||= File.join(@home, '.gillcache')
+      @home = File.expand_path('~')
+      @path = File.join(@home, '.gillrc')
+      @cache = File.join(@home, '.gillcache')
       self.setup
     end
     
+    #
+    # Build the initial .gillrc configuration file.
+    #
     def build_config
       config = { :home => @home, :config => @path, :source => "#{@home}/source", :cache => @cache }
       File.open(@path, 'w') do |out|
@@ -18,12 +21,21 @@ module Gill
       end
     end
 
+    #
+    # Build the initial source directory configured in the .gillrc file.
+    #
+    # The initial source directory is only created if it does not exist.
+    #
     def build_source_folder
       unless File.directory?(self.config[:source])
+        STDERR.puts "Creating Source Directory: " + "#{self.config[:source]}"
         Dir.mkdir(self.config[:source])
       end
     end
     
+    #
+    # Build the inital .gillache file in the user home directory.
+    #
     def build_cache
       cache = { }
       File.open(@cache, 'w') do |out|
@@ -31,23 +43,36 @@ module Gill
       end
     end
     
+    #
+    # Rebuild cache writes updated entries to the .gillache file in the user home directory.
+    #
     def self.rebuild_cache(path, cache)
       File.open(path, 'w+') do |out|
         YAML.dump(cache, out)
       end
     end
 
+    #
+    # Setup - Determine if the current user has the proper gill configuration file in place
+    # or return the current configuration files.
+    #
     def setup
       if File.exists?("#{@path}")
         self.build_cache unless File.exists?("#{@cache}")
         self.config = YAML.load_file(@path)
+        self.build_source_folder
       else
         self.build_config
         self.build_cache unless File.exists?("#{@cache}")
         self.config = YAML.load_file(@path)
+        self.build_source_folder
       end
     end
 
+    #
+    # Yaml
+    # return the configuration file in yaml format.
+    #
     def yaml
       self.config
     end

data/lib/gill/exceptions/argument_error.rb

@@ -0,0 +1,5 @@
+module Gill
+  class ArgumentError < Error
+    
+  end
+end

data/lib/gill/exceptions/directory_error.rb

@@ -0,0 +1,5 @@
+module Gill
+  class DirectoryError < Error
+    
+  end
+end

data/lib/gill/exceptions/error.rb

@@ -0,0 +1,4 @@
+module Gill
+  class Error < RuntimeError
+  end
+end

data/lib/gill/exceptions/repository_error.rb

@@ -0,0 +1,5 @@
+module Gill
+  class RepositoryError < Error
+    
+  end
+end

data/lib/gill/git.rb

@@ -1,42 +1,50 @@
 module Gill
   class Git
 
-    def initialize(type,folder,path)
-      @path = path
-      @type = type
-      @folder = folder
-      @cache = GILL_CONFIG[:cache]
-      @source = GILL_CONFIG[:source]
-      @type_path = File.join(@source, @type)
-      @folder_path = File.join(@type_path, @folder)
+    def initialize(category,folder,repo)
+      @repo, @category, @folder = repo, category, folder
+      @cache, @source = GILL_CONFIG[:cache], GILL_CONFIG[:source]
+      @category_path = File.join(@source, @category)
+      if @folder
+        @folder_path = File.join(@category_path, @folder)
+      else
+        @folder_path = @category_path
+      end
     end
 
     def build_cache
       old_cache = YAML.load_file(@cache)
-      if old_cache[:"#{@type}"]
-        old_cache[:"#{@type}"] = old_cache[:"#{@type}"].merge!({:"#{@folder}" => @path})
+      if old_cache[:"#{@category}"]
+        old_cache[:"#{@category}"] = old_cache[:"#{@category}"].merge!({:"#{@folder}" => @repo})
       else
-        old_cache = old_cache.merge!({:"#{@type}" => {:"#{@folder}" => @path}})
+        old_cache = old_cache.merge!({:"#{@category}" => {:"#{@folder}" => @repo}})
       end
       Gill::Config.rebuild_cache(@cache, old_cache)
     end
 
-    def build_type_folder
-      unless File.directory?(@type_path)
-        Dir.mkdir(@type_path)
-        unless File.directory?(@folder_path)
-          Dir.mkdir(@folder_path)
+    def build_type_folder(make_folder=true)
+      unless File.directory?(@category_path)
+        FileUtils.mkdir_p(@category_path)
+        if make_folder
+          unless File.directory?(@folder_path)
+            FileUtils.mkdir_p(@folder_path)
+          end
         end
       end
     end
 
     def clone
-      if File.directory?(@folder_path)
-        STDERR.puts "Gill - Version: #{Gill::VERSION}\n"
-        STDERR.puts "destination path '#{@folder_path}' already exists and is not an empty directory.\n"
+      if File.directory?(@folder_path) && @folder
+        raise(DirectoryError, "destination path '#{@folder_path}' already exists and is not an empty directory.")
       else
-        build_type_folder
-        build_cache if system('git', 'clone', @path, @folder_path)
+        if @folder
+          build_type_folder
+          build_cache if system('git', 'clone', @repo, @folder_path)
+        else
+          build_type_folder(false)
+          Dir.chdir(@folder_path)
+          build_cache if system('git', 'clone', @repo)
+        end
       end
     end
 

data/lib/gill/parse.rb

@@ -1,34 +1,66 @@
 module Gill
-  
+
   class Parse
-    
+
+    attr_accessor :category, :folder, :repo
+
     def initialize(uri)
-      @uri = uri.split(':', 3)
+      @uri = uri.split(/\#/)
+      self.start
     end
-    
-    def type
-      @uri.first
+
+    def category=(category)
+      @category = category
     end
-    
-    def folder
-      @uri[1]
+
+    def folder=(folder)
+      @folder = folder
     end
-    
-    def repo
-      @uri.last
+
+    def repo=(repo)
+      @repo = repo
     end
-    
-    def valid?
-      if type && folder && repo
-        if repo[/^(http\:|https\:|git\:)+/i] && repo[/\.git/]
-          return true
-        else
-          return false
-        end
+
+    def start
+      self.category = @uri.first
+      if @uri.length == 3
+        self.repo = @uri.first if valid?(@uri.first)
+        self.category = @uri[1]
+        self.folder = @uri.last      
+      elsif @uri.length == 2
+        self.category = @uri.last
+        self.repo = @uri.first if valid?(@uri.first)
+        self.folder = get_folder(self.repo)
+      elsif @uri.length < 2
+        raise(ArgumentError, "too few arguments.")
       else
-        return false
+        raise(ArgumentError, "too many arguments.")
       end
     end
     
+    def get_folder(repo)
+      if repo =~ /\.git/i
+        repo_name = repo.match(/\S+[\/|\:](\S+)\.git/i)[1]
+      else
+        repo_name = repo.match(/\S+[\/|\:](\S+)\Z/i)[1]
+      end
+      repo_name
+    end
+
+    def valid?(repo)
+      case repo
+        when repo[/\A(http|https|git)\:\/\/\S+[\:|\/]\S+[\.git|\Z]\Z/i]
+          return repo
+        when repo[/http\:\/\/\S+\Z|https\:\/\/\S+\Z|git\:\/\/\S+\Z/i]
+          return repo
+        when repo[/\A(\S+\@\b\d{1,3}\.\d{1,3}\.\d{1,3}\.\d{1,3}\b\:\S+\S+[\.git|\Z])\Z/i]
+          return repo
+        when repo[/\A\S+\@\S+[\:|\/]\S+[\.git|\Z]\Z/i]
+          return repo
+        else
+          raise(RepositoryError, 'not a git repository.')
+      end
+    end
+
   end
-end
+end

data/lib/gill/remove.rb

@@ -2,24 +2,24 @@ module Gill
 
   class Remove
 
-    def initialize(type,folder)
-
-      @type = type
-      @folder = folder
+    def initialize(args)
+      data = args.split('#')
+      raise(ArgumentError, 'Wrong number of arguments.') if data.length != 2
+      @category = data.first
+      @folder = data.last
       @cache = GILL_CONFIG[:cache]
       @source = GILL_CONFIG[:source]
-
     end
 
     def remove_cache
 
       old_cache = YAML.load_file(@cache)
 
-      if old_cache[:"#{@type}"]
-        old_cache[:"#{@type}"].delete(:"#{@folder}")
+      if old_cache[:"#{@category}"]
+        old_cache[:"#{@category}"].delete(:"#{@folder}")
 
-        if old_cache[:"#{@type}"].empty?
-          old_cache.delete(:"#{@type}")
+        if old_cache[:"#{@category}"].empty?
+          old_cache.delete(:"#{@category}")
           Gill::Config.rebuild_cache(@cache, old_cache)
           return true
 
@@ -35,31 +35,30 @@ module Gill
 
     def remove_repo
 
-      type_folder = "#{@source}/#{@type}"
-      folder = "#{@source}/#{@type}/#{@folder}"
+      type_folder = "#{@source}/#{@category}"
+      folder = "#{@source}/#{@category}/#{@folder}"
 
       if File.directory?(type_folder) && File.directory?(folder) && !YAML.load_file(@cache).empty?
 
-        if YAML.load_file(@cache)[:"#{@type}"][:"#{@folder}"]
-          STDERR.puts "Removing: #{@type} => " + "#{@folder}".foreground(:red)
+        if YAML.load_file(@cache)[:"#{@category}"][:"#{@folder}"]
+          STDERR.puts "Removing: #{@category} => " + "#{@folder}"
           FileUtils.rm_rf(folder)
           if remove_cache
-            STDERR.puts "Reviewing folder #{@type}.".foreground(:green)
+            STDERR.puts "Reviewing folder #{@category}."
             if Dir.enum_for(:foreach, type_folder).any? {|n| /\A\.\.?\z/ !~ n}
-              STDERR.puts "Skipping folder #{@type} - directory not empty.".foreground(:green)
+              STDERR.puts "Skipping folder #{@category} - directory not empty."
             else
-              STDERR.puts "Removing folder #{@type} - directory empty.".foreground(:green)
+              STDERR.puts "Removing folder #{@category} - directory empty."
               FileUtils.rm_rf(type_folder)
             end
           end
-          STDERR.puts "Repository Removed Successfully.".foreground(:green)
-          STDERR.puts "Updating Gill Cache...".foreground(:green)
+          STDERR.puts "Repository Removed Successfully."
+          STDERR.puts "Updating Gill Cache..."
         end
 
       else
         remove_cache
-        STDERR.puts "The directory #{@source}/#{@type}/#{@folder} does not exist or was not cloned with gill."
-
+        raise(DirectoryError, "The directory #{@source}/#{@category}/#{@folder} does not exist or was not cloned with gill.")
       end
     end
 

data/lib/gill/version.rb

@@ -1,4 +1,4 @@
 module Gill
   # Gill Version
-  VERSION = '0.0.5'
+  VERSION = '0.0.7'
 end

data/spec/gill_spec.rb

@@ -1,7 +1,7 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "Gill" do
-  it "fails" do
-    fail "hey buddy, you should probably rename this file and start specing for real"
+describe Gill do
+  it "should define a VERSION constant" do
+    Gill.should be_const_defined('VERSION')
   end
 end

data/spec/parse_spec.rb

@@ -0,0 +1,37 @@
+require 'gill/parse'
+
+describe Parse do
+  
+  before(:all) do
+    @p = Parse.new("https://mephux@github.com/mephux/gill.git#ruby")
+    @p1 = Parse.new("http://mephux@github.com:gill.git#ruby#gill-dev")
+    @p2 = Parse.new("git://mephux@github.com/3/3/3/mephux/gill.git#dev")
+    @p3 = Parse.new("mephux@github.com/gill.git#test-123")
+    @p4 = Parse.new("mephux@127.0.0.1:gill.git#ruby/w0ot/w0ot/test#hello")
+  end
+  
+  it "should grab the repository name correctly" do
+    @p.folder.should == 'gill'
+    @p1.folder.should == 'gill-dev'
+    @p2.folder.should == 'gill'
+    @p3.folder.should == 'gill'
+    @p4.folder.should == 'hello'
+  end
+  
+  it "should grab the repository uri correctly" do
+    @p.repo.should == 'https://mephux@github.com/mephux/gill.git'
+    @p1.repo.should == 'http://mephux@github.com:gill.git'
+    @p2.repo.should == 'git://mephux@github.com/3/3/3/mephux/gill.git'
+    @p3.repo.should == 'mephux@github.com/gill.git'
+    @p4.repo.should == 'mephux@127.0.0.1:gill.git'
+  end
+  
+  it "should grab the repository category name correctly" do
+    @p.category.should == 'ruby'
+    @p1.category.should == 'ruby'
+    @p2.category.should == 'dev'
+    @p3.category.should == 'test-123'
+    @p4.category.should == 'ruby/w0ot/w0ot/test'
+  end
+  
+end

data/spec/spec_helper.rb

@@ -1,9 +1,7 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'gill'
+require 'rubygems'
+gem 'rspec', '>=1.3.0'
 require 'spec'
-require 'spec/autorun'
 
-Spec::Runner.configure do |config|
-  
-end
+require 'gill/version'
+
+include Gill

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Dustin Willis Webber
@@ -14,64 +14,10 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-27 00:00:00 -04:00
+date: 2010-07-01 00:00:00 -04:00
 default_executable: gill
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
-  prerelease: false
-  type: :runtime
-  name: rainbow
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 8
-        - 7
-        version: 0.8.7
-  prerelease: false
-  type: :development
-  name: rake
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 4
-        - 0
-        version: 1.4.0
-  prerelease: false
-  type: :development
-  name: jeweler
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  requirement: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 3
-        - 0
-        version: 1.3.0
-  prerelease: false
-  type: :development
-  name: rspec
-  version_requirements: *id004
+dependencies: []
+
 description: Gill is a simple Ruby app to help keep your git clones clean and organized.
 email: dustin.webber@gmail.com
 executables: 
@@ -82,8 +28,6 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
-- .bundle/config
-- .document
 - .gitignore
 - .specopts
 - .yardopts
@@ -96,11 +40,16 @@ files:
 - lib/gill.rb
 - lib/gill/app.rb
 - lib/gill/config.rb
+- lib/gill/exceptions/argument_error.rb
+- lib/gill/exceptions/directory_error.rb
+- lib/gill/exceptions/error.rb
+- lib/gill/exceptions/repository_error.rb
 - lib/gill/git.rb
 - lib/gill/parse.rb
 - lib/gill/remove.rb
 - lib/gill/version.rb
 - spec/gill_spec.rb
+- spec/parse_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: yard
@@ -108,8 +57,8 @@ homepage: http://github.com/mephux/gill
 licenses: 
 - MIT
 post_install_message: 
-rdoc_options: []
-
+rdoc_options: 
+- --charset=UTF-8
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -135,4 +84,5 @@ specification_version: 3
 summary: Gill- Git, Clone, Cleanliness.
 test_files: 
 - spec/gill_spec.rb
+- spec/parse_spec.rb
 - spec/spec_helper.rb

data/.bundle/config

@@ -1,2 +0,0 @@
---- 
-BUNDLE_WITHOUT: ""

data/.document

@@ -1,5 +0,0 @@
-README.rdoc
-lib/**/*.rb
-bin/*
-features/**/*.feature
-LICENSE