gill 1.0.0.rc.4 → 1.0.0

data/lib/gill/git.rb

@@ -1,72 +1,42 @@
-require 'tempfile'
 module Gill
 
   class Git
-    # Include the gill cache convenience methods.
-    include Config::Cache
     include Helper
+    include Settings
 
-    # 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)
+    attr_reader :category, :category_path, :repo_name, :repo_path
+
+    def initialize(category,repo_name,repo_uri)
 
-      @repo, @category, @folder = repo, category, folder
+      @repo_uri, @category, @repo_name = repo_uri, category, repo_name
 
       if @category
         @category_path = File.join(Gill.config.source_path, @category)
       else
-        # If passed only a repository uri.
-        # Set the category name to misc by default.
-        # TODO: Add the default repo sub-folder name to the gill configuration file.
-        @category = basename(Gill.config.default_path)
+        @category = basename(Gill.config.default_path).to_s
         @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
-    #   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)
-        STDOUT.puts "#{@folder.capitalize} updated successfully."
+      if @repo_name
+        @repo_path = File.join(@category_path, @repo_name)
       else
-        STDOUT.puts "Failed to update #{@folder.capitalize} successfully."
+        @repo_path = @category_path
       end
+      
+      # Used for updating cloned repositories.
+      @matches = []
     end
 
-    # Update the gill cache after cloning a new repository.
-    def build_cache
-      updated_cache = Gill.config.cache
+    def update_cache
+      cache = Gill.config.cache
 
-      if updated_cache[:"#{@category}"]
-        updated_cache[:"#{@category}"] = updated_cache[:"#{@category}"].merge!({:"#{@folder}" => { :repo => @repo, :path => @folder_path }})
+      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
-        updated_cache.merge!({:"#{@category}" => {:"#{@folder}" => { :repo => @repo, :path => @folder_path }}})
+        cache[:categories].merge!(@category.to_sym => { @repo_name.to_sym => { :repo => @repo_uri, :path => @repo_path }})
       end
 
-      rebuild_cache(updated_cache,Gill.config.cache_path)
+      Gill.config.write_cache(cache)
     end
 
     # Create the repository category folder if it does not exist.
@@ -74,29 +44,42 @@ module Gill
     # @param [Boolean] make_folder
     #   Pass false to ignore the creation of the passed gill folder
     #
-    def build_type_folder(make_folder=true)
+    def build_category_folder
       unless File.directory?(@category_path)
         FileUtils.mkdir_p(@category_path)
       end
     end
+    
+    def update
+      
+      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')
+          end
+          
+        end
+        
+      end
+    end
 
     #
     # Clone the passed repository uri name.
     #
     def clone
-
-      if File.directory?(@folder_path)
-
-        raise(DirectoryError, "destination path '#{@folder_path}' already exists and is not an empty directory.")
-
+      if File.directory?(@repo_path)
+        raise(DirectoryError, red("destination path '#{@repo_path}' already exists and is not an empty directory."))
       else
-
-        build_type_folder
-        build_cache if system('git', 'clone', @repo, @folder_path)
-        
+        build_category_folder
+        update_cache if system('git', 'clone', @repo_uri, @repo_path)
       end
     end
 
-  end
 
+  end
 end

data/lib/gill/helper.rb

@@ -1,12 +1,35 @@
 module Gill
+  
   module Helper
-
+    
+    def green(msg)
+      "\e[32m#{msg}\e[0m"
+    end
+    
+    def blue(msg)
+      "\e[34m#{msg}\e[0m"
+    end
+    
+    def red(msg)
+      "\e[31m#{msg}\e[0m"
+    end
+    
+    def gill_error(msg)
+      STDERR.puts red("#{msg}")
+      exit -1
+    end
+    
     def basename(path)
       Pathname.new(path).basename
     end
     
+    def parent(path)
+      Pathname.new(path).parent
+    end
+    
     def folder_empty?(folder)
-      Dir.enum_for(:foreach, folder).any? {|n| /\A\.\.?\z/ !~ n}
+      return true unless Dir.enum_for(:foreach, folder).any? {|n| /\A\.\.?\z/ !~ n}
+      false
     end
 
     # Prompt the use for input
@@ -34,13 +57,13 @@ module Gill
         if input[/([Yy]|[Yy]es)$/i]
           yield
         elsif input[/([Nn]|[Nn]o)$/i]
-          exit -1
+          return
         else
           yield if default
         end
       end
     end
     
-    
   end
-end
+
+end

data/lib/gill/import.rb

@@ -4,11 +4,11 @@ module Gill
 
   class Import
     # Include the gill cache convenience methods.
-    include Config::Cache
     include Helper
+    include Settings
 
     def initialize
-      @updated_cache = Gill.config.cache || {}
+      @updated_cache = Gill.config.cache
       STDOUT.puts "Please wait..."
     end
 
@@ -48,10 +48,12 @@ module Gill
       git_uri = git_uri_for(path)
 
       if repo_in_root(basename)
+        
         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
-          move_root_repos_to_default_path(path,File.join(Gill.config.source_path, 'misc', repo_name))
-          add(basename(Gill.config.default_path),repo_name,git_uri,File.join(Gill.config.source_path, 'misc', repo_name))
+          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))
         end
+        
       else
         add(basename,repo_name,git_uri,path)
       end
@@ -77,19 +79,19 @@ module Gill
 
     def add(category,repo_name,git_uri,path)
 
-      if @updated_cache.has_key?(category.to_s.downcase.to_sym)
+      if @updated_cache[:categories].has_key?(category.to_s.downcase.to_sym)
 
-        @updated_cache[category.to_s.downcase.to_sym].merge!({repo_name.to_sym => {:repo => git_uri, :path => path}})
+        @updated_cache[:categories][category.to_s.downcase.to_sym].merge!({repo_name.to_sym => {:repo => git_uri, :path => path}})
 
       else
-        @updated_cache[category.to_s.downcase.to_sym] = { repo_name.to_sym => { :repo => git_uri, :path => path }}
+        @updated_cache[:categories][category.to_s.downcase.to_sym] = { repo_name.to_sym => { :repo => git_uri, :path => path }}
       end
 
     end
 
     def update_cache
-      STDOUT.puts "Import Completed Successfully."
-      rebuild_cache(@updated_cache, Gill.config.cache_path)
+      STDOUT.puts green("Import Completed Successfully.")
+      Gill.config.write_cache(@updated_cache)
     end
 
     def repo_in_root(folder)

data/lib/gill/remove.rb

@@ -1,113 +1,76 @@
 module Gill
 
   class Remove
-
-    # include the cache methods
-    include Config::Cache
-
-    # include all helper methods
     include Helper
+    include Settings
 
-    # Initialize a remove object.
-    #
-    # @param [String] args
-    #   The string to be parsed for the remove object.
-    #
     def initialize(args)
-      data = args.split('#')
-      # Raise ArgumentError if passed the incorrect amount of arguments.
-      raise(ArgumentError, 'Wrong number of arguments.') if data.length != 2
-      @source = Gill.config.source_path
-      @category = data.first
-      @folder = data.last
+      @args = args.split(/\#/)
+      @category, @repo_name = @args.first, @args.last
+      @category_path = File.join(Gill.config.source_path, @category)
+      @repo_path = File.join(@category_path, @repo_name)
+      @parent_folders = []
     end
 
-    #
-    # remove the repository from the gill cache.
-    #
-    def remove_cache
-      updated_cache = Gill.config.cache
-
-      if updated_cache[@category.to_sym]
-        updated_cache[@category.to_sym].delete(@folder.to_sym)
+    def remove_repo
+      remove_repository_files if category_exists? && repo_exists?
+    end
 
-        if updated_cache[@category.to_sym].empty?
-          updated_cache.delete(@category.to_sym)
-          rebuild_cache(updated_cache, Gill.config.cache_path)
-          return true
+    private
 
-        else
+      def clean_cache
+        Gill.config.clean_cache
+      end
 
-          rebuild_cache(updated_cache, Gill.config.cache_path)
-          return false
+      def cached_repo_path
+        Gill.config.categories[@category.to_sym][@repo_name.to_sym][:path]
+      end
 
+      def category_exists?
+        return true if File.directory?(@category_path)
+        if Gill.config.categories.has_key?(@category_path.to_sym)
+          return true if File.directory?(cached_repo_path)
         end
+        raise(CategoryMissing, red("Unknown Category: #{@category}"))
+      end
 
+      def repo_exists?
+        return true if File.directory?(@repo_path) || File.directory?(cached_repo_path)
+        raise(RepositoryMissing, red("Unknown Repository: #{@category}"))
       end
-    end
 
-    #
-    # Return true if the passed key and value exists.
-    #
-    # @param [Hash] args
-    #   A key and value to check the existence of.
-    #
-    # @return [Boolean] valid
-    #   Return true if the passed key and value exists in the gill cache file.
-    # 
-    def keys_exist(args={})
-      @valid = true
-      args.each do |key,value|
-        @valid = false if !Gill.config.cache[key.to_sym]
-        @valid = false if !Gill.config.cache[key.to_sym][value.to_sym]
+      def known_category?(key)
+        return true if Gill.config.repos.has_key?(key.to_s.to_sym)
+        false
       end
-      @valid
-    end
 
-    #
-    # Return true or false if the passed folder contains any files and/or sub-folders.
-    #
-    def category_folder_empty?
-      Dir.enum_for(:foreach, @type_folder).any? {|n| /\A\.\.?\z/ !~ n}
-    end
-    
-    #
-    # Check Cache - Raise exceptions
-    #
-    def check_gill_cache_and_folders
-      raise(CategoryMissing, "Unknown Category: `#{@folder}`") unless File.directory?(@type_folder)
-      raise(RepositoryMissing, "Unknown Repository: `#{@folder}`") unless File.directory?(@repo_name)
-      raise(CacheError, 'The gill cache appears to be empty.') if Gill.config.cache.empty?
-      raise(DirectoryError, "The directory #{@repo_name} does not exist or was not cloned with gill.") unless keys_exist(:"#{@category}" => @folder)
-    end
-    
-    #
-    # Remove the gill category folder.
-    #
-    def remove_gill_category_folder
-      unless category_folder_empty?
-        ask "The `#{@category}` directory is empty. Would you like to remove it?", :default => false do
-          STDOUT.puts "#{@category.capitalize} directory removed successfully."
-          FileUtils.rm_rf(@type_folder)
+      def find_parents_for_repo(path)
+        unless basename(path).to_s == basename(Gill.config.source_path).to_s
+          @parent_folders << path if known_category?(basename(path))
+          find_parents_for_repo(parent(path))
         end
       end
-    end
 
-    #
-    # remove all files and folders associated with the remove object.
-    #
-    def remove_repo
-      instance_variable_set(:@type_folder, File.join(@source,@category))
-      instance_variable_set(:@repo_name, File.join(@source,@category,@folder))
-      check_gill_cache_and_folders
-      
-      ask "Are you sure you want to remove #{@folder}?", :default => false do
-        STDOUT.puts "#{@folder.capitalize} removed successfully."
-        FileUtils.rm_rf(@repo_name)
-        remove_gill_category_folder
-        remove_cache
+      def remove_repository_files
+        find_parents_for_repo(cached_repo_path)
+
+        ask "Are you sure you want to remove the repository: #{@repo_name}?", :default => false do
+          STDOUT.puts green("#{@repo_name.capitalize} removed successfully.")
+          FileUtils.rm_rf(cached_repo_path)
+        end
+
+        @parent_folders.each do |path|
+          if folder_empty?(path)
+            unless basename(path).to_s == basename(Gill.config.default_path).to_s
+              ask "Would you like to remove the empty parent folder: #{basename(path)}?", :default => false do
+                STDOUT.puts green("#{path.to_s.capitalize} removed successfully.")
+                FileUtils.rm_rf(path)
+              end
+            end
+          end
+        end
       end
-    end
 
   end
+
 end

data/lib/gill/version.rb

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

data/spec/config_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+ 
+describe Settings::Config do
+  
+  before(:all) do
+    Gill.config = Settings::Config.new('/tmp')
+  end
+  
+  after(:all) do
+    FileUtils.rm_rf('/tmp/source')
+    FileUtils.rm_rf('/tmp/.gillrc')
+    FileUtils.rm_rf('/tmp/.gillcache')
+  end
+  
+  it "should have a source path ok /tmp/source" do
+    Gill.config.source_path.should == '/tmp/source'
+  end
+  
+  it "should have a default path of /tmp/source/misc" do
+    Gill.config.default_path.should == '/tmp/source/misc'
+  end
+  
+  it "should have a cache path of /tmp/.gillcache" do
+    Gill.config.cache_path.should == '/tmp/.gillcache'
+  end
+  
+  it "should have a configuration path of /tmp/.gillrc" do
+    Gill.config.settings_path.should == '/tmp/.gillrc'
+  end
+  
+  it "should have created a .gillcache file." do
+    File.should exist(Gill.config.cache_path)
+  end
+  
+  it "should have created a .gillrc file." do
+    File.should exist(Gill.config.settings_path)
+  end
+  
+  it "should have created a source folder." do
+    File.should exist(Gill.config.source_path)
+  end
+  
+  it "should have created a default repository location folder." do
+    File.should exist(Gill.config.default_path)
+  end
+  
+end