lib/gito/project.rb in gito-0.4.8 vs lib/gito/project.rb in gito-0.4.9

@@ -31,20 +31,24 @@
     end
     url
   end
 
   def destination
-    unless @base_url.include? 'github.com'
-      return Digest::SHA256.hexdigest @base_url
-    end
-
     stripped_url = @base_url.gsub('.git', '')
     stripped_url = stripped_url.gsub('.git', '')
     stripped_url = stripped_url.gsub('[e-mail]:', '')
     stripped_url = stripped_url.gsub('https://github.com/', '')
     stripped_url.gsub('http://github.com/', '')
 
+    if stripped_url.start_with?('http')
+      stripped_url = stripped_url.split('/').last(2).join('/')
+    end
+
+    if stripped_url.include?(':') && stripped_url.start_with?('git@')
+      stripped_url = stripped_url.split(':').last
+    end
+
     stripped_url.gsub('/','-')
   end
 
   def change_directory
     # TODO aparently this doesn't work because ruby forks the terminal process and can't communicate with his parent
@@ -74,11 +78,11 @@
         go_inside_and_run item['installation_command']
       end
     end
   end
 
-  def cloneable_url
+  def retrieve_cloneable_url
     starts_with_git = @base_url.split(//).first(4).join.eql? 'git@'
     ends_with_git = @base_url.split(//).last(4).join.eql? '.git'
 
     # ends with git but doesnt start with git
     return @base_url if ends_with_git && !starts_with_git
@@ -91,11 +95,11 @@
 
   ##
   ## CLONE THE REPOSITORY
   ##
   def clone(is_temp_folder=false, shell_copy=true)
-    url = cloneable_url
+    url = retrieve_cloneable_url
 
     unless is_temp_folder
       prefix = Dir.pwd + '/'
     else
       prefix = Dir.tmpdir + '/gito/'
@@ -103,9 +107,11 @@
 
     @destination_dir = prefix + "#{@destination}"
 
     if File.directory?(@destination_dir)
       puts "The folder #{@destination_dir.green} is not empty..."
+      go_inside_and_run "git reset --hard HEAD"
+      go_inside_and_run "git pull"
     else
       shell_copy_string = shell_copy ? '--depth 1' : ''
       AppUtils.execute("git clone #{shell_copy_string} --recursive #{url} #{@destination_dir}")
     end