gill 1.0.0.rc.2 → 1.0.0.rc.4

data/.yardopts

@@ -1 +1 @@
---markup markdown --title 'Gill Documentation' --protected --files ChangeLog.md,LICENSE.txt
+--markup rdoc --title 'Gill Documentation' --protected --files LICENSE.txt

data/gill.gemspec

@@ -5,17 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gill}
-  s.version = "1.0.0.rc.2"
+  s.version = "1.0.0.rc.4"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dustin Willis Webber"]
-  s.date = %q{2010-07-30}
+  s.date = %q{2010-08-03}
   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",
+    "LICENSE.txt",
      "README.rdoc"
   ]
   s.files = [
@@ -23,7 +23,7 @@ Gem::Specification.new do |s|
      ".specopts",
      ".yardopts",
      "Gemfile",
-     "LICENSE",
+     "LICENSE.txt",
      "README.rdoc",
      "Rakefile",
      "bin/gill",

data/lib/gill/git.rb

@@ -1,6 +1,6 @@
 require 'tempfile'
 module Gill
-  
+
   class Git
     # Include the gill cache convenience methods.
     include Config::Cache
@@ -18,9 +18,9 @@ module Gill
     #   The git uri for the repository
     #
     def initialize(category,folder,repo)
-      
+
       @repo, @category, @folder = repo, category, folder
-      
+
       if @category
         @category_path = File.join(Gill.config.source_path, @category)
       else
@@ -30,15 +30,15 @@ module Gill
         @category = basename(Gill.config.default_path)
         @category_path = File.join(Gill.config.source_path, @category)
       end
-      
+
       if @folder
         @folder_path = File.join(@category_path, @folder)
       else
         @folder_path = @category_path
       end
-      
+
     end
-    
+
     # Update A Repository
     #
     # @param [String] branch
@@ -55,22 +55,17 @@ 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
-      
-      if updated_cache.nil?
-        updated_cache = updated_cache.merge!({:"#{@category}" => {:"#{@folder}" => { :repo => @repo, :path => @folder_path }}})
+
+      if updated_cache[:"#{@category}"]
+        updated_cache[:"#{@category}"] = updated_cache[:"#{@category}"].merge!({:"#{@folder}" => { :repo => @repo, :path => @folder_path }})
       else
-      
-        if updated_cache[:"#{@category}"]
-          updated_cache[:"#{@category}"] = updated_cache[:"#{@category}"].merge!({:"#{@folder}" => { :repo => @repo, :path => @folder_path }})
-        else
-          updated_cache = updated_cache.merge!({:"#{@category}" => {:"#{@folder}" => { :repo => @repo, :path => @folder_path }}})
-        end
-        
+        updated_cache.merge!({:"#{@category}" => {:"#{@folder}" => { :repo => @repo, :path => @folder_path }}})
       end
+
       rebuild_cache(updated_cache,Gill.config.cache_path)
     end
 
@@ -78,41 +73,30 @@ module Gill
     #
     # @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
-    
+
     #
     # Clone the passed repository uri name.
     #
     def clone
-      
-      if File.directory?(@folder_path) && @folder
-        
+
+      if File.directory?(@folder_path)
+
         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)
-        else
-          build_type_folder(false)
-          Dir.chdir(@folder_path)
-          build_cache if system('git', 'clone', @repo)
-        end
+
+        build_type_folder
+        build_cache if system('git', 'clone', @repo, @folder_path)
         
       end
     end
-    
+
   end
-  
+
 end

data/lib/gill/version.rb

@@ -1,4 +1,4 @@
 module Gill
   # Gill Version
-  VERSION = "1.0.0.rc.2" unless defined?(::Gill::VERSION)
+  VERSION = "1.0.0.rc.4" unless defined?(::Gill::VERSION)
 end

metadata

@@ -7,8 +7,8 @@ version: !ruby/object:Gem::Version
   - 0
   - 0
   - rc
-  - 2
-  version: 1.0.0.rc.2
+  - 4
+  version: 1.0.0.rc.4
 platform: ruby
 authors: 
 - Dustin Willis Webber
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-30 00:00:00 -07:00
+date: 2010-08-03 00:00:00 -04:00
 default_executable: gill
 dependencies: []
 
@@ -27,14 +27,14 @@ executables:
 extensions: []
 
 extra_rdoc_files: 
-- LICENSE
+- LICENSE.txt
 - README.rdoc
 files: 
 - .gitignore
 - .specopts
 - .yardopts
 - Gemfile
-- LICENSE
+- LICENSE.txt
 - README.rdoc
 - Rakefile
 - bin/gill
@@ -77,7 +77,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 1109104530552266926
+      hash: -3170879872428078693
       segments: 
       - 0
       version: "0"