web_git 0.0.2.1 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de9efa350ad3a729b36039c0da0555e64c76e965b3b309916f3da6c018ff947e
-  data.tar.gz: 3af448fbbd8b2d7c022caf23f4b63e7cd34d4139179e913c79c36dd1c9e81098
+  metadata.gz: df344a99ced3ffa5aa14fd5e02c65b0dba783865e0de1a2a8890d60c503fa895
+  data.tar.gz: c73035a3d54a48e0408caaccd511fb870e8b146285fda027269a23e535c83837
 SHA512:
-  metadata.gz: a66041301627a64606643f14bbd00ecb13e342d16e5d8f1b3bf86532226cc44101e7b7ad0158fc0935fa4072f7a2688e8a2d84e71f6e73c0af020ce6015aef1c
-  data.tar.gz: 68b6d7b6bf6c35774f54a47b34f9646aecb85a3b76ccb60a18a03bdb5d78fbc9a1b9c4e90a2d9e1dc70cff593b02de1cc4919ea20136f322ebfc4ffa46d1efb5
+  metadata.gz: f06d1b999fc619fd52408cba7eeb68c3aec2ed329f05eb2d4f468cdc8773da5c839e38ab45f7a8bd1b701da44c5a3e56670686f36f639d4f167537bc3327cc5d
+  data.tar.gz: ebe553dbf002f9a6e142783543dc5cda05cac78dd76d53c0cbfaf733d7ae3fc5b438bc8c8a0570d7c9e731fa67a7907ad02cedf69eeca4e2c6fdec15aa68f28d

data/Gemfile

@@ -6,28 +6,15 @@ source "https://rubygems.org"
 # Add dependencies to develop your gem here.
 # Include everything needed to run rake, tests, features, etc.
 group :development do
-  gem "rspec", "~> 3.5.0"
-  gem "rdoc", "~> 3.12"
-  # gem "bundler", "~> 1.0"
   gem "juwelier", "~> 2.1.0"
-  gem "simplecov", ">= 0"
-  gem "pry", "~> 0"
-  gem "pry-byebug", "~> 3"
-  gem "pry-doc", "~> 0"
-  gem "pry-remote", "~> 0"
-  gem "pry-rescue", "~> 1"
-  gem "pry-stack_explorer", "~> 0"
+  gem "rdoc", ">= 6.3.1"
+  gem "rspec", "~> 3.5.0"
 end
 
+gem "actionview"
+gem "ansispan"
+gem "diffy"
+gem "git"
+gem "sinatra"
 # Windows does not include zoneinfo files, so bundle the tzinfo-data gem
 gem "tzinfo-data", platforms: [:mingw, :mswin, :x64_mingw, :jruby]
-
-gem "tether-rails"
-
-gem "octicons_helper"
-
-gem "turbolinks", "~> 5"
-
-gem "jquery-rails"
-
-gem "git_clone_url"

data/Gemfile.lock

@@ -1,86 +1,64 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    actioncable (5.2.3)
-      actionpack (= 5.2.3)
-      nio4r (~> 2.0)
-      websocket-driver (>= 0.6.1)
-    actionmailer (5.2.3)
-      actionpack (= 5.2.3)
-      actionview (= 5.2.3)
-      activejob (= 5.2.3)
-      mail (~> 2.5, >= 2.5.4)
-      rails-dom-testing (~> 2.0)
-    actionpack (5.2.3)
-      actionview (= 5.2.3)
-      activesupport (= 5.2.3)
-      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 (7.0.2.3)
+      activesupport (= 7.0.2.3)
       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)
-      globalid (>= 0.3.6)
-    activemodel (5.2.3)
-      activesupport (= 5.2.3)
-    activerecord (5.2.3)
-      activemodel (= 5.2.3)
-      activesupport (= 5.2.3)
-      arel (>= 9.0)
-    activestorage (5.2.3)
-      actionpack (= 5.2.3)
-      activerecord (= 5.2.3)
-      marcel (~> 0.3.1)
-    activesupport (5.2.3)
+      rails-html-sanitizer (~> 1.1, >= 1.2.0)
+    activesupport (7.0.2.3)
       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)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+    addressable (2.8.0)
+      public_suffix (>= 2.0.2, < 5.0)
+    ansispan (0.0.1)
+    builder (3.2.4)
+    concurrent-ruby (1.1.9)
+    crass (1.0.6)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
-    diff-lcs (1.3)
-    docile (1.3.2)
-    erubi (1.8.0)
-    faraday (0.15.4)
+    diff-lcs (1.5.0)
+    diffy (3.4.0)
+    erubi (1.10.0)
+    faraday (1.10.0)
+      faraday-em_http (~> 1.0)
+      faraday-em_synchrony (~> 1.0)
+      faraday-excon (~> 1.1)
+      faraday-httpclient (~> 1.0)
+      faraday-multipart (~> 1.0)
+      faraday-net_http (~> 1.0)
+      faraday-net_http_persistent (~> 1.0)
+      faraday-patron (~> 1.0)
+      faraday-rack (~> 1.0)
+      faraday-retry (~> 1.0)
+      ruby2_keywords (>= 0.0.4)
+    faraday-em_http (1.0.0)
+    faraday-em_synchrony (1.0.0)
+    faraday-excon (1.1.0)
+    faraday-httpclient (1.0.1)
+    faraday-multipart (1.0.3)
       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)
+    faraday-net_http (1.0.1)
+    faraday-net_http_persistent (1.2.0)
+    faraday-patron (1.0.0)
+    faraday-rack (1.0.0)
+    faraday-retry (1.0.3)
+    git (1.10.2)
+      rchardet (~> 1.8)
+    github_api (0.19.0)
       addressable (~> 2.4)
       descendants_tracker (~> 0.0.4)
-      faraday (~> 0.8)
+      faraday (>= 0.8, < 2)
       hashie (~> 3.5, >= 3.5.2)
       oauth2 (~> 1.0)
-    globalid (0.4.2)
-      activesupport (>= 4.2.0)
     hashie (3.6.0)
-    highline (2.0.2)
-    i18n (1.6.0)
+    highline (2.0.3)
+    i18n (1.10.0)
       concurrent-ruby (~> 1.0)
-    interception (0.5)
-    jquery-rails (4.3.5)
-      rails-dom-testing (>= 1, < 3)
-      railties (>= 4.2.0)
-      thor (>= 0.14, < 2.0)
-    json (1.8.6)
+    jar-dependencies (0.4.1)
     juwelier (2.1.3)
       builder
       bundler (>= 1.13)
@@ -91,85 +69,51 @@ GEM
       rake
       rdoc
       semver
-    jwt (2.2.1)
-    loofah (2.2.3)
+    jwt (2.3.0)
+    loofah (2.14.0)
       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)
+    mini_portile2 (2.8.0)
+    minitest (5.15.0)
+    multi_json (1.15.0)
     multi_xml (0.6.0)
     multipart-post (2.1.1)
-    nio4r (2.3.1)
-    nokogiri (1.10.3)
-      mini_portile2 (~> 2.4.0)
-    oauth2 (1.4.1)
-      faraday (>= 0.8, < 0.16.0)
+    mustermann (1.1.1)
+      ruby2_keywords (~> 0.0.1)
+    nokogiri (1.13.3)
+      mini_portile2 (~> 2.8.0)
+      racc (~> 1.4)
+    nokogiri (1.13.3-java)
+      racc (~> 1.4)
+    nokogiri (1.13.3-x64-mingw32)
+      racc (~> 1.4)
+    nokogiri (1.13.3-x86-mingw32)
+      racc (~> 1.4)
+    oauth2 (1.4.9)
+      faraday (>= 0.17.3, < 3.0)
       jwt (>= 1.0, < 3.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (>= 1.2, < 3)
-    octicons (9.1.0)
-      nokogiri (>= 1.6.3.1)
-    octicons_helper (9.1.0)
-      octicons (= 9.1.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.1.0)
-    rack (2.0.7)
-    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)
-      bundler (>= 1.3.0)
-      railties (= 5.2.3)
-      sprockets-rails (>= 2.0.0)
+    psych (4.0.3)
+      stringio
+    psych (4.0.3-java)
+      jar-dependencies (>= 0.1.7)
+    public_suffix (4.0.6)
+    racc (1.6.0)
+    racc (1.6.0-java)
+    rack (2.2.3)
+    rack-protection (2.2.0)
+      rack
     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)
-      method_source
-      rake (>= 0.8.7)
-      thor (>= 0.19.0, < 2.0)
-    rake (12.3.2)
-    rdoc (3.12.2)
-      json (~> 1.4)
+    rails-html-sanitizer (1.4.2)
+      loofah (~> 2.3)
+    rake (13.0.6)
+    rchardet (1.8.0)
+    rdoc (6.4.0)
+      psych (>= 4.0.0)
     rspec (3.5.0)
       rspec-core (~> 3.5.0)
       rspec-expectations (~> 3.5.0)
@@ -183,55 +127,39 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.5.0)
     rspec-support (3.5.0)
+    ruby2_keywords (0.0.5)
     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)
+    sinatra (2.2.0)
+      mustermann (~> 1.0)
+      rack (~> 2.2)
+      rack-protection (= 2.2.0)
+      tilt (~> 2.0)
+    stringio (3.0.1)
     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.1)
-      websocket-extensions (>= 0.1.0)
-    websocket-extensions (0.1.4)
-    yard (0.9.19)
+    thread_safe (0.3.6-java)
+    tilt (2.0.10)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    tzinfo-data (1.2021.5)
+      tzinfo (>= 1.0.0)
 
 PLATFORMS
+  java
   ruby
+  x64-mingw32
+  x86-mingw32
+  x86-mswin32
 
 DEPENDENCIES
-  git_clone_url
-  jquery-rails
+  actionview
+  ansispan
+  diffy
+  git
   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)
+  rdoc (>= 6.3.1)
   rspec (~> 3.5.0)
-  simplecov
-  tether-rails
-  turbolinks (~> 5)
+  sinatra
   tzinfo-data
 
 BUNDLED WITH
-   2.0.2
+   2.1.4

data/README.markdown

@@ -2,15 +2,10 @@
 
 An in-browser Git GUI for your Rails project.
 
-WebGit is a Rails Engine that provides an in-browser visual interface to a simple but effective Git workflow. For educational purposes.
+WebGit is an embeddable Sinatra app that provides an in-browser visual interface to a simple but effective Git workflow. For educational purposes.
 
 ## 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:
 
@@ -18,9 +13,36 @@ Add this line to your application's Gemfile:
 gem "web_git", git: "https://github.com/firstdraft/web_git"
 ```
 
-And then execute:
+And then execute the following command in a Terminal:
+
+```bash
+bundle install
+```
+
+In the directory of your Rails app run:
+
 ```bash
-$ bundle
+rails generate web_git:install
+```
+Then `rails server` and visit `/git`.
+
+## Usage
+
+In your Rails app
+
+```ruby
+# config.ru
+# This file is used by Rack-based servers to start the application.
+
+require_relative 'config/environment'
+
+map '/git' do
+  run WebGit::Server
+end
+
+map '/' do
+  run Rails.application
+end
 ```
 
 ## License

data/Rakefile

@@ -17,9 +17,9 @@ Juwelier::Tasks.new do |gem|
   gem.homepage = "http://github.com/firstdraft/web_git"
   gem.license = "MIT"
   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.description = %Q{WebGit is an embeddable Sinatra app that provides an in-browser visual interface to a simple but effective Git workflow. For educational purposes.}
+  gem.email = ["raghu@firstdraft.com", "jelani@firstdraft.com"]
+  gem.authors = ["Raghu Betina", "Jelani Woods"]
 
   # dependencies defined in Gemfile
 end

data/VERSION

@@ -1 +1 @@
-0.0.2.1
+0.1.0

data/lib/generators/web_git/install_generator.rb

@@ -0,0 +1,47 @@
+module WebGit
+  class InstallGenerator < Rails::Generators::Base
+    def generate_server
+      
+      filename = Rails.root.join("config.ru")
+
+      log :insert, "Updating config.ru to run apps in parallel."
+      if File.exists?(filename) && already_installed?
+        log :identical, "Skipping overrides."
+      else
+        contents = <<~RUBY
+
+        if Rails.env.development?
+          map '/git' do
+            run WebGit::Server
+          end
+        end
+  
+        map '/' do
+        RUBY
+  
+        filename = "config.ru"
+        match_text = "run Rails.application"
+  
+        insert_into_file filename, contents, before: match_text
+        insert_into_file filename, "\nend", after: match_text, force: true
+        gsub_file filename, match_text, "\t#{match_text}"
+      end
+
+      expect_installed = run("which expect")
+
+      unless expect_installed
+        log :insert, "Installing expect."
+        run "sudo apt install -y expect"
+      else
+        log :identical, "expect already installed."
+      end
+    end
+
+    def already_installed?
+      filename = Rails.root.join("config.ru")
+      contents = open(filename).read
+
+      contents.match?(/if\s*Rails.env.development\?\s*map\s*'\/git'\s*do\s*run\s*WebGit::Server\s*end\s*end/)
+    end
+  end
+end

data/lib/scripts/heroku_login.exp

@@ -0,0 +1,58 @@
+#!/usr/bin/expect -f
+#
+# This Expect script was generated by autoexpect on Tue Jun 22 17:49:07 2021
+# Expect and autoexpect were both written by Don Libes, NIST.
+#
+# Note that autoexpect does not guarantee a working script.  It
+# necessarily has to guess about certain things.  Two reasons a script
+# might fail are:
+#
+# 1) timing - A surprising number of programs (rn, ksh, zsh, telnet,
+# etc.) and devices discard or ignore keystrokes that arrive "too
+# quickly" after prompts.  If you find your new script hanging up at
+# one spot, try adding a short sleep just before the previous send.
+# Setting "force_conservative" to 1 (see below) makes Expect do this
+# automatically - pausing briefly before sending each character.  This
+# pacifies every program I know of.  The -c flag makes the script do
+# this in the first place.  The -C flag allows you to define a
+# character to toggle this mode off and on.
+
+set force_conservative 0  ;# set to 1 to force conservative mode even if
+			  ;# script wasn't run conservatively originally
+if {$force_conservative} {
+	set send_slow {1 .1}
+	proc send {ignore arg} {
+		sleep .1
+		exp_send -s -- $arg
+	}
+}
+
+#
+# 2) differing output - Some programs produce different output each time
+# they run.  The "date" command is an obvious example.  Another is
+# ftp, if it produces throughput statistics at the end of a file
+# transfer.  If this causes a problem, delete these patterns or replace
+# them with wildcards.  An alternative is to use the -p flag (for
+# "prompt") which makes Expect only look for the last line of output
+# (i.e., the prompt).  The -P flag allows you to define a character to
+# toggle this mode off and on.
+#
+# Read the man page for more info.
+#
+# -Don
+
+set email [lindex $argv 0];
+set password [lindex $argv 1];
+
+set timeout -1
+spawn heroku login --interactive
+match_max 100000
+expect -re {(.|\n)*Enter your login credentials\r}
+send -- "$email"
+expect -exact "$email"
+send -- "\r"
+expect -re {(.|\n)*Password:}
+send -- "$password"
+expect -re {\*.*}
+send -- "\r"
+expect eof