RubyGems - leg - Versions diffs - 0.0.1 → 0.0.2 - Mend

leg 0.0.1 → 0.0.2

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (78) hide show

checksums.yaml +5 -5
data/.gitignore +10 -0
data/CODE_OF_CONDUCT.md +74 -0
data/Gemfile +6 -0
data/Gemfile.lock +34 -0
data/LICENSE +21 -0
data/README.md +59 -0
data/Rakefile +11 -0
data/TUTORIAL.md +243 -0
data/bin/console +9 -0
data/bin/setup +6 -0
data/exe/leg +6 -0
data/leg.gemspec +31 -0
data/lib/leg.rb +27 -0
data/lib/leg/cli.rb +42 -0
data/lib/leg/commands.rb +19 -0
data/lib/leg/commands/amend.rb +49 -0
data/lib/leg/commands/base_command.rb +99 -0
data/lib/leg/commands/build.rb +126 -0
data/lib/leg/commands/commit.rb +48 -0
data/lib/leg/commands/diff.rb +29 -0
data/lib/leg/commands/help.rb +43 -0
data/lib/leg/commands/init.rb +46 -0
data/lib/leg/commands/reset.rb +26 -0
data/lib/leg/commands/resolve.rb +31 -0
data/lib/leg/commands/save.rb +31 -0
data/lib/leg/commands/status.rb +54 -0
data/lib/leg/commands/step.rb +31 -0
data/lib/leg/config.rb +42 -0
data/lib/leg/default_templates.rb +340 -0
data/lib/leg/diff.rb +151 -0
data/lib/leg/diff_transformers.rb +11 -0
data/lib/leg/diff_transformers/base_transformer.rb +13 -0
data/lib/leg/diff_transformers/fold_sections.rb +89 -0
data/lib/leg/diff_transformers/omit_adjacent_removals.rb +38 -0
data/lib/leg/diff_transformers/syntax_highlight.rb +32 -0
data/lib/leg/diff_transformers/trim_blank_lines.rb +25 -0
data/lib/leg/line.rb +83 -0
data/lib/leg/markdown.rb +20 -0
data/lib/leg/page.rb +27 -0
data/lib/leg/representations.rb +9 -0
data/lib/leg/representations/base_representation.rb +42 -0
data/lib/leg/representations/git.rb +388 -0
data/lib/leg/representations/litdiff.rb +85 -0
data/lib/leg/step.rb +16 -0
data/lib/leg/template.rb +95 -0
data/lib/leg/tutorial.rb +49 -0
data/lib/leg/version.rb +3 -0
metadata +112 -38
data/bin/leg +0 -9
data/lib/snaptoken.rb +0 -24
data/lib/snaptoken/cli.rb +0 -61
data/lib/snaptoken/commands.rb +0 -13
data/lib/snaptoken/commands/amend.rb +0 -27
data/lib/snaptoken/commands/base_command.rb +0 -92
data/lib/snaptoken/commands/build.rb +0 -107
data/lib/snaptoken/commands/commit.rb +0 -27
data/lib/snaptoken/commands/help.rb +0 -38
data/lib/snaptoken/commands/resolve.rb +0 -27
data/lib/snaptoken/commands/status.rb +0 -21
data/lib/snaptoken/commands/step.rb +0 -35
data/lib/snaptoken/default_templates.rb +0 -287
data/lib/snaptoken/diff.rb +0 -180
data/lib/snaptoken/diff_line.rb +0 -54
data/lib/snaptoken/diff_transformers.rb +0 -9
data/lib/snaptoken/diff_transformers/base_transformer.rb +0 -9
data/lib/snaptoken/diff_transformers/fold_sections.rb +0 -85
data/lib/snaptoken/diff_transformers/omit_adjacent_removals.rb +0 -28
data/lib/snaptoken/diff_transformers/trim_blank_lines.rb +0 -21
data/lib/snaptoken/markdown.rb +0 -18
data/lib/snaptoken/page.rb +0 -64
data/lib/snaptoken/representations.rb +0 -8
data/lib/snaptoken/representations/base_representation.rb +0 -38
data/lib/snaptoken/representations/git.rb +0 -262
data/lib/snaptoken/representations/litdiff.rb +0 -81
data/lib/snaptoken/step.rb +0 -27
data/lib/snaptoken/template.rb +0 -53
data/lib/snaptoken/tutorial.rb +0 -64

data/lib/snaptoken/commands/step.rb DELETED

@@ -1,35 +0,0 @@
-class Snaptoken::Commands::Step < Snaptoken::Commands::BaseCommand
-  def self.name
-    "step"
-  end
-  def self.summary
-    "Select a step for editing."
-  end
-  def self.usage
-    "<step-number>"
-  end
-  def setopts!(o)
-  end
-  def run
-    needs! :config, :repo
-    step_number = @args.first.to_i
-    FileUtils.cd(@git.repo_path) do
-      @git.each_step do |cur_step, commit|
-        if cur_step == step_number
-          `git checkout #{commit.oid}`
-          @git.copy_repo_to_step!
-          exit
-        end
-      end
-      puts "Error: Step not found."
-      exit 1
-    end
-  end
-end

data/lib/snaptoken/default_templates.rb DELETED

@@ -1,287 +0,0 @@
-module Snaptoken::DefaultTemplates
-  PAGE = <<~TEMPLATE
-    <!doctype html>
-    <html>
-      <head>
-        <meta charset="utf-8">
-        <meta name="viewport" content="width=device-width, initial-scale=1.0, maximum-scale=1.0">
-        <title><%= page_number %>. <%= page_title %></title>
-        <link href="style.css" rel="stylesheet">
-      </head>
-      <body>
-        <header class="bar">
-          <nav>
-            <% if prev_page %>
-              <a href="<%= prev_page.filename %>.html">&larr; prev</a>
-            <% else %>
-              <a href="#"></a>
-            <% end %>
-            <a href="<%= pages.first.filename %>.html">beginning</a>
-            <% if next_page %>
-              <a href="<%= next_page.filename %>.html">next &rarr;</a>
-            <% else %>
-              <a href="#"></a>
-            <% end %>
-          </nav>
-        </header>
-        <div id="container">
-          <%= content %>
-        </div>
-        <footer class="bar">
-          <nav>
-            <a href="#">top of page</a>
-          </nav>
-        </footer>
-      </body>
-    </html>
-  TEMPLATE
-  STEP = <<~TEMPLATE
-    <% for diff in diffs %>
-      <div class="diff">
-        <div class="diff-header">
-          <div class="step-filename">
-            <%= diff.filename %>
-          </div>
-          <div class="step-number">
-            Step <%= number %>
-          </div>
-        </div>
-        <pre class="highlight"><code>\\
-          <% for line in diff.lines %>\\
-            <% if line.type == :folded %>\\
-              <div class="line folded">\\
-                <%= line.source.gsub('<span class="err">…</span>', '…') %>\\
-              </div>\\
-            <% else %>\\
-              <% tag = {unchanged: :div, added: :ins, removed: :del}[line.type] %>\\
-              <% tag = :div if diff.is_new_file %>\\
-              <<%= tag %> class="line">\\
-                <%= line.source %>\\
-              </<%= tag %>>\\
-            <% end %>\\
-          <% end %>\\
-        </code></pre>
-      </div>
-    <% end %>
-  TEMPLATE
-  CSS = <<~TEMPLATE
-    * {
-      margin: 0;
-      padding: 0;
-      box-sizing: border-box;
-    }
-    body {
-      font-family: Utopia, Georgia, Times, 'Apple Symbols', serif;
-      line-height: 140%;
-      color: #333;
-      font-size: 18px;
-    }
-    #container {
-      width: 700px;
-      margin: 18px auto;
-    }
-    .bar {
-      display: block;
-      width: 100%;
-      background-color: #ceb;
-      box-shadow: 0px 0px 15px 1px #ddd;
-    }
-    .bar > nav {
-      display: flex;
-      justify-content: space-between;
-      width: 700px;
-      margin: 0 auto;
-    }
-    footer.bar > nav {
-      justify-content: center;
-    }
-    .bar > nav > a {
-      display: block;
-      padding: 2px 0 4px 0;
-      color: #152;
-    }
-    h1, h2, h3, h4, h5, h6 {
-      font-family: Futura, Helvetica, Arial, sans-serif;
-      color: #222;
-      line-height: 100%;
-      margin-top: 32px;
-    }
-    h2 a, h3 a, h4 a {
-      color: inherit;
-      text-decoration: none;
-    }
-    h2 a::before, h3 a::before, h4 a::before {
-      content: '#';
-      color: #fff;
-      font-weight: normal;
-      transition: color 0.15s ease;
-      display: block;
-      float: left;
-      width: 32px;
-      margin-left: -32px;
-    }
-    h2 a:hover::before, h3 a:hover::before, h4 a:hover::before {
-      color: #ccc;
-    }
-    h1 {
-      margin-top: 0;
-      font-size: 38px;
-      border-bottom: 3px solid #e7c;
-      display: inline-block;
-    }
-    h2 {
-      font-size: 26px;
-    }
-    p {
-      margin-top: 18px;
-    }
-    ul, ol {
-      margin-top: 18px;
-      margin-left: 36px;
-    }
-    hr {
-      border: none;
-      border-bottom: 1px solid #888;
-    }
-    a {
-      color: #26d;
-    }
-    code {
-      font-family: monospace;
-      font-size: inherit;
-      white-space: nowrap;
-      background-color: #eff4ea;
-      padding: 1px 3px;
-    }
-    h1 code, h2 code, h3 code, h4 code, h5 code, h6 code {
-      font-weight: normal;
-    }
-    kbd {
-      font-family: monospace;
-      border-radius: 3px;
-      padding: 2px 3px;
-      box-shadow: 1px 1px 1px #777;
-      margin: 2px;
-      font-size: 14px;
-      background: #f7f7f7;
-      font-weight: 500;
-      color: #555;
-      white-space: nowrap;
-    }
-    h1 kbd, h2 kbd, h3 kbd, h4 kbd, h5 kbd, h6 kbd {
-      font-size: 80%;
-    }
-    .diff code {
-      font-size: 14px;
-      line-height: 20px;
-      background-color: none;
-      padding: 0;
-      margin-bottom: 18px;
-      white-space: inherit;
-    }
-    .diff pre {
-      background-color: #fffcfa;
-      padding: 5px 0;
-    }
-    .diff {
-      border: 1px solid #ede7e3;
-      border-radius: 3px;
-      margin-top: 18px;
-    }
-    .diff .diff-header {
-      display: flex;
-      justify-content: space-between;
-      padding: 0 5px;
-      background-color: #ede7e3;
-      font-size: 16px;
-      color: #666;
-    }
-    .diff .step-number {
-      font-weight: bold;
-    }
-    .diff .step-filename {
-      font-weight: bold;
-    }
-    .diff .step-name {
-      font-family: monospace;
-      font-size: 12px;
-    }
-    .diff .line {
-      display: block;
-      height: 20px;
-      padding: 0 5px;
-      position: relative;
-    }
-    .diff .line.folded {
-      background-color: #eef;
-      opacity: 0.5;
-    }
-    .diff ins.line {
-      background-color: #ffd;
-      text-decoration: none;
-    }
-    .diff del.line {
-      background-color: #fdd;
-      text-decoration: line-through;
-    }
-    @media screen and (max-width: 700px) {
-      #container {
-        width: auto;
-        margin: 18px 0;
-        padding: 0 5px;
-      }
-      .bar > nav {
-        width: auto;
-        margin: 0;
-        padding: 0 5px;
-      }
-      .highlight {
-        overflow-x: scroll;
-      }
-      .diff .line {
-        width: 700px;
-      }
-    }
-    <%= syntax_highlighting_css ".highlight" %>
-  TEMPLATE
-end

data/lib/snaptoken/diff.rb DELETED

@@ -1,180 +0,0 @@
-class Snaptoken::Diff
-  attr_accessor :filename, :is_new_file, :lines, :syntax_highlighted
-  def initialize(filename = nil, is_new_file = false, lines = [])
-    @filename = filename
-    @is_new_file = is_new_file
-    @lines = lines
-    @syntax_highlighted = false
-  end
-  def clone
-    diff = Snaptoken::Diff.new(@filename.dup, @is_new_file, @lines.map(&:clone))
-    diff.syntax_highlighted = @syntax_highlighted
-    diff
-  end
-  def clone_empty
-    diff = Snaptoken::Diff.new(@filename.dup, @is_new_file, [])
-    diff.syntax_highlighted = @syntax_highlighted
-    diff
-  end
-  # Append a DiffLine to the Diff.
-  def <<(diff_line)
-    unless diff_line.is_a? Snaptoken::DiffLine
-      raise ArgumentError, "expected a DiffLine"
-    end
-    @lines << diff_line
-    self
-  end
-  def to_patch(options = {})
-    patch = "diff --git a/#{@filename} b/#{@filename}\n"
-    if @is_new_file
-      patch += "new file mode 100644\n"
-      patch += "--- /dev/null\n"
-    else
-      patch += "--- a/#{@filename}\n"
-    end
-    patch += "+++ b/#{@filename}\n"
-    find_hunks.each do |hunk|
-      patch += hunk_header(hunk)
-      hunk.each do |line|
-        patch += line.to_patch(options)
-      end
-    end
-    patch
-  end
-  # Parse a git diff and return an array of Diff objects, one for each file in
-  # the git diff.
-  def self.parse(git_diff)
-    in_diff = false
-    old_line_num = nil
-    new_line_num = nil
-    cur_diff = nil
-    diffs = []
-    git_diff.lines.each do |line|
-      if line =~ /^diff --git (\S+) (\S+)$/
-        filename = $2.split("/")[1..-1].join("/")
-        cur_diff = Snaptoken::Diff.new(filename)
-        diffs << cur_diff
-        in_diff = false
-      elsif !in_diff && line.start_with?('new file')
-        cur_diff.is_new_file = true
-      elsif line =~ /^@@ -(\d+)(,\d+)? \+(\d+)(,\d+)? @@/
-        # TODO: somehow preserve function name that comes to the right of the @@ header?
-        in_diff = true
-        old_line_num = $1.to_i
-        new_line_num = $3.to_i
-      elsif in_diff && line[0] == '\\'
-        # Ignore "".
-      elsif in_diff && [' ', '|', '+', '-'].include?(line[0])
-        case line[0]
-        when ' ', '|'
-          type = :unchanged
-          line_nums = [old_line_num, new_line_num]
-          old_line_num += 1
-          new_line_num += 1
-        when '+'
-          type = :added
-          line_nums = [nil, new_line_num]
-          new_line_num += 1
-        when '-'
-          type = :removed
-          line_nums = [old_line_num, nil]
-          old_line_num += 1
-        end
-        cur_diff << Snaptoken::DiffLine.new(type, line[1..-1], line_nums)
-      else
-        in_diff = false
-      end
-    end
-    diffs
-  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
-  SYNTAX_HIGHLIGHTER = HTMLLineByLine.new(Rouge::Formatters::HTML.new)
-  def syntax_highlight!
-    return if @syntax_highlighted
-    code = @lines.map(&:source).join("\n") + "\n"
-    lexer = Rouge::Lexer.guess(filename: @filename, source: code)
-    SYNTAX_HIGHLIGHTER.format(lexer.lex(code)).lines.each.with_index do |line_hl, idx|
-      @lines[idx].source = line_hl
-    end
-    @syntax_highlighted = true
-  end
-  private
-  # :S
-  def hunk_header(hunk)
-    old_line, new_line = hunk.first.line_numbers
-    old_line ||= 1
-    new_line ||= 1
-    old_count = hunk.count { |line| [:removed, :unchanged].include? line.type }
-    new_count = hunk.count { |line| [:added, :unchanged].include? line.type }
-    old_line = 0 if old_count == 0
-    new_line = 0 if new_count == 0
-    "@@ -#{old_line},#{old_count} +#{new_line},#{new_count} @@\n"
-  end
-  # :(
-  def find_hunks
-    raise "can't create patch from empty diff" if @lines.empty?
-    hunks = []
-    cur_hunk = [@lines.first]
-    cur_line_nums = @lines.first.line_numbers.dup
-    @lines[1..-1].each do |line|
-      case line.type
-      when :unchanged
-        cur_line_nums[0] = cur_line_nums[0].nil? ? line.line_numbers[0] : (cur_line_nums[0] + 1)
-        cur_line_nums[1] = cur_line_nums[1].nil? ? line.line_numbers[1] : (cur_line_nums[1] + 1)
-      when :added
-        cur_line_nums[1] = cur_line_nums[1].nil? ? line.line_numbers[1] : (cur_line_nums[1] + 1)
-      when :removed
-        cur_line_nums[0] = cur_line_nums[0].nil? ? line.line_numbers[0] : (cur_line_nums[0] + 1)
-      when :folded
-        raise "can't create patch from diff with folded lines"
-      end
-      old_match = (line.line_numbers[0].nil? || line.line_numbers[0] == cur_line_nums[0])
-      new_match = (line.line_numbers[1].nil? || line.line_numbers[1] == cur_line_nums[1])
-      if !old_match || !new_match
-        hunks << cur_hunk
-        cur_hunk = []
-        cur_line_nums = line.line_numbers.dup
-      end
-      cur_hunk << line
-    end
-    hunks << cur_hunk
-    hunks
-  end
-end