git_commands 3.0.5 → 3.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c525d19105de0f72959b99b1e287d27315d38c53
-  data.tar.gz: 9d43e49473f0431e72d74be76c780e829fd42da0
+  metadata.gz: 2115eda28aa459f4ca512e8e734cd859702da356
+  data.tar.gz: 5950edb6f580c4c06f35cb763a3f75e746ed15d5
 SHA512:
-  metadata.gz: 531c7c39db27dab500b11196560f826345635fdb98b3d4fde0900daa8742b96b6ff844203a7e374e7b2cce03837d34603f86c24c233fba5ad5f84300630af1eb
-  data.tar.gz: e689eff2f19be16612c97b7e2ed6306848942cb698e66dba30c34b944ff94060da0f32b550675b91836cbbec086dfcec2c0433064044bdd8c52bd85c4ce7ad61
+  metadata.gz: c247805c7a0fb198f760c499f1f1bcfd12ea911adec58b8366e5b8b0058852ffd74bf0fc57afffd616ce6f13817f9aa7958e10a5638a7308f7f33036182a676a
+  data.tar.gz: d44b3d70b5b9ecbe9f3e22e4cfd9d327c26d5fff177228684793eae31fd097c4be37f0cab2e684fca30fbe4ea481726cfc4881ed1458d39bf8ac9454b44e8fbd

data/lib/git_commands/cli.rb

@@ -3,6 +3,8 @@ require "git_commands/command"
 
 module GitCommands
   class CLI
+    include Prompt
+
     VALID_COMMANDS = %w[rebase aggregate purge]
 
     class UnknownCommandError < ArgumentError; end
@@ -20,6 +22,8 @@ module GitCommands
       parser.parse!(@args)
       command = @command_klass.new(repo: @repo, branches: @branches)
       command.send(@command_name)
+    rescue StandardError => e
+      error(e.message)  
     end
 
     private def create_command
@@ -39,7 +43,7 @@ module GitCommands
           @repo = repo
         end
 
-        opts.on("-bBRANCHES", "--branches=BRANCHES", "The comma-separated list of branches or the path to a .branches files") do |branches|
+        opts.on("-bBRANCHES", "--branches=BRANCHES", "The comma-separated list of branches or the path to a file listing branches names on each line") do |branches|
           @branches = branches
         end
 

data/lib/git_commands/command.rb

@@ -20,21 +20,28 @@ module GitCommands
       raise e, "There is no connection!"
     end
 
+    def self.git_repo?(repo)
+      `git rev-parse --is-inside-work-tree 2> /dev/null`.strip == "true"
+    end
+
+    def self.valid_branch?(branch)
+      `git rev-parse --verify origin/#{branch} 2> /dev/null`.match(/^[0-9a-z]+/)
+    end
+
     attr_reader :out
 
     def initialize(repo:, branches:, out: STDOUT)
       self.class.check_connection
       @out = out
       @repo = fetch_repo(repo)
-      @branches = fetch_branches(branches)
+      @branches = fetch_branches(String(branches))
       @timestamp = Time.new.strftime("%Y-%m-%d")
-      check_branches
+      print_branches
     end
 
     def purge
       enter_repo do
         @branches.each do |branch|
-          error("Trying ro remove master!", GitError) if branch == "master"
           warning("Removing branch: #{branch}")
           confirm("Remove local branch") do
             `git branch -D #{branch}`
@@ -77,6 +84,7 @@ module GitCommands
             `git checkout #{aggregate}`
             `git merge #{temp}`
             `git branch -d #{temp}`
+            `git checkout master`
           end      
         end
         success "#{aggregate} branch created"
@@ -84,19 +92,36 @@ module GitCommands
     end
 
     private def fetch_repo(repo)
-      return Pathname::new(repo) if File.exist?(repo)
-      fail NoentRepositoryError, "#{repo} is not a valid GIT repository!" 
+      fail NoentRepositoryError, "'#{repo}' is not a valid GIT repository!" unless valid_repo?(repo)
+      Pathname::new(repo)
     end
 
-    private def check_branches
-      error("No branches have been loaded!", NoBranchesError) if @branches.empty?
-      print_branches
+    private def valid_repo?(repo)
+      return false unless File.directory?(repo)
+      Dir.chdir(repo) do
+        self.class.git_repo?(repo)
+      end
     end
 
-    private def fetch_branches(branches)
+    private def fetch_branches(src)
       warning("Loading branches file")
-      return File.foreach(branches).map(&:strip) if File.exist?(branches)
-      branches.to_s.split(",").map(&:strip) 
+      branches = File.foreach(src).map(&:strip) if valid_file?(src)
+      branches ||= src.split(",").map(&:strip) 
+      branches.tap do |list|
+        fail(NoBranchesError, "No branches have been loaded!") if list.empty?
+        list.each { |branch| check_branch(branch) }
+      end
+    end
+
+    private def check_branch(branch)
+      Dir.chdir(@repo) do
+        fail(GitError, "Master branch cannot be included into commands operations!") if branch == "master"
+        fail(GitError, "Branch '#{branch}' does not exist!") unless self.class.valid_branch?(branch)
+      end
+    end
+
+    private def valid_file?(branches)
+      File.exist?(branches) && !File.directory?(branches)
     end
 
     private def print_branches
@@ -113,7 +138,10 @@ module GitCommands
 
     private def rebase_with_master
       `git rebase origin/master`
-      error("Halting unfinished rebase!", GitError) { `git rebase --abort` } if unfinished_rebase?
+      if unfinished_rebase?
+        `git rebase --abort`
+        fail(GitError, "Halting unfinished rebase!")
+      end
     end
 
     private def enter_repo

data/lib/git_commands/prompt.rb

@@ -5,23 +5,19 @@ module GitCommands
   module Prompt
     VALID_ANSWERS = %w[Y y N n]
 
+    class AbortError < StandardError; end
+
     def out
       @out ||= STDOUT
     end
 
-    def warning(message, char = "*")
-      spacer = (char * (message.size + 4)).grey
-      out.puts "\n", spacer, "#{char} #{message.to_s.yellow} #{char}", spacer, "\n"
-    end
-
-    def error(message, error = StandardError)
-      out.puts message.to_s.red
-      yield if block_given?
-      fail error, message
+    def warning(message)
+      out.puts "\n#{message}...".yellow
     end
 
     def success(message)
       out.puts message.to_s.green
+      true
     end
 
     def confirm(message)
@@ -32,23 +28,21 @@ module GitCommands
       when /y/i
         yield
       else
-        abort!("Aborted operation!")
+        fail(AbortError, "Aborted operation!")
       end
     end
 
-    private 
-    
-    def ask(message)
-      out.print message.cyan
-      input
-    end
-
-    def abort!(message)
+    def error(message)
       out.puts message.to_s.red
       exit
     end
 
-    def input
+    private def ask(message)
+      out.print message.cyan
+      input
+    end
+
+    private def input
       STDIN.gets.chomp
     end
   end

data/lib/git_commands/version.rb

@@ -1,3 +1,3 @@
 module GitCommands
-  VERSION = "3.0.5"
+  VERSION = "3.1.6"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: git_commands
 version: !ruby/object:Gem::Version
-  version: 3.0.5
+  version: 3.1.6
 platform: ruby
 authors:
 - costajob