web_git 0.0.2.1 → 0.1.0

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
+ 

data/lib/web_git.rb

@@ -1,10 +1,207 @@
-require "web_git/engine"
-require "jquery-rails"
-require "octicons_helper"
-require "tether-rails"
-require "turbolinks"
-require "git_clone_url"
+
+require "web_git/version"
 
 module WebGit
-  # Your code goes here...
+  require "active_support"
+  require "web_git/diff"
+  require "web_git/graph"
+  require "web_git/heroku"
+  require "web_git/string"
+  require "sinatra"
+  require "date"
+  require "git"
+  class Server < Sinatra::Base
+    enable :sessions
+
+    get '/log' do
+      graph = WebGit::Graph.new(git)
+      graph.to_hash.to_json
+      #sha = commit.sha.slice(0..7)
+      # commit_date = Date.parse commit.date
+      # strftime("%a, %d %b %Y, %H:%M %z") -> time_ago_in_words(commit_date)
+      # * 76eff73 - Wed, 11 Mar 2020 19:58:21 +0000 (13 days ago) (HEAD -> current_branch)
+      #  | blease - Jelani Woods
+
+      # " * " + sha + " - " + commit_date + " (" + time_ago_in_words(commit_date) + ") " + "\n\t| " + commit.message 
+    end
+
+    get "/" do
+      initialize_flash
+      clear_flash
+      # Update git index
+      git.status.changed.each do
+        git.diff.entries
+      end
+      status = git.status
+      # Just need the file names
+      @changed_files = status.changed.keys
+      @deleted_files = status.added.keys
+      @untracked_files = status.untracked.keys
+      @added_files = status.deleted.keys
+
+      @statuses = [
+        { name: "Changed Files:", file_list: @changed_files },
+        { name: "Untracked Files:", file_list: @untracked_files },
+        { name: "Deleted Files:", file_list: @deleted_files },
+        { name: "Added Files:", file_list: @added_files }
+      ]
+      
+      @current_branch = git.current_branch
+      # g.branch(@current_branch).checkout # maybe?
+      # TODO use git gem for status
+      @status = `git status`
+      @diff = git.diff
+      @diff = Diff.diff_to_html(git.diff.to_s)
+      if git.log.count > 1
+        last_diff = git.diff("HEAD~1", "HEAD").to_s + "\n"
+        @last_diff_html = Diff.last_to_html(last_diff)
+      end
+      @last_diff_html = ""
+      @branches = git.branches.local.map(&:full)
+      
+      logs = git.log
+      @last_commit_message = logs.first.message
+      @head = git.show.split("\n").first.split[1].slice(0..7)
+      @list = []
+      # (HEAD -> jw-non-sweet)
+      # TODO show where branches are on different remotes
+      @remotes = git.remotes.map {|remote| "#{remote.name}: #{remote.url}"  }
+      # (origin/master, origin/jw-non-sweet, origin/HEAD)
+      # git.branches[:master].gcommit
+
+      graph = WebGit::Graph.new(git)
+      @graph_hash = graph.to_hash
+      @cli_graph_interactive = graph.cli_graph
+      @graph_branches = @graph_hash.sort do |branch_a, branch_b|
+        branch_b[:log].last[:date] <=> branch_a[:log].last[:date]
+      end
+
+      # TODO heroku stuff
+      @heroku_auth = WebGit::Heroku.whoami
+      erb :status
+    end
+
+    post "/commit" do
+      title = params[:title]
+      description = params[:description]
+
+      # TODO validate commit message
+      if title.nil? || title.gsub(" ", "").length == 0
+        session[:alert] = "You need to make a commit message."
+        redirect to("/")
+      end
+
+      unless description.nil?
+        title += "\n#{description}"
+      end
+
+      safe_git_action(:commit, args: title, notice: "Commit created successfully", alert: "Failed to create commit")
+      redirect to("/")
+    end
+
+    get "/stash" do
+      safe_git_action(:stash, notice: "Changes stashed.", alert: "Failed to stash changes")
+      redirect to("/")
+    end
+
+    post "/branch/checkout/new" do
+      # TODO validate branch name
+      name = params.fetch(:branch_name).downcase.gsub(" ", "_")
+      commit = params.fetch(:commit_hash)
+
+      safe_git_action(:checkout, args: name, notice: "Branch #{name}, created successfully.", alert: "Failed to create branch")
+      safe_git_action(:reset_hard, args: commit, alert: "Failed to checkout branch at #{commit}")
+      redirect to("/")
+    end
+
+    post "/branch/checkout" do
+      name = params.fetch(:branch_name).downcase.gsub(" ", "_")
+
+      safe_git_action(:checkout, args: name, notice: "Switched to branch: #{name} successfully.", alert: "Failed to switch branch")
+      redirect to("/")
+    end
+
+    # TODO make delete request somehow with the links
+    post "/branch/delete" do
+      name = params.fetch(:branch_name).downcase.gsub(" ", "_")
+
+      safe_git_action(:delete, args: name, notice: "Deleted branch: #{name} successfully.", alert: "Failed to delete branch")
+      redirect to("/")
+    end
+
+    post "/push" do
+      # TODO push to heroku eventually, multiple remotes
+
+      safe_git_action(:push, notice: "Pushed to GitHub successfully.", alert: "Failed to push")
+      redirect to("/")
+    end
+
+    post "/pull" do
+      safe_git_action(:pull, notice: "Pulled successfully.", alert: "Git Pull failed")
+      redirect to("/")
+    end
+
+    post "/heroku/login" do
+      email = params[:heroku_email]
+      password = params[:heroku_password]
+
+      begin
+        WebGit::Heroku.authenticate(email, password)
+        set_flash(:notice, "Successfully logged into Heroku.")
+      rescue => exception
+        set_flash(:alert, "There was a problem logging into Heroku. #{exception.message}")
+      end
+      redirect to("/")
+    end
+
+    protected
+
+    def git
+      working_dir = File.exist?(Dir.pwd + "/.git") ? Dir.pwd : Dir.pwd + "/.."
+      @git ||= Git.open(working_dir)
+    end
+
+    def safe_git_action(method, **options)
+      begin
+        case method
+        when :push
+          git.push('origin', git.current_branch)
+        when :pull
+          git.pull
+        when :stash
+          git.add(all: true)
+          stash_count = Git::Stashes.new(git).count
+          Git::Stash.new(git, "Stash #{stash_count}")
+        when :commit
+          git.add(all: true)  
+          git.commit(options[:args])
+        when :checkout
+          git.branch(options[:args]).checkout
+        when :reset_hard
+          commit = git.gcommit(options[:args])
+          git.reset_hard(commit)
+        when :delete
+          git.branch(options[:args]).delete          
+        end
+        set_flash(:notice, options[:notice])
+      rescue Git::GitExecuteError => exception
+        alert_message = "#{options[:alert]}: #{exception.message.split("\n").last}"
+        set_flash(:alert, alert_message)
+      end
+    end
+
+    def set_flash(name, message)
+      session[name] = message
+    end
+
+    def clear_flash
+      session[:alert] = nil
+      session[:notice] = nil
+    end
+
+    def initialize_flash
+      @alert = session[:alert]
+      @notice = session[:notice]
+    end
+  end
 end

data/web_git.gemspec

@@ -2,18 +2,18 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Juwelier::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: web_git 0.0.3 ruby lib
+# stub: web_git 0.1.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "web_git".freeze
-  s.version = "0.0.3"
+  s.version = "0.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0".freeze) if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib".freeze]
-  s.authors = ["Raghu Betina".freeze]
-  s.date = "2019-07-11"
-  s.description = "WebGit is a Rails Engine that provides an in-browser visual interface to a simple but effective Git workflow. For educational purposes.".freeze
-  s.email = "raghu@firstdraft.com".freeze
+  s.authors = ["Raghu Betina".freeze, "Jelani Woods".freeze]
+  s.date = "2022-03-30"
+  s.description = "WebGit is an embeddable Sinatra app that provides an in-browser visual interface to a simple but effective Git workflow. For educational purposes.".freeze
+  s.email = ["raghu@firstdraft.com".freeze, "jelani@firstdraft.com".freeze]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.markdown"
@@ -28,88 +28,47 @@ Gem::Specification.new do |s|
     "README.markdown",
     "Rakefile",
     "VERSION",
-    "ansi2html.sh",
-    "app/assets/javascripts/web_git/application.js",
-    "app/assets/javascripts/web_git/bootstrap.min.js",
-    "app/assets/javascripts/web_git/popper.min.js",
-    "app/assets/stylesheets/web_git/application.scss",
-    "app/assets/stylesheets/web_git/bootstrap.min.css",
-    "app/assets/stylesheets/web_git/font-awesome.min.css",
-    "app/assets/stylesheets/web_git/octicons.css",
-    "app/controllers/web_git/application_controller.rb",
-    "app/controllers/web_git/branches_controller.rb",
-    "app/controllers/web_git/commands_controller.rb",
-    "app/controllers/web_git/commits_controller.rb",
-    "app/views/layouts/web_git/application.html.erb",
-    "app/views/web_git/commands/hello.html.erb",
-    "app/views/web_git/commands/status.html.erb",
-    "config/routes.rb",
+    "lib/generators/web_git/install_generator.rb",
+    "lib/scripts/heroku_login.exp",
+    "lib/views/status.erb",
     "lib/web_git.rb",
-    "lib/web_git/engine.rb",
+    "lib/web_git/diff.rb",
+    "lib/web_git/exceptions.rb",
+    "lib/web_git/graph.rb",
+    "lib/web_git/heroku.rb",
+    "lib/web_git/string.rb",
     "lib/web_git/version.rb",
-    "web_git-0.0.2.gem",
     "web_git.gemspec"
   ]
   s.homepage = "http://github.com/firstdraft/web_git".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.7.8".freeze
+  s.rubygems_version = "3.1.6".freeze
   s.summary = "An in-browser Git GUI for your Rails project".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
+  end
 
-    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<tzinfo-data>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<tether-rails>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<octicons_helper>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<turbolinks>.freeze, ["~> 5"])
-      s.add_runtime_dependency(%q<jquery-rails>.freeze, [">= 0"])
-      s.add_runtime_dependency(%q<git_clone_url>.freeze, [">= 0"])
-      s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
-      s.add_development_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-      s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.1.0"])
-      s.add_development_dependency(%q<simplecov>.freeze, [">= 0"])
-      s.add_development_dependency(%q<pry>.freeze, ["~> 0"])
-      s.add_development_dependency(%q<pry-byebug>.freeze, ["~> 3"])
-      s.add_development_dependency(%q<pry-doc>.freeze, ["~> 0"])
-      s.add_development_dependency(%q<pry-remote>.freeze, ["~> 0"])
-      s.add_development_dependency(%q<pry-rescue>.freeze, ["~> 1"])
-      s.add_development_dependency(%q<pry-stack_explorer>.freeze, ["~> 0"])
-    else
-      s.add_dependency(%q<tzinfo-data>.freeze, [">= 0"])
-      s.add_dependency(%q<tether-rails>.freeze, [">= 0"])
-      s.add_dependency(%q<octicons_helper>.freeze, [">= 0"])
-      s.add_dependency(%q<turbolinks>.freeze, ["~> 5"])
-      s.add_dependency(%q<jquery-rails>.freeze, [">= 0"])
-      s.add_dependency(%q<git_clone_url>.freeze, [">= 0"])
-      s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
-      s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
-      s.add_dependency(%q<juwelier>.freeze, ["~> 2.1.0"])
-      s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-      s.add_dependency(%q<pry>.freeze, ["~> 0"])
-      s.add_dependency(%q<pry-byebug>.freeze, ["~> 3"])
-      s.add_dependency(%q<pry-doc>.freeze, ["~> 0"])
-      s.add_dependency(%q<pry-remote>.freeze, ["~> 0"])
-      s.add_dependency(%q<pry-rescue>.freeze, ["~> 1"])
-      s.add_dependency(%q<pry-stack_explorer>.freeze, ["~> 0"])
-    end
+  if s.respond_to? :add_runtime_dependency then
+    s.add_runtime_dependency(%q<actionview>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<ansispan>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<diffy>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<git>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<sinatra>.freeze, [">= 0"])
+    s.add_runtime_dependency(%q<tzinfo-data>.freeze, [">= 0"])
+    s.add_development_dependency(%q<juwelier>.freeze, ["~> 2.1.0"])
+    s.add_development_dependency(%q<rdoc>.freeze, [">= 6.3.1"])
+    s.add_development_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
   else
+    s.add_dependency(%q<actionview>.freeze, [">= 0"])
+    s.add_dependency(%q<ansispan>.freeze, [">= 0"])
+    s.add_dependency(%q<diffy>.freeze, [">= 0"])
+    s.add_dependency(%q<git>.freeze, [">= 0"])
+    s.add_dependency(%q<sinatra>.freeze, [">= 0"])
     s.add_dependency(%q<tzinfo-data>.freeze, [">= 0"])
-    s.add_dependency(%q<tether-rails>.freeze, [">= 0"])
-    s.add_dependency(%q<octicons_helper>.freeze, [">= 0"])
-    s.add_dependency(%q<turbolinks>.freeze, ["~> 5"])
-    s.add_dependency(%q<jquery-rails>.freeze, [">= 0"])
-    s.add_dependency(%q<git_clone_url>.freeze, [">= 0"])
-    s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
-    s.add_dependency(%q<rdoc>.freeze, ["~> 3.12"])
     s.add_dependency(%q<juwelier>.freeze, ["~> 2.1.0"])
-    s.add_dependency(%q<simplecov>.freeze, [">= 0"])
-    s.add_dependency(%q<pry>.freeze, ["~> 0"])
-    s.add_dependency(%q<pry-byebug>.freeze, ["~> 3"])
-    s.add_dependency(%q<pry-doc>.freeze, ["~> 0"])
-    s.add_dependency(%q<pry-remote>.freeze, ["~> 0"])
-    s.add_dependency(%q<pry-rescue>.freeze, ["~> 1"])
-    s.add_dependency(%q<pry-stack_explorer>.freeze, ["~> 0"])
+    s.add_dependency(%q<rdoc>.freeze, [">= 6.3.1"])
+    s.add_dependency(%q<rspec>.freeze, ["~> 3.5.0"])
   end
 end