lib/shelly/app.rb in shelly-0.4.5 vs lib/shelly/app.rb in shelly-0.4.6

@@ -51,10 +51,19 @@
     def git_fetch_remote(remote = 'shelly')
       system("git fetch #{remote} > /dev/null 2>&1")
     end
 
     def remove_git_remote
-      system("git remote rm shelly > /dev/null 2>&1")
+      remote = git_remote_name
+      if remote.present?
+        system("git remote rm #{remote} > /dev/null 2>&1")
+      end
+    end
+
+    def git_remote_name
+      io = IO.popen("git remote -v").readlines
+      remote = io.select {|line| line.include? git_info["repository_url"]}.first
+      remote.split("\t").first unless remote.nil?
     end
 
     def create
       attributes = {:code_name => code_name,
                     :organization_name => organization_name,