gitflash 0.1.2.alpha → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3e2ab919eb4408a42c7bbd519e063a8f749e5c76802f078a410934bd6bf0faec
-  data.tar.gz: e821bb291632e98b292a0b6df49ede8836566904342026e9aa6693c8a0367ca6
+  metadata.gz: 37431db670588b8025d973c045532de047b33a667fc1c86152e1180d2d0a01a6
+  data.tar.gz: 307fe7991415b2bedce69a08f7b0e09e591be3cbcb6be692c1d46c87c79019b1
 SHA512:
-  metadata.gz: 5f855639bd9cee9d4761198e37e86a5b76e3ce6641a35be10602aaeb2698524aedf6c0fb4df761f3fcb3e306629ced9816586c8f5c0adea7e9acdcacca3636f5
-  data.tar.gz: 8a90c367cea30c5bbc242bb73eced1907e773a6e6cbad0d3673f4cf07a27bbcc1c972256d60eafde834cdc1134de2fcc3142ee2c4c8d7aad1faaa7e2c1dfa48d
+  metadata.gz: dcc8b7a6a6c740c46c78d29766bc78b99fa9949217482a71e47070a077a51759903c74a82adbcbe24590e27dbc04f5db5501175efda1a2a624f7b84211e72579
+  data.tar.gz: 541587b9f335e4ccd47f4cb0e7ec9806d1e4a2abb06d8811e81e8c483c2eba2126c26f7cbaebe5074d07d968d4e156b6ea751ccfbff08b6128a6239af0cd4272

data/README.md

@@ -24,7 +24,7 @@ Or install it yourself as:
 
 ## Requirements
 
-This gem requires Ruby 2.7+.
+This gem requires Ruby 3.3.2+.
 ## Usage
 
 Run `gitflash` to get a list with the available commands and their description.
@@ -37,7 +37,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/git_flash. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/[USERNAME]/git_flash/blob/master/CODE_OF_CONDUCT.md).
+Bug reports and pull requests are welcome on GitHub at https://github.com/Kleanthismits/git_flash. This project is intended to be a safe, welcoming space for collaboration, and contributors are expected to adhere to the [code of conduct](https://github.com/Kleanthismits/git_flash/blob/main/CODE_OF_CONDUCT.md).
 
 ## License
 
@@ -45,4 +45,4 @@ The gem is available as open source under the terms of the [MIT License](https:/
 
 ## Code of Conduct
 
-Everyone interacting in the GitFlash project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/[USERNAME]/git_flash/blob/master/CODE_OF_CONDUCT.md).
+Everyone interacting in the GitFlash project's codebases, issue trackers, chat rooms and mailing lists is expected to follow the [code of conduct](https://github.com/Kleanthismits/git_flash/blob/main/CODE_OF_CONDUCT.md).

data/command_descriptions.yml

@@ -0,0 +1,33 @@
+checkout:
+  short: 'Checkout the selected branch'
+  long: |
+    Presents a list with all the available local branches.
+
+    You can use the arrow keys to navigate through the branches.
+    Type for quick searching a specific branch.
+    Press `enter` to choose and checkout the branch.
+    Press `ctrl+c` to cancel the operation.
+
+delete:
+  short: 'Delete the selected branches'
+  long: |
+    Presents a list with all the available local branches (without current or main/master).
+
+    You can use the arrow keys to navigate through the branches.
+    Type for quick searching a specific branch.
+    Press `space` to choose multiple branches.
+    Press `enter` to confirm selection and delete branches.
+    Press `ctrl+c` to cancel the operation.
+
+reset:
+  short: 'Reset your code to the selected commit'
+  long: |
+    Accepts an optional parameter (hard) if you want to hard reset.
+
+    Presents a list with all the available commits.
+
+    You can use the arrow keys to navigate through the commits.
+    Type for quick searching a specific commit.
+    Press `space` to choose multiple commits.
+    Press `enter` to confirm selection and reset to that commit.
+    Press `ctrl+c` to cancel the operation.

data/lib/gitflash/cli.rb

@@ -4,43 +4,34 @@ require 'thor'
 
 module Gitflash
   class Cli < Thor
+    extend Configuration::Descriptions
+
     def self.exit_on_failure?
       true
     end
 
-    desc 'checkout', 'Checkout the selected branch'
-    long_desc <<-TEXT
-
-    Presents a list with all the available local branches.
-
-    You can use the arrow keys to navigate through the branches.
-    Type for quick searching a specific branch.
-    Press `enter` to choose and checkout the branch.
-    Press `ctrl+c` to cancel the operation.
-    TEXT
+    desc 'checkout', descriptions.checkout.short
+    long_desc descriptions.checkout.long
 
     def checkout
       branches? ? checkout_branch : prompt.ok('You only have one branch!')
     end
 
-    desc 'delete', 'Delete the selected branches'
-    long_desc <<-TEXT
-
-    Presents a list with all the available local branches(without current or main/master).
-
-    You can use the arrow keys to navigate through the branches.
-    Type for quick searching a specific branch.
-    Press `space` to choose multiple branches.
-    Press `enter` to confirm selection and delete branches.
-    Press `ctrl+c` to cancel the operation.
-
-    WARNING: The branches will be deleted even if they have unmerged changes!!
-    TEXT
+    desc 'delete', descriptions.delete.short
+    long_desc descriptions.delete.long
 
     def delete
       branches? ? delete_branch : prompt.ok('You only have one branch!')
     end
 
+    desc 'reset', descriptions.reset.short
+    long_desc descriptions.reset.long
+
+    option :hard, type: :boolean, default: false, desc: 'Perform a hard reset'
+    def reset
+      commits? ? reset_to_commit : prompt.ok('You only have one branch!')
+    end
+
     private
 
     def checkout_branch
@@ -59,24 +50,45 @@ module Gitflash
         branches(options: { master: false, current: false })
       )
 
-      prompt.warn(<<~TEXT
+      warning_message = <<~TEXT
         You are about to permanently delete the following branches even if they have unmerged changes:
 
         #{selection.map { |br| "* #{br}" }.join("\n")}
       TEXT
-                 )
-      answer = prompt.yes?('Do you want to proceed?')
-      puts answer ? git.delete(selection) : 'Exited'
+
+      prompt_proceed_warning(warning_message) { git.delete(selection) }
+    end
+
+    def reset_to_commit
+      selection = prompt.select('Select a commit to reset to', branch_commits)
+      reset_options = { commit_hash: selection, hard: options[:hard] }
+
+      if options[:hard]
+        warning_message = 'You are about to reset your branch and lose all your current changes'
+        prompt.proceed_with_warning(warning_message) { git.reset(**reset_options) }
+      else
+        git.reset(**reset_options)
+      end
     end
 
     def branches?
       all_branches && all_branches.size > 1
     end
 
+    def commits?
+      branch_commits && branch_commits.size > 1
+    end
+
     def prompt
       @prompt ||= Prompt.create
     end
 
+    def prompt_proceed_warning(message)
+      prompt.warn(message)
+      answer = prompt.yes?('Do you want to proceed?')
+      puts answer ? yield : 'Exited'
+    end
+
     def checkout_options
       {}.tap do |opt|
         opt[:default] = current unless current.nil?
@@ -95,6 +107,10 @@ module Gitflash
       @current ||= git.current_branch
     end
 
+    def branch_commits
+      @branch_commits = git.branch_commits
+    end
+
     def git
       Gitflash::Git::Wrapper
     end

data/lib/gitflash/configuration.rb

@@ -0,0 +1,29 @@
+require 'yaml'
+
+module Gitflash
+  module Configuration
+    module Descriptions
+      def descriptions
+        @descriptions ||= load_descriptions
+      end
+
+      private
+
+      def load_descriptions
+        file = File.expand_path('../../command_descriptions.yml', __dir__)
+        transform_to_struct(YAML.load_file(file))
+      end
+
+      def transform_to_struct(data)
+        return data unless data.is_a? Hash
+
+        keys = data.keys.map(&:to_sym)
+        Struct.new(*keys).new(*data.values).tap do |st|
+          keys.each do |method|
+            st.send("#{method}=".to_sym, transform_to_struct(st.send(method)))
+          end
+        end
+      end
+    end
+  end
+end

data/lib/gitflash/git/wrapper.rb

@@ -1,4 +1,5 @@
 # frozen_string_literal: true
+
 module Gitflash
   module Git
     class Wrapper
@@ -23,8 +24,29 @@ module Gitflash
           bash.system_exec('git', 'checkout', branch)
         end
 
-        def delete(selection)
-          bash.system_exec('git', 'branch', '-D', *selection)
+        def delete(branch)
+          bash.system_exec('git', 'branch', '-D', *branch)
+        end
+
+        def reset(commit_hash:, hard:)
+          params = [].tap do |ar|
+            ar << '--hard' if hard
+          end
+
+          bash.system_exec('git', 'reset', *params, commit_hash)
+        end
+
+        def branch_commits
+          commits_string = bash.exec('git log --oneline')
+          {}.tap do |hsh|
+            commits_string.each_line do |line|
+              parts = line.strip.split
+              commit_code = parts[0]
+              commit_name = parts[1..].join(' ')
+              label = "#{commit_code} - #{commit_name}"
+              hsh[label] = commit_code
+            end
+          end
         end
 
         private

data/lib/gitflash/prompt.rb

@@ -23,9 +23,15 @@ module Gitflash
       super(message, collection, default_select_options(options))
     end
 
-    private
+    def proceed_with_warning(message, &block)
+      raise ArgumentError, 'A block is required for this method' unless block_given?
+
+      warn(message)
+      answer = yes?('Do you want to proceed?')
+      answer ? block.call : 'Exited'
+    end
 
-    attr_reader :prompt
+    private
 
     def default_create_options(options)
       {
@@ -37,7 +43,6 @@ module Gitflash
     def default_select_options(options)
       {
         cycle: true,
-        per_page: 50,
         filter: true,
         symbols: { marker: '>' }
       }.merge(options)

data/lib/gitflash/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Gitflash
-  VERSION = '0.1.2.alpha'
+  VERSION = '0.3.0'
 end

data/lib/gitflash.rb

@@ -5,7 +5,6 @@ original_verbose = $VERBOSE
 $VERBOSE = nil
 
 require 'zeitwerk'
-require 'pry'
 
 loader = Zeitwerk::Loader.for_gem
 loader.setup

metadata

@@ -1,15 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: gitflash
 version: !ruby/object:Gem::Version
-  version: 0.1.2.alpha
+  version: 0.3.0
 platform: ruby
 authors:
 - Kleanthis Mitsioulis
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-04 00:00:00.000000000 Z
-dependencies: []
+date: 2025-10-10 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.2'
+- !ruby/object:Gem::Dependency
+  name: tty-prompt
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.23'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.23'
+- !ruby/object:Gem::Dependency
+  name: zeitwerk
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.6'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '13.0'
 description: This gem allows you to perform a number of git commands using interactive
   cli prompts
 email:
@@ -25,8 +81,10 @@ files:
 - bin/console
 - bin/gitflash
 - bin/setup
+- command_descriptions.yml
 - lib/gitflash.rb
 - lib/gitflash/cli.rb
+- lib/gitflash/configuration.rb
 - lib/gitflash/git/bash_command.rb
 - lib/gitflash/git/wrapper.rb
 - lib/gitflash/prompt.rb
@@ -47,14 +105,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: '3.0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
-rubygems_version: 3.2.15
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Simplified usage of some git cli commands