gill 1.0.0 → 1.1.0

data/README.rdoc

@@ -24,12 +24,13 @@ Gill Usage:
  Gill - Git, Clone, Cleanliness.
  Usage: gill git://host/repository.git#category/sub-category/...
 
-    -l, --list                       List all cloned repositories.
-    -r, --remove                     Remove a cloned repository. ie. -r category#folder
-    -u, --update                     Update repository. ie. -u category#folder#branch
-    -i, --import                     Import untracked repository.
-    -h, --help                       This help summary page.
-    -v, --version                    Version number
+     -l, --list                       List all cloned repositories.
+     -p, --path                       Ouput the path of a repository. e.g. --path gill
+     -r, --remove                     Remove repository. e.g. -r category#repository
+     -u, --update                     Update repository. e.g. -u *gill*
+     -i, --import                     Import untracked repositories.
+     -h, --help                       This help summary page.
+     -v, --version                    Version number
 
 
 Cloning a git repository with gill:

data/lib/gill/cli.rb

@@ -11,13 +11,24 @@ require 'gill/exceptions'
 module Gill
 
   module CLI
+    # Include The Gill Helper Methods
     include Helper
 
+    #
+    # CLI.Pull
+    #
+    # @param [String] args Repository, folder name and/or repository name.
+    #
     def CLI.pull(args)
       begin
+        require 'rubygems'
+        require 'bundler'
         uri = Parse.new(args)
         git = Git.new(uri.category, uri.folder, uri.repo)
         git.clone
+      rescue LoadError
+        STDERR.puts "Count not load the bundler gem. Install it with 'gem install bundler'."
+        exit -1
       rescue TypeError => e
         STDERR.puts "Error: #{e}"
       rescue => e
@@ -40,7 +51,9 @@ module Gill
       end
     end
 
+    #
     # Update a gill repository.
+    #
     def CLI.update(repo_name)
       begin
         git = Git.new(false, repo_name, false)
@@ -55,18 +68,24 @@ module Gill
       end
     end
 
+    #
     # List all gill cloned repositories.
+    #
     def CLI.list
       Gill.config.list_entries
       exit -1
     end
 
+    #
     # Remove a gill cloned repository.
+    #
+    # @param [String] args The category and repository name to remove.
+    #
     def CLI.remove(args)
       begin
-        # Raise exception if the params are not seperated by a `#`.
-        raise(SyntaxError, "Invalid Syntax. Arguments must be separated by `#`") unless args =~ /\#/
-        Remove.new(args).remove_repo
+      # Raise exception if the params are not seperated by a `#`.
+      raise(SyntaxError, "Invalid Syntax. Arguments must be separated by `#`") unless args =~ /\#/
+      Remove.new(args).remove_repo
 
       rescue => e
         STDERR.puts "Error: #{e}"
@@ -89,15 +108,20 @@ module Gill
         CLI.list
       end
 
-      @opts.on('-r ','--remove ','Remove a cloned repository. ie. -r category#folder') do |remove|
+      @opts.on('-p ','--path ','Ouput the path of a repository. e.g. --path gill') do |repo_name|
+        Gill.config.find_repo_paths_by_name(repo_name)
+        exit -1
+      end
+
+      @opts.on('-r ','--remove ','Remove repository. e.g. -r category#repository') do |remove|
         CLI.remove(remove)
       end
 
-      @opts.on('-u ', '--update ','Update repository. ie. -u category#folder#branch') do |update|
+      @opts.on('-u ', '--update ','Update repository. e.g. -u *gill*') do |update|
         CLI.update(update)
       end
 
-      @opts.on('-i','--import','Import untracked repository.') do |import|
+      @opts.on('-i','--import','Import untracked repositories.') do |import|
         CLI.import
       end
 
@@ -111,23 +135,26 @@ module Gill
       end
 
       begin
-
         @args = @opts.parse!(args)
         usage if @args.empty? || @args[0].nil?
         CLI.pull(@args[0])
       rescue OptionParser::MissingArgument => e
-        gillerror e.message
-        SDTOUT.puts @opts
-        SDTOUT.puts "\n"
+        STDERR.puts e.message
+        STDOUT.puts @opts
+        STDOUT.puts "\n"
         exit -1
       rescue OptionParser::InvalidOption => e
-        gillerror e.message
-        SDTOUT.puts @opts
-        SDTOUT.puts "\n"
+        STDERR.puts e.message
+        STDOUT.puts @opts
+        STDOUT.puts "\n"
         exit -1
       end
     end
 
+    #
+    # Gill usage.
+    # @return [String] Gill Usage Information.
+    #
     def usage
       STDOUT.puts "#{@opts}\n"
       exit -1

data/lib/gill/config.rb

@@ -1,7 +1,5 @@
 module Gill
 
-  FROZENKEYS = [:version, :categories].freeze
-
   module Settings
 
     class Config
@@ -9,67 +7,112 @@ module Gill
 
       attr_reader :home, :config_path, :cache_path, :settings, :cache, :repos
 
+      #
+      # Initialize Gill Configuration
+      # 
+      # @param [String] home_path Override the default user home path.
+      #
       def initialize(home_path=nil)
         @home = home_path || File.expand_path('~')
         @settings_path = File.join(@home, '.gillrc')
         @cache_path = File.join(@home, '.gillcache')
+        Dir.chdir(@home)
         file_check!
         version_check!
         check_default_folders!
         self
       end
 
+      #
+      # Gill File Check
+      #
       def file_check!
-
         if File.exists?(@settings_path)
           load_gill_settings
         else
           setup_gill_settings
         end
-
         if File.exists?(@cache_path)
           load_gill_cache
         else
           setup_gill_cache
         end
-
       end
 
+      #
+      # Gill Categories
+      # 
+      # @return [Hash] Gill Category Hash
+      #
       def categories
         @repos = @cache[:categories]
       end
 
+      #
+      # Gill Source Path
+      # 
+      # @return [String] Source Path
+      #
       def source_path
         @source_path = @settings[:source]
       end
 
+      #
+      # Cache Path
+      # 
+      # @return [String] Gill Cache Path
+      #
       def cache_path
         @source_path = @settings[:cache]
       end
 
+      #
+      # Gill Settings Path
+      # 
+      # @return [String] Gill Settings Path
+      #
       def settings_path
         @settings_path = @settings[:settings]
       end
 
+      #
+      # Gill Default Path
+      # 
+      # @return [String] Gill Default Clone Path
+      #
       def default_path
         @default_path = @settings[:default]
       end
 
+      #
+      # Write Settings
+      # 
+      # @param [Hash] settings Hash To Write To The Gill Settings
+      #
       def write_settings(settings)
         File.open(@settings_path, 'w') do |out|
           YAML.dump(settings, out)
         end
       end
 
+      #
+      # Write Cache
+      # 
+      # @param [Hash] cache Hash To Write To The Gill Cache
+      #
       def write_cache(cache)
         File.open(@cache_path, 'w') do |out|
           YAML.dump(cache, out)
         end
       end
 
+      #
+      # List Gill Cloned Repos
+      # 
+      #
       def list_entries
         STDERR.puts green("\n*** Listing Cloned Repositories ***\n")
-        categories.each do |category,repos|
+        categories.sort.each do |category,repos|
           STDERR.puts "\t#{category}:"
           repos.each do |repo|
             STDERR.puts "\t  #{green(repo[0])} => " + "#{repo[1][:repo]}"
@@ -78,23 +121,30 @@ module Gill
         end
       end
 
+      #
+      # Clean Cache
+      # 
+      # Check the gill cache on load for missing
+      # values and remove.
+      #
       def clean_cache
         @clean_cache = Gill.config.cache
-
+        
         @clean_cache[:categories].each do |key,value|
-
           value.each do |k,v|
             @clean_cache[:categories][key.to_sym].delete(k.to_sym) unless File.directory?(v[:path].to_s)
           end
-
           @clean_cache[:categories].delete(key.to_sym) if @clean_cache[:categories][key.to_sym].empty?
-
         end
-
+        
         write_cache(@clean_cache)
-
       end
 
+      #
+      # Gill Paths
+      # 
+      # @return [Array] Array Of Gill Repo Paths
+      #
       def paths
         @paths = []
         Gill.config.categories.each do |key,value|
@@ -104,25 +154,44 @@ module Gill
         end
         @paths
       end
+      
+      #
+      # Find Repo
+      # 
+      # @param [String] repo_name Repository Name
+      # 
+      # @return [String] Repository Path 
+      #
+      def find_repo_paths_by_name(repo_name)
+        Gill.config.categories.each do |key,value|
+          value.each do |k,v|
+            STDOUT.puts "#{k} => #{green(v[:path])}" if repo_name =~ /#{k.to_s}/
+          end
+        end
+      end
 
       private
 
         def version_check!
           unless current_settings_version && current_cache_version
-            STDOUT.puts red("Your Gill configuration is outdated.")
-            STDOUT.puts red("The must upgrade the gill configuration files to #{Gill::VERSION} to continue.")
-
-            ask("Would you like to update them now?", :default => true) do
-              remove_gill_configuration_files
-              file_check!
-              version_check!
-            end
-
+            update_gill_settings
+            update_gill_cache
           end
         end
 
+        def update_gill_cache
+          update_cache = @cache
+          update_cache[:version] = VERSION
+          write_cache(update_cache)
+        end
+        
+        def update_gill_settings
+          update_settings = @settings
+          update_settings[:version] = VERSION
+          write_settings(update_settings)
+        end
+
         def remove_gill_configuration_files
-          STDOUT.puts red("NOTICE: If you modified any paths in the .gillrc you will have to reconfigure them.\n")
           FileUtils.rm_rf(@cache_path)
           FileUtils.rm_rf(@settings_path)
         end
@@ -164,8 +233,8 @@ module Gill
         end
 
         def check_default_folders!
-          FileUtils.mkdir(source_path) unless File.exists?(source_path) && File.directory?(source_path)
-          FileUtils.mkdir(default_path) unless File.exists?(default_path) && File.directory?(default_path)
+          FileUtils.mkdir_p(source_path)
+          FileUtils.mkdir_p(default_path)
         end
 
     end

data/lib/gill/core_extension/symbol.rb

@@ -0,0 +1,12 @@
+#
+# Addeds support for sorting
+# symbols in ruby >= 1.8.7.
+#
+class Symbol
+  include Comparable
+
+  def <=>(other)
+    self.to_s <=> other.to_s
+  end
+  
+end

data/lib/gill/exceptions/cache_error.rb

@@ -1,5 +1,4 @@
 module Gill
   class CacheError < Error
-    
   end
 end

data/lib/gill/exceptions/category_missing.rb

@@ -1,5 +1,4 @@
 module Gill
   class CategoryMissing < Error
-    
   end
 end

data/lib/gill/exceptions/directory_error.rb

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

data/lib/gill/exceptions/repository_error.rb

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

data/lib/gill/exceptions/repository_missing.rb

@@ -1,5 +1,4 @@
 module Gill
   class RepositoryMissing < Error
-    
   end
 end

data/lib/gill/exceptions/syntax_error.rb

@@ -1,5 +1,4 @@
 module Gill
   class SyntaxError < Error
-    
   end
 end

data/lib/gill/gill.rb

@@ -1,8 +1,6 @@
 require 'fileutils'
 require 'pathname'
 require 'yaml'
-require 'pp'
-
 require 'gill/cli'
 
 module Gill
@@ -11,15 +9,31 @@ module Gill
     include CLI
   end
 
+  #
+  # Gill config setter method
+  # 
+  # @param [Object] config Settings::Config Object
+  #
   def Gill.config=(config=nil)
     @config = config
   end
 
+  #
+  # Gill config getter method
+  # 
+  # @return [Object] Settings::Config Object
+  #
   def Gill.config
     return @config if defined?(@config)
     Gill.config = Settings::Config.new
   end
 
+  #
+  # Setup
+  # 
+  # Load the gill configuration 
+  # files and parse options.
+  #
   def Gill.setup
     Gill.config
     Gill.config.clean_cache

data/lib/gill/git.rb

@@ -1,83 +1,110 @@
 module Gill
 
+  #
+  # GIT ENV Variables that interfere with paths
+  #
+  ENV_BLACKLIST = %w(GIT_DIR GIT_INDEX_FILE GIT_WORK_TREE)
+
   class Git
     include Helper
     include Settings
 
     attr_reader :category, :category_path, :repo_name, :repo_path
 
+    #
+    # Initialize New Git Object
+    # 
+    # @param [String] category Repo Category
+    # 
+    # @param [String] repo_name Repo Name
+    # 
+    # @param [String] repo_uri Repo URI
+    #
     def initialize(category,repo_name,repo_uri)
 
       @repo_uri, @category, @repo_name = repo_uri, category, repo_name
 
-      if @category
-        @category_path = File.join(Gill.config.source_path, @category)
-      else
-        @category = basename(Gill.config.default_path).to_s
-        @category_path = File.join(Gill.config.source_path, @category)
-      end
+      @category ||= File.basename(Gill.config.default_path)
+      @category_path = File.join(Gill.config.source_path, @category)
 
       if @repo_name
         @repo_path = File.join(@category_path, @repo_name)
       else
         @repo_path = @category_path
       end
-      
-      # Used for updating cloned repositories.
-      @matches = []
     end
 
+    #
+    # Update Cache
+    # 
+    # Update the gill cache of a successful clone 
+    # 
+    # and write changes to the Gill global cache.
+    #
     def update_cache
       cache = Gill.config.cache
 
-      if cache[:categories].has_key?(@category.to_sym)
-        cache[:categories][@category.to_sym] = cache[:categories][@category.to_sym].merge!({@repo_name.to_sym => { :repo => @repo_uri, :path => @repo_path }})
-      else
-        cache[:categories].merge!(@category.to_sym => { @repo_name.to_sym => { :repo => @repo_uri, :path => @repo_path }})
-      end
+      cache[:categories][@category.to_sym] ||= {}
+      cache[:categories][@category.to_sym].merge!(
+        @repo_name.to_sym => {
+        :repo => @repo_uri,
+        :path => @repo_path
+        }
+      )
 
       Gill.config.write_cache(cache)
     end
 
+    #
     # Create the repository category folder if it does not exist.
     #
     # @param [Boolean] make_folder
     #   Pass false to ignore the creation of the passed gill folder
     #
     def build_category_folder
-      unless File.directory?(@category_path)
-        FileUtils.mkdir_p(@category_path)
+      FileUtils.mkdir_p(@category_path)
+    end
+
+    #
+    # Bundle
+    # 
+    # @param [String] path Repository Path
+    #
+    def bundle_from_gemfile(path)
+      Dir.chdir(path) do
+        return unless File.exists?('Gemfile')
+        ask "Would you like to `bundle install`?", :default => true do
+          system('bundle install')
+        end
       end
     end
-    
+
+    #
+    # Update/Bundle Repository
+    #
     def update
-      
-      paths = Dir[File.join(Gill.config.source_path,'**',@repo_name)]
-      
+      paths = Dir[File.join(Gill.config.source_path,'**',@repo_name)]      
       paths.each do |path|
-        
         if Gill.config.paths.include?(path)
-          
-          ask "Update #{blue(basename(path))} => #{green(path)}?", :default => true do
-            Dir.chdir(path)
-            system('git', 'pull', 'origin', 'master')
+          ask "Update #{basename(path)} => #{green(path)}?", :default => true do
+            Dir.chdir(path) do
+              system('git', 'pull', 'origin', 'master')
+              bundle_from_gemfile(path)
+            end
           end
-          
         end
-        
       end
     end
 
     #
     # Clone the passed repository uri name.
     #
-    def clone
-      if File.directory?(@repo_path)
-        raise(DirectoryError, red("destination path '#{@repo_path}' already exists and is not an empty directory."))
-      else
-        build_category_folder
-        update_cache if system('git', 'clone', @repo_uri, @repo_path)
-      end
+    def clone(bundle_install=true)
+      raise(DirectoryError, "destination path '#{@repo_path}' already exists and is not an empty directory.") if File.directory?(@repo_path)
+      build_category_folder
+      ENV_BLACKLIST.each(&(ENV.method(:delete)))
+      update_cache if system('git', 'clone', @repo_uri, @repo_path)
+      bundle_from_gemfile(@repo_path) if bundle_install
     end
 
 

data/lib/gill/helper.rb

@@ -1,35 +1,76 @@
 module Gill
-  
+
   module Helper
-    
+
+    #
+    # Green
+    #
+    # @param [String] msg Message to format.
+    #
+    # @return [String] Green Colored String
+    #
     def green(msg)
       "\e[32m#{msg}\e[0m"
     end
-    
+
+    #
+    # Blue
+    #
+    # @param [String] msg Message to format.
+    #
+    # @return [String] Blue Colored String
+    #
     def blue(msg)
       "\e[34m#{msg}\e[0m"
     end
-    
+
+    #
+    # Red
+    #
+    # @param [String] msg Message to format.
+    #
+    # @return [String] Red Colored String
+    #
     def red(msg)
       "\e[31m#{msg}\e[0m"
     end
-    
-    def gill_error(msg)
-      STDERR.puts red("#{msg}")
-      exit -1
-    end
-    
+
+    #
+    # Basename
+    #
+    # @param [String] path Path to extract the basename from
+    #
+    # @return [Object] Pathname Object
+    #
     def basename(path)
       Pathname.new(path).basename
     end
-    
+
+    #
+    # Parent Name
+    #
+    # @param [String] path Path to extract the parent folder name from
+    #
+    # @return [String] Parent Folder Name
+    #
     def parent(path)
       Pathname.new(path).parent
     end
-    
+
+    #
+    # Empty Folder?
+    #
+    # @param [String] folder Path to folder
+    #
+    # @return [true,false] Return true if the folder is empty.
+    #
     def folder_empty?(folder)
-      return true unless Dir.enum_for(:foreach, folder).any? {|n| /\A\.\.?\z/ !~ n}
-      false
+      if File.exists?(folder)
+        return true unless Dir.enum_for(:foreach, folder).any? {|n| /\A\.\.?\z/ !~ n}
+        return false
+      else
+        return false
+      end
     end
 
     # Prompt the use for input
@@ -38,17 +79,17 @@ module Gill
     #  Message to prompt for user input.
     #
     # @param [Hash] options
-    # 
+    #
     # @option options [Symbol, String] :default
     #   The default option for a return.
     #
     def ask(msg, options={})
       default = options[:default] || false
-      
+
       if default
-        STDOUT.print "#{msg} [Y/n] "
+        STDOUT.print "#{green("INFO")} #{msg} [Y/n] "
       else
-        STDOUT.print "#{msg} [y/N] "
+        STDOUT.print "#{green("INFO")} #{msg} [y/N] "
       end
       input = STDIN.gets.chomp
       STDOUT.flush
@@ -63,7 +104,7 @@ module Gill
         end
       end
     end
-    
+
   end
 
-end
+end

data/lib/gill/import.rb

@@ -12,6 +12,11 @@ module Gill
       STDOUT.puts "Please wait..."
     end
 
+    #
+    # Import
+    # 
+    # @param [String] path Override Default Import Path
+    #
     def import(path=nil)
 
       if path.nil?
@@ -23,16 +28,30 @@ module Gill
       search_folder(folder)
     end
 
-    def find_repo(path,file,parent)
+    #
+    # Find Repo
+    # 
+    # @param [String] path Folder Path
+    # 
+    # @param [String] repo_name Repository Name
+    # 
+    # @param [Object] parent Pathname Parent Pbject
+    #
+    def find_repo(path,repo_name,parent)
 
       if has_git_folder?(path)
-        check_move_import(basename(parent.path), file, path) if has_git_config?(path)
+        check_move_import(basename(parent.path), repo_name, path) if has_git_config?(path)
       else
         import(path)
       end
 
     end
 
+    #
+    # Search Folder
+    # 
+    # @param [String] folder Folder Path
+    #
     def search_folder(folder)
       current_folder = Dir.new(folder)
       
@@ -44,14 +63,28 @@ module Gill
 
     end
 
+    #
+    # Check, Move & import
+    # 
+    # @param [String] basename Basename Of The Repository Path
+    # 
+    # @param [String] repo_name Repository Name
+    # 
+    # @param [Object] path Pathname Parent Object
+    #
     def check_move_import(basename,repo_name,path)
       git_uri = git_uri_for(path)
 
       if repo_in_root(basename)
+        prompt = "Do you want to move #{basename(Gill.config.source_path)}/#{basename(repo_name)} to",
+        "#{basename(Gill.config.source_path)}/#{basename(Gill.config.default_path)}/#{basename(repo_name)}?"
         
-        ask "Do you want to move #{basename(Gill.config.source_path)}/#{basename(repo_name)} to #{basename(Gill.config.source_path)}/#{basename(Gill.config.default_path)}/#{basename(repo_name)}?", :default => false do
+        ask prompt, :default => false do
           move_root_repos_to_default_path(path,File.join(Gill.config.source_path, basename(Gill.config.default_path), repo_name))
-          add(basename(Gill.config.default_path),repo_name,git_uri,File.join(Gill.config.source_path, basename(Gill.config.default_path), repo_name))
+          add(basename(Gill.config.default_path),repo_name,git_uri,
+          File.join(Gill.config.source_path,
+          basename(Gill.config.default_path), 
+          repo_name))
         end
         
       else
@@ -60,15 +93,35 @@ module Gill
 
     end
 
+    #
+    # Has Git?
+    # 
+    # @param [String] path Folder Path
+    # 
+    # @return [true,false] Retrun true if the .git folder is found.
+    #
     def has_git_config?(path)
       return true if File.exist?(File.join(path, '.git', 'config'))
       false
     end
 
-    def move_root_repos_to_default_path(src,dest)
-      FileUtils.mv(src,dest)
+    #
+    # Move Repository
+    # 
+    # @param [String] source Repository Source Path
+    # @param [String] destination Repository Destination Path
+    #
+    def move_root_repos_to_default_path(source,destination)
+      FileUtils.mv(source,destination)
     end
 
+    #
+    # Git URI For Path
+    # 
+    # @param [String] path Repository Path
+    # 
+    # @return [String] Return the git uri for a path.
+    #
     def git_uri_for(path)
       File.open(File.join(path, '.git', 'config'), 'r') do |file|
         @git_uri = file.read[/url\s+\=\s+(\S+)/m,1]
@@ -77,16 +130,23 @@ module Gill
       @git_uri
     end
 
+    #
+    # Add Repository
+    # 
+    # @param [String] category Repository Category
+    # 
+    # @param [String] repo_name Repository Name
+    # 
+    # @param [String] git_uri Repository URI
+    # 
+    # @param [String] path Repository Path
+    #
     def add(category,repo_name,git_uri,path)
-
       if @updated_cache[:categories].has_key?(category.to_s.downcase.to_sym)
-
         @updated_cache[:categories][category.to_s.downcase.to_sym].merge!({repo_name.to_sym => {:repo => git_uri, :path => path}})
-
       else
         @updated_cache[:categories][category.to_s.downcase.to_sym] = { repo_name.to_sym => { :repo => git_uri, :path => path }}
       end
-
     end
 
     def update_cache
@@ -94,11 +154,27 @@ module Gill
       Gill.config.write_cache(@updated_cache)
     end
 
+    #
+    # Repository In Root
+    # 
+    # @param [String] folder Folder Path
+    # 
+    # @return [true,false] Return true if the Repository
+    # is in the root dir. 
+    #
     def repo_in_root(folder)
       return true if folder.to_s == basename(Gill.config.source_path).to_s
       false
     end
 
+    #
+    # Has Git Folder
+    # 
+    # @param [String] path Folder Path
+    # 
+    # @return [true,false] Return true if the folder
+    # path contains a .git folder.
+    #
     def has_git_folder?(path)
       temp = Dir.new(path)
 

data/lib/gill/remove.rb

@@ -4,6 +4,13 @@ module Gill
     include Helper
     include Settings
 
+    attr_reader :category, :category_path, :repo_name, :repo_path
+
+    #
+    # Initialize New Remove Object
+    # 
+    # @param [String] args Arguments - Path,RepoName,Category
+    #
     def initialize(args)
       @args = args.split(/\#/)
       @category, @repo_name = @args.first, @args.last
@@ -12,7 +19,12 @@ module Gill
       @parent_folders = []
     end
 
-    def remove_repo
+    #
+    # Remove Repo
+    # 
+    # @param [true,false] force Forcefully remove a repository.
+    #
+    def remove_repo(force=false)
       remove_repository_files if category_exists? && repo_exists?
     end
 
@@ -23,12 +35,13 @@ module Gill
       end
 
       def cached_repo_path
-        Gill.config.categories[@category.to_sym][@repo_name.to_sym][:path]
+        return Gill.config.categories[@category.to_sym][@repo_name.to_sym][:path] if Gill.config.categories.has_key?(@category.to_sym)
+        raise(CategoryMissing, red("Unknown Category: #{@category}"))
       end
 
       def category_exists?
         return true if File.directory?(@category_path)
-        if Gill.config.categories.has_key?(@category_path.to_sym)
+        if Gill.config.categories.has_key?(@category.to_sym)
           return true if File.directory?(cached_repo_path)
         end
         raise(CategoryMissing, red("Unknown Category: #{@category}"))
@@ -72,5 +85,4 @@ module Gill
       end
 
   end
-
 end

data/lib/gill/version.rb

@@ -1,3 +1,7 @@
 module Gill
-  VERSION = '1.0.0'
+  
+  # VERSION
+  # @return [String] Gill Version Number
+  VERSION = '1.1.0'
+  
 end

data/lib/gill.rb

@@ -1,2 +1,3 @@
 require 'gill/gill'
+require 'gill/core_extension/symbol'
 require 'gill/version'

data/spec/gill_spec.rb

@@ -6,4 +6,8 @@ describe Gill do
     Gill.should be_const_defined('VERSION')
   end
   
+  it "should define a ENV_BLACKLIST constant" do
+    Gill.should be_const_defined('ENV_BLACKLIST')
+  end
+  
 end

data/spec/git_spec.rb

@@ -7,13 +7,7 @@ describe Git do
     Gill.config = Settings::Config.new('/tmp')
     @uri = Parse.new('git://github.com/mephux/gill.git')
     @git = Git.new(@uri.category, @uri.folder, @uri.repo)
-    #@git.clone
-  end
-
-  after(:all) do
-    FileUtils.rm_rf('/tmp/source')
-    FileUtils.rm_rf('/tmp/.gillrc')
-    FileUtils.rm_rf('/tmp/.gillcache')
+    @git.clone(false)
   end
 
   it "should parse the empty category name as false" do
@@ -43,5 +37,37 @@ describe Git do
   it "should have a repo path of /tmp/source/misc/gill" do
     @git.repo_path.should == '/tmp/source/misc/gill'
   end
+  
+  it "should create a new folder for the cloned repo" do
+    File.should exist(File.join(Gill.config.default_path, @uri.folder))
+  end
+
+  it "should create a GemFile" do
+    File.should exist(File.join(Gill.config.default_path, @uri.folder, 'Gemfile'))
+  end
+
+  it "should delete GIT_DIR from ENV" do
+    ENV['GIT_DIR'].should be_nil
+  end
+  
+  it "should delete GIT_INDEX_FILE from ENV" do
+    ENV['GIT_INDEX_FILE'].should be_nil
+  end
+
+  it "should delete GIT_WORK_TREE from ENV" do
+    ENV['GIT_WORK_TREE'].should be_nil
+  end
+
+  it "should not propegate GIT_DIR" do
+    `echo $GIT_DIR`.strip.should be_empty
+  end
+
+  it "should not propegate GIT_INDEX_FILE" do
+    `echo $GIT_INDEX_FILE`.strip.should be_empty
+  end
+
+  it "should not propegate GIT_WORK_TREE" do
+    `echo $GIT_WORK_TREE`.strip.should be_empty
+  end
 
 end

data/spec/remove_spec.rb

@@ -0,0 +1,26 @@
+require 'spec_helper'
+require "gill/gill"
+
+describe Remove do
+
+  before(:all) do
+    Gill.config = Settings::Config.new('/tmp')
+    @remove = Remove.new('misc#gill')
+    @remove.remove_repo(true)
+  end
+
+  after(:all) do
+    FileUtils.rm_rf('/tmp/source')
+    FileUtils.rm_rf('/tmp/.gillrc')
+    FileUtils.rm_rf('/tmp/.gillcache')
+  end
+
+  it "should parse the remove category name as misc" do
+    @remove.category.should == 'misc'
+  end
+
+  it "should parse the repo_path as /tmp/source/misc/gill" do
+    @remove.repo_path.should == '/tmp/source/misc/gill'
+  end
+
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 0
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors: 
 - Dustin Willis Webber
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-09 00:00:00 -04:00
+date: 2010-08-26 00:00:00 -04:00
 default_executable: gill
 dependencies: []
 
@@ -25,7 +25,7 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
+- LICENSE.txt
 - README.rdoc
 files: 
 - .gitignore
@@ -33,13 +33,14 @@ files:
 - .yardopts
 - Gemfile
 - Gemfile.lock
-- LICENSE
+- LICENSE.txt
 - README.rdoc
 - Rakefile
 - bin/gill
 - lib/gill.rb
 - lib/gill/cli.rb
 - lib/gill/config.rb
+- lib/gill/core_extension/symbol.rb
 - lib/gill/exceptions.rb
 - lib/gill/exceptions/argument_error.rb
 - lib/gill/exceptions/cache_error.rb
@@ -59,6 +60,7 @@ files:
 - spec/config_spec.rb
 - spec/gill_spec.rb
 - spec/git_spec.rb
+- spec/remove_spec.rb
 - spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: yard
@@ -75,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: -3202130277375719218
+      hash: 2163447694756148579
       segments: 
       - 0
       version: "0"
@@ -98,4 +100,5 @@ test_files:
 - spec/config_spec.rb
 - spec/gill_spec.rb
 - spec/git_spec.rb
+- spec/remove_spec.rb
 - spec/spec_helper.rb