braid 1.1.6 → 1.1.7

data/braids-json.schema.json

@@ -1,91 +0,0 @@
-{
-  "title": "schema for .braids.json configuration file",
-  "type": "object",
-  "properties": {
-    "config_version": {
-      "type": "number",
-      "enum": [
-        1
-      ],
-      "description": "configuration format version (see https://cristibalan.github.io/braid/#braid-version-compatibility)",
-      "$comment": "So far, only version 1 is defined. (Version \"0\" is a mess and not worth writing a schema for.) When we have more than one defined version, we can look into the best way to make the rest of the schema dependent on the version."
-    },
-    "mirrors": {
-      "type": "object",
-      "description": "container for all added vendor repository mirrors",
-      "patternProperties": {
-        ".*": {
-          "allOf": [
-            {
-              "type": "object",
-              "description": "local path where the vendor content is placed, relative to the .braids.json file",
-              "properties": {
-                "url": {
-                  "type": "string",
-                  "description": "remote URL of the vendor repository"
-                },
-                "path": {
-                  "type": "string",
-                  "description": "path to a subdirectory or single file in the vendor tree (instead of the whole tree) to place at the specified local path"
-                },
-                "branch": {
-                  "type": "string",
-                  "description": "branch name of the vendor repository to track"
-                },
-                "tag": {
-                  "type": "string",
-                  "description": "tag name of the vendor repository to track"
-                },
-                "revision": {
-                  "type": "string",
-                  "description": "commit ID of the vendor repository currently used by the mirror"
-                }
-              },
-              "required": [
-                "url",
-                "revision"
-              ],
-              "additionalProperties": false
-            },
-            {
-              "$comment": "At most one of \"branch\" and \"tag\". Technique from https://stackoverflow.com/a/33358676 .",
-              "oneOf": [
-                {
-                  "not": {
-                    "anyOf": [
-                      {
-                        "required": [
-                          "branch"
-                        ]
-                      },
-                      {
-                        "required": [
-                          "tag"
-                        ]
-                      }
-                    ]
-                  }
-                },
-                {
-                  "required": [
-                    "branch"
-                  ]
-                },
-                {
-                  "required": [
-                    "tag"
-                  ]
-                }
-              ]
-            }
-          ]
-        }
-      }
-    }
-  },
-  "required": [
-    "config_version",
-    "mirrors"
-  ],
-  "additionalProperties": false
-}

data/config_versions.md

@@ -1,58 +0,0 @@
-# Braid configuration version history
-
-The Braid configuration file (`.braids.json`) contains a configuration version
-number that indicates the format of the configuration file and the Braid
-features required by the project.  You'll be directed to this page if you use a
-version of Braid that does not support the project's configuration version; see
-[the readme](README.md#braid-version-compatibility) for more information about
-the versioning scheme.
-
-To get a compatible version of Braid:
-
-1. First check if the project has its own instructions to install and run Braid,
-   and if so, follow them instead.
-2. Look up the Braid versions corresponding to your current configuration
-   version in the table below.
-3. Run `gem query --remote --all --exact braid` to get a list of all existing
-   versions of Braid, and choose one that is compatible with your configuration
-   version (you probably want the newest such version); call it `x.y.z`.
-4. Run `gem install braid --version x.y.z` to install the chosen version of
-   Braid.
-5. Run Braid as `braid _x.y.z_` (that's the chosen version surrounded by literal
-   underscores) followed by your desired arguments.
-
-<table border="border">
-<tr>
-<th>Config. version</th>
-<th>Braid versions</th>
-<th>Changes since previous</th>
-</tr>
-<tr>
-<td>1</td>
-<td>1.1.x</td>
-<td>(Various)</td>
-</tr>
-<tr>
-<td>"0"</td>
-<td colspan="2">
-(Braid versions earlier than 1.1.0 have varying configuration formats and
-features and do not have a well-defined compatibility scheme.  Braid 1.1.0 and
-newer refer to all of these formats as version "0" and are capable of correctly
-upgrading most of them.  We recommend upgrading to Braid 1.1.0 or newer if you
-can.)
-</td>
-</tr>
-</table>
-
-<style>
-header, section#downloads, .inner > hr {
-    display: none;
-}
-.inner {
-    padding-top: 35px;  /* same as header when it is visible */
-}
-th, td {
-    border: 1px solid #6d6d6d;
-    padding: 2px;
-}
-</style>

data/spec/config_spec.rb

@@ -1,59 +0,0 @@
-require File.dirname(__FILE__) + '/test_helper'
-
-describe 'Braid::Config, when empty' do
-  before(:each) do
-    @config = Braid::Config.new({'config_file' => 'tmp.yml'})
-  end
-
-  after(:each) do
-    FileUtils.rm('tmp.yml') rescue nil
-  end
-
-  it 'should not get a mirror by name' do
-    expect(@config.get('path')).to be_nil
-    expect { @config.get!('path') }.to raise_error(Braid::Config::MirrorDoesNotExist)
-  end
-
-  it 'should add a mirror and its params' do
-    @mirror = build_mirror
-    @config.add(@mirror)
-    expect(@config.get('path').path).not_to be_nil
-  end
-end
-
-describe 'Braid::Config, with one mirror' do
-  before(:each) do
-    @config = Braid::Config.new({'config_file' => 'tmp.yml'})
-    @mirror = build_mirror
-    @config.add(@mirror)
-  end
-
-  after(:each) do
-    FileUtils.rm('tmp.yml') rescue nil
-  end
-
-  it 'should get the mirror by name' do
-    expect(@config.get('path')).to eq(@mirror)
-    expect(@config.get!('path')).to eq(@mirror)
-  end
-
-  it 'should raise when trying to overwrite a mirror on add' do
-    expect { @config.add(@mirror) }.to raise_error(Braid::Config::PathAlreadyInUse)
-  end
-
-  it 'should remove the mirror' do
-    @config.remove(@mirror)
-    expect(@config.get('path')).to be_nil
-  end
-
-  it 'should update the mirror with new params' do
-    @mirror.branch = 'other'
-    @config.update(@mirror)
-    expect(@config.get('path').attributes).to eq({'branch' => 'other'})
-  end
-
-  it 'should raise when trying to update nonexistent mirror' do
-    @mirror.instance_variable_set('@path', 'other')
-    expect { @config.update(@mirror) }.to raise_error(Braid::Config::MirrorDoesNotExist)
-  end
-end

data/spec/fixtures/shiny/README

@@ -1,3 +0,0 @@
-shiny app
-
-it uses braid to pull in a bunch of stuff!

data/spec/fixtures/shiny/other-skit/layout.liquid

@@ -1,219 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-{{ '/feed/atom.xml' | assign_to: 'global_feed' }}
-{{ '/feed/all_comments.xml' | assign_to: 'global_comments_feed' }}
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>
-  {{ site.title }}
-  {% if site.current_section %}
-    - {{ site.current_section.name }}
-  {% endif %}
-  {% if article %}
-    - {{ article.title }}
-  {% endif %}
-</title>
-<link rel="alternate" type="application/atom+xml" title="{{ site.title }} feed" href="{{ global_feed }}"/>
-<link rel="alternate" type="application/atom+xml" title="{{ site.title }} comments feed" href="{{ global_comments_feed }}"/>
-{{ 'base' | stylesheet }}
-{{ 'app' | javascript }}
-<!--[if IE]>
-{{ 'base_ie' | stylesheet }}
-<![endif]-->
-</head>
-
-<body class="fixed orange">
-<script type="text/javascript">loadPreferences()</script>
-
-<div id="wrapper">
-
-<div id="header" class="clearfix">
-<div id="title" class="clearfix">
-  <h1><a href="/">{{ site.title }}</a></h1>
-</div>
-<h2>Sections</h2>
-<ul id="menu">
-{% for section in site.sections %}
-  {% if section.articles_count > 0 %}
-  {% if section.is_home  %}
-    <li{% if section.current %} class="selected"{% endif %}>{{ section | link_to_section }}</li>
-  {% else %}
-    {% if section.is_paged  %}
-    <li{% if section.current %} class="selected"{% endif %}>{{ section | link_to_section }}</li>
-    {% endif %}
-  {% endif %}
-  {% endif %}
-{% endfor %}
-</ul>
-</div>
-
-<div id="contentwrapper" class="clearfix">
-
-<div id="content">
-
-  <div id="innerwrapper">
-
-<div class="article">
-  <div class="body">
-  <h2>Skittlish Tips'n'Tricks</h2>
-  <ul>
-    <li>Change the classes for the body tag to set your default site style. also change these in the app.js file (line 66).</li>
-    <li>Remove the scripts and the #options div if you don't want the option switcher.</li>
-    <li>The top menu shows the home section and the sections that are not blogs.</li>
-    <li>Email me at <a href="mailto:evil@che.lu">evil@che.lu</a> if you have any questions.</li>
-    <li>Happy hacking!</li>
-  </ul>
-  </div>
-</div>
-
-{{ content_for_layout }}
-
-  </div>
-
-</div>
-
-<div id="sidebar">
-
-<div class="boxy short">
-<h3>boxy short</h3>
-
-<p>You can have, boxes with a short, tall or no background shade, just change the class of the containing div.</p>
-
-<p>Have boxes with smaller text with the class "minor". See the "Recent" boxy below.</p>
-
-</div>
-
-<div id="search" class="boxy short">
-  <h3>Search</h3>
-  <form method="get" action="/search">
-    <fieldset>
-      <input class="text" type="text" id="q" value="" name="q"/>
-    </fieldset>
-  </form>
-</div>
-
-<div class="boxy tall minor">
-  <h3>Recent</h3>
-
-<dl>
-<dt>Articles <a class="feed" href="{{ global_feed }}"><span>feed</span></a></dt>
-<dd>
-  <ul>
-  {% for article in site.latest_articles %}
-    <li>{{ article | link_to_article }} <em>({{ article.published_at | format_date: 'stub', true }})</em></li>
-  {% endfor %}
-  </ul>
-</dd>
-
-<dt>Comments <a class="feed" href="{{ global_comments_feed }}"><span>feed</span></a></dt>
-<dd>
-  <ul>
-  {% for comment in site.latest_comments %}
-    <li>{{ comment.author_link }} on <a href="{{ comment.url }}#comment-{{ comment.id }}">{{ comment.title }}</a></li>
-  {% endfor %}
-  </ul>
-</dd>
-</dl>
-</div>
-
-<div class="boxy short">
-  <h3>Archives</h3>
-  <p>This would be much nicer with jamis' month_drop thingy.</p>
-  {{ '' | section | months | assign_to: 'home_section' }}
-  <ul>
-  {% for month in home_section.months %}
-    {{ home_section | monthly_articles: month | size | assign_to: 'articles_count' }}
-    {% if articles_count > 0 %}
-    <li>{{ home_section | link_to_month: month }} ({{ articles_count }})</li>
-    {% endif %}
-  {% endfor %}
-  </ul>
-</div>
-
-{% if site.blog_sections.size > 1 %}
-<div class="boxy short">
-<h3>Categories</h3>
-<p>Lists only blog type categories with at least one article.</p>
-<p>This list uses an ul. You could use a dl with only dd's in it for the same effect. Wouldn't be semantic tho.</p>
-<ul class="sections">
-{% for section in site.blog_sections %}
-  {% if section.articles_count > 0 %}
-  {% unless section.is_home %}
-  <li>{{ section | link_to_section }} ({{ section.articles_count }})</li>
-  {% endunless %}
-  {% endif %}
-{% endfor %}
-</ul>
-</div>
-
-{% endif %}
-{% unless site.tags == empty %}
-<div class="boxy short">
-  <p>This would be nicer if we could get the number of articles for each tag.</p>
-  <h3>tags: </h3>
-  <ul>
-  {% for tag in site.tags %}
-    <li>{{ tag | link_to_tag }}</li>
-  {% endfor %}
-  </ul>
-</div>
-
-{% endunless %}
-<div class="boxy tall">
-<h3>boxy tall</h3>
-<p>When using a tall box, make sure it's got plenty of content or that it's immediately followed by a short boxy. It might look a bit chopped off otherwise.</p>
-<dl>
-  <dt>thing 1</dt>
-  <dd><a href="#">value 1</a></dd>
-  <dd><a href="#">value 2</a></dd>
-  <dd><a href="#">value 3</a></dd>
-  <dd><a href="#">value 4</a></dd>
-  <dd><a href="#">value 5</a></dd>
-  <dd><a href="#">value 6</a></dd>
-  <dd><a href="#">value 6</a></dd>
-
-  <dt>thing 1</dt>
-  <dd><a href="#">value 1</a></dd>
-  <dd><a href="#">value 2</a></dd>
-  <dd><a href="#">value 3</a></dd>
-  <dd>value 4</dd>
-  <dd>value 5</dd>
-  <dd><a href="#">value 6</a></dd>
-  <dd><a href="#">value 6</a></dd>
-
-</dl>
-</div>
-
-</div>
-
-</div>
-
-<div id="options">
-  <h2>Options:</h2>
-  <h3>Size</h3>
-  <ul id="option_size">
-    <li id="option_size_fixed"   class="fixed" ><a><span>fixed </span></a></li>
-    <li id="option_size_fluid"   class="fluid" ><a><span>fluid </span></a></li>
-  </ul>
-  <h3>Colors</h3>
-  <ul id="option_color">
-    <li id="option_color_orange" class="orange"><a><span>orange</span></a></li>
-    <li id="option_color_blue"   class="blue"  ><a><span>blue  </span></a></li>
-    <li id="option_color_green"  class="green" ><a><span>green </span></a></li>
-    <li id="option_color_pink"   class="pink"  ><a><span>pink  </span></a></li>
-    <li id="option_color_cyan"   class="cyan"  ><a><span>cyan  </span></a></li>
-    <li id="option_color_red"    class="red"   ><a><span>red   </span></a></li>
-    <li id="option_color_violet" class="violet"><a><span>violet</span></a></li>
-  </ul>
-</div>
-
-<div id="footer">
-<p>Copyright &copy; 2006, Your Name. Valid <a href="http://validator.w3.org/check/referer">XHTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a>.</p>
-<p>Using <a href="http://evil.che.lu/projects/skittlish">skittlish</a> on <a href="http://publishwithimpunity.com/">mephisto</a>.</p>
-</div>
-
-</div>
-
-</body>
-
-</html>

data/spec/fixtures/shiny/skit-layout.liquid.test

@@ -1,2 +0,0 @@
-This file exists to test that `braid diff skit-layout.liquid` correctly limits
-the diff to the single file and doesn't do a naive path prefix match.

data/spec/fixtures/shiny/skit1.test

@@ -1,2 +0,0 @@
-This file exists to test that `braid diff skit1` correctly limits the diff to
-the single directory and doesn't do a naive path prefix match.

data/spec/fixtures/shiny-conf-1.0.9-lock/.braids.json

@@ -1,10 +0,0 @@
-{
-  "skit1": {
-    "url": "file:///path/to/braid/spec/fixtures/skit1",
-    "remote": "master/braid/skit1",
-    "branch": "master",
-    "squashed": true,
-    "revision": "6d3aeac08f9f4f9689d367fc771f5f1c90496176",
-    "lock": "6d3aeac08f9f4f9689d367fc771f5f1c90496176"
-  }
-}

data/spec/fixtures/shiny-conf-1.0.9-lock/expected.braids.json

@@ -1,9 +0,0 @@
-{
-  "config_version": 1,
-  "mirrors": {
-    "skit1": {
-      "url": "file:///path/to/braid/spec/fixtures/skit1",
-      "revision": "6d3aeac08f9f4f9689d367fc771f5f1c90496176"
-    }
-  }
-}

data/spec/fixtures/shiny-conf-1.0.9-lock/skit1/layouts/layout.liquid

@@ -1,219 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml">
-{{ '/feed/atom.xml' | assign_to: 'global_feed' }}
-{{ '/feed/all_comments.xml' | assign_to: 'global_comments_feed' }}
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<title>
-  {{ site.title }}
-  {% if site.current_section %}
-    - {{ site.current_section.name }}
-  {% endif %}
-  {% if article %}
-    - {{ article.title }}
-  {% endif %}
-</title>
-<link rel="alternate" type="application/atom+xml" title="{{ site.title }} feed" href="{{ global_feed }}"/>
-<link rel="alternate" type="application/atom+xml" title="{{ site.title }} comments feed" href="{{ global_comments_feed }}"/>
-{{ 'base' | stylesheet }}
-{{ 'app' | javascript }}
-<!--[if IE]>
-{{ 'base_ie' | stylesheet }}
-<![endif]-->
-</head>
-
-<body class="fixed orange">
-<script type="text/javascript">loadPreferences()</script>
-
-<div id="wrapper">
-
-<div id="header" class="clearfix">
-<div id="title" class="clearfix">
-  <h1><a href="/">{{ site.title }}</a></h1>
-</div>
-<h2>Sections</h2>
-<ul id="menu">
-{% for section in site.sections %}
-  {% if section.articles_count > 0 %}
-  {% if section.is_home  %}
-    <li{% if section.current %} class="selected"{% endif %}>{{ section | link_to_section }}</li>
-  {% else %}
-    {% if section.is_paged  %}
-    <li{% if section.current %} class="selected"{% endif %}>{{ section | link_to_section }}</li>
-    {% endif %}
-  {% endif %}
-  {% endif %}
-{% endfor %}
-</ul>
-</div>
-
-<div id="contentwrapper" class="clearfix">
-
-<div id="content">
-
-  <div id="innerwrapper">
-
-<div class="article">
-  <div class="body">
-  <h2>Skittlish Tips'n'Tricks</h2>
-  <ul>
-    <li>Change the classes for the body tag to set your default site style. also change these in the app.js file (line 66).</li>
-    <li>Remove the scripts and the #options div if you don't want the option switcher.</li>
-    <li>The top menu shows the home section and the sections that are not blogs.</li>
-    <li>Email me at <a href="mailto:evil@che.lu">evil@che.lu</a> if you have any questions.</li>
-    <li>Happy hacking!</li>
-  </ul>
-  </div>
-</div>
-
-{{ content_for_layout }}
-
-  </div>
-
-</div>
-
-<div id="sidebar">
-
-<div class="boxy short">
-<h3>boxy short</h3>
-
-<p>You can have, boxes with a short, tall or no background shade, just change the class of the containing div.</p>
-
-<p>Have boxes with smaller text with the class "minor". See the "Recent" boxy below.</p>
-
-</div>
-
-<div id="search" class="boxy short">
-  <h3>Search</h3>
-  <form method="get" action="/search">
-    <fieldset>
-      <input class="text" type="text" id="q" value="" name="q"/>
-    </fieldset>
-  </form>
-</div>
-
-<div class="boxy tall minor">
-  <h3>Recent</h3>
-
-<dl>
-<dt>Articles <a class="feed" href="{{ global_feed }}"><span>feed</span></a></dt>
-<dd>
-  <ul>
-  {% for article in site.latest_articles %}
-    <li>{{ article | link_to_article }} <em>({{ article.published_at | format_date: 'stub', true }})</em></li>
-  {% endfor %}
-  </ul>
-</dd>
-
-<dt>Comments <a class="feed" href="{{ global_comments_feed }}"><span>feed</span></a></dt>
-<dd>
-  <ul>
-  {% for comment in site.latest_comments %}
-    <li>{{ comment.author_link }} on <a href="{{ comment.url }}#comment-{{ comment.id }}">{{ comment.title }}</a></li>
-  {% endfor %}
-  </ul>
-</dd>
-</dl>
-</div>
-
-<div class="boxy short">
-  <h3>Archives</h3>
-  <p>This would be much nicer with jamis' month_drop thingy.</p>
-  {{ '' | section | months | assign_to: 'home_section' }}
-  <ul>
-  {% for month in home_section.months %}
-    {{ home_section | monthly_articles: month | size | assign_to: 'articles_count' }}
-    {% if articles_count > 0 %}
-    <li>{{ home_section | link_to_month: month }} ({{ articles_count }})</li>
-    {% endif %}
-  {% endfor %}
-  </ul>
-</div>
-
-{% if site.blog_sections.size > 1 %}
-<div class="boxy short">
-<h3>Categories</h3>
-<p>Lists only blog type categories with at least one article.</p>
-<p>This list uses an ul. You could use a dl with only dd's in it for the same effect. Wouldn't be semantic tho.</p>
-<ul class="sections">
-{% for section in site.blog_sections %}
-  {% if section.articles_count > 0 %}
-  {% unless section.is_home %}
-  <li>{{ section | link_to_section }} ({{ section.articles_count }})</li>
-  {% endunless %}
-  {% endif %}
-{% endfor %}
-</ul>
-</div>
-
-{% endif %}
-{% unless site.tags == empty %}
-<div class="boxy short">
-  <p>This would be nicer if we could get the number of articles for each tag.</p>
-  <h3>tags: </h3>
-  <ul>
-  {% for tag in site.tags %}
-    <li>{{ tag | link_to_tag }}</li>
-  {% endfor %}
-  </ul>
-</div>
-
-{% endunless %}
-<div class="boxy tall">
-<h3>boxy tall</h3>
-<p>When using a tall box, make sure it's got plenty of content or that it's immediately followed by a short boxy. It might look a bit chopped off otherwise.</p>
-<dl>
-  <dt>thing 1</dt>
-  <dd><a href="#">value 1</a></dd>
-  <dd><a href="#">value 2</a></dd>
-  <dd><a href="#">value 3</a></dd>
-  <dd><a href="#">value 4</a></dd>
-  <dd><a href="#">value 5</a></dd>
-  <dd><a href="#">value 6</a></dd>
-  <dd><a href="#">value 6</a></dd>
-
-  <dt>thing 1</dt>
-  <dd><a href="#">value 1</a></dd>
-  <dd><a href="#">value 2</a></dd>
-  <dd><a href="#">value 3</a></dd>
-  <dd>value 4</dd>
-  <dd>value 5</dd>
-  <dd><a href="#">value 6</a></dd>
-  <dd><a href="#">value 6</a></dd>
-
-</dl>
-</div>
-
-</div>
-
-</div>
-
-<div id="options">
-  <h2>Options:</h2>
-  <h3>Size</h3>
-  <ul id="option_size">
-    <li id="option_size_fixed"   class="fixed" ><a><span>fixed </span></a></li>
-    <li id="option_size_fluid"   class="fluid" ><a><span>fluid </span></a></li>
-  </ul>
-  <h3>Colors</h3>
-  <ul id="option_color">
-    <li id="option_color_orange" class="orange"><a><span>orange</span></a></li>
-    <li id="option_color_blue"   class="blue"  ><a><span>blue  </span></a></li>
-    <li id="option_color_green"  class="green" ><a><span>green </span></a></li>
-    <li id="option_color_pink"   class="pink"  ><a><span>pink  </span></a></li>
-    <li id="option_color_cyan"   class="cyan"  ><a><span>cyan  </span></a></li>
-    <li id="option_color_red"    class="red"   ><a><span>red   </span></a></li>
-    <li id="option_color_violet" class="violet"><a><span>violet</span></a></li>
-  </ul>
-</div>
-
-<div id="footer">
-<p>Copyright &copy; 2006, Your Name. Valid <a href="http://validator.w3.org/check/referer">XHTML</a> and <a href="http://jigsaw.w3.org/css-validator/check/referer">CSS</a>.</p>
-<p>Using <a href="http://evil.che.lu/projects/skittlish">skittlish</a> on <a href="http://publishwithimpunity.com/">mephisto</a>.</p>
-</div>
-
-</div>
-
-</body>
-
-</html>