gill 1.0.0.rc.4 → 1.0.0

data/Gemfile

@@ -1,3 +1,5 @@
+# GILL DEPS
+
 source 'https://rubygems.org'
 
 group(:development) do
@@ -10,4 +12,4 @@ group(:doc) do
   gem 'yard', '~> 0.5.3'
 end
 
-gem 'rspec', '~> 1.3.0', :group => [:development]
+gem 'rspec', '>= 1.3.0', :group => [:development]

data/Gemfile.lock

@@ -0,0 +1,26 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    bluecloth (2.0.7)
+    gemcutter (0.6.1)
+    git (1.2.5)
+    jeweler (1.4.0)
+      gemcutter (>= 0.1.0)
+      git (>= 1.2.5)
+      rubyforge (>= 2.0.0)
+    json_pure (1.4.5)
+    rake (0.8.7)
+    rspec (1.3.0)
+    rubyforge (2.0.4)
+      json_pure (>= 1.1.7)
+    yard (0.5.8)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bluecloth (~> 2.0.7)
+  jeweler (~> 1.4.0)
+  rake (~> 0.8.7)
+  rspec (>= 1.3.0)
+  yard (~> 0.5.3)

data/README.rdoc

@@ -1,7 +1,5 @@
 = 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:
@@ -26,11 +24,13 @@ Gill Usage:
  Gill - Git, Clone, Cleanliness.
  Usage: gill git://host/repository.git#category/sub-category/...
 
-     -l, --list                       List all cloned repositories.
-     -r, --remove                     Remove a cloned repository. ie. -r category#folder
-     -u, --update                     Update repository. ie. -u category#folder#branch
-     -h, --help                       This help summary page.
-     -v, --version                    Version number
+    -l, --list                       List all cloned repositories.
+    -r, --remove                     Remove a cloned repository. ie. -r category#folder
+    -u, --update                     Update repository. ie. -u category#folder#branch
+    -i, --import                     Import untracked repository.
+    -h, --help                       This help summary page.
+    -v, --version                    Version number
+
 
 Cloning a git repository with gill:
 
@@ -77,13 +77,13 @@ Listing cloned repositories:
 Removing cloned repositories:
 
  $ gill -r rails#snorby-dev
- Removing: rails => snorby-dev
+ Are you sure you want to remove the repository: snorby-dev? [y/N] y
  Repository Removed Successfully.
- Updating Cache...
  
 Updating cloned repositories:
 
- $ gill -u rails#snorby-dev
+ $ gill -u snorby-dev
+ Update ronin => /Users/mephux/source/rails/snorby-dev? [Y/n] y
  Updating snorby-dev repository.
  From https://github.com/mephux/Snorby
   * branch            master     -> FETCH_HEAD

data/bin/gill

@@ -6,4 +6,4 @@ unless $LOAD_PATH.include?(lib_dir)
 end
 
 require 'gill'
-Gill.run
+Gill.setup

data/lib/gill/cli.rb

@@ -0,0 +1,138 @@
+require 'optparse'
+
+require 'gill/helper'
+require 'gill/config'
+require 'gill/remove'
+require 'gill/import'
+require 'gill/parse'
+require 'gill/git'
+require 'gill/exceptions'
+
+module Gill
+
+  module CLI
+    include Helper
+
+    def CLI.pull(args)
+      begin
+        uri = Parse.new(args)
+        git = Git.new(uri.category, uri.folder, uri.repo)
+        git.clone
+      rescue TypeError => e
+        STDERR.puts "Error: #{e}"
+      rescue => e
+        STDERR.puts "Error: #{e}"
+      end
+    end
+
+    #
+    # Import any preexisting repos intop the gill cache.
+    #
+    def CLI.import
+      begin
+        search = Import.new
+        search.import
+        search.update_cache
+        exit -1
+      rescue => e
+        STDERR.puts "Error: #{e}"
+        exit -1
+      end
+    end
+
+    # Update a gill repository.
+    def CLI.update(repo_name)
+      begin
+        git = Git.new(false, repo_name, false)
+        git.update
+        exit -1
+      rescue TypeError => e
+        STDERR.puts "Error: #{e}\n"
+        exit -1
+      rescue => e
+        STDERR.puts "Error: #{e}"
+        exit -1
+      end
+    end
+
+    # List all gill cloned repositories.
+    def CLI.list
+      Gill.config.list_entries
+      exit -1
+    end
+
+    # Remove a gill cloned repository.
+    def CLI.remove(args)
+      begin
+        # Raise exception if the params are not seperated by a `#`.
+        raise(SyntaxError, "Invalid Syntax. Arguments must be separated by `#`") unless args =~ /\#/
+        Remove.new(args).remove_repo
+
+      rescue => e
+        STDERR.puts "Error: #{e}"
+        exit -1
+      end
+      exit -1
+    end
+
+    # Gill option parser
+    # @param [Array] passed gill options.
+    def 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|
+        CLI.list
+      end
+
+      @opts.on('-r ','--remove ','Remove a cloned repository. ie. -r category#folder') do |remove|
+        CLI.remove(remove)
+      end
+
+      @opts.on('-u ', '--update ','Update repository. ie. -u category#folder#branch') do |update|
+        CLI.update(update)
+      end
+
+      @opts.on('-i','--import','Import untracked repository.') do |import|
+        CLI.import
+      end
+
+      @opts.on('-h','--help','This help summary page.') do |help|
+        usage
+      end
+
+      @opts.on('-v','--version','Version number') do |version|
+        STDOUT.puts "Version: #{Gill::VERSION}"
+        exit -1
+      end
+
+      begin
+
+        @args = @opts.parse!(args)
+        usage if @args.empty? || @args[0].nil?
+        CLI.pull(@args[0])
+      rescue OptionParser::MissingArgument => e
+        gillerror e.message
+        SDTOUT.puts @opts
+        SDTOUT.puts "\n"
+        exit -1
+      rescue OptionParser::InvalidOption => e
+        gillerror e.message
+        SDTOUT.puts @opts
+        SDTOUT.puts "\n"
+        exit -1
+      end
+    end
+
+    def usage
+      STDOUT.puts "#{@opts}\n"
+      exit -1
+    end
+
+  end
+
+end

data/lib/gill/config.rb

@@ -1,30 +1,173 @@
-require 'gill/config/setup'
-require 'gill/config/cache'
-
 module Gill
 
-  class Config
-    
-    # Include the gill setup and cache convenience methods.
-    include Setup, Cache
-    
-    attr_reader :home, :config_path, :cache_path, :config, :cache
-    
-    # Initialize the Gill configuration.
-    # @return [Object] the gill configuration 
-    def initialize
-      
-      @home = File.expand_path('~')
-      @config_path = File.join(@home, '.gillrc')
-      @cache_path = File.join(@home, '.gillcache')
-      @config = find_or_create_config
-      @cache = cache
-      cache_check! # Check The Cache For Missing Entries.
-      
-      self
-      
+  FROZENKEYS = [:version, :categories].freeze
+
+  module Settings
+
+    class Config
+      include Helper
+
+      attr_reader :home, :config_path, :cache_path, :settings, :cache, :repos
+
+      def initialize(home_path=nil)
+        @home = home_path || File.expand_path('~')
+        @settings_path = File.join(@home, '.gillrc')
+        @cache_path = File.join(@home, '.gillcache')
+        file_check!
+        version_check!
+        check_default_folders!
+        self
+      end
+
+      def file_check!
+
+        if File.exists?(@settings_path)
+          load_gill_settings
+        else
+          setup_gill_settings
+        end
+
+        if File.exists?(@cache_path)
+          load_gill_cache
+        else
+          setup_gill_cache
+        end
+
+      end
+
+      def categories
+        @repos = @cache[:categories]
+      end
+
+      def source_path
+        @source_path = @settings[:source]
+      end
+
+      def cache_path
+        @source_path = @settings[:cache]
+      end
+
+      def settings_path
+        @settings_path = @settings[:settings]
+      end
+
+      def default_path
+        @default_path = @settings[:default]
+      end
+
+      def write_settings(settings)
+        File.open(@settings_path, 'w') do |out|
+          YAML.dump(settings, out)
+        end
+      end
+
+      def write_cache(cache)
+        File.open(@cache_path, 'w') do |out|
+          YAML.dump(cache, out)
+        end
+      end
+
+      def list_entries
+        STDERR.puts green("\n*** Listing Cloned Repositories ***\n")
+        categories.each do |category,repos|
+          STDERR.puts "\t#{category}:"
+          repos.each do |repo|
+            STDERR.puts "\t  #{green(repo[0])} => " + "#{repo[1][:repo]}"
+          end
+          STDERR.puts "\n"
+        end
+      end
+
+      def clean_cache
+        @clean_cache = Gill.config.cache
+
+        @clean_cache[:categories].each do |key,value|
+
+          value.each do |k,v|
+            @clean_cache[:categories][key.to_sym].delete(k.to_sym) unless File.directory?(v[:path].to_s)
+          end
+
+          @clean_cache[:categories].delete(key.to_sym) if @clean_cache[:categories][key.to_sym].empty?
+
+        end
+
+        write_cache(@clean_cache)
+
+      end
+
+      def paths
+        @paths = []
+        Gill.config.categories.each do |key,value|
+          value.each do |k,v|
+            @paths << v[:path]
+          end
+        end
+        @paths
+      end
+
+      private
+
+        def version_check!
+          unless current_settings_version && current_cache_version
+            STDOUT.puts red("Your Gill configuration is outdated.")
+            STDOUT.puts red("The must upgrade the gill configuration files to #{Gill::VERSION} to continue.")
+
+            ask("Would you like to update them now?", :default => true) do
+              remove_gill_configuration_files
+              file_check!
+              version_check!
+            end
+
+          end
+        end
+
+        def remove_gill_configuration_files
+          STDOUT.puts red("NOTICE: If you modified any paths in the .gillrc you will have to reconfigure them.\n")
+          FileUtils.rm_rf(@cache_path)
+          FileUtils.rm_rf(@settings_path)
+        end
+
+        def current_settings_version
+          return true if (@settings[:version] == Gill::VERSION)
+          false
+        end
+
+        def current_cache_version
+          return true if (@cache[:version] == Gill::VERSION)
+          false
+        end
+
+        def load_gill_settings
+          @settings = YAML.load_file(@settings_path)
+        end
+
+        def load_gill_cache
+          @cache = YAML.load_file(@cache_path)
+        end
+
+        def setup_gill_settings
+          settings = {
+            :version => Gill::VERSION,
+            :settings => @settings_path,
+            :source => "#{@home}/source",
+            :default => "#{@home}/source/misc",
+            :cache => @cache_path
+          }
+          write_settings(settings)
+          file_check!
+        end
+
+        def setup_gill_cache
+          cache = { :version => Gill::VERSION, :categories => {} }
+          write_cache(cache)
+          file_check!
+        end
+
+        def check_default_folders!
+          FileUtils.mkdir(source_path) unless File.exists?(source_path) && File.directory?(source_path)
+          FileUtils.mkdir(default_path) unless File.exists?(default_path) && File.directory?(default_path)
+        end
+
     end
-    
   end
-  
 end

data/lib/gill/gill.rb

@@ -1,172 +1,29 @@
 require 'fileutils'
-require 'optparse'
+require 'pathname'
 require 'yaml'
 require 'pp'
 
-require 'gill/config'
-require 'gill/helper'
-require 'gill/git'
-require 'gill/import'
-require 'gill/remove'
-require 'gill/parse'
-require 'gill/exceptions'
+require 'gill/cli'
 
 module Gill
 
-  # Module method for the gill configuration.
-  # @return [Object] the gill configuration
-  def Gill.config
-    @config ||= Config.new
-  end
-
-  # Run Gill
-  def Gill.run
-    Gill.optparse(*ARGV)
-  end
-
-  def Gill.pull
-    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."
-    rescue => e
-      STDERR.puts "Error: #{e}"
-    end
-  end
-
-  #
-  # Import any preexisting repos intop the gill cache.
-  #
-  def Gill.import_to_gill
-    begin
-      search = Import.new
-      search.import
-      search.update_cache
-      exit -1
-    rescue => e
-      STDERR.puts "Error: #{e}"
-      exit -1
-    end
+  class << self
+    include CLI
   end
 
-  # 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 argument. category#title") if args.length != 2
-      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
+  def Gill.config=(config=nil)
+    @config = config
   end
 
-  # List all gill cloned repositories.
-  def Gill.list
-    STDERR.puts "\n*** Listing Cloned Repositories ***\n\n"
-    unless Gill.config.cache.nil?
-      Gill.config.cache.each do |type,repos|
-        STDERR.puts "\t#{type}:"
-        repos.each do |repo|
-          STDERR.puts "\t  #{repo[0]} => " + "#{repo[1][:repo]}"
-        end
-        STDERR.puts "\n"
-      end
-    end
-    exit -1
-  end
-
-  # Remove a gill cloned repository.
-  def Gill.remove
-    begin
-      # Raise exception if the params are not seperated by a `#`.
-      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}"
-    rescue => e
-      STDERR.puts "Error: #{e}"
-    end
-    exit -1
-  end
-
-  # Gill option parser
-  # @param [Array] passed gill options.
-  def Gill.optparse(*args)
-
-
-    Gill.config # Load the gill configuration file
-
-    @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|
-      Gill.list
-    end
-
-    @opts.on('-r ','--remove ','Remove a cloned repository. ie. -r category#folder') do |remove|
-      @options[:remove] = remove
-      Gill.remove
-    end
-
-    @opts.on('-u ', '--update ','Update repository. ie. -u category#folder#branch') do |update|
-      @options[:update] = update
-      Gill.update
-    end
-
-    @opts.on('-i','--import','Import untracked repository.') do |import|
-      Gill.import_to_gill
-    end
-
-    @opts.on('-h','--help','This help summary page.') do |help|
-      Gill.usage
-    end
-
-    @opts.on('-v','--version','Version number') do |version|
-      STDERR.puts "Version: #{Gill::VERSION}"
-      exit -1
-    end
-
-    begin
-
-      @args = @opts.parse!(args)
-      @options[:uri] = @args[0]
-      Gill.usage if @options.empty? || @options[:uri].nil?
-      Gill.pull
-    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
+  def Gill.config
+    return @config if defined?(@config)
+    Gill.config = Settings::Config.new
   end
 
-  # Gill Error
-  # @return [Object] gill usage
-  def Gill.usage
-    STDOUT.puts "#{@opts}\n"
-    exit -1
+  def Gill.setup
+    Gill.config
+    Gill.config.clean_cache
+    optparse(*ARGV)
   end
 
 end