web_git 0.0.4 → 0.1.0

data/lib/web_git/diff.rb

@@ -1,233 +1,234 @@
-  module WebGit
-    class Diff
-      def self.get_diff
-        Dir.chdir(Rails.root) do
-          `git diff`
-        end
-      end
 
-      def self.get_each_left(diff)
-        filenames = get_file_names("")
-        files = file_diffs(diff)
-        lefts = {}
-        files.each_with_index do |file, i|
-          file_content = ""
-          lines = file.split("\n").drop(4)
-          start_line = 0
-          current_line_index = 0
-          line_number = start_line + current_line_index
-          lines.each do |line|
-            if !line.match?(/@@ ([-]\d+,\d+\s[+]\d+,\d+) @@/)
-              if line.first != "+"
-                file_content += "#{line_number}| " + line + "\n"
-                line_number += 1
-              end
-            else
-              current_line_index = 0
-              # The line numbers in the output of a git diff match this regex
-              numbers = line.scan(/@@ ([-]\d+,\d+\s[+]\d+,\d+) @@/).map(&:join)
-              # If left, starting line number is the first one in a split Array
-              start_line = numbers.first.split(" ").first.
-                split(",").first.to_i.abs
-              line_number = start_line + current_line_index
-              file_content += "\n"
+  require "diffy"
+  require "git"
+  class Diff
+
+    def self.get_diff
+      # Dir.chdir(Rails.root) do
+        `git diff`
+      # end
+    end
+
+    def self.get_each_left(diff)
+      filenames = get_file_names("")
+      files = file_diffs(diff)
+      lefts = {}
+      files.each_with_index do |file, i|
+        file_content = ""
+        lines = file.split("\n").drop(4)
+        start_line = 0
+        current_line_index = 0
+        line_number = start_line + current_line_index
+        lines.each do |line|
+          if !line.match?(/@@ ([-]\d+,\d+\s[+]\d+,\d+) @@/)
+            if line[0] != "+"
+              file_content += "#{line_number}| " + line + "\n"
+              line_number += 1
             end
-          end
-          lefts[filenames[i]] = file_content.chomp "\n"
-        end
-        lefts
-      end
-
-      def self.get_each_right(diff)
-        filenames = get_file_names("")
-        files = file_diffs(diff)
-        rights = {}
-        files.each_with_index do |file, i|
-          file_content = ""
-          lines = file.split("\n").drop(4)
-          start_line = 0
-          current_line_index = 0
-          line_number = start_line + current_line_index
-          lines.each do |line|
+          else
+            current_line_index = 0
             # The line numbers in the output of a git diff match this regex
-            # @@ -61,18 +61,15 @@
-            if !line.match?(/@@ ([-]\d+,\d+\s[+]\d+,\d+) @@/)
-              if line.first != "-"
-                file_content += "#{line_number}| " + line + "\n"
-                line_number += 1
-              end
-            else
-              current_line_index = 0
-              numbers = line.scan(/@@ ([-]\d+,\d+\s[+]\d+,\d+) @@/).map(&:join)
-              # If right, start line is the second in a split Array
-              start_line = numbers.first.split(" ").second.
-                split(",").first.to_i.abs
-              line_number = start_line + current_line_index
-              file_content += "\n"
-            end
+            numbers = line.scan(/@@ ([-]\d+,\d+\s[+]\d+,\d+) @@/).map(&:join)
+            # If left, starting line number is the first one in a split Array
+            start_line = numbers[0].split(" ")[0].
+              split(",")[0].to_i.abs
+            line_number = start_line + current_line_index
+            file_content += "\n"
           end
-          rights[filenames[i]] = file_content.chomp "\n"
         end
-        rights
+        lefts[filenames[i]] = file_content.chomp "\n"
       end
-
-      def self.get_last_commit_hash
-        Dir.chdir(Rails.root) do
-          log = `git log -1 --oneline`
-          log.split.first
-        end
-      end
-
-      def self.file_diffs(diff)
-        diff.scan(/diff --git.*?(?=diff --git|\z)/m)
-      end
-
-      def self.match_other_files(line, file, filenames)
-        filenames.each do |other_file|
-          if file != other_file
-            # It looks like:
-            #   --- a/<path-to-file>
-            #   +++ b/<path-to-file>
-            if line.include?('diff --git a/' + other_file + ' b/' + other_file)
-              return true
+      lefts
+    end
+
+    def self.get_each_right(diff)
+      filenames = get_file_names("")
+      files = file_diffs(diff)
+      rights = {}
+      files.each_with_index do |file, i|
+        file_content = ""
+        lines = file.split("\n").drop(4)
+        start_line = 0
+        current_line_index = 0
+        line_number = start_line + current_line_index
+        lines.each do |line|
+          # The line numbers in the output of a git diff match this regex
+          # @@ -61,18 +61,15 @@
+          if !line.match?(/@@ ([-]\d+,\d+\s[+]\d+,\d+) @@/)
+            if line[0] != "-"
+              file_content += "#{line_number}| " + line + "\n"
+              line_number += 1
             end
+          else
+            current_line_index = 0
+            numbers = line.scan(/@@ ([-]\d+,\d+\s[+]\d+,\d+) @@/).map(&:join)
+            # If right, start line is the second in a split Array
+            start_line = numbers[0].split(" ")[1].
+              split(",")[0].to_i.abs
+            line_number = start_line + current_line_index
+            file_content += "\n"
           end
         end
-        false
+        rights[filenames[i]] = file_content.chomp "\n"
       end
-
-      def self.get_file_names(commit)
-        Dir.chdir(Rails.root) do
-          if commit.blank?
-            filenames = `git diff --name-only`
-          else
-            filenames = `git diff-tree --no-commit-id --name-only -r #{commit}`
+      rights
+    end
+
+    def self.get_last_commit_hash
+      working_dir = Dir.pwd
+      git = Git.open(working_dir)
+      git.log.first.sha.slice(0, 7)
+    end
+
+    def self.file_diffs(diff)
+      diff.scan(/diff --git.*?(?=diff --git|\z)/m)
+    end
+
+    def self.match_other_files(line, file, filenames)
+      filenames.each do |other_file|
+        if file != other_file
+          # It looks like:
+          #   --- a/<path-to-file>
+          #   +++ b/<path-to-file>
+          if line.include?('diff --git a/' + other_file + ' b/' + other_file)
+            return true
           end
-          filenames.split("\n")
         end
       end
-
-      def self.get_last_diff
-        Dir.chdir(Rails.root) do
-          `git diff -M HEAD~1`
-        end
+      false
+    end
+
+    def self.get_file_names(commit)
+      git = Git.open(Dir.pwd)
+      if commit.empty?
+        filenames = git.status.changed.keys
+      else
+        filenames = git.diff(commit, "HEAD").map(&:path)
       end
-
-      def self.get_last_left(diff)
-        filenames = get_file_names(get_last_commit_hash)
-        files = file_diffs(diff)
-        ones = {}
-        files.each_with_index do |file, i|
-          file_content = ""
-          lines = file.split("\n").drop(4)
-          lines.each do |line|
-            # The line numbers in the output of a git diff match this regex
-            # @@ -61,18 +61,15 @@
-            if !line.match?(/@@ ([-]\d+,\d+\s[+]\d+,\d+) @@/)
-              if line.first != "+"
-                line.slice!(0)
-                file_content += line + "\n"
-              end
-            else
-              file_content += "\n"
+      filenames
+    end
+
+    def self.get_last_diff
+      # Dir.chdir(Rails.root) do
+        `git diff -M HEAD~1`
+      # end
+    end
+
+    def self.get_last_left(diff)
+      filenames = get_file_names("HEAD~1")
+      files = file_diffs(diff)
+      ones = {}
+      files.each_with_index do |file, i|
+        file_content = ""
+        lines = file.split("\n").drop(4)
+        lines.each do |line|
+          # The line numbers in the output of a git diff match this regex
+          # @@ -61,18 +61,15 @@
+          if !line.match?(/@@ ([-]\d+,\d+\s[+]\d+,\d+) @@/)
+            if line[0] != "+"
+              line.slice!(0)
+              file_content += line + "\n"
             end
+          else
+            file_content += "\n"
           end
-          ones[filenames[i]] = file_content.chomp "\n"
         end
-        ones
+        ones[filenames[i]] = file_content.chomp "\n"
       end
-
-      def self.get_last_right(diff)
-        filenames = get_file_names(get_last_commit_hash)
-        files = file_diffs(diff)
-        ones = {}
-        files.each_with_index do |file, i|
-          file_content = ""
-          lines = file.split("\n").drop(4)
-          lines.each do |line|
-            if !line.match?(/@@ ([-]\d+,\d+\s[+]\d+,\d+) @@/)
-              if line.first != "+"
-              elsif line.first == "+"
-                line.slice!(0)
-                file_content += line + "\n"
-              end
-            else
-              file_content += "\n"
+      ones
+    end
+
+    def self.get_last_right(diff)
+      filenames = get_file_names("HEAD~1")
+      files = file_diffs(diff)
+      ones = {}
+      files.each_with_index do |file, i|
+        file_content = ""
+        lines = file.split("\n").drop(4)
+        lines.each do |line|
+          if !line.match?(/@@ ([-]\d+,\d+\s[+]\d+,\d+) @@/)
+            if line[0] != "+"
+            elsif line[0] == "+"
+              line.slice!(0)
+              file_content += line + "\n"
             end
+          else
+            file_content += "\n"
           end
-          ones[filenames[i]] = file_content.chomp "\n"
         end
-        ones
+        ones[filenames[i]] = file_content.chomp "\n"
       end
-
-      def self.last_to_html(diff)
-        left_hash = get_last_left(diff)
-        right_hash = get_last_right(diff)
-
-        html_output = '<link rel="stylesheet"' +
-          'href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/' +
-          'bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/' +
-          '1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">'
-        html_output += '<style>'
-        html_output += Diffy::CSS
-        html_output += '</style>'
-        html_output += '<div class="card">'
-        left_hash.keys.each do |file|
-          html_output += '<div class="file mb-4 p-3">'
-          html_output += '<h4>' + file + '</h4>'
-          html_output += Diffy::Diff.new(
-            left_hash[file],
-            right_hash[file],
-            :include_plus_and_minus_in_html => true
-          ).to_s(:html)
-          html_output += '</div>'
-        end
+      ones
+    end
+
+    def self.last_to_html(diff)
+      left_hash = get_last_left(diff)
+      right_hash = get_last_right(diff)
+
+      html_output = '<link rel="stylesheet"' +
+        'href="https://stackpath.bootstrapcdn.com/bootstrap/4.3.1/css/' +
+        'bootstrap.min.css" integrity="sha384-ggOyR0iXCbMQv3Xipma34MD+dH/' +
+        '1fQ784/j6cY/iJTQUOhcWr7x9JvoRxT2MZw1T" crossorigin="anonymous">'
+      html_output += '<style>'
+      html_output += Diffy::CSS
+      html_output += '</style>'
+      html_output += '<div class="card" style="overflow-y: scroll;max-height:400px">'
+      left_hash.keys.each do |file|
+        html_output += '<div class="file mb-4 p-1">'
+        html_output += '<h4>' + file + '</h4>'
+        html_output += Diffy::Diff.new(
+          left_hash[file],
+          right_hash[file],
+          :include_plus_and_minus_in_html => true,
+          :allow_empty_diff => false
+        ).to_s(:html)
         html_output += '</div>'
-        html_output
       end
-
-      def self.diff_to_html(diff)
-        left_hash = get_each_left(diff)
-        right_hash = get_each_right(diff)
-        html_output = '<div style="overflow-y: scroll;height:400px">'
-        html_output += '<style>'
-        html_output += Diffy::CSS
-        html_output += '</style>'
-        html_output += '<div class="row mb-3">'
-        html_output += '<div class="col-md-12 offset" style="overflow-y: scroll;">'
-
-        left_hash.keys.each do |file|
-          html_output += '<div class="row text-center">
-            <div class="col-12">
-              <h4>'
-          html_output+= file.to_s
-          html_output += '</h4>
-            </div>
+      html_output += '</div>'
+      html_output
+    end
+
+    def self.diff_to_html(diff)
+      left_hash = get_each_left(diff)
+      right_hash = get_each_right(diff)
+      html_output = '<div style="overflow-y: scroll;height:400px">'
+      html_output += '<style>'
+      html_output += Diffy::CSS
+      html_output += '</style>'
+      html_output += '<div class="row mb-3">'
+      html_output += '<div class="col-md-12 offset" style="overflow-y: scroll;">'
+
+      left_hash.keys.each do |file|
+        html_output += '<div class="row text-center">
+          <div class="col-12">
+            <h4>'
+        html_output+= file.to_s
+        html_output += '</h4>
           </div>
-            <div class="row mb-4">
-              <div class="col-6">'
-          html_output += Diffy::SplitDiff.new(
-            left_hash[file],
-            right_hash[file],
-            :format => :html
-            ).left
-
-          html_output +=
-              '</div>
-              <div class="col-6">'
-          html_output += Diffy::SplitDiff.new(
-            left_hash[file],
-            right_hash[file],
-            :format => :html
-          ).right
-
-          html_output += '</div></div>'
-        end
-        html_output += "</div>"
-        html_output += "</div>"
-        html_output += "</div>"
-        html_output
-
+        </div>
+          <div class="row mb-4">
+            <div class="col-6">'
+        html_output += Diffy::SplitDiff.new(
+          left_hash[file],
+          right_hash[file],
+          :format => :html
+          ).left
+
+        html_output +=
+            '</div>
+            <div class="col-6">'
+        html_output += Diffy::SplitDiff.new(
+          left_hash[file],
+          right_hash[file],
+          :format => :html
+        ).right
+
+        html_output += '</div></div>'
       end
+      html_output += "</div>"
+      html_output += "</div>"
+      html_output += "</div>"
+      html_output
+
+    end
   end
-end

data/lib/web_git/exceptions.rb

@@ -0,0 +1,3 @@
+module WebGit
+  class AuthenticationError < StandardError; end
+end

data/lib/web_git/graph.rb

@@ -0,0 +1,114 @@
+module WebGit
+  require "git"
+  require "ansispan"
+  
+  class Graph
+    require "action_view"
+    require "action_view/helpers"
+    include ActionView::Helpers::DateHelper
+    attr_accessor :heads
+
+    def initialize(git)
+      @git = git
+      @full_list = []
+      @heads = {}
+    end
+
+    def to_hash
+      
+      has_changes = has_untracked_changes?
+      if has_changes
+        temporarily_stash_changes
+      end
+
+      draw_graph
+
+      if has_changes
+        stash_pop
+      end
+      @full_list
+    end
+
+    def self.project_root
+      if defined?(Rails) && Rails.respond_to?("root")
+        return Rails.root
+      end
+    
+      if defined?(Bundler)
+        return Bundler.root
+      end
+    
+      Dir.pwd
+    end
+
+    def cli_graph
+      Dir.chdir(Graph.project_root) do
+        @cli_graph = `git log --oneline --decorate --graph --all --color`
+        all_commits = `git log  --all --format=format:%H`.split("\n").map{|a| a.slice(0,7)}
+
+        @cli_graph = Ansispan.convert(@cli_graph)
+        all_commits.each do |sha|
+          sha_button = "<span class=\"commit\"><button class=\"btn btn-link sha\">#{sha}</button></span>"
+          @cli_graph.gsub!(sha, sha_button)
+        end
+      end
+      @cli_graph
+    end
+
+    def has_untracked_changes?
+      @git.diff.size > 0
+    end
+
+    def temporarily_stash_changes
+      @git.add(all: true)
+      stash_count = Git::Stashes.new(@git).count
+      Git::Stash.new(@git, "Temporary Stash #{stash_count}")
+    end
+
+    def stash_pop
+      stashes = Git::Stashes.new(@git)
+      stashes.apply(0)
+    end
+
+    def draw_graph
+      starting_branch = @git.current_branch
+      branches = @git.branches.local.map(&:name)
+      branches.each do |branch_name|
+        branch = { branch: branch_name }
+        @git.checkout(branch_name)
+        log_commits = build_array_of_commit_hashes
+        branch[:log] = log_commits
+        branch[:head] = log_commits.last[:sha]
+        @full_list.push branch
+      end
+      @git.checkout(starting_branch)
+
+      @full_list.each do |branch_hash|
+        head_sha = branch_hash[:head]
+        branch_name = branch_hash[:branch]
+
+        if @heads[head_sha].nil?
+          @heads[head_sha] = [branch_name]
+        else
+          @heads[head_sha].push branch_name
+        end
+      end
+
+    end
+
+    def build_array_of_commit_hashes
+      log_commits = []
+      @git.log.sort_by(&:date).each do |git_commit_object|
+        commit = {}
+        commit[:sha] = git_commit_object.sha.slice(0..7)
+        commit[:date] = git_commit_object.date
+        commit[:formatted_date] = time_ago_in_words(git_commit_object.date)
+        commit[:message] = git_commit_object.message
+        commit[:author] = git_commit_object.author.name
+        commit[:heads] = []
+        log_commits.push commit
+      end
+      log_commits
+    end
+  end
+end

data/lib/web_git/heroku.rb

@@ -0,0 +1,34 @@
+require 'timeout'
+require 'web_git/exceptions'
+
+module WebGit
+  class Heroku
+    def self.authenticate(email, password)
+      raise ArgumentError.new("Email and password cannot be blank.") if email.blank? || password.blank?
+      script = File.join( File.dirname(__FILE__), '/../scripts/heroku_login.exp')
+
+      command = "#{script} #{email} #{password}"
+      rout, wout = IO.pipe
+      pid = Process.spawn(command, :out => wout)
+
+      begin
+        status = Timeout.timeout(30) do
+          _, status = Process.wait2(pid)
+          wout.close
+        end
+        stdout = rout.readlines.join("\n")
+        rout.close
+        message = stdout.match(/Error.*\./).to_s
+        raise WebGit::AuthenticationError.new(message) if stdout.include?("Error")
+
+      rescue Timeout::Error
+        Process.kill('TERM', script_pid)
+        raise Timeout::Error.new("Sign in took longer than 30 seconds.")
+      end
+    end
+
+    def self.whoami
+      `heroku whoami`.chomp
+    end
+  end
+end

data/lib/web_git/string.rb

@@ -0,0 +1,8 @@
+# required for git
+class String
+  def strip_heredoc
+    indent = scan(/^[ \t]*(?=\S)/).min.size || 0
+    gsub(/^[ \t]{#{indent}}/, '')
+  end
+end
+