gill 0.0.4 → 0.0.5

data/README.rdoc

@@ -9,6 +9,8 @@ Files created by gill:
 == Install
 
  gem install gill
+ 
+* NOTE: if you are using gill <= 0.0.3 please upgrade to version >= 0.0.4.
 
 == Example
 

data/gill.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{gill}
-  s.version = "0.0.4"
+  s.version = "0.0.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Dustin Willis Webber"]
@@ -34,6 +34,7 @@ Gem::Specification.new do |s|
     "lib/gill/app.rb",
     "lib/gill/config.rb",
     "lib/gill/git.rb",
+    "lib/gill/parse.rb",
     "lib/gill/remove.rb",
     "lib/gill/version.rb",
     "spec/gill_spec.rb",

data/lib/gill/app.rb

@@ -2,6 +2,7 @@ require 'gill/config'
 require 'gill/git'
 require 'fileutils'
 require 'gill/remove'
+require 'gill/parse'
 require 'gill/version'
 require 'rainbow'
 require 'yaml'
@@ -15,17 +16,17 @@ module Gill
   def Gill.run
     Gill.optparse(*ARGV)
     begin
-      uri = @options[:uri].split(':', 3)
-      type = uri[0]
-      folder = uri[1]
-      path = uri[2]
-      if path =~ /\.git/
-        gillgit = Git.new(type, folder, path)
+
+      path = Parse.new(@options[:uri])
+            
+      if path.valid?
+        gillgit = Git.new(path.type, path.folder, path.repo)
         gillgit.clone
       else
         STDERR.puts "Gill - Version: #{Gill::VERSION}\n"
-        STDERR.puts "Error: Not a git repository."
+        STDERR.puts "Error: Not a valid git repository \"#{path.repo}\" or is currently not supported."
       end
+      
     rescue TypeError
       STDERR.puts "Gill - Version: #{Gill::VERSION}\n"
       STDERR.puts "Error: Please make sure to remove all whitespace from types and folder names."

data/lib/gill/git.rb

@@ -11,9 +11,6 @@ module Gill
       @folder_path = File.join(@type_path, @folder)
     end
 
-    def parse_path
-    end
-
     def build_cache
       old_cache = YAML.load_file(@cache)
       if old_cache[:"#{@type}"]
@@ -39,8 +36,7 @@ module Gill
         STDERR.puts "destination path '#{@folder_path}' already exists and is not an empty directory.\n"
       else
         build_type_folder
-        build_cache
-        system('git', 'clone', @path, @folder_path)
+        build_cache if system('git', 'clone', @path, @folder_path)
       end
     end
 

data/lib/gill/parse.rb

@@ -0,0 +1,34 @@
+module Gill
+  
+  class Parse
+    
+    def initialize(uri)
+      @uri = uri.split(':', 3)
+    end
+    
+    def type
+      @uri.first
+    end
+    
+    def folder
+      @uri[1]
+    end
+    
+    def repo
+      @uri.last
+    end
+    
+    def valid?
+      if type && folder && repo
+        if repo[/^(http\:|https\:|git\:)+/i] && repo[/\.git/]
+          return true
+        else
+          return false
+        end
+      else
+        return false
+      end
+    end
+    
+  end
+end

data/lib/gill/remove.rb

@@ -57,7 +57,7 @@ module Gill
         end
 
       else
-
+        remove_cache
         STDERR.puts "The directory #{@source}/#{@type}/#{@folder} does not exist or was not cloned with gill."
 
       end

data/lib/gill/version.rb

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

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 4
-  version: 0.0.4
+  - 5
+  version: 0.0.5
 platform: ruby
 authors: 
 - Dustin Willis Webber
@@ -97,6 +97,7 @@ files:
 - lib/gill/app.rb
 - lib/gill/config.rb
 - lib/gill/git.rb
+- lib/gill/parse.rb
 - lib/gill/remove.rb
 - lib/gill/version.rb
 - spec/gill_spec.rb