git-reclone 0.2.3 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 773ab4311def22ad7a61354f524f3439850a3b850a7d7d85478fb5ee50546de8
-  data.tar.gz: 6bc7f99038ba912dc4f132d7e904807a39d1379621486249f743f5c3c0aefbe1
+  metadata.gz: 7d7a5a34e55842b68937ef1bf93521b7a07e4b2dfa8c13b2c4d7796a80c66602
+  data.tar.gz: 5c9e66b1ae1d394434a57d65b0e2998b5f82d062591f6750db97015b7b71a826
 SHA512:
-  metadata.gz: c6a5922718687dc8c61bdc899a084f731e0d8ab9db978e1a8b606f3bec13cae0cd7264f751316aeaf30221bf46a5f9b146161743f5f17945553090235d7f346c
-  data.tar.gz: a5c29b46ea984b37bb6f6ecce064e5e760d286d9b064b488c053967fe49fe3f692c1ab943a121329c7bd7daf2a5e5e3a23d7bdf06a098714b25d9cbb3901660d
+  metadata.gz: 7807f4738bbe02ffff7f0a424bfd43896e2d293d0eb7169b431fcb79e48257b6b1abda8762928453303a6553ad71965f6dbb08071558b30699097bd26205cc2d
+  data.tar.gz: 6405463051f049349651d27177902ef6f1b0e7a38f54ac6858681ebbdc826c61f2940b8fb7150dd2adeaf1f6360eeb7b057bd2b7a2535a59e48ebb059ea1a48c

data/lib/git-reclone-version.rb

@@ -1,5 +1,5 @@
 # universal version tracking
 
 class GitReclone
-  Version = "0.2.3"
+  VERSION = "1.0.0"
 end

data/lib/git-reclone.rb

@@ -1,27 +1,26 @@
 # git-reclone gem
 # jeremy warner
 
-=begin
-todo: add an option to automatically add a backup of the local copy
-todo: add all remotes other than the origins, maintain connections
-todo: -b / --backup, and this actually should be the default (maybe)
-=end
+# todo: add an option to automatically add a backup of the local copy
+# todo: add all remotes other than the origins, maintain connections
+# todo: -b / --backup, and this actually should be the default (maybe)
 
 require "colored"
 require "fileutils"
+require "tmpdir"
 require "git-reclone-version"
 
 class GitReclone
-  def initialize(test=false)
+  def initialize(test = false)
     @pdelay = 0.01 # constant for arrow speed
     @testing = test
     @verify = !test
   end
 
   def fire(args = [])
-    opts = args.select {|a| a[0] == "-" }
-    opts.each {|o| parse_opt o }
-    exit 0 if (@testing || opts.first)
+    opts = args.select { |a| a[0] == "-" }
+    opts.each { |o| parse_opt o }
+    exit 0 if @testing || opts.first
     parse_arg((args - opts).first)
   end
 
@@ -35,14 +34,14 @@ class GitReclone
     when "--force", "-f"
       @verify = false
     when "--help", "-h"
-      puts GitReclone::Help
+      puts GitReclone::HELP
     when "--version", "-v"
-      puts GitReclone::Version
+      puts GitReclone::VERSION
     end
   end
 
   def parse_arg(a)
-    a.nil?? verify(remote) : verify(remote(a))
+    a.nil? ? verify(remote) : verify(remote(a))
   end
 
   def no_repo?
@@ -51,11 +50,15 @@ class GitReclone
   end
 
   def git_root
-    %x{git rev-parse --show-toplevel}
+    `git rev-parse --show-toplevel`
+  end
+
+  def current_branch
+    `git rev-parse --abbrev-ref HEAD`.chomp
   end
 
   def remotes
-    %x{git remote -v}.split("\n").map { |r| r.split[1] }.uniq
+    `git remote -v`.split("\n").map { |r| r.split[1] }.uniq
   end
 
   def reclonebanner
@@ -80,9 +83,9 @@ class GitReclone
     if r.nil?
       errmsg = "No remotes found that match #{search.to_s.red}. All remotes:\n" + remotes.join("\n")
       pexit errmsg
-      return errmsg
+      errmsg
     else
-      return r
+      r
     end
   end
 
@@ -92,8 +95,11 @@ class GitReclone
     puts "Remote source:\t".red << r
     puts "Local target:\t".red << git_root
 
+    branch = current_branch
+    puts "Current branch:\t".red << branch unless branch == "HEAD"
+
     if @verify
-      puts "Warning: this will completely overwrite the local copy.".yellow
+      puts "Warning: this will replace the local copy with a fresh clone from the remote.".yellow
       printf "Continue recloning local repo? [yN] ".yellow
       unless $stdin.gets.chomp.downcase[0] == "y"
         puts "Reclone aborted.".green
@@ -101,29 +107,61 @@ class GitReclone
       end
     end
 
-    reclone remote, git_root.chomp unless @testing
+    reclone remote, git_root.chomp, branch unless @testing
   end
 
   # overwrite the local copy of the repository with the remote one
-  def reclone(remote, root)
-    # remove the git repo from this computer
-    if !@testing
-      tree = Dir.glob("*", File::FNM_DOTMATCH).select {|d| not ['.','..'].include? d }
-      FileUtils.rmtree (tree)
+  def reclone(remote, root, branch = nil)
+    # create a temporary directory for cloning
+    temp_dir = Dir.mktmpdir("git-reclone-")
+
+    begin
+      # clone into temp directory (disable credential prompts)
+      cloner = "GIT_TERMINAL_PROMPT=0 git clone \"#{remote}\" \"#{temp_dir}\" > /dev/null 2>&1"
+
+      if system(cloner)
+        # clone succeeded, now replace the local copy
+        if !@testing
+          tree = Dir.glob("*", File::FNM_DOTMATCH).select { |d| ![".", ".."].include? d }
+          FileUtils.rmtree(tree)
+
+          # move contents from temp to root
+          Dir.glob("#{temp_dir}/*", File::FNM_DOTMATCH).each do |item|
+            next if File.basename(item) == "." || File.basename(item) == ".."
+            FileUtils.mv(item, root)
+          end
+
+          # restore original branch if it exists
+          if branch && branch != "HEAD"
+            Dir.chdir(root) do
+              system("git checkout #{branch} > /dev/null 2>&1")
+            end
+          end
+        end
+
+        puts "Recloned successfully.".green
+        "Recloned successfully.".green
+      else
+        # clone failed
+        puts "Clone failed.".red
+        nil
+      end
+    ensure
+      # always clean up temp directory
+      FileUtils.rm_rf(temp_dir) if Dir.exist?(temp_dir)
     end
-
-    cloner = "git clone \"#{remote}\" \"#{root}\""
-
-    puts "Recloned successfully.".green if system(cloner)
   end
 end
 
-GitReclone::Help = <<-HELP
-#{'git reclone'.red}: a git repo restoring tool
-
-reclones from the remote listed first, overwriting your local copy.
-to restore from a particular remote repository, specify the host:
-
-    git reclone bitbucket # reclone using bitbucket
-    git reclone github # reclone using github
+GitReclone::HELP = <<~HELP
+  #{"git reclone".red}: a git repo restoring tool
+  
+  replaces your local copy with a fresh clone from the remote.
+  clones to a temp directory first, so your local copy is safe if the clone fails.
+  to restore from a particular remote repository, specify the host:
+
+      git reclone github    # reclone using github
+      git reclone bitbucket # reclone using bitbucket
+      git reclone gitea     # reclone using gitea
+      git reclone gogs      # reclone using gogs
 HELP

data/readme.md

@@ -1,21 +1,19 @@
-git-reclone :rocket:
-=================
-
+# git-reclone :rocket:
 
+[![Gem Version](https://badge.fury.io/rb/git-reclone.svg)](https://badge.fury.io/rb/git-reclone)
+[![Build Status](https://app.travis-ci.com/jeremywrnr/git-reclone.svg)](https://app.travis-ci.com/github/jeremywrnr/git-reclone)
 [![MIT](https://img.shields.io/npm/l/alt.svg?style=flat)](http://jeremywrnr.com/mit-license)
--[![Gem Version](https://badge.fury.io/rb/git-reclone.svg)](https://badge.fury.io/rb/git-reclone)
-[![Build Status](https://travis-ci.org/jeremywrnr/git-reclone.svg?branch=master)](https://travis-ci.org/jeremywrnr/git-reclone)
-[![Code Climate](https://codeclimate.com/github/jeremywrnr/git-reclone/badges/gpa.svg)](https://codeclimate.com/github/jeremywrnr/git-reclone)
-
 
-destroy your local copy of a git repo, and reclone it from your remote.
+replace your local copy of a git repo with a fresh clone from your remote.
 
-![Screencast](http://i.imgur.com/HIvZCJB.gif)
+![Screencast](assets/screencast.gif)
 
 tested and works well for:
 
     - github
     - bitbucket
+    - gitea
+    - gogs
 
 ## setup
 
@@ -35,18 +33,24 @@ part (or all) of the host name. for example:
     git reclone bucket
     git reclone bitbucket
 
-will all overwrite the current repository with bitbucket's remote (assuming
-that some other host/repo name doesn't also match 'bitbucket').
+will all replace the current repository with a fresh clone from bitbucket's
+remote (assuming that some other host/repo name doesn't also match 'bitbucket').
+
+The tool safely clones to a temporary directory first, so if the clone fails,
+your local copy remains intact. Your current branch is automatically restored
+after recloning (if it exists on the remote).
 
 
 ## about
 
 sometimes i mess up git histories, with (merges or rebasing, etc), and it
 becomes more of a headache to figure out how to undo what i did than to just
-reclone the remote copy and apply the changes i want in the right way. i was
-doing this often enough that i figured it would be nice to have a tool that
-just did this automatically. besides, it can be satisfying to just reclone your
-local copy and start anew - after all, what are backups meant for?
+get a fresh clone from the remote and apply the changes i want in the right
+way. i was doing this often enough that i figured it would be nice to have a
+tool that just did this automatically. the tool clones to a temporary directory
+first, so if something goes wrong, your local copy is safe. besides, it can be
+satisfying to just start fresh from the remote - after all, what are backups
+meant for?
 
 ## testing
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: git-reclone
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 1.0.0
 platform: ruby
 authors:
 - Jeremy Warner
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2019-11-15 00:00:00.000000000 Z
+date: 2026-02-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colored
@@ -31,48 +31,50 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.2'
 - !ruby/object:Gem::Dependency
-  name: ronn
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '1.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-description: reclone a local git repo from the remote.
+        version: '1.0'
+description: A tool to safely replace your local git repository with a fresh clone
+  from the remote. Clones to a temporary directory first to protect your local copy
+  if something goes wrong, and automatically restores your current branch.
 email: jeremy.warner@berkeley.edu
 executables:
 - git-reclone
@@ -87,7 +89,7 @@ homepage: http://github.com/jeremywrnr/git-reclone
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -102,8 +104,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.6
-signing_key: 
+rubygems_version: 3.4.20
+signing_key:
 specification_version: 4
-summary: reclone a local git repo from the remote.
+summary: Replace your local git repo with a fresh clone from the remote
 test_files: []