gill 0.0.7 → 0.0.8

data/README.rdoc

@@ -1,5 +1,7 @@
 = gill
 
+*NOTICE: THIS IS BETA SOFTWARE!
+
 Gill is a simple Ruby app to help keep your git clones clean and organized. Gill creates a source directory (~/source) in the users home path were all cloned repos will be stored. The gill default source location can be changed at any time by simply editing the ".gillrc" in the users home directory.
 
 Files created by gill:
@@ -9,8 +11,6 @@ Files created by gill:
 == Install
 
  gem install gill
- 
-* NOTE: if you are using gill <= 0.0.3 please upgrade to version >= 0.0.6.
 
 == Example
 
@@ -42,7 +42,7 @@ This will create a folder called 'rails' and clone the repo inside a folder call
   gill http://github.com/jruby/jruby.git#jruby
   gill http://github.com/ronin-ruby/ronin.git#security#ronin-dev
   gill http://github.com/postmodern/spidr.git#security#spidr-dev
-  gill https://mephux@github.com/mephux/Snorby.git#rails/3.0#snorby/dev/beta2.0
+  gill https://mephux@github.com/mephux/Snorby.git#rails#snorby-dev
   
 etc...
 
@@ -65,16 +65,31 @@ Listing cloned repositories:
  	  ronin-dev => http://github.com/ronin-ruby/ronin.git
  	  spidr-dev => http://github.com/postmodern/spidr.git
 
- 	rails/3.0:
- 	  snorby/dev/beta2.0 => https://mephux@github.com/mephux/Snorby.git
+ 	rails:
+ 	  snorby-dev => https://mephux@github.com/mephux/Snorby.git
 
 Removing cloned repositories:
 
- $ gill -r rails/3.0#snorby/dev/beta2.0
- Removing: rails/3.0 => snorby/dev/beta2.0
+ $ gill -r rails#snorby-dev
+ Removing: rails => snorby-dev
  Repository Removed Successfully.
  Updating Cache...
  
+Updating cloned repositories:
+
+ $ gill -u rails#snorby-dev
+ Updating snorby-dev repository.
+ From https://github.com/mephux/Snorby
+  * branch            master     -> FETCH_HEAD
+ Already up-to-date.
+ Snorby-dev updated successfully.
+
+== Current Issues
+
+* Listing cloned repos is not standardized.
+* Nested/Sub categories with empty folders will not be removed when uninstalling a cloned repo. 
+Only the parent folder to the cloned repo will be removed.
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/Rakefile

@@ -14,7 +14,6 @@ require 'jeweler'
 require './lib/gill/version.rb'
 
 begin
-  require 'jeweler'
   Jeweler::Tasks.new do |gem|
     gem.name = 'gill'
     gem.version = Gill::VERSION

data/gill.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gill}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   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-01}
+  s.date = %q{2010-07-04}
   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}

data/lib/gill/app.rb

@@ -1,136 +1,58 @@
-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 = Gill::Config.new.yaml
-
-  #
-  # 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
+  class App
+    attr_accessor :gill, :cache, :source, :cache_file
 
-    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}"
+    def initialize
+      @gill = Gill::Config.new.yaml
+      @cache = @gill[:cache]
+      @source = @gill[:source]
+      @cache_file = cache
     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
-      Gill::Config.rebuild_cache(cache, @new_cache)
+    #
+    # Return the gill YAML configuration file.
+    #
+    def cache
+      YAML.load_file(@cache)
     end
-
-    def Gill.error
-      STDERR.puts "#{@opts}\n"
-      exit -1
+    
+    #
+    # Return the path for the passed type.
+    #
+    def path(type)
+      return @gill[:'#{type}'] if %w(source cache).include?(type.to_sym)
     end
-
-    def Gill.list
-      cache = YAML.load_file(GILL_CONFIG[:cache])
-      STDERR.puts "\n*** Listing Cloned Repositories ***\n\n"
-      cache.each do |type,repos|
-        STDERR.puts "\t#{type}:"
-        repos.each do |repo|
-          STDERR.puts "\t  #{repo[0]} => " + "#{repo[1]}"
+    
+    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
-        STDERR.puts "\n"
-      end
-      exit -1
-    end
-
-    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
-
-    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 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('-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}"
+      else
         exit -1
       end
+    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.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
+    #
+    # Return the gill configuration file.
+    #
+    def self.config
+      @gill || Gill::Config.new.yaml
     end
+  end
 
 end

data/lib/gill/config.rb

@@ -15,10 +15,12 @@ module Gill
     # 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
 
     #
@@ -27,29 +29,41 @@ module Gill
     # The initial source directory is only created if it does not exist.
     #
     def build_source_folder
+      
       unless File.directory?(self.config[:source])
-        STDERR.puts "Creating Source Directory: " + "#{self.config[:source]}"
+        
+        STDOUT.puts "Creating Source Directory: " + "#{self.config[:source]}"
         Dir.mkdir(self.config[:source])
+        
       end
+      
     end
     
     #
     # 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
     
     #
     # 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
+      
     end
 
     #
@@ -57,16 +71,22 @@ module Gill
     # or return the current configuration files.
     #
     def setup
+      
       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
+      
     end
 
     #

data/lib/gill/exceptions/error.rb

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

data/lib/gill/git.rb

@@ -1,42 +1,76 @@
 module Gill
-  class Git
+  
+  class Git < App
 
     def initialize(category,folder,repo)
+      super()
+      
       @repo, @category, @folder = repo, category, folder
-      @cache, @source = GILL_CONFIG[:cache], GILL_CONFIG[:source]
       @category_path = File.join(@source, @category)
+      
       if @folder
         @folder_path = File.join(@category_path, @folder)
       else
         @folder_path = @category_path
       end
+      
+    end
+    
+    
+    def update(branch='master')
+      Dir.chdir(@folder_path)
+      STDOUT.puts "Updating #{@folder} repository."
+      if system('git', 'pull', 'origin', branch)
+        STDOUT.puts "#{@folder.capitalize} updated successfully."
+      else
+        STDOUT.puts "Failed to update #{@folder.capitalize} successfully."
+      end
     end
 
     def build_cache
-      old_cache = YAML.load_file(@cache)
+      
+      old_cache = @cache_file
+      
       if old_cache[:"#{@category}"]
+        
         old_cache[:"#{@category}"] = old_cache[:"#{@category}"].merge!({:"#{@folder}" => @repo})
+        
       else
+        
         old_cache = old_cache.merge!({:"#{@category}" => {:"#{@folder}" => @repo}})
+        
       end
+      
       Gill::Config.rebuild_cache(@cache, old_cache)
+      
     end
 
     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)
@@ -45,6 +79,7 @@ module Gill
           Dir.chdir(@folder_path)
           build_cache if system('git', 'clone', @repo)
         end
+        
       end
     end
 

data/lib/gill/remove.rb

@@ -1,36 +1,13 @@
 module Gill
 
-  class Remove
+  class Remove < App
 
     def initialize(args)
       data = args.split('#')
       raise(ArgumentError, 'Wrong number of arguments.') if data.length != 2
       @category = data.first
       @folder = data.last
-      @cache = GILL_CONFIG[:cache]
-      @source = GILL_CONFIG[:source]
-    end
-
-    def remove_cache
-
-      old_cache = YAML.load_file(@cache)
-
-      if old_cache[:"#{@category}"]
-        old_cache[:"#{@category}"].delete(:"#{@folder}")
-
-        if old_cache[:"#{@category}"].empty?
-          old_cache.delete(:"#{@category}")
-          Gill::Config.rebuild_cache(@cache, old_cache)
-          return true
-
-        else
-
-          Gill::Config.rebuild_cache(@cache, old_cache)
-          return false
-
-        end
-
-      end
+      super()
     end
 
     def remove_repo
@@ -38,27 +15,30 @@ module Gill
       type_folder = "#{@source}/#{@category}"
       folder = "#{@source}/#{@category}/#{@folder}"
 
-      if File.directory?(type_folder) && File.directory?(folder) && !YAML.load_file(@cache).empty?
+      if File.directory?(type_folder) && File.directory?(folder) && !@cache_file.empty?
+        
+        if @cache_file[:"#{@category}"][:"#{@folder}"]
+          
+          ask "Are you sure you want to remove #{@folder}?", :default => :no do
+            STDOUT.puts "#{@folder.capitalize} removed successfully."
+            FileUtils.rm_rf(folder)
+          end
 
-        if YAML.load_file(@cache)[:"#{@category}"][:"#{@folder}"]
-          STDERR.puts "Removing: #{@category} => " + "#{@folder}"
-          FileUtils.rm_rf(folder)
-          if remove_cache
-            STDERR.puts "Reviewing folder #{@category}."
-            if Dir.enum_for(:foreach, type_folder).any? {|n| /\A\.\.?\z/ !~ n}
-              STDERR.puts "Skipping folder #{@category} - directory not empty."
-            else
-              STDERR.puts "Removing folder #{@category} - directory empty."
+          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
-          STDERR.puts "Repository Removed Successfully."
-          STDERR.puts "Updating Gill Cache..."
+
         end
 
       else
-        remove_cache
+        
         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.7'
+  VERSION = '0.0.8'
 end

data/lib/gill.rb

@@ -1 +1,174 @@
-require 'gill/app'
+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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Dustin Willis Webber
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-01 00:00:00 -04:00
+date: 2010-07-04 00:00:00 -04:00
 default_executable: gill
 dependencies: []