leg 0.0.1 → 0.0.2

data/lib/leg/commands/diff.rb

@@ -0,0 +1,29 @@
+module Leg
+  module Commands
+    class Diff < BaseCommand
+      def self.name
+        "diff"
+      end
+
+      def self.summary
+        "Compare last step with changes made in step/."
+      end
+
+      def self.usage
+        ""
+      end
+
+      def setopts!(o)
+      end
+
+      def run
+        needs! :config, :repo
+
+        @git.copy_step_to_repo!
+        FileUtils.cd(@git.repo_path) do
+          system("git diff")
+        end
+      end
+    end
+  end
+end

data/lib/leg/commands/help.rb

@@ -0,0 +1,43 @@
+module Leg
+  module Commands
+    class Help < BaseCommand
+      def self.name
+        "help"
+      end
+
+      def self.summary
+        "Print out list of commands, or get help\n" +
+        "on a specific command."
+      end
+
+      def self.usage
+        "[<command>]"
+      end
+
+      def setopts!(o)
+      end
+
+      def run
+        if @args.empty?
+          puts "<< Hello! I am leg, version #{Leg::VERSION} >>"
+          puts
+          puts "Usage: leg <command> [args...]"
+          puts
+          puts "Commands:"
+          Leg::Commands::LIST.each do |cmd|
+            puts "  #{cmd.name} #{cmd.usage}"
+            cmd.summary.split("\n").each do |line|
+              puts "      #{line}"
+            end
+          end
+          puts
+          puts "For more help on a specific command, run `leg help <command>`."
+        elsif cmd = Leg::Commands::LIST.find { |cmd| cmd.name == @args.first }
+          cmd.new(["--help"], @config)
+        else
+          puts "There is no '#{@args.first}' command."
+        end
+      end
+    end
+  end
+end

data/lib/leg/commands/init.rb

@@ -0,0 +1,46 @@
+module Leg
+  module Commands
+    class Init < BaseCommand
+      def self.name
+        "init"
+      end
+
+      def self.summary
+        "Initialize a new leg project."
+      end
+
+      def self.usage
+        "[new-dir]"
+      end
+
+      def setopts!(o)
+      end
+
+      def run
+        if @config
+          puts "You are already in a leg working directory."
+          return false
+        end
+
+        if new_dir = @args.first
+          if File.exist?(new_dir)
+            puts "Error: directory already exists."
+            return false
+          end
+          FileUtils.mkdir(new_dir)
+          FileUtils.cd(new_dir)
+        end
+
+        FileUtils.mkdir_p(".leg/repo")
+        FileUtils.mkdir_p("step")
+        FileUtils.mkdir_p("doc")
+        File.write("doc/tutorial.litdiff", "")
+        File.write("leg.yml", "---\n")
+
+        config = Leg::Config.new(FileUtils.pwd)
+        git = Leg::Representations::Git.new(config)
+        git.init!
+      end
+    end
+  end
+end

data/lib/leg/commands/reset.rb

@@ -0,0 +1,26 @@
+module Leg
+  module Commands
+    class Reset < BaseCommand
+      def self.name
+        "reset"
+      end
+
+      def self.summary
+        "Abort any saves in progress and checkout the top-most step."
+      end
+
+      def self.usage
+        ""
+      end
+
+      def setopts!(o)
+      end
+
+      def run
+        needs! :config, :repo
+
+        @git.reset!
+      end
+    end
+  end
+end

data/lib/leg/commands/resolve.rb

@@ -0,0 +1,31 @@
+module Leg
+  module Commands
+    class Resolve < BaseCommand
+      def self.name
+        "resolve"
+      end
+
+      def self.summary
+        "Continue rewriting steps after resolving a merge conflict."
+      end
+
+      def self.usage
+        ""
+      end
+
+      def setopts!(o)
+      end
+
+      def run
+        needs! :config, :repo
+
+        if @git.resolve!
+          git_to_litdiff!
+          output "Success!\n"
+        else
+          output "Looks like you've got a conflict to resolve!\n"
+        end
+      end
+    end
+  end
+end

data/lib/leg/commands/save.rb

@@ -0,0 +1,31 @@
+module Leg
+  module Commands
+    class Save < BaseCommand
+      def self.name
+        "save"
+      end
+
+      def self.summary
+        "Save changes to doc/."
+      end
+
+      def self.usage
+        ""
+      end
+
+      def setopts!(o)
+      end
+
+      def run
+        needs! :config, :repo
+
+        if @git.rebase_remaining!
+          git_to_litdiff!
+          output "Success!\n"
+        else
+          output "Looks like you've got a conflict to resolve!\n"
+        end
+      end
+    end
+  end
+end

data/lib/leg/commands/status.rb

@@ -0,0 +1,54 @@
+module Leg
+  module Commands
+    class Status < BaseCommand
+      def self.name
+        "status"
+      end
+
+      def self.summary
+        "Show unsaved changes and the state of the step/ folder."
+      end
+
+      def self.usage
+        ""
+      end
+
+      def setopts!(o)
+      end
+
+      def run
+        needs! :config, :repo
+
+        state = @git.state
+        case state.operation
+        when nil
+          if state.step_number.nil?
+            output "Nothing to report.\n"
+          else
+            output "Step #{state.step_number} checked out into step/.\n"
+          end
+        when :commit
+          if state.args[1]
+            output "Amended step #{state.step_number}. "
+          end
+          if state.args[0] > 0
+            output "Added #{state.args[0]} step#{'s' if state.args[0] != 1} after step #{state.step_number}."
+          end
+          output "\n"
+        else
+          raise "unknown operation"
+        end
+
+        if state.conflict
+          output "\n"
+          output "Currently in a merge conflict. Resolve the conflict in step/ and\n"
+          output "run `leg resolve` to continue.\n"
+        elsif !state.operation.nil?
+          output "\n"
+          output "The above change(s) have not been saved yet. Run `leg save` to\n"
+          output "save to the doc/ folder.\n"
+        end
+      end
+    end
+  end
+end

data/lib/leg/commands/step.rb

@@ -0,0 +1,31 @@
+module Leg
+  module Commands
+    class Step < 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
+
+        unless @git.checkout!(@args.first.to_i)
+          output "Error: Step not found.\n"
+          return false
+        end
+      end
+    end
+  end
+end

data/lib/leg/config.rb

@@ -0,0 +1,42 @@
+module Leg
+  class Config
+    attr_reader :path, :options
+
+    def initialize(path)
+      @path = path
+    end
+
+    def load!
+      @options = YAML.load_file(File.join(@path, "leg.yml"))
+      @options = {} unless @options.is_a? Hash
+      @options = symbolize_keys(@options)
+    end
+
+    def last_synced_at
+      File.mtime(last_synced_path) if File.exist?(last_synced_path)
+    end
+
+    def synced!
+      FileUtils.touch(last_synced_path)
+    end
+
+    private
+
+    def last_synced_path
+      File.join(@path, ".leg/last_synced")
+    end
+
+    def symbolize_keys(value)
+      case value
+      when Hash
+        value.map do |k, v|
+          [k.to_sym, symbolize_keys(v)]
+        end.to_h
+      when Array
+        value.map { |v| symbolize_keys(v) }
+      else
+        value
+      end
+    end
+  end
+end

data/lib/leg/default_templates.rb

@@ -0,0 +1,340 @@
+module Leg
+  module DefaultTemplates
+    PAGE = {}
+    STEP = {}
+
+    PAGE["html"] = <<~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>
+        </body>
+      </html>
+    TEMPLATE
+
+    STEP["html"] = <<~TEMPLATE
+      <div class="step">
+        <div class="step-number">
+          <%= number %>
+        </div>
+
+        <% for diff in diffs %>
+          <% diff = Leg::DiffTransformers::SyntaxHighlight.new.transform(diff) %>
+          <div class="diff">
+            <div class="diff-header">
+              <div class="diff-summary">
+                <%= markdown(summary) %>
+              </div>
+              <div class="diff-filename">
+                <%= diff.filename %>
+              </div>
+            </div>
+            <div class="diff-code">
+              <table>
+              <% for line in diff.lines %>
+                <tr>
+                  <td class="line-number">
+                    <%= line.line_number %>
+                  </td>
+                  <td class="line <%= diff.is_new_file ? :unchanged : line.type %>">\\
+                    <% if line.type == :folded %>\\
+                      <%= line.source.gsub('<span class="err">…</span>', '…') %>\\
+                    <% else %>\\
+                      <%= line.source %>\\
+                    <% end %>\\
+                  </td>
+                </tr>
+              <% end %>
+              </table>
+            </div>
+          </div>
+        <% end %>
+      </div>
+    TEMPLATE
+
+    PAGE["md"] = <<~TEMPLATE
+      <%= content %>
+    TEMPLATE
+
+    STEP["md"] = <<~TEMPLATE
+      ## <%= number %>. <%= summary %>
+
+      <% for diff in diffs %>\\
+      ```diff
+       // <%= diff.filename %>
+      <% for line in diff.lines %>\\
+      <%= { added: '+', removed: '-', unchanged: ' ', folded: '@' }[line.type] + line.source %>
+      <% end %>\\
+      ```
+      <% 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: 750px;
+        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%;
+      }
+
+      .step {
+        margin-top: 18px;
+      }
+
+      .step-number {
+        position: absolute;
+        margin-top: -6px;
+        margin-left: -148px;
+        font-size: 48px;
+        font-family: Helvetica, sans-serif;
+        line-height: 130%;
+        width: 128px;
+        text-align: right;
+      }
+
+      .diff {
+        border: 1px solid #ede7e3;
+        border-radius: 3px;
+      }
+
+      .diff .diff-header {
+        display: flex;
+        justify-content: space-between;
+        align-items: center;
+        padding: 7px 10px;
+        background-color: #fafbfc;
+        border-bottom: 1px solid #ede7e3;
+        font-size: 16px;
+      }
+
+      .diff .diff-summary {
+        color: #666;
+        font-size: 18px;
+      }
+
+      .diff .diff-summary p {
+        margin-top: 0;
+      }
+
+      .diff .diff-filename {
+        color: #666;
+        font-weight: bold;
+      }
+
+      .diff table {
+        width: 100%;
+        border-spacing: 0;
+        border-collapse: collapse;
+      }
+
+      .diff tr {
+        height: 20px;
+        line-height: 20px;
+        padding: 0 5px;
+        background-color: #fff;
+        font-family: monospace;
+        font-size: 14px;
+      }
+
+      .diff td.line-number {
+        width: 1%;
+        min-width: 55px;
+        text-align: right;
+        padding-right: 15px;
+        background-color: #fafbfc;
+        color: #ccc;
+      }
+
+      .diff td.line {
+        white-space: pre;
+        position: relative;
+        background-color: inherit;
+        padding-left: 5px;
+      }
+
+      .diff td.line.folded {
+        background-color: #eef;
+        opacity: 0.5;
+      }
+
+      .diff td.line.added {
+        background-color: #ffd;
+        text-decoration: none;
+      }
+
+      .diff td.line.removed {
+        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;
+        }
+
+        .diff .diff-code {
+          overflow-x: scroll;
+        }
+
+        .diff .table {
+          width: 700px;
+        }
+      }
+
+      <%= syntax_highlighting_css ".line" %>
+    TEMPLATE
+  end
+end