norbert-braid 0.4.13 → 0.5.1

data/lib/braid/mirror.rb

@@ -86,7 +86,7 @@ module Braid
     def diff
       remote_hash = git.rev_parse("#{base_revision}:")
       local_hash = git.tree_hash(path)
-      remote_hash != local_hash ? git.diff_tree(remote_hash, local_hash, path) : ""
+      remote_hash != local_hash ? git.diff_tree(remote_hash, local_hash) : ""
     end
 
     def fetch

data/lib/braid/operations.rb

@@ -1,6 +1,7 @@
 require 'singleton'
 require 'rubygems'
 require 'open4'
+require 'tempfile'
 
 module Braid
   module Operations
@@ -118,13 +119,13 @@ module Braid
         def sh(cmd, message = nil)
           message ||= "could not fetch" if cmd =~ /fetch/
           log(cmd)
-          system(cmd)
-          raise ShellExecutionError, message unless $? == 0
+          `#{cmd}`
+          raise ShellExecutionError, message unless $?.exitstatus == 0
           true
         end
 
         def msg(str)
-          puts str
+          puts "Braid: #{str}"
         end
 
         def log(cmd)
@@ -138,7 +139,16 @@ module Braid
 
     class Git < Proxy
       def commit(message, *args)
-        status, out, err = exec("git commit -m #{message.inspect} --no-verify #{args.join(' ')}")
+        cmd = "git commit --no-verify"
+        if message # allow nil
+          message_file = Tempfile.new("braid_commit")
+          message_file.print(message)
+          message_file.flush
+          cmd << " -F #{message_file.path}"
+        end
+        cmd << " #{args.join(' ')}" unless args.empty?
+        status, out, err = exec(cmd)
+        message_file.unlink if message_file
 
         if status == 0
           true
@@ -149,10 +159,10 @@ module Braid
         end
       end
 
-      def fetch(remote = nil)
-        args = remote && "-n #{remote}"
+      def fetch(remote = nil, *args)
+        args.unshift "-n #{remote}" if remote
         # open4 messes with the pipes of index-pack
-        sh("git fetch #{args} 2>&1 >/dev/null")
+        sh("git fetch #{args.join(' ')} 2>&1 >/dev/null")
       end
 
       def checkout(treeish)

data/lib/core_ext.rb

@@ -0,0 +1,13 @@
+require 'yaml'
+
+class Hash
+  def to_yaml(opts = {})
+    YAML::quick_emit(object_id, opts) do |out|
+      out.map(taguri, to_yaml_style) do |map|
+        sort.each do |k,v|
+          map.add(k, v)
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: norbert-braid
 version: !ruby/object:Gem::Version 
-  version: 0.4.13
+  version: 0.5.1
 platform: ruby
 authors: 
 - Cristi Balan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-23 00:00:00 -07:00
+date: 2008-10-29 00:00:00 -07:00
 default_executable: braid
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -37,14 +37,18 @@ executables:
 - braid
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
-- bin/braid
+- LICENSE
+- Rakefile
+- README.textile
 - braid.gemspec
+- bin/braid
 - lib/braid/command.rb
 - lib/braid/commands/add.rb
 - lib/braid/commands/diff.rb
+- lib/braid/commands/push.rb
 - lib/braid/commands/remove.rb
 - lib/braid/commands/setup.rb
 - lib/braid/commands/update.rb
@@ -52,23 +56,13 @@ files:
 - lib/braid/mirror.rb
 - lib/braid/operations.rb
 - lib/braid.rb
-- LICENSE
-- Rakefile
-- README.rdoc
+- lib/core_ext.rb
 - 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
-has_rdoc: true
+has_rdoc: false
 homepage: http://evil.che.lu/projects/braid
 post_install_message: 
 rdoc_options: 
@@ -77,7 +71,6 @@ rdoc_options:
 - --title
 - braid
 - --main
-- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 

data/README.rdoc

@@ -1,27 +0,0 @@
-= braid
-A simple tool for tracking vendor branches in git.
-
-http://evil.che.lu/projects/braid/
-
-== Requirements
-
-You will need git 1.5.4.5 or higher to run this version.
-
-== Installation
-
-  git clone git://github.com/evilchelu/braid.git
-  cd braid
-  gem build braid.gemspec
-  sudo gem install braid-x.y.z.gem
-
-== Usage
-
-  braid help
-  braid help COMMANDNAME
-
-For more usage examples and documentation check the project wiki at http://github.com/evilchelu/braid/wikis.
-Also see the bug tracker at http://evilchelu.lighthouseapp.com/projects/10600-braid for current issues and future plans.
-
-== Contributing
-
-If you want to send a patch please fork the project on GitHub and send a pull request.

data/test/fixtures/shiny/README

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

data/test/fixtures/skit1.1/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 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

@@ -1,221 +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 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>