gill 0.0.3 → 0.0.4

data/.bundle/config

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

data/gill.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gill}
-  s.version = "0.0.3"
+  s.version = "0.0.4"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dustin Willis Webber"]
@@ -19,6 +19,7 @@ Gem::Specification.new do |s|
     "README.rdoc"
   ]
   s.files = [
+    ".bundle/config",
     ".document",
     ".gitignore",
     ".specopts",

data/lib/gill/remove.rb

@@ -1,58 +1,66 @@
 module Gill
 
   class Remove
-    
+
     def initialize(type,folder)
-    
+
       @type = type
       @folder = folder
       @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[:"#{@type}"].empty?
           old_cache.delete(:"#{@type}")
           Gill::Config.rebuild_cache(@cache, old_cache)
           return true
-      
+
         else
-      
+
           Gill::Config.rebuild_cache(@cache, old_cache)
           return false
-      
+
         end
-      
+
       end
     end
 
     def remove_repo
-      
+
       type_folder = "#{@source}/#{@type}"
       folder = "#{@source}/#{@type}/#{@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)
           FileUtils.rm_rf(folder)
+          if remove_cache
+            STDERR.puts "Reviewing folder #{@type}.".foreground(:green)
+            if Dir.enum_for(:foreach, type_folder).any? {|n| /\A\.\.?\z/ !~ n}
+              STDERR.puts "Skipping folder #{@type} - directory not empty.".foreground(:green)
+            else
+              STDERR.puts "Removing folder #{@type} - directory empty.".foreground(:green)
+              FileUtils.rm_rf(type_folder)
+            end
+          end
           STDERR.puts "Repository Removed Successfully.".foreground(:green)
           STDERR.puts "Updating Gill Cache...".foreground(:green)
-          FileUtils.rm_rf(type_folder) if remove_cache
         end
-        
+
       else
-        
+
         STDERR.puts "The directory #{@source}/#{@type}/#{@folder} does not exist or was not cloned with gill."
-        
-      end 
+
+      end
     end
 
   end

data/lib/gill/version.rb

@@ -1,4 +1,4 @@
 module Gill
   # Gill Version
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 3
-  version: 0.0.3
+  - 4
+  version: 0.0.4
 platform: ruby
 authors: 
 - Dustin Willis Webber
@@ -82,6 +82,7 @@ extra_rdoc_files:
 - LICENSE
 - README.rdoc
 files: 
+- .bundle/config
 - .document
 - .gitignore
 - .specopts