web_git 0.0.2.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de9efa350ad3a729b36039c0da0555e64c76e965b3b309916f3da6c018ff947e
-  data.tar.gz: 3af448fbbd8b2d7c022caf23f4b63e7cd34d4139179e913c79c36dd1c9e81098
+  metadata.gz: 2c5bfa1659ff7288b47ee5a359442da83f7d287d870b6835e0ab866e6da29398
+  data.tar.gz: dc3894d6d033944e3c87164e703805d2be7a097a738a231a2265e96b1b59f9ad
 SHA512:
-  metadata.gz: a66041301627a64606643f14bbd00ecb13e342d16e5d8f1b3bf86532226cc44101e7b7ad0158fc0935fa4072f7a2688e8a2d84e71f6e73c0af020ce6015aef1c
-  data.tar.gz: 68b6d7b6bf6c35774f54a47b34f9646aecb85a3b76ccb60a18a03bdb5d78fbc9a1b9c4e90a2d9e1dc70cff593b02de1cc4919ea20136f322ebfc4ffa46d1efb5
+  metadata.gz: c745137eee762be97fe2f5494ec0423bfbf7b61fbafe6c31affef0fd9b788376e9d7f98553c17efadce79b8588c541ad4108d2c747af6480db5b9ed39689f30a
+  data.tar.gz: b284391effc03a970b70d93ec007119c54b6508833eecf0fbbfd1100fd4f9ca852e97a744dec559e2ef49092e689fc1380c86d0dc8a41f51dfe23861bf9b5077

data/Gemfile

@@ -8,7 +8,7 @@ source "https://rubygems.org"
 group :development do
   gem "rspec", "~> 3.5.0"
   gem "rdoc", "~> 3.12"
-  # gem "bundler", "~> 1.0"
+  gem "bundler", "~> 1.0"
   gem "juwelier", "~> 2.1.0"
   gem "simplecov", ">= 0"
   gem "pry", "~> 0"
@@ -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

@@ -1,43 +1,43 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
+    actioncable (5.2.2.1)
+      actionpack (= 5.2.2.1)
       nio4r (~> 2.0)
       websocket-driver (>= 0.6.1)
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
+    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.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
+    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.3)
-      activesupport (= 5.2.3)
+    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.3)
-      activesupport (= 5.2.3)
+    activejob (5.2.2.1)
+      activesupport (= 5.2.2.1)
       globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
+    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.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
+    activestorage (5.2.2.1)
+      actionpack (= 5.2.2.1)
+      activerecord (= 5.2.2.1)
       marcel (~> 0.3.1)
-    activesupport (5.2.3)
+    activesupport (5.2.2.1)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 0.7, < 2)
       minitest (~> 5.1)
@@ -56,7 +56,8 @@ GEM
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.3)
-    docile (1.3.2)
+    diffy (3.3.0)
+    docile (1.3.1)
     erubi (1.8.0)
     faraday (0.15.4)
       multipart-post (>= 1.2, < 3)
@@ -72,11 +73,11 @@ GEM
     globalid (0.4.2)
       activesupport (>= 4.2.0)
     hashie (3.6.0)
-    highline (2.0.2)
+    highline (2.0.1)
     i18n (1.6.0)
       concurrent-ruby (~> 1.0)
     interception (0.5)
-    jquery-rails (4.3.5)
+    jquery-rails (4.3.3)
       rails-dom-testing (>= 1, < 3)
       railties (>= 4.2.0)
       thor (>= 0.14, < 2.0)
@@ -91,7 +92,7 @@ GEM
       rake
       rdoc
       semver
-    jwt (2.2.1)
+    jwt (2.1.0)
     loofah (2.2.3)
       crass (~> 1.0.2)
       nokogiri (>= 1.5.9)
@@ -106,9 +107,9 @@ GEM
     minitest (5.11.3)
     multi_json (1.13.1)
     multi_xml (0.6.0)
-    multipart-post (2.1.1)
+    multipart-post (2.0.0)
     nio4r (2.3.1)
-    nokogiri (1.10.3)
+    nokogiri (1.10.2)
       mini_portile2 (~> 2.4.0)
     oauth2 (1.4.1)
       faraday (>= 0.8, < 0.16.0)
@@ -116,10 +117,10 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    octicons (9.1.0)
+    octicons (8.5.0)
       nokogiri (>= 1.6.3.1)
-    octicons_helper (9.1.0)
-      octicons (= 9.1.0)
+    octicons_helper (8.5.0)
+      octicons (= 8.5.0)
       rails
     pry (0.12.2)
       coderay (~> 1.1.0)
@@ -139,31 +140,31 @@ GEM
     pry-stack_explorer (0.4.9.3)
       binding_of_caller (>= 0.7)
       pry (>= 0.9.11)
-    public_suffix (3.1.0)
-    rack (2.0.7)
+    public_suffix (3.0.3)
+    rack (2.0.6)
     rack-test (1.1.0)
       rack (>= 1.0, < 3)
-    rails (5.2.3)
-      actioncable (= 5.2.3)
-      actionmailer (= 5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      activemodel (= 5.2.3)
-      activerecord (= 5.2.3)
-      activestorage (= 5.2.3)
-      activesupport (= 5.2.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.3)
+      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.3)
-      actionpack (= 5.2.3)
-      activesupport (= 5.2.3)
+    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)
@@ -207,15 +208,17 @@ GEM
     tzinfo (1.2.5)
       thread_safe (~> 0.1)
     uri-ssh_git (2.0.0)
-    websocket-driver (0.7.1)
+    websocket-driver (0.7.0)
       websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
-    yard (0.9.19)
+    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)
@@ -234,4 +237,4 @@ DEPENDENCIES
   tzinfo-data
 
 BUNDLED WITH
-   2.0.2
+   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.2.1
+0.0.3

data/app/controllers/web_git/commands_controller.rb

@@ -4,7 +4,7 @@ module WebGit
 
     def status
       Dir.chdir(Rails.root) do
-        logger.debug @status = `git status`
+        @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"
-        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`
+
+        @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 "web_git/commands/hello.html.erb"
-      render "web_git/commands/status.html.erb", layout: "web_git/application"
+
+      render layout: "web_git/application"
     end
+
   end
+
 end

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/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/web_git.gemspec

@@ -2,15 +2,15 @@
 # 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.0.2.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "web_git".freeze
-  s.version = "0.0.3"
+  s.version = "0.0.2.3"
 
   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.authors = ["Raghu Betina".freeze, "Jelani Woods".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
@@ -41,13 +41,12 @@ Gem::Specification.new do |s|
     "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.2.gem",
     "web_git.gemspec"
   ]
   s.homepage = "http://github.com/firstdraft/web_git".freeze
@@ -59,6 +58,7 @@ Gem::Specification.new do |s|
     s.specification_version = 4
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      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"])
@@ -67,6 +67,7 @@ Gem::Specification.new do |s|
       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"])
@@ -76,6 +77,7 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<pry-rescue>.freeze, ["~> 1"])
       s.add_development_dependency(%q<pry-stack_explorer>.freeze, ["~> 0"])
     else
+      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"])
@@ -84,6 +86,7 @@ Gem::Specification.new do |s|
       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"])
@@ -94,6 +97,7 @@ Gem::Specification.new do |s|
       s.add_dependency(%q<pry-stack_explorer>.freeze, ["~> 0"])
     end
   else
+    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"])
@@ -102,6 +106,7 @@ Gem::Specification.new do |s|
     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"])

metadata

@@ -1,15 +1,30 @@
 --- !ruby/object:Gem::Specification
 name: web_git
 version: !ruby/object:Gem::Version
-  version: 0.0.2.1
+  version: 0.0.3
 platform: ruby
 authors:
 - Raghu Betina
+- Jelani Woods
 autorequire: 
 bindir: bin
 cert_chain: []
 date: 2019-07-11 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
@@ -122,6 +137,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.12'
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '1.0'
 - !ruby/object:Gem::Dependency
   name: juwelier
   requirement: !ruby/object:Gem::Requirement
@@ -265,13 +294,12 @@ 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.2.gem
 - web_git.gemspec
 homepage: http://github.com/firstdraft/web_git
 licenses:

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

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