git_oops 0.1.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA256:
+  metadata.gz: f039b1f266b4203ba43f8586572030392283e13dd1ece54d0f3c5e41910f065d
+  data.tar.gz: 5524f70d7b4667c872b29f85520967daa22d647f445b98e15c0a81da33fe7530
+SHA512:
+  metadata.gz: edfff93f20a86a729b5a2822912c8bc948b461d72e7af4cbdbf6e56cfe6a5071e39cb1a3f1926930a0cf6f1ef49072b55e51fb5c1677786fe329d99388caa634
+  data.tar.gz: 1a1a7c436ae4177cb229bcdad16c4f4133e2d1c2682a7d3003a8f0f1fbeecd07a21b693cc57bf4c7303b0df76964d743f33bd6ee0eaef7d4ae0a00316470e2b4

data/CHANGELOG.md

@@ -0,0 +1,5 @@
+## [Unreleased]
+
+## [0.1.0] - 2025-01-07
+
+- Initial release

data/CODE_OF_CONDUCT.md

@@ -0,0 +1,84 @@
+# Contributor Covenant Code of Conduct
+
+## Our Pledge
+
+We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, visible or invisible disability, ethnicity, sex characteristics, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation.
+
+We pledge to act and interact in ways that contribute to an open, welcoming, diverse, inclusive, and healthy community.
+
+## Our Standards
+
+Examples of behavior that contributes to a positive environment for our community include:
+
+* Demonstrating empathy and kindness toward other people
+* Being respectful of differing opinions, viewpoints, and experiences
+* Giving and gracefully accepting constructive feedback
+* Accepting responsibility and apologizing to those affected by our mistakes, and learning from the experience
+* Focusing on what is best not just for us as individuals, but for the overall community
+
+Examples of unacceptable behavior include:
+
+* The use of sexualized language or imagery, and sexual attention or
+  advances of any kind
+* Trolling, insulting or derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or email
+  address, without their explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+## Enforcement Responsibilities
+
+Community leaders are responsible for clarifying and enforcing our standards of acceptable behavior and will take appropriate and fair corrective action in response to any behavior that they deem inappropriate, threatening, offensive, or harmful.
+
+Community leaders have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that are not aligned to this Code of Conduct, and will communicate reasons for moderation decisions when appropriate.
+
+## Scope
+
+This Code of Conduct applies within all community spaces, and also applies when an individual is officially representing the community in public spaces. Examples of representing our community include using an official e-mail address, posting via an official social media account, or acting as an appointed representative at an online or offline event.
+
+## Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be reported to the community leaders responsible for enforcement at minh.tang1@tomosia.com. All complaints will be reviewed and investigated promptly and fairly.
+
+All community leaders are obligated to respect the privacy and security of the reporter of any incident.
+
+## Enforcement Guidelines
+
+Community leaders will follow these Community Impact Guidelines in determining the consequences for any action they deem in violation of this Code of Conduct:
+
+### 1. Correction
+
+**Community Impact**: Use of inappropriate language or other behavior deemed unprofessional or unwelcome in the community.
+
+**Consequence**: A private, written warning from community leaders, providing clarity around the nature of the violation and an explanation of why the behavior was inappropriate. A public apology may be requested.
+
+### 2. Warning
+
+**Community Impact**: A violation through a single incident or series of actions.
+
+**Consequence**: A warning with consequences for continued behavior. No interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, for a specified period of time. This includes avoiding interactions in community spaces as well as external channels like social media. Violating these terms may lead to a temporary or permanent ban.
+
+### 3. Temporary Ban
+
+**Community Impact**: A serious violation of community standards, including sustained inappropriate behavior.
+
+**Consequence**: A temporary ban from any sort of interaction or public communication with the community for a specified period of time. No public or private interaction with the people involved, including unsolicited interaction with those enforcing the Code of Conduct, is allowed during this period. Violating these terms may lead to a permanent ban.
+
+### 4. Permanent Ban
+
+**Community Impact**: Demonstrating a pattern of violation of community standards, including sustained inappropriate behavior,  harassment of an individual, or aggression toward or disparagement of classes of individuals.
+
+**Consequence**: A permanent ban from any sort of public interaction within the community.
+
+## Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 2.0,
+available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html.
+
+Community Impact Guidelines were inspired by [Mozilla's code of conduct enforcement ladder](https://github.com/mozilla/diversity).
+
+[homepage]: https://www.contributor-covenant.org
+
+For answers to common questions about this code of conduct, see the FAQ at
+https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations.

data/LICENSE.txt

@@ -0,0 +1,21 @@
+The MIT License (MIT)
+
+Copyright (c) 2025 Minh Tang Q.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/README.md

@@ -0,0 +1,91 @@
+# Git Oops
+
+A friendly tool to help recover deleted Git commits safely and conveniently.
+
+## Installation
+
+Install the gem by running:
+
+```bash
+gem install git_oops
+```
+
+## Usage
+
+The main command is `goops reset`, which helps you interactively restore deleted Git commits:
+
+```bash
+# Basic usage - shows last 20 commits from reflog
+goops reset
+
+# Show more commits from reflog
+goops reset --limit 30
+
+# Show more commits in current log
+goops reset --log-limit 10
+
+# Search commits by keyword
+goops reset --search "fix"
+
+# Skip warning messages
+goops reset --no-warning
+```
+
+### Features
+
+- 🔍 Interactive commit selection with arrow keys
+- 🔎 Search commits by keyword
+- 💾 Option to backup current state before restoring
+- ⚠️ Safety warnings to prevent accidental data loss
+- 🎨 Colored output for better readability
+
+### Options
+
+- `--limit NUMBER` - Number of commits to display from reflog (default: 20)
+- `--log-limit NUMBER` - Number of commits to display in current log (default: 5)
+- `--search KEYWORD` - Search commits by keyword
+- `--no-warning` - Skip warning messages
+
+## Development Guide
+
+### Setup Development Environment
+
+```bash
+git clone https://github.com/rubykachu/git_oops.git
+cd git_oops
+bin/setup
+```
+
+### Debug
+
+1. Add `require 'pry'` to your code
+2. Insert breakpoint with `binding.pry`
+3. Run gem with `bundle exec exe/goops reset`
+
+### Test Changes Without Reinstalling
+
+```bash
+# Run directly from source
+bundle exec exe/goops reset [options]
+
+# Or create alias for development
+alias gdev="bundle exec exe/goops"
+gdev reset [options]
+```
+
+### Release Process
+
+1. Update version in `lib/git_oops/version.rb`
+2. Update `CHANGELOG.md`
+3. Run release script:
+```bash
+bin/release
+```
+
+## Contributing
+
+Bug reports and pull requests are welcome on GitHub at https://github.com/rubykachu/git_oops.
+
+## License
+
+The gem is available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/exe/goops

@@ -0,0 +1,7 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "git_oops"
+require "git_oops/cli"
+
+GitOops::CLI.start(ARGV)

data/git_oops.gemspec

@@ -0,0 +1,55 @@
+# frozen_string_literal: true
+
+require_relative "lib/git_oops/version"
+
+Gem::Specification.new do |spec|
+  spec.name = "git_oops"
+  spec.version = GitOops::VERSION
+  spec.authors = ["Minh Tang Q."]
+  spec.email = ["minh.tang1@tomosia.com"]
+
+  spec.summary = "A friendly tool to help recover deleted Git commits safely and conveniently"
+  spec.description = "git_oops provides an interactive interface to help users recover deleted Git commits safely. It features a user-friendly selection interface, commit preview, and safety measures to prevent data loss."
+  spec.homepage = "https://github.com/TOMOSIA-VIETNAM/git_oops"
+  spec.license = "MIT"
+  spec.required_ruby_version = ">= 3.3.0"
+
+  spec.metadata["allowed_push_host"] = "https://rubygems.org"
+
+  spec.metadata["homepage_uri"] = spec.homepage
+  spec.metadata["source_code_uri"] = "https://github.com/TOMOSIA-VIETNAM/git_oops"
+  spec.metadata["changelog_uri"] = "https://github.com/TOMOSIA-VIETNAM/git_oops/blob/main/CHANGELOG.md"
+
+  # Specify which files should be added to the gem when it is released.
+  spec.files = Dir.chdir(__dir__) do
+    `git ls-files -z`.split("\x0").reject do |f|
+      (File.expand_path(f) == __FILE__) ||
+        f.start_with?(*%w[
+          bin/
+          test/
+          spec/
+          features/
+          .git
+          .github
+          .gitignore
+          .rspec
+          .rubocop.yml
+          Gemfile
+          Rakefile
+          git_oops-*.gem
+          *.gemspec
+        ])
+    end
+  end
+  spec.bindir = "exe"
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.require_paths = ["lib"]
+
+  # Dependencies
+  spec.add_dependency "tty-prompt", "~> 0.23.1"  # For interactive CLI
+  spec.add_dependency "pastel", "~> 0.8.0"       # For colored output
+  spec.add_dependency "thor", "~> 1.3.0"         # For CLI command structure
+
+  spec.add_development_dependency "rspec", "~> 3.12"
+  spec.add_development_dependency "rubocop", "~> 1.59"
+end

data/lib/git_oops/cli.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require "thor"
+require_relative "commands/reset_command"
+
+module GitOops
+  class CLI < Thor
+    package_name "Git Oops"
+
+    class_option :help, aliases: '-h', type: :boolean,
+                description: 'Display usage information'
+
+    desc "reset", "Restore deleted Git commits interactively"
+    long_desc <<-LONGDESC
+      `goops reset` will help you restore deleted Git commits in an interactive way.
+
+      Examples:
+        $ goops reset                    # Shows last 20 commits from reflog
+        $ goops reset --limit 30         # Shows last 30 commits from reflog
+        $ goops reset --log-limit 10     # Shows last 10 commits in current log
+        $ goops reset --search "fix"     # Search commits with "fix" in message
+        $ goops reset --no-warning       # Skip warning messages
+
+      You can combine options:
+        $ goops reset --limit 50 --log-limit 8 --search "feature" --no-warning
+    LONGDESC
+    method_option :limit, type: :numeric, default: 20,
+                 desc: "Number of commits to display from reflog (default: 20)"
+    method_option :log_limit, type: :numeric, default: 5,
+                 desc: "Number of commits to display in current log (default: 5)"
+    method_option :search, type: :string,
+                 desc: "Search commits by keyword in commit message"
+    method_option :no_warning, type: :boolean, default: false,
+                 desc: "Skip warning messages before restoring"
+    def reset
+      GitOops::Commands::ResetCommand.new(options).execute
+    end
+
+    def self.exit_on_failure?
+      true
+    end
+  end
+end

data/lib/git_oops/commands/reset_command.rb

@@ -0,0 +1,157 @@
+# frozen_string_literal: true
+
+require "tty-prompt"
+require "pastel"
+
+module GitOops
+  module Commands
+    class ResetCommand
+      DEFAULT_LOG_LIMIT = 5
+
+      def initialize(options)
+        @options = options
+        @prompt = TTY::Prompt.new
+        @pastel = Pastel.new
+      end
+
+      def execute
+        display_current_log
+        puts "\n#{@pastel.blue('ℹ')} Above is your current git log. Below are all available commits from git reflog:\n\n"
+
+        commits = fetch_commits
+        return if commits.empty?
+
+        begin
+          selected_commit = select_commit(commits)
+          return unless selected_commit
+
+          handle_restore(selected_commit)
+        rescue TTY::Reader::InputInterrupt
+          puts "\n#{@pastel.blue('ℹ')} Operation cancelled. No changes were made."
+          exit 0
+        end
+      end
+
+      private
+
+      def display_current_log
+        puts @pastel.cyan("Current Git Log:")
+        puts @pastel.cyan("---------------")
+
+        # Get total number of commits
+        total_commits = `git rev-list --count HEAD`.strip.to_i
+        log_limit = @options[:log_limit] || DEFAULT_LOG_LIMIT
+
+        # Get current branch name and latest commits
+        current_branch = `git rev-parse --abbrev-ref HEAD`.strip
+        command = %Q{git log --oneline --decorate --color=always -n #{log_limit}}
+        log_output = `#{command}`
+
+        # Display branch and commit information
+        puts "#{@pastel.bright_blue('Branch:')} #{current_branch}"
+        puts "#{@pastel.bright_blue('Total commits:')} #{total_commits}"
+        puts "#{@pastel.bright_blue('Latest commits:')} (showing #{[log_limit, total_commits].min} of #{total_commits})"
+        puts "#{@pastel.cyan('─' * 40)}"
+        puts log_output
+
+        if total_commits > log_limit
+          remaining = total_commits - log_limit
+          puts @pastel.dim("... and #{remaining} more commits")
+        end
+      end
+
+      def fetch_commits
+        limit = @options[:limit] || 20
+        search = @options[:search]
+        current_commit = `git rev-parse HEAD`.strip
+        current_branch = `git rev-parse --abbrev-ref HEAD`.strip
+
+        # Use a more detailed format that includes the full reflog information
+        command = %Q{git reflog --format="%h (%gD) %gs"}
+        command += " | grep -i '#{search}'" if search
+        command += " | head -n #{limit}"
+
+        result = `#{command}`
+        commits = result.split("\n")
+
+        # Mark current commit and format like git reflog
+        commits.map do |commit|
+          # Split by first space to get hash, then by closing parenthesis to get ref
+          parts = commit.split(" ", 2)
+          hash = parts[0]
+          rest = parts[1]
+
+          # Extract ref and message
+          ref_start = rest.index("(") + 1
+          ref_end = rest.index(")")
+          ref = rest[ref_start...ref_end]
+          message = rest[ref_end + 2..-1]
+
+          # Format the commit line
+          commit_line = if hash == current_commit
+            head_info = @pastel.green("HEAD -> #{current_branch}")
+            "#{hash} (#{head_info}, #{ref}) #{message}"
+          else
+            "#{hash} (#{ref}) #{message}"
+          end
+
+          [commit_line, hash]
+        end
+      end
+
+      def select_commit(commits)
+        choices = commits.map do |commit_info, hash|
+          { name: commit_info, value: hash }
+        end
+
+        selected = @prompt.select(
+          "Select a commit to restore:",
+          choices,
+          per_page: 10,
+          filter: true,
+          show_help: :always,
+          help: "(Use ↑/↓ to navigate, type to filter)"
+        )
+
+        current_commit = `git rev-parse HEAD`.strip
+        if selected == current_commit
+          puts "\n#{@pastel.blue('ℹ')} Selected commit is the current HEAD. No changes needed."
+          return nil
+        end
+
+        selected
+      end
+
+      def handle_restore(hash)
+        unless @options[:no_warning]
+          return unless confirm_restore
+        end
+
+        if @prompt.yes?("Do you want to save the current state before restoring?")
+          backup_current_state
+        end
+
+        restore_commit(hash)
+      end
+
+      def confirm_restore
+        @prompt.yes?(@pastel.yellow("⚠️  WARNING: You are about to reset your code. This action can be undone with git reflog.\nDo you want to continue?"))
+      end
+
+      def backup_current_state
+        timestamp = Time.now.strftime("%Y%m%d_%H%M%S")
+        branch_name = "backup_#{timestamp}"
+        system("git branch #{branch_name}")
+        puts @pastel.green("✅ Current state saved to branch: #{branch_name}")
+      end
+
+      def restore_commit(hash)
+        if system("git reset --hard #{hash}")
+          puts @pastel.green("✅ Successfully restored commit #{hash}")
+        else
+          puts @pastel.red("❌ Failed to restore commit #{hash}")
+        end
+      end
+    end
+  end
+end

data/lib/git_oops/version.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+module GitOops
+  VERSION = "0.1.0"
+end

data/lib/git_oops.rb

@@ -0,0 +1,18 @@
+# frozen_string_literal: true
+
+require_relative "git_oops/version"
+require_relative "git_oops/cli"
+
+module GitOops
+  class Error < StandardError; end
+
+  # Check if git is installed
+  def self.git_installed?
+    system("which git > /dev/null 2>&1")
+  end
+
+  # Check if current directory is a git repository
+  def self.git_repository?
+    system("git rev-parse --git-dir > /dev/null 2>&1")
+  end
+end

data/sig/git_oops.rbs

@@ -0,0 +1,4 @@
+module GitOops
+  VERSION: String
+  # See the writing guide of rbs: https://github.com/ruby/rbs#guides
+end

metadata

@@ -0,0 +1,131 @@
+--- !ruby/object:Gem::Specification
+name: git_oops
+version: !ruby/object:Gem::Version
+  version: 0.1.0
+platform: ruby
+authors:
+- Minh Tang Q.
+autorequire:
+bindir: exe
+cert_chain: []
+date: 2025-01-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.23.1
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.23.1
+- !ruby/object:Gem::Dependency
+  name: pastel
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.59'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.59'
+description: git_oops provides an interactive interface to help users recover deleted
+  Git commits safely. It features a user-friendly selection interface, commit preview,
+  and safety measures to prevent data loss.
+email:
+- minh.tang1@tomosia.com
+executables:
+- goops
+extensions: []
+extra_rdoc_files: []
+files:
+- CHANGELOG.md
+- CODE_OF_CONDUCT.md
+- LICENSE.txt
+- README.md
+- exe/goops
+- git_oops.gemspec
+- lib/git_oops.rb
+- lib/git_oops/cli.rb
+- lib/git_oops/commands/reset_command.rb
+- lib/git_oops/version.rb
+- sig/git_oops.rbs
+homepage: https://github.com/TOMOSIA-VIETNAM/git_oops
+licenses:
+- MIT
+metadata:
+  allowed_push_host: https://rubygems.org
+  homepage_uri: https://github.com/TOMOSIA-VIETNAM/git_oops
+  source_code_uri: https://github.com/TOMOSIA-VIETNAM/git_oops
+  changelog_uri: https://github.com/TOMOSIA-VIETNAM/git_oops/blob/main/CHANGELOG.md
+post_install_message:
+rdoc_options: []
+require_paths:
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: 3.3.0
+required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements:
+  - - ">="
+    - !ruby/object:Gem::Version
+      version: '0'
+requirements: []
+rubygems_version: 3.5.3
+signing_key:
+specification_version: 4
+summary: A friendly tool to help recover deleted Git commits safely and conveniently
+test_files: []