evilchelu-braid 0.4.13 → 0.5

data/README.textile

@@ -0,0 +1,120 @@
+h1. Braid
+
+Braid is a simple tool to help track git and svn vendor branches in a git repository.
+
+The project homepage is at "http://github.com/evilchelu/braid/wikis/home":http://github.com/evilchelu/braid/wikis/home
+
+h2. Requirements
+
+* git 1.6+ (and git-svn if you want to mirror svn repositories)
+* main >= 2.8.0
+* open4 >= 0.9.6
+
+h2. Installing using rubygems - official releases
+
+  gem install braid
+
+h2. Installing using rubygems - development releases
+
+  gem sources -a http://gems.github.com
+  gem install evilchelu-braid
+
+h2. Installing from source
+
+  git clone git://github.com/evilchelu/braid.git
+  cd braid
+  gem build braid.gemspec
+  sudo gem install braid-x.y.z.gem
+
+h2. Quick usage - ruby project
+
+Let's assume we're writing something like gitnub that needs grit in lib/grit. Initialize the repo (nothing braid related here):
+
+  git init gritty
+  cd gritty
+  touch README
+  git add README
+  git commit -m "initial commit"
+
+Now let's vendor grit:
+
+  braid add git://github.com/mojombo/grit.git lib/grit
+
+And you're done! Braid vendored grit into lib/grit. Feel free to inspect the changes with git log or git show.
+
+If further down the line, you want to bring new changes from grit in your repository, just update the mirror:
+
+  braid update lib/grit
+
+h2. Quick usage - rails project
+
+Let's assume you want to start a new rails app called shiny. Initialize the repo (nothing braid related here):
+
+  git init shiny
+  cd shiny
+  touch README
+  git add README
+  git commit -m "initial commit"
+
+Vendor rails (this might take a while because the rails repo is huge!):
+
+  braid add git://github.com/rails/rails.git vendor/rails
+
+Create your new rails app (nothing braid related here):
+
+  ruby vendor/rails/railties/bin/rails .
+  git add .
+  git commit -m "rails ."
+
+Add any plugins you might need:
+
+  braid add git://github.com/thoughtbot/shoulda.git -p
+  braid add git://github.com/thoughtbot/factory_girl.git -p
+  braid add git://github.com/mbleigh/subdomain-fu.git -p
+
+And you're done! Braid vendored rails and your plugins. Feel free to inspect the changes with git log or git show.
+
+If further down the line, you want to bring new changes from rails in your repository, just update the mirror:
+
+  braid update vendor/rails
+
+Or, if you want all mirrors updated:
+
+  braid update
+
+h2. More usage
+
+Use the built in help system to find out about all commands and options:
+
+  braid help
+  braid help add # or braid add --help
+
+You may also want to read "Usage and examples":http://github.com/evilchelu/braid/wikis/usage-and-examples.
+
+h2. Troubleshooting
+
+Check "Troubleshooting":http://github.com/evilchelu/braid/wikis/troubleshooting if you're having issues.
+
+h2. Contributing
+
+We appreciate any patches, error reports and usage ideas you may have. Please submit a lighthouse ticket or start a thread on the mailing list.
+
+Bugs and feature requests: "*braid project on lighthouse*":http://evilchelu.lighthouseapp.com/projects/10600-braid
+
+Discussions and community support: "*braid-gem google group*":http://groups.google.com/group/braid-gem
+
+h2. Authors
+
+* Cristi Balan (evilchelu)
+* Norbert Crombach (norbert)
+
+h2. Contributors (alphabetically)
+
+* Alan Harper
+* Christoph Sturm
+* Dennis Muhlestein
+* Ferdinand Svehla
+* Michael Klishin
+* Roman Heinrich
+* Tyler Rick
+

data/bin/braid

@@ -106,7 +106,10 @@ Main {
 
   mode(:setup) {
     description <<-TXT
-      Set up git and git-svn remotes.
+      Set up git or git-svn remote for a mirror.
+      All commands that need a remote run setup internally.
+
+      Defaults to setting up remotes for all mirrors if none is specified.
     TXT
 
     examples <<-TXT

data/braid.gemspec

@@ -1,21 +1,20 @@
 Gem::Specification.new do |s|
   s.name = %q{braid}
-  s.version = "0.4.13"
+  s.version = "0.5"
 
   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-10-23}
+  s.date = %q{2008-10-29}
   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 = ["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.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.textile", "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 = false
   s.homepage = %q{http://evil.che.lu/projects/braid}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "braid", "--main", "README.rdoc"]
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "braid", "--main"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{braid}
   s.rubygems_version = %q{1.1.0}

data/lib/braid.rb

@@ -1,7 +1,7 @@
 $:.unshift File.dirname(__FILE__)
 
 module Braid
-  VERSION = "0.4.13"
+  VERSION = "0.5"
 
   CONFIG_FILE = ".braids"
   REQUIRED_GIT_VERSION = "1.6"

data/lib/braid/command.rb

@@ -23,7 +23,7 @@ module Braid
     end
 
     def self.msg(str)
-      puts str
+      puts "Braid: #{str}"
     end
 
     def msg(str)
@@ -34,7 +34,15 @@ module Braid
       @config ||= load_and_migrate_config
     end
 
+    def verbose?
+      Braid.verbose
+    end
+
     private
+      def setup_remote(mirror)
+        Command.run(:setup, mirror.path)
+      end
+
       def use_local_cache?
         Braid.use_local_cache
       end

data/lib/braid/commands/add.rb

@@ -30,15 +30,13 @@ module Braid
           config.update(mirror)
           add_config_file
 
-          commit_message = "Add mirror '#{mirror.path}/'#{revision_message}"
+          commit_message = "Added mirror '#{mirror.path}' at #{display_revision(mirror)}"
+
           git.commit(commit_message)
+          msg commit_message
         end
       end
 
-      private
-        def setup_remote(mirror)
-          Command.run(:setup, mirror.path)
-        end
     end
   end
 end

data/lib/braid/commands/diff.rb

@@ -3,6 +3,8 @@ module Braid
     class Diff < Command
       def run(path)
         mirror = config.get!(path)
+        setup_remote(mirror)
+
         diff = mirror.diff
         puts diff unless diff.empty?
       end

data/lib/braid/commands/remove.rb

@@ -7,15 +7,19 @@ module Braid
         bail_on_local_changes!
 
         with_reset_on_error do
-          msg "Removing mirror from '#{mirror.path}/'."
+          msg "Removing mirror from '#{mirror.path}'."
 
           git.rm_r(mirror.path)
 
+          # will need this in case we decide to remove the .git/config entry also
+          # setup_remote(mirror)
+
           config.remove(mirror)
           add_config_file
 
-          commit_message = "Remove mirror '#{mirror.path}/'"
+          commit_message = "Removed mirror '#{mirror.path}'"
           git.commit(commit_message)
+          msg commit_message
         end
       end
     end

data/lib/braid/commands/setup.rb

@@ -17,11 +17,11 @@ module Braid
           mirror = config.get!(path)
 
           if git.remote_url(mirror.remote)
-            msg "Mirror '#{mirror.path}/' already has a remote. Skipping."
+            msg "Setup: Mirror '#{mirror.path}' already has a remote. Reusing it." if verbose?
             return
           end
 
-          msg "Setting up remote for '#{mirror.path}/'."
+          msg "Setup: Creating remote for '#{mirror.path}'."
           unless mirror.type == "svn"
             url = use_local_cache? ? git_cache.path(mirror.url) : mirror.url
             git.remote_add(mirror.remote, url, mirror.branch)

data/lib/braid/commands/update.rb

@@ -21,24 +21,29 @@ module Braid
         def update_one(path, options = {})
           mirror = config.get!(path)
 
+          revision_message = options["revision"] ? " to #{display_revision(mirror, options["revision"])}" : ""
+          msg "Updating mirror '#{mirror.path}'#{revision_message}."
+
           # check options for lock modification
           if mirror.locked?
             if options["head"]
-              msg "Unlocking mirror '#{mirror.path}/'."
+              msg "Unlocking mirror '#{mirror.path}'." if verbose?
               mirror.lock = nil
             elsif !options["revision"]
-              msg "Mirror '#{mirror.path}/' is locked to #{display_revision(mirror, mirror.lock)}. Skipping."
+              msg "Mirror '#{mirror.path}' is locked to #{display_revision(mirror, mirror.lock)}. Use --head to force."
               return
             end
           end
 
+          setup_remote(mirror)
+          msg "Fetching new commits for '#{mirror.path}'." if verbose?
           mirror.fetch
 
           new_revision = validate_new_revision(mirror, options["revision"])
           target_revision = determine_target_revision(mirror, new_revision)
 
           if mirror.merged?(target_revision)
-            msg "Mirror '#{mirror.path}/' is already up to date. Skipping."
+            msg "Mirror '#{mirror.path}' is already up to date."
             return
           end
 
@@ -50,7 +55,7 @@ module Braid
           mirror.revision = new_revision
           mirror.lock = new_revision if options["revision"]
 
-          msg "Updating mirror '#{mirror.path}/'."
+          msg "Merging in mirror '#{mirror.path}'." if verbose?
           begin
             if mirror.squashed?
               local_hash = git.rev_parse("HEAD")
@@ -73,20 +78,21 @@ module Braid
           config.update(mirror)
           add_config_file
 
-          commit_message = "Update mirror '#{mirror.path}/' to #{display_revision(mirror)}"
+          commit_message = "Updated mirror '#{mirror.path}' to #{display_revision(mirror)}"
 
           if error
             File.open(".git/MERGE_MSG", 'w') { |f| f.puts(commit_message) }
             return
-          else
-            git.commit(commit_message)
           end
+
+          git.commit(commit_message)
+          msg commit_message
         end
 
         def generate_tree_hash(mirror, revision)
           git.rm_r(mirror.path)
           git.read_tree_prefix(revision, mirror.path)
-          success = git.commit("Temporary commit for mirror '#{mirror.path}/'")
+          success = git.commit("Temporary commit for mirror '#{mirror.path}'")
           hash = git.rev_parse("HEAD")
           git.reset_hard("HEAD^") if success
           hash

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,12 @@ module Braid
 
     class Git < Proxy
       def commit(message, *args)
-        status, out, err = exec("git commit -m #{message.inspect} --no-verify #{args.join(' ')}")
+
+        commit_message_file = Tempfile.new("braid_commit", ".")
+        commit_message_file.print("Braid: " + message)
+        commit_message_file.flush
+        status, out, err = exec("git commit -F #{commit_message_file.path} --no-verify #{args.join(' ')}")
+        commit_message_file.unlink
 
         if status == 0
           true

data/test/integration/adding_test.rb

@@ -24,7 +24,7 @@ describe "Adding a mirror in a clean repository" do
 
       output = `git log --pretty=oneline`.split("\n")
       output.length.should == 2
-      output[0].should =~ "Add mirror 'skit1/'"
+      output[0].should =~ /Braid: Added mirror 'skit1' at '[0-9a-f]{7}'/
     end
 
     it "should create .braids and add the mirror to it" do
@@ -59,7 +59,7 @@ describe "Adding a mirror in a clean repository" do
 
       output = `git log --pretty=oneline`.split("\n")
       output.length.should == 2
-      output[0].should =~ "Add mirror 'skit1/'"
+      output[0].should =~ /Braid: Added mirror 'skit1' at r1/
     end
 
     it "should create .braids and add the mirror to it" do

data/test/integration/updating_test.rb

@@ -41,7 +41,7 @@ describe "Updating a mirror without conflicts" do
 
       output = `git log --pretty=oneline`.split("\n")
       output.length.should == 3
-      output[0].should =~ /Update mirror 'skit1\/' to '[0-9a-f]{7}'/
+      output[0].should =~ /Braid: Updated mirror 'skit1' to '[0-9a-f]{7}'/
     end
 
   end
@@ -79,7 +79,7 @@ describe "Updating a mirror without conflicts" do
 
       output = `git log --pretty=oneline`.split("\n")
       output.length.should == 3
-      output[0].should =~ "Update mirror 'skit1/' to r3"
+      output[0].should =~ /Braid: Updated mirror 'skit1' to r3/
     end
 
   end

data/test/integration_helper.rb

@@ -9,6 +9,7 @@ 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.rm_rf(TMP_PATH)
 FileUtils.mkdir_p(TMP_PATH)
 BRAID_BIN = File.join(BRAID_PATH, "bin", "braid")
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: evilchelu-braid
 version: !ruby/object:Gem::Version 
-  version: 0.4.13
+  version: "0.5"
 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,8 +37,8 @@ executables:
 - braid
 extensions: []
 
-extra_rdoc_files: 
-- README.rdoc
+extra_rdoc_files: []
+
 files: 
 - bin/braid
 - braid.gemspec
@@ -54,7 +54,7 @@ files:
 - lib/braid.rb
 - LICENSE
 - Rakefile
-- README.rdoc
+- README.textile
 - test/braid_test.rb
 - test/config_test.rb
 - test/fixtures/shiny/README
@@ -68,7 +68,7 @@ files:
 - 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 +77,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.