gill 0.1.0 → 0.1.1

data/bin/gill

@@ -5,7 +5,6 @@ unless $LOAD_PATH.include?(lib_dir)
   $LOAD_PATH << lib_dir
 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.1.0"
+  s.version = "0.1.1"
 
   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-10}
+  s.date = %q{2010-07-14}
   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}
@@ -34,9 +34,12 @@ Gem::Specification.new do |s|
      "lib/gill/config/setup.rb",
      "lib/gill/exceptions.rb",
      "lib/gill/exceptions/argument_error.rb",
+     "lib/gill/exceptions/category_missing.rb",
      "lib/gill/exceptions/directory_error.rb",
      "lib/gill/exceptions/error.rb",
      "lib/gill/exceptions/repository_error.rb",
+     "lib/gill/exceptions/repository_missing.rb",
+     "lib/gill/exceptions/syntax_error.rb",
      "lib/gill/gill.rb",
      "lib/gill/git.rb",
      "lib/gill/helper.rb",
@@ -53,7 +56,7 @@ Gem::Specification.new do |s|
   s.licenses = ["MIT"]
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Gill- Git, Clone, Cleanliness.}
   s.test_files = [
     "spec/gill_spec.rb",
@@ -65,7 +68,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
     else
     end
   else

data/lib/gill/exceptions/category_missing.rb

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

data/lib/gill/exceptions/repository_missing.rb

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

data/lib/gill/exceptions/syntax_error.rb

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

data/lib/gill/exceptions.rb

@@ -1,4 +1,7 @@
 require 'gill/exceptions/error'
+require 'gill/exceptions/category_missing'
+require 'gill/exceptions/repository_missing'
+require 'gill/exceptions/syntax_error'
 require 'gill/exceptions/argument_error'
 require 'gill/exceptions/repository_error'
 require 'gill/exceptions/directory_error'

data/lib/gill/gill.rb

@@ -1,15 +1,14 @@
+require 'fileutils'
+require 'optparse'
+require 'yaml'
+
 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.
@@ -88,8 +87,9 @@ module Gill
   # Update a gill repository.
   def Gill.update
     begin
+      raise(SyntaxError, "Invalid Syntax. Arguments must be separated by `#`. Example: gill -u category#title") unless @options[:update] =~ /\#/
       args = @options[:update].split(/\#/)
-      raise(ArgumentError, "Requires three arguments. category#title#branch") if args.length > 4
+      raise(ArgumentError, "Requires argument. category#title") if args.length != 2
       category, folder, branch = args
       git = Git.new(category, folder, false)
       if branch
@@ -125,6 +125,7 @@ module Gill
   # Remove a gill cloned repository.
   def Gill.remove
     begin
+      raise(SyntaxError, "Invalid Syntax. Arguments must be separated by `#`. Example: gill -r category#title") unless @options[:remove] =~ /\#/
       Remove.new(@options[:remove]).remove_repo
     rescue Gill::DirectoryError => e
       STDERR.puts "Error: #{e}"

data/lib/gill/git.rb

@@ -1,8 +1,10 @@
+require 'tempfile'
 module Gill
   
   class Git
     # Include the gill cache convenience methods.
     include Config::Cache
+    include Gill::Helper
 
     # Initialize a new gill git instance.
     #
@@ -34,6 +36,8 @@ module Gill
     #   The branch to git pull
     #
     def update(branch='master')
+      raise(CategoryMissing, "Unknown Category: `#{@folder}`") unless File.directory?(@category_path)
+      raise(RepositoryMissing, "Unknown Repository: `#{@folder}`") unless File.directory?(@folder_path)
       Dir.chdir(@folder_path)
       STDOUT.puts "Updating #{@folder} repository."
       if system('git', 'pull', 'origin', branch)
@@ -77,13 +81,15 @@ module Gill
       end
     end
     
-    #
-    # 
-    #
+    # Clone
     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)
@@ -92,9 +98,10 @@ module Gill
           Dir.chdir(@folder_path)
           build_cache if system('git', 'clone', @repo)
         end
+        
       end
     end
-
+    
   end
   
 end

data/lib/gill/remove.rb

@@ -38,6 +38,9 @@ module Gill
       type_folder = "#{@source}/#{@category}"
       folder = "#{@source}/#{@category}/#{@folder}"
 
+      raise(CategoryMissing, "Unknown Category: `#{@folder}`") unless File.directory?(type_folder)
+      raise(RepositoryMissing, "Unknown Repository: `#{@folder}`") unless File.directory?(folder)
+
       if File.directory?(type_folder) && File.directory?(folder) && !Gill.config.cache.empty?
 
         if Gill.config.cache[:"#{@category}"][:"#{@folder}"]

data/lib/gill/version.rb

@@ -1,4 +1,4 @@
 module Gill
   # Gill Version
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/gill.rb

@@ -1 +1,2 @@
 require 'gill/gill'
+require 'gill/version'

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: gill
 version: !ruby/object:Gem::Version 
+  hash: 25
   prerelease: false
   segments: 
   - 0
   - 1
-  - 0
-  version: 0.1.0
+  - 1
+  version: 0.1.1
 platform: ruby
 authors: 
 - Dustin Willis Webber
@@ -14,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-10 00:00:00 -04:00
+date: 2010-07-14 00:00:00 -04:00
 default_executable: gill
 dependencies: []
 
@@ -43,9 +44,12 @@ files:
 - lib/gill/config/setup.rb
 - lib/gill/exceptions.rb
 - lib/gill/exceptions/argument_error.rb
+- lib/gill/exceptions/category_missing.rb
 - lib/gill/exceptions/directory_error.rb
 - lib/gill/exceptions/error.rb
 - lib/gill/exceptions/repository_error.rb
+- lib/gill/exceptions/repository_missing.rb
+- lib/gill/exceptions/syntax_error.rb
 - lib/gill/gill.rb
 - lib/gill/git.rb
 - lib/gill/helper.rb
@@ -66,23 +70,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Gill- Git, Clone, Cleanliness.