oleg 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fe515e58859a107bbab71359a195c02320c7103f
-  data.tar.gz: 9e6be5fa4d23ca96d0bb5818bec9aaf4d5f37f25
+  metadata.gz: e2c98a618bee0b37cb5705e210ba7f8f68074852
+  data.tar.gz: a52a2608c0a829aa5ba152e42f110fb794841271
 SHA512:
-  metadata.gz: 0616f537ca77cb5e405e4704f50043e54d8a217fe8e29de6b8e08859063bf46ebf11677461b23b05214e9b0e817c17d0264eaee172bd0b95876e6f9da0eb2a31
-  data.tar.gz: f315be05ebda93d8e3ac796f8456f872b39f3b53857d9068272a6b8629fbcb241b41cc099bc12c027893bacd81f52846bed34aaf4514623fd0659cebfeb554c3
+  metadata.gz: 32a1bde2f363fe02e851d11264b5eba3f6e8547dcf4cd165b9ef58b7ae6fed0730b8dcf89bd4318517e83319a9f844a354b8bd20c4a33d3dbaceff8ac6636c75
+  data.tar.gz: 4691effe76d202330e907159feed5c1df0190dbe0f96bd18af91f0951ae7699e432c82f3361789f65696004615a79bbd827d26595e6759ae1a9d2a95aaa1c12e

data/lib/leg.rb

@@ -9,4 +9,5 @@ end
 
 require 'leg/cli'
 require 'leg/commands'
+require 'leg/diff'
 

data/lib/leg/commands/doc.rb

@@ -20,13 +20,28 @@ class Leg::Commands::Doc < Leg::Commands::BaseCommand
     end
   end
 
+  class HTMLLineByLine < Rouge::Formatter
+    def initialize(formatter)
+      @formatter = formatter
+    end
+
+    def stream(tokens, &b)
+      token_lines(tokens) do |line|
+        line.each do |tok, val|
+          yield @formatter.span(tok, val)
+        end
+        yield "\n"
+      end
+    end
+  end
+
   private
 
   def copy_static_files
     Dir["html_in/*"].each do |f|
       name = File.basename(f)
       unless %w(template.html style.css).include? name
-        FileUtils.cp(f, "html_out/#{name}")
+        FileUtils.cp_r(f, "html_out/#{name}")
       end
     end
   end
@@ -51,7 +66,6 @@ class Leg::Commands::Doc < Leg::Commands::BaseCommand
     diffs = {}
     FileUtils.cd("../steps") do
       FileUtils.mkdir_p("0")
-
       last_step = "0"
       Dir["*"].sort_by(&:to_i).each do |step|
         names = [step.to_i.to_s]
@@ -59,123 +73,16 @@ class Leg::Commands::Doc < Leg::Commands::BaseCommand
           names << $1
         end
 
-        diffout = []
-        section_stack = []
-        in_diff = false
-        lexer = nil
-        formatter = Rouge::Formatters::HTML.new
-
-        diff = `git diff --histogram --unified=100000 --ignore-space-change --no-index #{last_step} #{step}`
-        diff.lines.each do |line|
-          if !in_diff && line =~ /^\+\+\+ (.+)$/
-            filename = File.basename($1)
-            lexer = Rouge::Lexer.guess(filename: filename)
-            diffout << {type: :section, section_type: :file, summary: filename, content: []}
-            section_stack = [diffout.last]
-          elsif line.start_with? '@@'
-            in_diff = true
-          elsif in_diff && [' ', '+', '-'].include?(line[0])
-            line_hl = formatter.format(lexer.lex(line[1..-1])).gsub("\n", "")
-            type = {' ' => :nochange, '+' => :add, '-' => :remove }[line[0]]
-
-            section_stack.each { |s| s[:dirty] = true } if type != :nochange
-
-            if line[1..-1] =~ /^\/\*\*\* (.+) \*\*\*\/$/
-              section_stack = [section_stack[0]]
-              section_stack.last[:content] << {type: :section, section_type: :comment, summary: line[1..-1].chomp, content: []}
-              section_stack.push(section_stack.last[:content].last)
-            elsif line[1] =~ /\S/ && line.chomp[-1] == "{"
-              section_stack.pop if section_stack.length > 1 && section_stack.last[:section_type] == :braces
-              section_stack.last[:content] << {type: :section, section_type: :braces, summary: line[1..-1].chomp + " ... ", content: []}
-              section_stack.push(section_stack.last[:content].last)
-            end
-
-            section_stack.last[:content] << {type: type, content: line_hl}
-
-            if line[1..-1] =~ /^(}( \w+)?;?)$/ && section_stack.last[:section_type] == :braces
-              s = section_stack.pop
-              s[:summary] << $1
-            end
-
-            section_stack.each { |s| s[:dirty] = true } if type != :nochange
-          else
-            in_diff = false
-          end
-        end
-
-        change_chain = []
-        diffout.each do |file|
-          to_render = file[:content].dup
-          until to_render.empty?
-            cur = to_render.shift
-            if cur[:type] == :section
-              if cur[:dirty]
-                to_render = cur[:content] + to_render
-              else
-                if change_chain.first && change_chain.first[:content].empty?
-                  change_chain.first[:type] = :nochange
-                end
-                if change_chain.last && change_chain.last[:content].empty?
-                  change_chain.last[:type] = :nochange
-                end
-                change_chain = []
-              end
-            else
-              if cur[:type] == :nochange
-                if change_chain.first && change_chain.first[:content].empty?
-                  change_chain.first[:type] = :nochange
-                end
-                if change_chain.last && change_chain.last[:content].empty?
-                  change_chain.last[:type] = :nochange
-                end
-                change_chain = []
-              else
-                change_chain << cur
-                if cur[:type] == :add
-                  change_chain.each { |c| c[:omit] = true if c[:type] == :remove }
-                elsif cur[:type] == :remove
-                  cur[:omit] = true if change_chain.any? { |c| c[:type] == :add }
-                end
-              end
-            end
-          end
-        end
-
-        html = ""
-        diffout.each do |file|
-          html << "<div class=\"diff\">\n"
-          html << "<div class=\"filename\">#{file[:summary]}</div>\n"
-          html << "<pre class=\"highlight\"><code>"
-
-          to_render = file[:content].dup
-          until to_render.empty?
-            cur = to_render.shift
-            if cur[:type] == :section
-              if cur[:dirty]
-                to_render = cur[:content] + to_render
-              else
-                summary = formatter.format(lexer.lex(cur[:summary])).gsub("\n", "")
-                html << "<div class=\"line folded\">#{summary}</div>"
-              end
-            elsif !cur[:omit]
-              tag = {nochange: :div, add: :ins, remove: :del}[cur[:type]]
-              html << "<#{tag} class=\"line\">#{cur[:content]}</#{tag}>"
-            end
-          end
-
-          html << "</code></pre>\n</div>\n"
-        end
+        diff = Leg::Diff.new(last_step, step)
 
         names.each do |name|
-          diffs[name] = html
+          diffs[name] = diff.html.values.join("\n")
         end
 
         last_step = step
       end
-
       FileUtils.rmdir("0")
     end
-
     diffs
   end
 

data/lib/leg/diff.rb

@@ -0,0 +1,201 @@
+class Leg::Diff
+  GIT_DIFF_OPTIONS = "--histogram --unified=100000 --ignore-space-change --no-index"
+
+  attr_reader :files, :html
+
+  def initialize(step_a, step_b)
+    git_diff = `git diff #{GIT_DIFF_OPTIONS} #{step_a} #{step_b}`
+    parse_git_diff(git_diff)
+    @files.values.each(&:omit_adjacent_removals!)
+
+    @html = {}
+    @files.each do |filename, file|
+      @html[filename] = file.to_html
+    end
+  end
+
+  class DiffLine
+    attr_reader :type, :line
+    attr_writer :type
+
+    def initialize(type, line)
+      @type = type
+      @line = line
+    end
+
+    def empty!; @empty = true; end
+    def empty?; @empty; end
+
+    def omit!; @omit = true; end
+    def omit?; @omit; end
+  end
+
+  class DiffSection
+    attr_reader :type, :lines, :contents
+
+    def initialize(type, line=nil)
+      @type = type
+      @lines = Array(line)
+      @contents = []
+    end
+
+    def <<(content)
+      @contents << content
+    end
+
+    def dirty!; @dirty = true; end
+    def dirty?; @dirty; end
+  end
+
+  class DiffFile < DiffSection
+    attr_reader :filename, :file_contents
+
+    def initialize(filename)
+      super(:file)
+      @filename = filename
+      @file_contents = ""
+    end
+
+    def append_line(line)
+      @file_contents << line
+      @file_contents << "\n" unless line.end_with? "\n"
+    end
+
+    def new_file!; @new_file = true; end
+    def new_file?; @new_file; end
+
+    def omit_adjacent_removals!
+      change_chain = []
+      to_render = @contents.dup
+      until to_render.empty?
+        cur = to_render.shift
+        if cur.is_a? DiffSection
+          if cur.dirty?
+            to_render = cur.contents + to_render
+          else
+            [change_chain.first, change_chain.last].compact.each do |line|
+              line.type = :nochange if line.empty?
+            end
+            change_chain = []
+          end
+        else
+          if cur.type == :nochange
+            [change_chain.first, change_chain.last].compact.each do |line|
+              line.type = :nochange if line.empty?
+            end
+            change_chain = []
+          else
+            change_chain << cur
+            if cur.type == :add
+              change_chain.each { |c| c.omit! if c.type == :remove }
+            elsif cur.type == :remove
+              cur.omit! if change_chain.any? { |c| c.type == :add }
+            end
+          end
+        end
+      end
+    end
+
+    def to_html
+      formatter = Rouge::Formatters::HTML.new
+      formatter = HTMLLineByLine.new(formatter)
+
+      lexer = Rouge::Lexer.guess(filename: @filename)
+      code_hl = formatter.format(lexer.lex(@file_contents)).lines.each(&:chomp!)
+
+      html = ""
+      html << "<div class=\"diff\">\n"
+      html << "<div class=\"filename\">#{@filename}</div>\n"
+      html << "<pre class=\"highlight\"><code>"
+
+      to_render = @contents.dup
+      until to_render.empty?
+        cur = to_render.shift
+        if cur.is_a? DiffSection
+          if cur.dirty?
+            to_render = cur.contents + to_render
+          else
+            summary = cur.lines.map { |n| code_hl[n] }.join(" ... ").gsub("\n", "")
+            html << "<div class=\"line folded\">#{summary}</div>"
+          end
+        elsif !cur.omit?
+          tag = {nochange: :div, add: :ins, remove: :del}[cur.type]
+          tag = :div if new_file?
+          html << "<#{tag} class=\"line\">#{code_hl[cur.line]}</#{tag}>"
+        end
+      end
+      html << "</code></pre>\n</div>\n"
+
+      html
+    end
+  end
+
+  class HTMLLineByLine < Rouge::Formatter
+    def initialize(formatter)
+      @formatter = formatter
+    end
+
+    def stream(tokens, &b)
+      token_lines(tokens) do |line|
+        line.each do |tok, val|
+          yield @formatter.span(tok, val)
+        end
+        yield "\n"
+      end
+    end
+  end
+
+  private
+
+  def parse_git_diff(git_diff)
+    diff_file = nil
+    section_stack = nil
+    line_idx = nil
+    in_diff = false
+    @files = {}
+
+    git_diff.lines.each do |line|
+      if !in_diff && line =~ /^diff --git (\S+) (\S+)$/
+        diff_file = DiffFile.new(File.basename($2))
+        @files[diff_file.filename] = diff_file
+        section_stack = [diff_file]
+        line_idx = -1
+      elsif !in_diff && line.start_with?('new file')
+        diff_file.new_file!
+      elsif line.start_with? '@@'
+        in_diff = true
+      elsif in_diff && [' ', '+', '-'].include?(line[0])
+        type = {' ' => :nochange, '+' => :add, '-' => :remove }[line[0]]
+        diff_file.append_line(line[1..-1])
+        line_idx += 1
+
+        section_stack.each(&:dirty!) if type != :nochange
+
+        if line[1..-1] =~ /^\/\*\*\* (.+) \*\*\*\/$/
+          section = DiffSection.new(:comment, line_idx)
+          diff_file << section
+          section_stack = [diff_file, section]
+        elsif line[1] =~ /\S/ && line.chomp[-1] == "{"
+          section = DiffSection.new(:braces, line_idx)
+          section_stack.pop if section_stack.last.type == :braces
+          section_stack.last << section
+          section_stack.push(section)
+        end
+
+        diff_line = DiffLine.new(type, line_idx)
+        diff_line.empty! if line[1..-1].strip.empty?
+        section_stack.last << diff_line
+
+        if line[1..-1] =~ /^}( \w+)?;?$/ && section_stack.last.type == :braces
+          section = section_stack.pop
+          section.lines << line_idx
+        end
+
+        section_stack.each(&:dirty!) if type != :nochange
+      else
+        in_diff = false
+      end
+    end
+  end
+end
+

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: oleg
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - Jeremy Ruten
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-13 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rugged
@@ -73,6 +73,7 @@ files:
 - lib/leg/commands/repo.rb
 - lib/leg/commands/undiff.rb
 - lib/leg/commands/unrepo.rb
+- lib/leg/diff.rb
 homepage: https://github.com/yjerem/leg
 licenses:
 - MIT