G4t 1.2 → 2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0eb50b9d743bafdb52b1f019a4107a781219cd23d467cf354a7d8b8d8e8dd79c
-  data.tar.gz: cbd38159c733eb4ace0e41ae24eba74172fe3ab5b458a6f9ed24ef79f90a3d8c
+  metadata.gz: 3444e27ffa161b5177255951d95af8d36a6ab092e16999750f658e28c31004d6
+  data.tar.gz: e346503def345173e3a349eb4f68e935e286be17ce575d9b91c0f4770fc4d8e0
 SHA512:
-  metadata.gz: 70225a899f1bc5618adc1065ef970fc41017f7571f1e196e9f3c198cad02cb56ed9cf7901360551c6b8ec7f36d0e08a51eb95c21d52171408914abce8d987096
-  data.tar.gz: 292cef5792293f97f442260a68a036afff56155ce4febbaf3027940799e3eb3ac7c766420e48567b470979baa25781a69f97fa771c98280a3699c98abc86c8a2
+  metadata.gz: dc57f81f30d916d78d865ad02ccb8b394d8c273ce6e8fce5f5ba4981e51d80a94567c24f50b9f208cb00d740a4cfcf5a9033f64e7ba4df778571fa3a67c8503a
+  data.tar.gz: e0507409baafae6d26821b61528501c428b433940ecca33ce92f796bc14d160cd42a479aff3fc685cd73d0d7b6c76a6d3b39d732e7ad1877f067adfbbee13899

data/bin/g4t

@@ -1,2 +1,3 @@
 #!/usr/bin/env ruby
+
 require "g4t"

data/lib/g4t.rb

@@ -2,154 +2,32 @@
 # frozen_string_literal: true
 require "os"
 require "tty-prompt"
+
+require_relative "g4tOptions"
 require "etc"
 
 module G4t
-  class Options
-    def initialize
-      $prompt = TTY::Prompt.new
-    end
-    def commit_files
-      $lastmsg = "Now that we commited the files"
-      msg = $prompt.ask("Commit message:")
-
-      if msg[0] != "\""
-        msg = "\"#{msg}"
-      end
-
-      if msg[-1] != "\""
-        msg = "#{msg}\""
-      end
-
-      puts msg
-      run_command("git commit -m #{msg}")
-    end
-
-    def add_files
-      $lastmsg = "Now that we added the files"
-      all_files = $prompt.yes?("Add all files?")
-      if all_files
-        cmd = "git add ."
-        puts("Adding all files...")
-      else
-        fname = $prompt.ask("File to add:")
-        cmd = "git add #{fname}"
-      end
-      run_command(cmd)
-    end
-
-    def logs
-      run_command("git log")
-    end
-
-    def push_branch
-      branch = $prompt.ask("Branch to push:")
-      run_command("git push origin #{branch}")
-    end
-
-    def remote_adress
-      $lastmsg = "Now that we the remote address"
-      uname = $prompt.ask("Your github username:")
-      repo = $prompt.ask("Your repository name:")
-      puts("Adding remote repository https://github.com/#{uname}/#{repo}...")
-      run_command("git remote add origin https://github.com/#{uname}/#{repo}.git")
-    end
-
-    def status
-      run_command("git status")
-    end
-
-    def clone_repo
-      uname = $prompt.ask("Username:")
-      repo = $prompt.ask("Repository name:")
-      run_command("git clone https://github.com/#{uname}/#{repo}/")
-    end
-
-    def restore
-      fname = $prompt.ask("File name:")
-      run_command("git restore #{fname}")
-    end
-
-    def reset
-      commit = $prompt.ask("Commit id:")
-      run_command("git reset --hard #{commit}")
-    end
-
-    def hard_reset
-      confirmation = $prompt.yes?("do you really want to hard reset?")
-
-      if confirmation
-        run_command("git reset --hard HEAD~")
-      else
-        puts "Cancelling operation"
-      end
-
-    end
-
-    def initialize_git
-      $lastmsg = "Now that we initialized .git"
-      puts("Initializing Git repository in '#{Dir.pwd}/.git'...")
-      run_command("git init")
-    end
-
-    def diff
-      run_command("git diff")
-    end
-
-    def change_branch
-      bname = $prompt.ask("Branch name:")
-      run_command("git checkout -b #{bname}")
-    end
-
-    def git_info
-      status = {
-          "Git branch" => IO.popen("git branch"),
-          "Repository url" => IO.popen("git config --get remote.origin.url")
-      }
-      status.each do |k, v|
-        puts("#{k}: #{v.read}")
-      end
-      puts("____________\n\n")
-    end
-
-    def remove_file
-      file_name = $prompt.ask("Enter the file name: ")
-      run_command("git rm #{file_name}")
-    end
-
-    def show_last_commit
-      run_command("git show")
-    end
-
-    def pull_changes
-      git_pull_options = ["rebase", "no-rebase", "ff-only"]
-      chose = $prompt.select("chose: ", git_pull_options)
-      run_command("git pull --#{chose}")
-    end
-
-    def run_command(cmd)
-      puts "Command: #{cmd}"
-      system(cmd)
-    end
-  end
-
-  class Run
+  class Core
     def initialize
       @opt = Options.new
-      git_init?
+      @prompt = TTY::Prompt.new
       start
     end
 
     def verify_system
-      if OS.windows?; "C:\\Users\\#{Etc.getlogin}\\.gitconfig" else "/home/#{Etc.getlogin}/.gitconfig" end
+      if OS.windows?
+         "C:\\Users\\#{Etc.getlogin}\\.gitconfig" 
+      else
+        "/home/#{Etc.getlogin}/.gitconfig" 
+      end
     end
+    
     def git_init?
-      identify_user
       unless File.directory?(".git")
         begin
           options = ["Clone a repo", "Initialize a repo", "Close"]
-          @git_init_select = $prompt.select("The .git directory was not found, what do you want to do?", options)
-          git_init_verify
+          userSelect = @prompt.select("The .git directory was not found, what do you want to do?", options)
+          git_init_verify(userSelect)
         rescue TTY::Reader::InputInterrupt
           abort("\nCloseed")
         end
@@ -170,8 +48,8 @@ module G4t
     def identify_user
       if(File.exist?(verify_system)) == false
         begin
-          email = $prompt.ask("Github email: ")
-          uname = $prompt.ask("Github username: ")
+          email = @prompt.ask("Github email: ")
+          uname = @prompt.ask("Github username: ")
           @opt.run_command("git config --global user.email #{email} && git config --global user.name #{uname}")
         rescue TTY::Reader::InputInterrupt
           abort("\nYou closed the application")
@@ -180,7 +58,8 @@ module G4t
     end
 
     def show_panel
-      options = ["Add remote address",
+      options = [
+        "Add remote address",
         "Add files",
         "Commit files",
         "Push files to branch",
@@ -198,46 +77,33 @@ module G4t
       ]
 
       begin
-        @opt.git_info
-        @opt_select = $prompt.select("Select: ", options)
-        verify_option
+        Options.new.git_info
+        opt_select = @prompt.select("Select: ", options)
+        verify_option(opt_select)
       rescue TTY::Reader::InputInterrupt
         abort("\nYou has closed the application.")
       end
     end
-    def verify_option
-      case @opt_select
-      when "Add remote address" then
-        @opt.remote_adress
-      when "Add files" then
-        @opt.add_files
-      when "Commit files" then
-        @opt.commit_files
-      when "Push files to branch" then
-        @opt.push_branch
-      when "Show git status" then
-        @opt.status
-      when "Show git logs" then
-        @opt.logs
-      when "Show diff" then
-        @opt.diff
-      when "Restore a file" then
-        @opt.restore
-      when "Reset to a commit" then
-        @opt.reset
-      when "Reset to the last commit" then
-        @opt.hard_reset
-      when "Change branch" then
-        @opt.change_branch
-      when "Remove a file" then
-        @opt.remove_file
-      when "Show the last commit" then
-        @opt.show_last_commit
-      when "Git pull changes" then
-        @opt.pull_changes
-      else
-        abort("Goodbye, closed.")
-      end
+    
+    def verify_option(option)
+      switch = {
+        "Add remote address" => @opt.method(:remote_adress),
+        "Add files" => @opt.method(:add_files),
+        "Commit files" => @opt.method(:commit_files),
+        "Push files to branch" => @opt.method(:push_branch),
+        "Show git status" => @opt.method(:status),
+        "Show git logs" => @opt.method(:logs),
+        "Show diff" => @opt.method(:diff),
+        "Restore a file" => @opt.method(:restore),
+        "Reset to a commit" => @opt.method(:reset),
+        "Reset to the last commit" => @opt.method(:hard_reset),
+        "Change branch" => @opt.method(:change_branch),
+        "Remove a file" => @opt.method(:remove_file),
+        "Show the last commit" => @opt.method(:show_last_commit),
+        "Git pull changes" => @opt.method(:pull_changes)
+      }
+    
+      return switch[option].call
     end
 
     def start
@@ -245,5 +111,5 @@ module G4t
     end
   end
 
-  Run.new
+  Core.new
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: G4t
 version: !ruby/object:Gem::Version
-  version: '1.2'
+  version: '2.0'
 platform: ruby
 authors:
 - freazesss
@@ -48,7 +48,7 @@ extra_rdoc_files: []
 files:
 - bin/g4t
 - lib/g4t.rb
-homepage: https://github.com/freazesss/g4t
+homepage: https://github.com/labsz/g4t
 licenses:
 - MIT
 metadata: {}
@@ -67,7 +67,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubyforge_project: 
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: git