web_git 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48b533506b61ecf1abba4e9a4b4ee2919f6f13370f3fce0e4952f48ba190456f
-  data.tar.gz: 228e6d06266aa69bd76f289feaf404e500e476544e6bdde41e560880d9f2ef46
+  metadata.gz: 89d8eef92b2c4cb8ca66b0ab374148141681c23a48546d6527f9f20142fdd53e
+  data.tar.gz: 1d650a1dd33ae931104e89fde068fe22de2c03f9c7baa8ef34095510493b12d9
 SHA512:
-  metadata.gz: 819d9a708290f78ec476fad1731e86115ca91e62fe9bf889cacc2a7d540137bbd798d64916b0cfde8887b8c373e236ff0d6609c8a6ab0a9756ea1db4b18636bf
-  data.tar.gz: 9c3499c223eaaa883b6d06e887bd75d5db3b0476a515d1360ad6dc97dd80e8b97c34ca52a3d342c5ddfad30a495ca23bd1fdb3d7df80d291738e6b375d7555d7
+  metadata.gz: 72a468c367e5e54661d2fed60e95b3481f20a044a16fcfb152300930d94a065937b8c5a3e8dbf6e869c3d791b25d16c18ff01983b31f52d4c54655cee681bfea
+  data.tar.gz: 5421ce8a8b8bf1ddbeee887850c55a0f3d6cad9ee12f6a1e425b8c624263cefeea74a6ccb9fe66eae81d66becf7841d08eaf96541dfc7df1b788f3d637e23dd2

data/Gemfile

@@ -19,6 +19,7 @@ group :development do
   gem "pry-stack_explorer", "~> 0"
 end
 
+gem "diffy"
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
 

data/Gemfile.lock

@@ -0,0 +1,240 @@
+GEM
+  remote: https://rubygems.org/
+  specs:
+    actioncable (5.2.2.1)
+      actionpack (= 5.2.2.1)
+      nio4r (~> 2.0)
+      websocket-driver (>= 0.6.1)
+    actionmailer (5.2.2.1)
+      actionpack (= 5.2.2.1)
+      actionview (= 5.2.2.1)
+      activejob (= 5.2.2.1)
+      mail (~> 2.5, >= 2.5.4)
+      rails-dom-testing (~> 2.0)
+    actionpack (5.2.2.1)
+      actionview (= 5.2.2.1)
+      activesupport (= 5.2.2.1)
+      rack (~> 2.0)
+      rack-test (>= 0.6.3)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.2)
+    actionview (5.2.2.1)
+      activesupport (= 5.2.2.1)
+      builder (~> 3.1)
+      erubi (~> 1.4)
+      rails-dom-testing (~> 2.0)
+      rails-html-sanitizer (~> 1.0, >= 1.0.3)
+    activejob (5.2.2.1)
+      activesupport (= 5.2.2.1)
+      globalid (>= 0.3.6)
+    activemodel (5.2.2.1)
+      activesupport (= 5.2.2.1)
+    activerecord (5.2.2.1)
+      activemodel (= 5.2.2.1)
+      activesupport (= 5.2.2.1)
+      arel (>= 9.0)
+    activestorage (5.2.2.1)
+      actionpack (= 5.2.2.1)
+      activerecord (= 5.2.2.1)
+      marcel (~> 0.3.1)
+    activesupport (5.2.2.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 0.7, < 2)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    addressable (2.6.0)
+      public_suffix (>= 2.0.2, < 4.0)
+    arel (9.0.0)
+    binding_of_caller (0.8.0)
+      debug_inspector (>= 0.0.1)
+    builder (3.2.3)
+    byebug (11.0.1)
+    coderay (1.1.2)
+    concurrent-ruby (1.1.5)
+    crass (1.0.4)
+    debug_inspector (0.0.3)
+    descendants_tracker (0.0.4)
+      thread_safe (~> 0.3, >= 0.3.1)
+    diff-lcs (1.3)
+    diffy (3.3.0)
+    docile (1.3.1)
+    erubi (1.8.0)
+    faraday (0.15.4)
+      multipart-post (>= 1.2, < 3)
+    git (1.5.0)
+    git_clone_url (2.0.0)
+      uri-ssh_git (>= 2.0)
+    github_api (0.18.2)
+      addressable (~> 2.4)
+      descendants_tracker (~> 0.0.4)
+      faraday (~> 0.8)
+      hashie (~> 3.5, >= 3.5.2)
+      oauth2 (~> 1.0)
+    globalid (0.4.2)
+      activesupport (>= 4.2.0)
+    hashie (3.6.0)
+    highline (2.0.1)
+    i18n (1.6.0)
+      concurrent-ruby (~> 1.0)
+    interception (0.5)
+    jquery-rails (4.3.3)
+      rails-dom-testing (>= 1, < 3)
+      railties (>= 4.2.0)
+      thor (>= 0.14, < 2.0)
+    json (1.8.6)
+    juwelier (2.1.3)
+      builder
+      bundler (>= 1.13)
+      git (>= 1.2.5)
+      github_api
+      highline (>= 1.6.15)
+      nokogiri (>= 1.5.10)
+      rake
+      rdoc
+      semver
+    jwt (2.1.0)
+    loofah (2.2.3)
+      crass (~> 1.0.2)
+      nokogiri (>= 1.5.9)
+    mail (2.7.1)
+      mini_mime (>= 0.1.1)
+    marcel (0.3.3)
+      mimemagic (~> 0.3.2)
+    method_source (0.9.2)
+    mimemagic (0.3.3)
+    mini_mime (1.0.1)
+    mini_portile2 (2.4.0)
+    minitest (5.11.3)
+    multi_json (1.13.1)
+    multi_xml (0.6.0)
+    multipart-post (2.0.0)
+    nio4r (2.3.1)
+    nokogiri (1.10.2)
+      mini_portile2 (~> 2.4.0)
+    oauth2 (1.4.1)
+      faraday (>= 0.8, < 0.16.0)
+      jwt (>= 1.0, < 3.0)
+      multi_json (~> 1.3)
+      multi_xml (~> 0.5)
+      rack (>= 1.2, < 3)
+    octicons (8.5.0)
+      nokogiri (>= 1.6.3.1)
+    octicons_helper (8.5.0)
+      octicons (= 8.5.0)
+      rails
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
+    pry-byebug (3.7.0)
+      byebug (~> 11.0)
+      pry (~> 0.10)
+    pry-doc (0.13.5)
+      pry (~> 0.11)
+      yard (~> 0.9.11)
+    pry-remote (0.1.8)
+      pry (~> 0.9)
+      slop (~> 3.0)
+    pry-rescue (1.5.0)
+      interception (>= 0.5)
+      pry (>= 0.12.0)
+    pry-stack_explorer (0.4.9.3)
+      binding_of_caller (>= 0.7)
+      pry (>= 0.9.11)
+    public_suffix (3.0.3)
+    rack (2.0.6)
+    rack-test (1.1.0)
+      rack (>= 1.0, < 3)
+    rails (5.2.2.1)
+      actioncable (= 5.2.2.1)
+      actionmailer (= 5.2.2.1)
+      actionpack (= 5.2.2.1)
+      actionview (= 5.2.2.1)
+      activejob (= 5.2.2.1)
+      activemodel (= 5.2.2.1)
+      activerecord (= 5.2.2.1)
+      activestorage (= 5.2.2.1)
+      activesupport (= 5.2.2.1)
+      bundler (>= 1.3.0)
+      railties (= 5.2.2.1)
+      sprockets-rails (>= 2.0.0)
+    rails-dom-testing (2.0.3)
+      activesupport (>= 4.2.0)
+      nokogiri (>= 1.6)
+    rails-html-sanitizer (1.0.4)
+      loofah (~> 2.2, >= 2.2.2)
+    railties (5.2.2.1)
+      actionpack (= 5.2.2.1)
+      activesupport (= 5.2.2.1)
+      method_source
+      rake (>= 0.8.7)
+      thor (>= 0.19.0, < 2.0)
+    rake (12.3.2)
+    rdoc (3.12.2)
+      json (~> 1.4)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.4)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    semver (1.0.1)
+    simplecov (0.16.1)
+      docile (~> 1.1)
+      json (>= 1.8, < 3)
+      simplecov-html (~> 0.10.0)
+    simplecov-html (0.10.2)
+    slop (3.6.0)
+    sprockets (3.7.2)
+      concurrent-ruby (~> 1.0)
+      rack (> 1, < 3)
+    sprockets-rails (3.2.1)
+      actionpack (>= 4.0)
+      activesupport (>= 4.0)
+      sprockets (>= 3.0.0)
+    tether-rails (1.4.0)
+      rails (>= 3.1)
+    thor (0.20.3)
+    thread_safe (0.3.6)
+    turbolinks (5.2.0)
+      turbolinks-source (~> 5.2)
+    turbolinks-source (5.2.0)
+    tzinfo (1.2.5)
+      thread_safe (~> 0.1)
+    uri-ssh_git (2.0.0)
+    websocket-driver (0.7.0)
+      websocket-extensions (>= 0.1.0)
+    websocket-extensions (0.1.3)
+    yard (0.9.18)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  bundler (~> 1.0)
+  diffy
+  git_clone_url
+  jquery-rails
+  juwelier (~> 2.1.0)
+  octicons_helper
+  pry (~> 0)
+  pry-byebug (~> 3)
+  pry-doc (~> 0)
+  pry-remote (~> 0)
+  pry-rescue (~> 1)
+  pry-stack_explorer (~> 0)
+  rdoc (~> 3.12)
+  rspec (~> 3.5.0)
+  simplecov
+  tether-rails
+  turbolinks (~> 5)
+  tzinfo-data
+
+BUNDLED WITH
+   1.17.2

data/README.markdown

@@ -6,10 +6,6 @@ WebGit is a Rails Engine that provides an in-browser visual interface to a simpl
 
 ## Installation
 
-You need to have the `diff2html-cli` command available on your system. You can install it with:
-
-```
-npm install -g diff2html-cli
 ```
 
 Add this line to your application's Gemfile:

data/Rakefile

@@ -19,7 +19,7 @@ Juwelier::Tasks.new do |gem|
   gem.summary = %Q{An in-browser Git GUI for your Rails project}
   gem.description = %Q{WebGit is a Rails Engine that provides an in-browser visual interface to a simple but effective Git workflow. For educational purposes.}
   gem.email = "raghu@firstdraft.com"
-  gem.authors = ["Raghu Betina"]
+  gem.authors = ["Raghu Betina", "Jelani Woods"]
 
   # dependencies defined in Gemfile
 end

data/VERSION

@@ -1 +1 @@
-0.0.1
+0.0.2

data/app/controllers/web_git/commands_controller.rb

@@ -4,7 +4,7 @@ module WebGit
 
     def status
       Dir.chdir(Rails.root) do
-        @status = `git status`
+        logger.debug @status = `git status`
 
         @current_branch = `git symbolic-ref --short HEAD`.chomp
 
@@ -23,15 +23,10 @@ module WebGit
         diff = `git diff`
 
         unless diff.blank?
-          @diff_html = `diff2html --style=side --output=stdout`.
-            gsub("<h1>Diff to HTML by <a href=\"https://github.com/rtfpessoa\">rtfpessoa</a></h1>", "").
-            gsub("<a class=\"d2h-file-switch d2h-hide\">hide</a>", "").
-            gsub("<a class=\"d2h-file-switch d2h-show\">show</a>", "")
+          @diff_html = WebGit::Diff.diff_to_html(diff)
         else
-          @last_diff_html = `diff2html --style=line --output=stdout -- -M HEAD~1`.
-            gsub("<h1>Diff to HTML by <a href=\"https://github.com/rtfpessoa\">rtfpessoa</a></h1>", "").
-            gsub("<a class=\"d2h-file-switch d2h-hide\">hide</a>", "").
-            gsub("<a class=\"d2h-file-switch d2h-show\">show</a>", "")
+          last_diff = WebGit::Diff.get_last_diff
+          @last_diff_html = WebGit::Diff.last_to_html(last_diff)
 
           @last_commit_message = `git log -1 --pretty=%B`
         end
@@ -40,11 +35,13 @@ module WebGit
 
         # @log = `git log --branches --remotes --tags --graph --oneline --decorate --pretty=format:"#%h %d %s - %cr"`
         shell_script_path = WebGit::Engine.root.to_s + "/ansi2html.sh"
-
-        @log_html = `git log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n''          %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --branches --remotes --tags | sh #{shell_script_path} --bg=dark`
+        logger.debug @log_html = `git log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(bold yellow)%d%C(reset)%n%C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --branches --remotes --tags | sh #{shell_script_path} --bg=dark`
       end
-
-      render layout: "web_git/application"
+      # render layout: "web_git/application"
+      # render "web_git/commands/hello.html.erb"
+      render "web_git/commands/status.html.erb", layout: "web_git/application"
     end
+
   end
+
 end

data/app/views/web_git/commands/hello.html.erb

@@ -0,0 +1 @@
+We made it!

data/app/views/web_git/commands/status.html.erb

@@ -25,8 +25,7 @@
           <% end %>
 
           <% if @diff_html.present? %>
-            <iframe srcdoc="<%= @diff_html %>" width="100%" height="400" class="mb-3">
-            </iframe>
+            <%= @diff_html.html_safe %>
           <% end %>
 
           <p class="h4 mb-3 text-center">

data/lib/web_git.rb

@@ -1,4 +1,6 @@
 require "web_git/engine"
+require "web_git/diff"
+require "diffy"
 require "jquery-rails"
 require "octicons_helper"
 require "tether-rails"

data/lib/web_git/diff.rb

@@ -0,0 +1,233 @@
+  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"
+            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|
+            # 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
+          end
+          rights[filenames[i]] = file_content.chomp "\n"
+        end
+        rights
+      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
+            end
+          end
+        end
+        false
+      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}`
+          end
+          filenames.split("\n")
+        end
+      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(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"
+            end
+          end
+          ones[filenames[i]] = file_content.chomp "\n"
+        end
+        ones
+      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"
+            end
+          end
+          ones[filenames[i]] = file_content.chomp "\n"
+        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">'
+        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
+        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>
+            <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/web_git.gemspec

@@ -10,8 +10,8 @@ Gem::Specification.new do |s|
 
   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 = "2017-06-20"
+  s.authors = ["Raghu Betina".freeze, "Jelani Woods".freeze]
+  s.date = "2019-05-06"
   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.extra_rdoc_files = [
@@ -22,6 +22,7 @@ Gem::Specification.new do |s|
     ".document",
     ".rspec",
     "Gemfile",
+    "Gemfile.lock",
     "LICENSE.txt",
     "MIT-LICENSE",
     "README.markdown",
@@ -43,73 +44,77 @@ Gem::Specification.new do |s|
     "app/views/web_git/commands/status.html.erb",
     "config/routes.rb",
     "lib/web_git.rb",
+    "lib/web_git/diff.rb",
     "lib/web_git/engine.rb",
     "lib/web_git/version.rb",
     "web_git.gemspec"
   ]
   s.homepage = "http://github.com/firstdraft/web_git".freeze
   s.licenses = ["MIT".freeze]
-  s.rubygems_version = "2.6.11".freeze
+  s.rubygems_version = "3.0.1".freeze
   s.summary = "An in-browser Git GUI for your Rails project".freeze
 
   if s.respond_to? :specification_version then
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_runtime_dependency(%q<tzinfo-data>, [">= 0"])
-      s.add_runtime_dependency(%q<tether-rails>, [">= 0"])
-      s.add_runtime_dependency(%q<octicons_helper>, [">= 0"])
-      s.add_runtime_dependency(%q<turbolinks>, ["~> 5"])
-      s.add_runtime_dependency(%q<jquery-rails>, [">= 0"])
-      s.add_runtime_dependency(%q<git_clone_url>, [">= 0"])
-      s.add_development_dependency(%q<rspec>, ["~> 3.5.0"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_development_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_development_dependency(%q<juwelier>, ["~> 2.1.0"])
-      s.add_development_dependency(%q<simplecov>, [">= 0"])
-      s.add_development_dependency(%q<pry>, ["~> 0"])
-      s.add_development_dependency(%q<pry-byebug>, ["~> 3"])
-      s.add_development_dependency(%q<pry-doc>, ["~> 0"])
-      s.add_development_dependency(%q<pry-remote>, ["~> 0"])
-      s.add_development_dependency(%q<pry-rescue>, ["~> 1"])
-      s.add_development_dependency(%q<pry-stack_explorer>, ["~> 0"])
+      s.add_runtime_dependency(%q<diffy>.freeze, [">= 0"])
+      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<bundler>.freeze, ["~> 1.0"])
+      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>, [">= 0"])
-      s.add_dependency(%q<tether-rails>, [">= 0"])
-      s.add_dependency(%q<octicons_helper>, [">= 0"])
-      s.add_dependency(%q<turbolinks>, ["~> 5"])
-      s.add_dependency(%q<jquery-rails>, [">= 0"])
-      s.add_dependency(%q<git_clone_url>, [">= 0"])
-      s.add_dependency(%q<rspec>, ["~> 3.5.0"])
-      s.add_dependency(%q<rdoc>, ["~> 3.12"])
-      s.add_dependency(%q<bundler>, ["~> 1.0"])
-      s.add_dependency(%q<juwelier>, ["~> 2.1.0"])
-      s.add_dependency(%q<simplecov>, [">= 0"])
-      s.add_dependency(%q<pry>, ["~> 0"])
-      s.add_dependency(%q<pry-byebug>, ["~> 3"])
-      s.add_dependency(%q<pry-doc>, ["~> 0"])
-      s.add_dependency(%q<pry-remote>, ["~> 0"])
-      s.add_dependency(%q<pry-rescue>, ["~> 1"])
-      s.add_dependency(%q<pry-stack_explorer>, ["~> 0"])
+      s.add_dependency(%q<diffy>.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<bundler>.freeze, ["~> 1.0"])
+      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
   else
-    s.add_dependency(%q<tzinfo-data>, [">= 0"])
-    s.add_dependency(%q<tether-rails>, [">= 0"])
-    s.add_dependency(%q<octicons_helper>, [">= 0"])
-    s.add_dependency(%q<turbolinks>, ["~> 5"])
-    s.add_dependency(%q<jquery-rails>, [">= 0"])
-    s.add_dependency(%q<git_clone_url>, [">= 0"])
-    s.add_dependency(%q<rspec>, ["~> 3.5.0"])
-    s.add_dependency(%q<rdoc>, ["~> 3.12"])
-    s.add_dependency(%q<bundler>, ["~> 1.0"])
-    s.add_dependency(%q<juwelier>, ["~> 2.1.0"])
-    s.add_dependency(%q<simplecov>, [">= 0"])
-    s.add_dependency(%q<pry>, ["~> 0"])
-    s.add_dependency(%q<pry-byebug>, ["~> 3"])
-    s.add_dependency(%q<pry-doc>, ["~> 0"])
-    s.add_dependency(%q<pry-remote>, ["~> 0"])
-    s.add_dependency(%q<pry-rescue>, ["~> 1"])
-    s.add_dependency(%q<pry-stack_explorer>, ["~> 0"])
+    s.add_dependency(%q<diffy>.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<bundler>.freeze, ["~> 1.0"])
+    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
 end
 

metadata

@@ -1,15 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: web_git
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Raghu Betina
+- Jelani Woods
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-20 00:00:00.000000000 Z
+date: 2019-07-09 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: diffy
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: tzinfo-data
   requirement: !ruby/object:Gem::Requirement
@@ -260,6 +275,7 @@ files:
 - ".document"
 - ".rspec"
 - Gemfile
+- Gemfile.lock
 - LICENSE.txt
 - MIT-LICENSE
 - README.markdown
@@ -278,11 +294,14 @@ files:
 - 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/web_git.rb
+- lib/web_git/diff.rb
 - lib/web_git/engine.rb
 - lib/web_git/version.rb
+- web_git-0.0.1.gem
 - web_git.gemspec
 homepage: http://github.com/firstdraft/web_git
 licenses:
@@ -303,7 +322,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.1
+rubyforge_project: 
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: An in-browser Git GUI for your Rails project