norbert-braid 0.4.9 → 0.4.12

data/bin/braid

@@ -51,9 +51,10 @@ Main {
       . braid add svn://remote/path --branch notmaster
     TXT
 
-    mixin :argument_url, :option_type, :optional_path, :option_branch, :option_rails_plugin, :option_revision, :option_full
+    mixin :argument_url, :option_type, :optional_path, :option_branch, :option_rails_plugin, :option_revision, :option_full, :option_verbose
 
     run {
+      Braid::Operations::VERBOSE = verbose
       Braid::Command.run(:add, url, { "type" => type, "path" => path, "branch" => branch, "rails_plugin" => rails_plugin, "revision" => revision, "full" => full })
     }
   }
@@ -74,9 +75,10 @@ Main {
       . braid update local/dir
     TXT
 
-    mixin :optional_path, :option_revision, :option_head, :option_safe
+    mixin :optional_path, :option_revision, :option_head, :option_safe, :option_verbose
 
     run {
+      Braid::Operations::VERBOSE = verbose
       Braid::Command.run(:update, path, { "revision" => revision, "head" => head , "safe" => safe })
     }
   }
@@ -94,9 +96,10 @@ Main {
       . braid remove local/dir
     TXT
 
-    mixin :argument_path
+    mixin :argument_path, :option_verbose
 
     run {
+      Braid::Operations::VERBOSE = verbose
       Braid::Command.run(:remove, path)
     }
   }
@@ -110,9 +113,10 @@ Main {
       . braid setup local/dir
     TXT
 
-    mixin :optional_path
+    mixin :optional_path, :option_verbose
 
     run {
+      Braid::Operations::VERBOSE = verbose
       Braid::Command.run(:setup, path)
     }
   }
@@ -126,9 +130,10 @@ Main {
       . braid diff local/dir
     TXT
 
-    mixin :argument_path
+    mixin :argument_path, :option_verbose
 
     run {
+      Braid::Operations::VERBOSE = verbose
       Braid::Command.run(:diff, path)
     }
   }
@@ -218,6 +223,14 @@ Main {
       attr
     }
   }
+  
+  mixin(:option_verbose) {
+    option(:verbose, :v) {
+      optional 
+      desc 'log shell commands'
+      attr
+    }
+  }
 
   run { help! }
 }

data/braid.gemspec

@@ -1,18 +1,18 @@
 Gem::Specification.new do |s|
   s.name = %q{braid}
-  s.version = "0.4.9"
+  s.version = "0.4.12"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Cristi Balan", "Norbert Crombach"]
-  s.date = %q{2008-09-06}
+  s.date = %q{2008-10-04}
   s.default_executable = %q{braid}
   s.description = %q{A simple tool for tracking vendor branches in git.}
   s.email = %q{evil@che.lu}
   s.executables = ["braid"]
   s.extra_rdoc_files = ["README.rdoc"]
-  s.files = ["LICENSE", "README.rdoc", "Rakefile", "braid.gemspec", "bin/braid", "lib/braid/command.rb", "lib/braid/commands/add.rb", "lib/braid/commands/diff.rb", "lib/braid/commands/remove.rb", "lib/braid/commands/setup.rb", "lib/braid/commands/update.rb", "lib/braid/config.rb", "lib/braid/mirror.rb", "lib/braid/operations.rb", "lib/braid.rb", "test/braid_test.rb", "test/config_test.rb", "test/mirror_test.rb", "test/operations_test.rb", "test/test_helper.rb"]
+  s.files = ["bin/braid", "braid.gemspec", "lib/braid/command.rb", "lib/braid/commands/add.rb", "lib/braid/commands/diff.rb", "lib/braid/commands/remove.rb", "lib/braid/commands/setup.rb", "lib/braid/commands/update.rb", "lib/braid/config.rb", "lib/braid/mirror.rb", "lib/braid/operations.rb", "lib/braid.rb", "LICENSE", "Rakefile", "README.rdoc", "test/braid_test.rb", "test/config_test.rb", "test/fixtures/shiny/README", "test/fixtures/skit1/layouts/layout.liquid", "test/fixtures/skit1/preview.png", "test/fixtures/skit1.1/layouts/layout.liquid", "test/fixtures/skit1.2/layouts/layout.liquid", "test/integration/adding_test.rb", "test/integration/updating_test.rb", "test/integration_helper.rb", "test/mirror_test.rb", "test/operations_test.rb", "test/test_helper.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://evil.che.lu/projects/braid}
   s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "braid", "--main", "README.rdoc"]

data/lib/braid/commands/setup.rb

@@ -23,7 +23,7 @@ module Braid
 
           msg "Setting up remote for '#{mirror.path}/'."
           unless mirror.type == "svn"
-            git.remote_add(mirror.remote, mirror.url, mirror.branch)
+            git.remote_add(mirror.remote, mirror.cached_url, mirror.branch)
           else
             git_svn.init(mirror.remote, mirror.url)
           end

data/lib/braid/mirror.rb

@@ -29,7 +29,7 @@ module Braid
     end
 
     def self.new_from_options(url, options = {})
-      url.sub!(/\/$/, '')
+      url = url.sub(/\/$/, '')
 
       branch = options["branch"] || "master"
 
@@ -91,12 +91,25 @@ module Braid
 
     def fetch
       unless type == "svn"
+        init_or_fetch_local_cache
         git.fetch(remote)
       else
         git_svn.fetch(remote)
       end
     end
 
+    def cached_url
+      if Braid::USE_LOCAL_CACHE
+        File.join(Braid::LOCAL_CACHE_DIR, url.gsub(/[\/:@]/, "_"))
+      else
+        url
+      end
+    end
+
+    def init_or_fetch_local_cache
+      git_cache.init_or_fetch(url, cached_url)
+    end
+
     private
       def method_missing(name, *args)
         if ATTRIBUTES.find { |attribute| name.to_s =~ /^(#{attribute})(=)?$/ }

data/lib/braid/operations.rb

@@ -14,13 +14,14 @@ module Braid
       end
     end
     class VersionTooLow < BraidError
-      def initialize(command, version)
+      def initialize(command, version, required)
         @command = command
         @version = version.to_s.split("\n").first
+        @required = required
       end
 
       def message
-        "#{@command} version too low: #{@version}"
+        "#{@command} version too low: #{@version}. #{@required} needed."
       end
     end
     class UnknownRevision < BraidError
@@ -33,12 +34,22 @@ module Braid
         "local changes are present"
       end
     end
+    class LocalCacheDirBroken < BraidError
+      def initialize(dir)
+        @dir = dir
+      end
+
+      def message
+        "Local cache '#{@dir}' needs to be recreated. Remove the directory and run the command again."
+      end
+    end
 
     # The command proxy is meant to encapsulate commands such as git, git-svn and svn, that work with subcommands.
     class Proxy
       include Singleton
 
       def self.command; name.split('::').last.downcase; end # hax!
+      def self.verbose; Braid::Operations::VERBOSE ; end
 
       def version
         status, out, err = exec!("#{self.class.command} --version")
@@ -68,7 +79,7 @@ module Braid
       end
 
       def require_version!(required)
-        require_version(required) || raise(VersionTooLow.new(self.class.command, version))
+        require_version(required) || raise(VersionTooLow.new(self.class.command, version, required))
       end
 
       private
@@ -92,6 +103,7 @@ module Braid
           ENV['LANG'] = 'C'
 
           out, err = nil
+          puts "executing cmd(#{cmd})" if Proxy.verbose
           status = Open4.popen4(cmd) do |pid, stdin, stdout, stderr|
             out = stdout.read
             err = stderr.read
@@ -107,6 +119,11 @@ module Braid
           raise ShellExecutionError, err unless status == 0
           [status, out, err]
         end
+
+        def msg(str)
+          puts str
+        end
+
     end
 
     class Git < Proxy
@@ -124,7 +141,7 @@ module Braid
 
       def fetch(remote)
         # open4 messes with the pipes of index-pack
-        system("git fetch -n #{remote} &> /dev/null")
+        system("git fetch -n #{remote} 2>&1 >/dev/null")
         raise ShellExecutionError, "could not fetch" unless $? == 0
         true
       end
@@ -249,7 +266,7 @@ module Braid
 
       def fetch(remote)
         # open4 messes with the pipes of index-pack
-        system("git svn fetch #{remote} &> /dev/null")
+        system("git svn fetch #{remote} 2>&1 >/dev/null")
         raise ShellExecutionError, "could not fetch" unless $? == 0
         true
       end
@@ -278,6 +295,27 @@ module Braid
       end
     end
 
+    class GitCache < Proxy
+      def init_or_fetch(url, dir)
+        if File.exists? dir
+          # bail if the local cache was created with --no-checkout
+          if File.exists? "#{dir}/.git"
+            raise LocalCacheDirBroken.new(dir)
+          end
+
+          msg "Updating local cache of '#{url}' into '#{dir}'."
+          FileUtils.cd(dir) do |d|
+            status, out, err = exec!("git fetch")
+          end
+        else
+          FileUtils.mkdir_p(Braid::LOCAL_CACHE_DIR)
+
+          msg "Caching '#{url}' into '#{dir}'."
+          status, out, err = exec!("git clone --mirror #{url} #{dir}")
+        end
+      end
+    end
+
     module VersionControl
       def git
         Git.instance
@@ -290,6 +328,10 @@ module Braid
       def svn
         Svn.instance
       end
+
+      def git_cache
+        GitCache.instance
+      end
     end
   end
 end

data/lib/braid.rb

@@ -1,10 +1,12 @@
 $:.unshift File.dirname(__FILE__)
 
 module Braid
-  VERSION = "0.4.9"
+  VERSION = "0.4.12"
 
   CONFIG_FILE = ".braids"
-  REQUIRED_GIT_VERSION = "1.5.4.5"
+  USE_LOCAL_CACHE = ENV["BRAID_USE_LOCAL_CACHE"] != "no"
+  LOCAL_CACHE_DIR = ENV["BRAID_LOCAL_CACHE_DIR"] || "#{ENV["HOME"]}/.braid/cache/"
+  REQUIRED_GIT_VERSION = "1.6"
 
   class BraidError < StandardError
     def message

data/test/fixtures/shiny/README

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

data/test/fixtures/skit1/layouts/layout.liquid

@@ -0,0 +1,219 @@
+<!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/test/fixtures/skit1.1/layouts/layout.liquid

@@ -0,0 +1,219 @@
+<!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 green">
+<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/test/fixtures/skit1.2/layouts/layout.liquid

@@ -0,0 +1,221 @@
+<!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 green">
+<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>
+
+<p>Happy boxying!</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/test/integration/adding_test.rb

@@ -0,0 +1,80 @@
+require File.dirname(__FILE__) + '/../integration_helper'
+
+describe "Adding a mirror in a clean repository" do
+
+  before do
+    FileUtils.rm_rf(TMP_PATH)
+    FileUtils.mkdir_p(TMP_PATH)
+  end
+
+  describe "from a git repository" do
+    before do
+      @shiny = create_git_repo_from_fixture("shiny")
+      @skit1 = create_git_repo_from_fixture("skit1")
+    end
+
+    it "should add the files and commit" do
+      in_dir(@shiny) do
+        `#{BRAID_BIN} add --type git #{@skit1}`
+      end
+
+      file_name = "skit1/layouts/layout.liquid"
+      output = `diff -U 3 #{File.join(FIXTURE_PATH, file_name)} #{File.join(TMP_PATH, "shiny", file_name)}`
+      $?.should.be.success
+
+      output = `git log --pretty=oneline`.split("\n")
+      output.length.should == 2
+      output[0].should =~ "Add mirror 'skit1/'"
+    end
+
+    it "should create .braids and add the mirror to it" do
+      in_dir(@shiny) do
+        `#{BRAID_BIN} add --type git #{@skit1}`
+      end
+
+      braids = YAML::load_file("#{@shiny}/.braids")
+      braids["skit1"]["squashed"].should == true
+      braids["skit1"]["url"].should == @skit1
+      braids["skit1"]["type"].should == "git"
+      braids["skit1"]["revision"].should.not.be nil
+      braids["skit1"]["branch"].should == "master"
+      braids["skit1"]["remote"].should == "braid/skit1"
+    end
+  end
+
+  describe "from an svn repository" do
+    before do
+      @shiny = create_git_repo_from_fixture("shiny")
+      @skit1 = create_svn_repo_from_fixture("skit1")
+    end
+
+    it "should add the files and commit" do
+      in_dir(@shiny) do
+        `#{BRAID_BIN} add --type svn #{@skit1}`
+      end
+
+      file_name = "skit1/layouts/layout.liquid"
+      output = `diff -U 3 #{File.join(FIXTURE_PATH, file_name)} #{File.join(TMP_PATH, "shiny", file_name)}`
+      $?.should.be.success
+
+      output = `git log --pretty=oneline`.split("\n")
+      output.length.should == 2
+      output[0].should =~ "Add mirror 'skit1/'"
+    end
+
+    it "should create .braids and add the mirror to it" do
+      in_dir(@shiny) do
+        `#{BRAID_BIN} add --type svn #{@skit1}`
+      end
+
+      braids = YAML::load_file("#{@shiny}/.braids")
+      braids["skit1"]["squashed"].should == true
+      braids["skit1"]["url"].should == @skit1
+      braids["skit1"]["type"].should == "svn"
+      braids["skit1"]["revision"].should == 1
+      braids["skit1"]["remote"].should == "braid/skit1"
+      braids["skit1"]["branch"].should.be == nil
+    end
+  end
+
+end

data/test/integration/updating_test.rb

@@ -0,0 +1,87 @@
+require File.dirname(__FILE__) + '/../integration_helper'
+
+describe "Updating a mirror without conflicts" do
+
+  before do
+    FileUtils.rm_rf(TMP_PATH)
+    FileUtils.mkdir_p(TMP_PATH)
+  end
+
+  describe "from a git repository" do
+    before do
+      @shiny = create_git_repo_from_fixture("shiny")
+      @skit1 = create_git_repo_from_fixture("skit1")
+
+      in_dir(@shiny) do
+        `#{BRAID_BIN} add --type git #{@skit1}`
+      end
+
+      update_dir_from_fixture("skit1", "skit1.1")
+      in_dir(@skit1) do
+        `git add *`
+        `git commit -m "change default color"`
+      end
+
+      update_dir_from_fixture("skit1", "skit1.2")
+      in_dir(@skit1) do
+        `git add *`
+        `git commit -m "add a happy note"`
+      end
+
+    end
+
+    it "should add the files and commit" do
+      in_dir(@shiny) do
+        `#{BRAID_BIN} update skit1`
+      end
+
+      file_name = "layouts/layout.liquid"
+      output = `diff -U 3 #{File.join(FIXTURE_PATH, "skit1.2", file_name)} #{File.join(TMP_PATH, "shiny", "skit1", file_name)}`
+      $?.should.be.success
+
+      output = `git log --pretty=oneline`.split("\n")
+      output.length.should == 3
+      output[0].should =~ "Update mirror 'skit1/' to HEAD"
+    end
+
+  end
+
+  describe "from a svn repository" do
+    before do
+      @shiny = create_git_repo_from_fixture("shiny")
+      @skit1 = create_svn_repo_from_fixture("skit1")
+      @skit1_wc = File.join(TMP_PATH, "skit1_wc")
+
+      in_dir(@shiny) do
+        `#{BRAID_BIN} add --type svn #{@skit1}`
+      end
+
+      update_dir_from_fixture("skit1_wc", "skit1.1")
+      in_dir(@skit1_wc) do
+        `svn commit -m "change default color"`
+      end
+
+      update_dir_from_fixture("skit1_wc", "skit1.2")
+      in_dir(@skit1_wc) do
+        `svn commit -m "add a happy note"`
+      end
+
+    end
+
+    it "should add the files and commit" do
+      in_dir(@shiny) do
+        `#{BRAID_BIN} update skit1`
+      end
+
+      file_name = "layouts/layout.liquid"
+      output = `diff -U 3 #{File.join(FIXTURE_PATH, "skit1.2", file_name)} #{File.join(TMP_PATH, "shiny", "skit1", file_name)}`
+      $?.should.be.success
+
+      output = `git log --pretty=oneline`.split("\n")
+      output.length.should == 3
+      output[0].should =~ "Update mirror 'skit1/' to HEAD"
+    end
+
+  end
+
+end

data/test/integration_helper.rb

@@ -0,0 +1,69 @@
+require 'rubygems'
+require 'test/spec'
+require 'mocha'
+
+require 'tempfile'
+require 'fileutils'
+require 'pathname'
+
+TMP_PATH = File.join(Dir.tmpdir, "braid_integration")
+BRAID_PATH = Pathname.new(File.dirname(__FILE__)).parent.realpath
+FIXTURE_PATH = File.join(BRAID_PATH, "test", "fixtures")
+FileUtils.mkdir_p(TMP_PATH)
+BRAID_BIN = File.join(BRAID_PATH, "bin", "braid")
+
+#def exec(cmd)
+#  `cd #{TMP} && #{cmd}`
+#end
+
+def in_dir(dir = TMP_PATH)
+  Dir.chdir(dir)
+  yield
+end
+
+def run_cmds(ary)
+  ary.each do |cmd|
+    cmd = cmd.strip!
+    out = `#{cmd}`
+  end
+end
+
+def update_dir_from_fixture(dir, fixture = dir)
+  to_dir = File.join(TMP_PATH, dir)
+  FileUtils.mkdir_p(to_dir)
+  FileUtils.cp_r(File.join(FIXTURE_PATH, fixture) + "/.", to_dir)
+end
+
+def create_git_repo_from_fixture(fixture_name)
+  git_repo = File.join(TMP_PATH, fixture_name)
+  update_dir_from_fixture(fixture_name)
+
+  in_dir(git_repo) do
+    run_cmds(<<-EOD)
+      git init
+      git add *
+      git commit -m "initial commit of #{fixture_name}"
+    EOD
+  end
+
+  git_repo
+end
+
+def create_svn_repo_from_fixture(fixture_name)
+  svn_wc = File.join(TMP_PATH, fixture_name + "_wc")
+  svn_repo = File.join(TMP_PATH, fixture_name)
+  run_cmds(<<-EOD)
+    svnadmin create #{svn_repo}
+    svn co file://#{svn_repo} #{svn_wc}
+  EOD
+  update_dir_from_fixture(fixture_name + "_wc", fixture_name)
+  in_dir(svn_wc) do
+    run_cmds(<<-EOD)
+      svn add *
+      svn commit -m "initial commit of #{fixture_name}"
+    EOD
+  end
+  "file://#{svn_repo}"
+end
+
+

data/test/mirror_test.rb

@@ -92,3 +92,27 @@ describe "Braid::Mirror#inferred_revision" do
     @mirror.send(:inferred_revision).should == 'b' * 40
   end
 end
+
+describe "Braid::Mirror#cached_url" do
+  it "should return a valid local cache name" do
+    @mirror = new_from_options("git://remoteurl/path/to/repo.git")
+    @mirror.cached_url.should == "#{ENV["HOME"]}/.braid/cache/git___remoteurl_path_to_repo.git"
+
+    @mirror = new_from_options("git@remoteurl/path/to/repo.git")
+    @mirror.cached_url.should == "#{ENV["HOME"]}/.braid/cache/git_remoteurl_path_to_repo.git"
+
+    @mirror = new_from_options("remoteurl/path/to/repo/", "type" => "git")
+    @mirror.cached_url.should == "#{ENV["HOME"]}/.braid/cache/remoteurl_path_to_repo"
+  end
+end
+
+describe "Braid::Mirror#init_or_fetch_local_cache" do
+  it "should " do
+    @mirror = new_from_options("git@remoteurl/path/to/repo.git")
+    git_cache.expects(:init_or_fetch).with("git@remoteurl/path/to/repo.git", "#{ENV["HOME"]}/.braid/cache/git_remoteurl_path_to_repo.git")
+    @mirror.init_or_fetch_local_cache
+  end
+
+end
+
+

data/test/operations_test.rb

@@ -67,3 +67,8 @@ describe "Braid::Operations::Git#require_version" do
     end
   end
 end
+
+describe "Braid::Operations::GitCache#init_or_fetch" do
+  it "should initialize or fetch a local clone of the given url in the given directory" do
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: norbert-braid
 version: !ruby/object:Gem::Version 
-  version: 0.4.9
+  version: 0.4.12
 platform: ruby
 authors: 
 - Cristi Balan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-06 00:00:00 -07:00
+date: 2008-10-04 00:00:00 -07:00
 default_executable: braid
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -40,11 +40,8 @@ extensions: []
 extra_rdoc_files: 
 - README.rdoc
 files: 
-- LICENSE
-- README.rdoc
-- Rakefile
-- braid.gemspec
 - bin/braid
+- braid.gemspec
 - lib/braid/command.rb
 - lib/braid/commands/add.rb
 - lib/braid/commands/diff.rb
@@ -55,8 +52,19 @@ files:
 - lib/braid/mirror.rb
 - lib/braid/operations.rb
 - lib/braid.rb
+- LICENSE
+- Rakefile
+- README.rdoc
 - test/braid_test.rb
 - test/config_test.rb
+- test/fixtures/shiny/README
+- test/fixtures/skit1/layouts/layout.liquid
+- test/fixtures/skit1/preview.png
+- test/fixtures/skit1.1/layouts/layout.liquid
+- test/fixtures/skit1.2/layouts/layout.liquid
+- test/integration/adding_test.rb
+- test/integration/updating_test.rb
+- test/integration_helper.rb
 - test/mirror_test.rb
 - test/operations_test.rb
 - test/test_helper.rb