gill 0.0.8 → 0.1.0

data/README.rdoc

@@ -22,10 +22,10 @@ Gill Usage:
 
      -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
      -h, --help                       This help summary page.
      -v, --version                    Version number
 
-
 Cloning a git repository with gill:
 
  $ gill https://mephux@github.com/mephux/Snorby.git#rails#snorby-dev
@@ -102,4 +102,4 @@ Only the parent folder to the cloned repo will be removed.
 
 == Copyright
 
-Copyright (c) 2010 Dustin Willis Webber. See LICENSE for details.
+Copyright (c) 2010 Dustin Willis Webber. See LICENSE for details.

data/bin/gill

@@ -7,4 +7,5 @@ end
 
 require 'rubygems'
 require 'gill'
+
 Gill.run

data/gill.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gill}
-  s.version = "0.0.8"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dustin Willis Webber"]
-  s.date = %q{2010-07-04}
+  s.date = %q{2010-07-10}
   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}
@@ -29,13 +29,17 @@ Gem::Specification.new do |s|
      "bin/gill",
      "gill.gemspec",
      "lib/gill.rb",
-     "lib/gill/app.rb",
      "lib/gill/config.rb",
+     "lib/gill/config/cache.rb",
+     "lib/gill/config/setup.rb",
+     "lib/gill/exceptions.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/gill.rb",
      "lib/gill/git.rb",
+     "lib/gill/helper.rb",
      "lib/gill/parse.rb",
      "lib/gill/remove.rb",
      "lib/gill/version.rb",

data/lib/gill/config/cache.rb

@@ -0,0 +1,74 @@
+module Gill
+  class Config
+
+    module Cache
+
+      # Returns the gill cache yaml file.
+      # @return [Hash] the gill cache
+      def cache
+        @cache ||= find_or_create_cache
+      end
+
+      # Returns the path of the .gillcache file.
+      # @return [String] path to the gill cache file.
+      def cache_path
+        @cache_path
+      end
+
+      # Find or created the gill cache file.
+      def find_or_create_cache
+        if File.exists?("#{@cache_path}")
+          @cache = YAML.load_file(@cache_path) || build_cache
+        else
+          build_cache
+        end
+      end
+
+      # Build the inital .gillache file in the user home directory.
+      # @return [Hash] the gill cache 
+      def build_cache
+        puts 'in build cache'
+        new_cache = {}
+        File.open(@cache_path, 'w') do |out|
+          YAML.dump(new_cache, out)
+        end
+        YAML.load_file(@cache_path)
+      end
+
+      # Rebuild cache writes updated entries to the .gillache file in the user home directory.
+      # @param [String] path to the gill cache file
+      # @param [String] override the default cache path in the gill configuration file.
+      def rebuild_cache(cache, path=false)
+        @cache_path = path if path
+        File.open("#{@cache_path}", 'w+') do |out|
+          YAML.dump(cache, out)
+        end
+      end
+      
+      # Checks the current gill cache file for missing entries and removes them accordingly.
+      def cache_check!
+
+        updated_cache = cache
+        updated_cache.each do |key,value|
+          
+          if File.directory?("#{source_path}/#{key}")
+            
+            value.each do |skey,svalue|
+              unless File.directory?("#{source_path}/#{key}/#{skey}")
+                updated_cache[:"#{key}"].delete(:"#{skey}")
+              end
+            end
+            
+          else
+            
+            updated_cache.delete(:"#{key}")
+          end
+          
+        end
+        
+        rebuild_cache(updated_cache)
+      end
+
+    end
+  end
+end

data/lib/gill/config/setup.rb

@@ -0,0 +1,68 @@
+module Gill
+  class Config
+
+    module Setup
+
+      # Returns the gill configuration.
+      # @return [Hash] the gill configuration
+      def config
+        @config
+      end
+
+      # Finds or created the gill configuration file.
+      # @return [Hash] the gill configuration file
+      def find_or_create_config
+        
+        if File.exists?("#{@config_path}")
+          find_or_create_cache
+          @config = YAML.load_file(@config_path)
+          build_source_folder
+        else
+          build_config && find_or_create_cache
+          @config = YAML.load_file(@config_path)
+          build_source_folder
+        end
+        
+        YAML.load_file(@config_path)
+      end
+
+      # The gill configuration path.
+      # @return [String] the gill configuration path
+      def config_path
+        @config_path
+      end
+
+      # The source folder path set in the gill configuration file.
+      # @return [String] the gill source folder path.
+      def source_path
+        @config[:source]
+      end
+
+      # Build the initial .gillrc configuration file.
+      def build_config
+        
+        config = { :home => @home, :config => @config_path, :source => "#{@home}/source", :cache => @cache_path }
+        
+        File.open(@config_path, 'w') do |out|
+          YAML.dump(config, out)
+        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?(@config[:source])
+        
+          STDERR.puts "Creating Source Directory: " + "#{@config[:source]}"
+          Dir.mkdir(@config[:source])
+        
+        end
+        
+      end
+
+
+    end
+  end
+end

data/lib/gill/config.rb

@@ -1,102 +1,30 @@
+require 'gill/config/setup'
+require 'gill/config/cache'
+
 module Gill
 
   class Config
-
-    attr_accessor :config
-
-    def initialize
-      @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|
-         YAML.dump(config, out)
-      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])
-        
-        STDOUT.puts "Creating Source Directory: " + "#{self.config[:source]}"
-        Dir.mkdir(self.config[:source])
-        
-      end
-      
-    end
+    # Include the gill setup and cache convenience methods.
+    include Setup, Cache
     
-    #
-    # Build the inital .gillache file in the user home directory.
-    #
-    def build_cache
-      
-      cache = { }
-      File.open(@cache, 'w') do |out|
-        
-        YAML.dump(cache, out)
-        
-      end
-      
-    end
+    attr_reader :home, :config_path, :cache_path, :config, :cache
     
-    #
-    # 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
+    # Initialize the Gill configuration.
+    # @return [Object] the gill configuration 
+    def initialize
       
-    end
-
-    #
-    # Setup - Determine if the current user has the proper gill configuration file in place
-    # or return the current configuration files.
-    #
-    def setup
+      @home = File.expand_path('~')
+      @config_path = File.join(@home, '.gillrc')
+      @cache_path = File.join(@home, '.gillcache')
+      @config = find_or_create_config
+      @cache = cache
+      cache_check! # Check The Cache For Missing Entries.
       
-      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
+      self
       
     end
-
-    #
-    # Yaml
-    # return the configuration file in yaml format.
-    #
-    def yaml
-      self.config
-    end
-
+    
   end
-
+  
 end

data/lib/gill/exceptions/error.rb

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

data/lib/gill/exceptions.rb

@@ -0,0 +1,4 @@
+require 'gill/exceptions/error'
+require 'gill/exceptions/argument_error'
+require 'gill/exceptions/repository_error'
+require 'gill/exceptions/directory_error'

data/lib/gill/gill.rb

@@ -0,0 +1,144 @@
+require 'gill/config'
+require 'gill/helper'
+require 'gill/git'
+require 'gill/remove'
+require 'gill/parse'
+require 'gill/version'
+require 'gill/exceptions'
+
+require 'fileutils'
+require 'optparse'
+require 'yaml'
+
+module Gill
+
+  # Module method for the gill configuration.
+  # @return [Object] the gill configuration
+  def Gill.config
+    @config ||= Config.new
+  end
+
+  # Run Gill
+  def Gill.run
+    Gill.optparse(*ARGV)
+    begin
+      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 "Error: #{e}"
+    end
+  end
+
+  # Gill option parser
+  # @param [Array] passed gill options.
+  def Gill.optparse(*args)
+    
+    Gill.config # Load the gill configuration file
+    @opts = OptionParser.new
+
+    @options = {}
+
+    @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 category#folder') do |remove|
+      @options[:remove] = remove
+    end
+
+    @opts.on('-u ', '--update ','Update repository. ie. -u category#folder#branch') do |update|
+      @options[:update] = update
+    end
+
+    @opts.on('-h','--help','This help summary page.') do |help|
+      @options[:help] = help
+    end
+
+    @opts.on('-v','--version','Version number') do |version|
+      STDERR.puts "Version: #{Gill::VERSION}"
+      exit -1
+    end
+
+    begin
+      @args = @opts.parse!(args)
+      @options[:uri] = @args[0]
+      Gill.error if @options[:help]
+      Gill.list if @options[:list]
+      Gill.remove if @options[:remove]
+      Gill.update if @options[:update]
+      Gill.error if @options.empty? or @options[:uri].nil?
+    rescue OptionParser::MissingArgument => e
+      STDERR.puts e.message
+      STDERR.puts @opts
+      STDERR.puts "\n"
+      exit -1
+    rescue OptionParser::InvalidOption => e
+      STDERR.puts e.message
+      STDERR.puts @opts
+      STDERR.puts "\n"
+      exit -1
+    end
+  end
+  
+  # Update a gill repository.
+  def Gill.update
+    begin
+      args = @options[:update].split(/\#/)
+      raise(ArgumentError, "Requires three arguments. category#title#branch") if args.length > 4
+      category, folder, branch = args
+      git = Git.new(category, folder, false)
+      if branch
+        git.update(branch)
+      else
+        git.update
+      end
+      exit -1
+    rescue TypeError => e
+      STDERR.puts "Error: #{e}\nError: Please make sure to remove all whitespace from the category and/or folder name."
+      exit -1
+    rescue => e
+      STDERR.puts "Error: #{e}"
+      exit -1
+    end
+  end
+
+  # List all gill cloned repositories.
+  def Gill.list
+    STDERR.puts "\n*** Listing Cloned Repositories ***\n\n"
+    unless @config.cache.nil?
+      Gill.config.cache.each do |type,repos|
+        STDERR.puts "\t#{type}:"
+        repos.each do |repo|
+          STDERR.puts "\t  #{repo[0]} => " + "#{repo[1]}"
+        end
+        STDERR.puts "\n"
+      end
+    end
+    exit -1
+  end
+
+  # Remove a gill cloned repository.
+  def Gill.remove
+    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
+
+  # Gill Error
+  # @return [Object] gill usage
+  def Gill.error
+    STDERR.puts "#{@opts}\n"
+    exit -1
+  end
+
+end

data/lib/gill/git.rb

@@ -1,12 +1,24 @@
 module Gill
   
-  class Git < App
+  class Git
+    # Include the gill cache convenience methods.
+    include Config::Cache
 
+    # Initialize a new gill git instance.
+    #
+    # @param [String] category
+    #   The category for the new cloned repository
+    #
+    # @param [String] folder
+    #   The folder name in which the cloned repository will be stored
+    #
+    # @param [String] repo
+    #   The git uri for the repository
+    #
     def initialize(category,folder,repo)
-      super()
       
       @repo, @category, @folder = repo, category, folder
-      @category_path = File.join(@source, @category)
+      @category_path = File.join(Gill.config.source_path, @category)
       
       if @folder
         @folder_path = File.join(@category_path, @folder)
@@ -16,7 +28,11 @@ module Gill
       
     end
     
-    
+    # Update A Repository
+    #
+    # @param [String] branch
+    #   The branch to git pull
+    #
     def update(branch='master')
       Dir.chdir(@folder_path)
       STDOUT.puts "Updating #{@folder} repository."
@@ -26,51 +42,48 @@ module Gill
         STDOUT.puts "Failed to update #{@folder.capitalize} successfully."
       end
     end
-
+    
+    # Update the gill cache after cloning a new repository.
     def build_cache
+      updated_cache = Gill.config.cache
       
-      old_cache = @cache_file
-      
-      if old_cache[:"#{@category}"]
-        
-        old_cache[:"#{@category}"] = old_cache[:"#{@category}"].merge!({:"#{@folder}" => @repo})
-        
+      if updated_cache.nil?
+        updated_cache = updated_cache.merge!({:"#{@category}" => {:"#{@folder}" => @repo}})
       else
-        
-        old_cache = old_cache.merge!({:"#{@category}" => {:"#{@folder}" => @repo}})
+      
+        if updated_cache[:"#{@category}"]
+          updated_cache[:"#{@category}"] = updated_cache[:"#{@category}"].merge!({:"#{@folder}" => @repo})
+        else
+          updated_cache = updated_cache.merge!({:"#{@category}" => {:"#{@folder}" => @repo}})
+        end
         
       end
-      
-      Gill::Config.rebuild_cache(@cache, old_cache)
-      
+      rebuild_cache(updated_cache,Gill.config.cache_path)
     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_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) && @folder
-        
         raise(DirectoryError, "destination path '#{@folder_path}' already exists and is not an empty directory.")
-        
       else
-        
         if @folder
           build_type_folder
           build_cache if system('git', 'clone', @repo, @folder_path)
@@ -79,9 +92,9 @@ module Gill
           Dir.chdir(@folder_path)
           build_cache if system('git', 'clone', @repo)
         end
-        
       end
     end
 
   end
+  
 end

data/lib/gill/helper.rb

@@ -0,0 +1,39 @@
+module Gill
+  module Helper
+
+    # Prompt the use for input
+    #
+    # @param [String] msg
+    #  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] || :yes
+      if default == :yes
+        STDOUT.print "#{msg} [Y/n] "
+      else
+        STDOUT.print "#{msg} [y/N] "
+      end
+      input = STDIN.gets.chomp
+      STDOUT.flush
+
+      if block_given?
+        if input[/([Yy]|[Yy]es)$/i]
+          yield
+        elsif input[/([Nn]|[Nn]o)$/i]
+          exit -1
+        else
+          yield if default == :yes
+        end
+      else
+        exit -1
+      end
+    end
+    
+    
+  end
+end

data/lib/gill/parse.rb

@@ -23,27 +23,38 @@ module Gill
 
     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
+        
         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
 

data/lib/gill/remove.rb

@@ -1,13 +1,36 @@
 module Gill
 
-  class Remove < App
+  class Remove
+    include Config::Cache
+    include Gill::Helper
 
     def initialize(args)
       data = args.split('#')
       raise(ArgumentError, 'Wrong number of arguments.') if data.length != 2
+      @source = Gill.config.source_path
       @category = data.first
       @folder = data.last
-      super()
+    end
+
+    def remove_cache
+      updated_cache = Gill.config.cache
+
+      if updated_cache[:"#{@category}"]
+        updated_cache[:"#{@category}"].delete(:"#{@folder}")
+
+        if updated_cache[:"#{@category}"].empty?
+          updated_cache.delete(:"#{@category}")
+          rebuild_cache(updated_cache, Gill.config.cache_path)
+          return true
+
+        else
+
+          rebuild_cache(updated_cache, Gill.config.cache_path)
+          return false
+
+        end
+
+      end
     end
 
     def remove_repo
@@ -15,9 +38,9 @@ module Gill
       type_folder = "#{@source}/#{@category}"
       folder = "#{@source}/#{@category}/#{@folder}"
 
-      if File.directory?(type_folder) && File.directory?(folder) && !@cache_file.empty?
-        
-        if @cache_file[:"#{@category}"][:"#{@folder}"]
+      if File.directory?(type_folder) && File.directory?(folder) && !Gill.config.cache.empty?
+
+        if Gill.config.cache[:"#{@category}"][:"#{@folder}"]
           
           ask "Are you sure you want to remove #{@folder}?", :default => :no do
             STDOUT.puts "#{@folder.capitalize} removed successfully."
@@ -25,20 +48,18 @@ module Gill
           end
 
           unless Dir.enum_for(:foreach, type_folder).any? {|n| /\A\.\.?\z/ !~ n}
-            
             ask "The `#{@category}` directory is empty. Would you like to remove it?", :default => :no do
               STDOUT.puts "#{@category.capitalize} directory removed successfully."
               FileUtils.rm_rf(type_folder)
             end
-            
           end
 
         end
-
-      else
         
-        raise(DirectoryError, "The directory #{@source}/#{@category}/#{@folder} does not exist or was not cloned with gill.")
+        remove_cache
         
+      else
+        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.8'
+  VERSION = '0.1.0'
 end

data/lib/gill.rb

@@ -1,174 +1 @@
-require 'gill/app'
-require 'gill/config'
-require 'gill/git'
-require 'gill/remove'
-require 'gill/parse'
-require 'gill/version'
-
-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 = App.config
-
-  #
-  # Run Gill
-  #
-  def Gill.run
-    Gill.check_cache
-    Gill.optparse(*ARGV)
-    begin
-
-      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."
-      exit -1
-    rescue => e
-      STDERR.puts "Error: #{e}"
-      exit -1
-    end
-  end
-
-  def Gill.update
-    begin
-      args = @options[:update].split(/\#/)
-      raise(ArgumentError, "Requires three arguments. category#title#branch") if args.length > 4
-      category, folder, branch = args
-      git = Git.new(category, folder, false)
-      if branch
-        git.update(branch)
-      else
-        git.update
-      end
-      exit -1
-    rescue TypeError => e
-      STDERR.puts "Error: #{e}\nError: Please make sure to remove all whitespace from the category and/or folder name."
-      exit -1
-    rescue => e
-      STDERR.puts "Error: #{e}"
-      exit -1
-    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
-      Config.rebuild_cache(cache, @new_cache)
-    end
-
-    def Gill.error
-      STDERR.puts "#{@opts}\n"
-      exit -1
-    end
-
-    def Gill.list
-      cache = YAML.load_file(GILL_CONFIG[:cache])
-      STDOUT.puts "\n*** Listing Cloned Repositories ***\n\n"
-      cache.each do |type,repos|
-        STDOUT.puts " #{type}:"
-        repos.each do |repo|
-          STDOUT.puts "  - #{repo[0]} => " + "#{repo[1]}"
-        end
-        STDOUT.puts "\n"
-      end
-      exit -1
-    end
-
-    def Gill.remove
-      begin
-        Remove.new(@options[:remove]).remove_repo
-      rescue Gill::DirectoryError => e
-        STDERR.puts "Error: #{e}"
-        exit -1
-      rescue => e
-        STDERR.puts "Error: #{e}"
-        exit -1
-      end
-      exit -1
-    end
-
-    def Gill.optparse(*args)
-      @opts = OptionParser.new
-
-      @options = {}
-
-      @opts.banner = "Gill - Git, Clone, Cleanliness.\nUsage: gill git://host/repository.git#category/sub-category/...\n\n"
-
-      @opts.on('-l','--list','List repositories.') do |list|
-        @options[:list] = list
-      end
-
-      @opts.on('-r ', '--remove ','Remove repository. ie. -r category#folder') do |remove|
-        @options[:remove] = remove
-      end
-
-      @opts.on('-u ', '--update ','Update repository. ie. -u category#folder#branch') do |update|
-        @options[:update] = update
-      end
-
-      @opts.on('-x','--reload','Force gill cache reload.') do |remove|
-        STDOUT.print "Updating Gill Cache... "
-        Gill.check_cache
-        STDOUT.puts "Done."
-        exit -1
-      end
-
-      @opts.on('-h','--help','This help summary page.') do |help|
-        @options[:help] = help
-      end
-
-      @opts.on('-v','--version','Version number') do |version|
-        puts "Version: #{Gill::VERSION}"
-        exit -1
-      end
-
-      begin
-        @args = @opts.parse!(args)
-        @options[:uri] = @args[0]
-        Gill.error if @options[:help]
-        Gill.list if @options[:list]
-        Gill.remove if @options[:remove]
-        Gill.update if @options[:update]
-        Gill.error if @options.empty? or @options[:uri].nil?
-      rescue OptionParser::MissingArgument => e
-        STDERR.puts e.message
-        STDERR.puts @opts
-        STDERR.puts "\n"
-        exit -1
-      rescue OptionParser::InvalidOption => e
-        STDERR.puts e.message
-        STDERR.puts @opts
-        STDERR.puts "\n"
-        exit -1
-      end
-    end
-
-end
+require 'gill/gill'

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
+  - 1
   - 0
-  - 8
-  version: 0.0.8
+  version: 0.1.0
 platform: ruby
 authors: 
 - Dustin Willis Webber
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-04 00:00:00 -04:00
+date: 2010-07-10 00:00:00 -04:00
 default_executable: gill
 dependencies: []
 
@@ -38,13 +38,17 @@ files:
 - bin/gill
 - gill.gemspec
 - lib/gill.rb
-- lib/gill/app.rb
 - lib/gill/config.rb
+- lib/gill/config/cache.rb
+- lib/gill/config/setup.rb
+- lib/gill/exceptions.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/gill.rb
 - lib/gill/git.rb
+- lib/gill/helper.rb
 - lib/gill/parse.rb
 - lib/gill/remove.rb
 - lib/gill/version.rb

data/lib/gill/app.rb

@@ -1,58 +0,0 @@
-module Gill
-
-  class App
-    attr_accessor :gill, :cache, :source, :cache_file
-
-    def initialize
-      @gill = Gill::Config.new.yaml
-      @cache = @gill[:cache]
-      @source = @gill[:source]
-      @cache_file = cache
-    end
-
-    #
-    # Return the gill YAML configuration file.
-    #
-    def cache
-      YAML.load_file(@cache)
-    end
-    
-    #
-    # Return the path for the passed type.
-    #
-    def path(type)
-      return @gill[:'#{type}'] if %w(source cache).include?(type.to_sym)
-    end
-    
-    def ask(msg, options={})
-      default = options[:default] || :yes
-      if default == :yes
-        STDOUT.print "#{msg} [Y/n] "
-      else
-        STDOUT.print "#{msg} [y/N] "
-      end
-      input = STDIN.gets.chomp
-      STDOUT.flush
-
-      if block_given?
-        if input[/([Yy]|[Yy]es)$/i]
-          yield
-        elsif input[/([Nn]|[Nn]o)$/i]
-          exit -1
-        else
-          yield if default == :yes
-        end
-      else
-        exit -1
-      end
-    end
-
-    #
-    # Return the gill configuration file.
-    #
-    def self.config
-      @gill || Gill::Config.new.yaml
-    end
-  end
-
-end