braid 0.5 → 0.6

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2007-2008 Cristi Balan, Norbert Crombach
+Copyright (c) 2007-2010 Cristi Balan, Norbert Crombach
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/bin/braid

@@ -89,54 +89,59 @@ Main {
 
         * removes metadata from .braids
         * removes the local directory and commits the removal
-        * does NOT remove the git and git svn remotes in case you still need them around
+        * removes the git remote by default, --keep can be used to supress that
     TXT
 
     examples <<-TXT
       . braid remove local/dir
     TXT
 
-    mixin :argument_path, :option_verbose
+    mixin :argument_path, :option_verbose, :option_keep_remote
 
     run {
+      options = {
+        :keep => keep
+      }
       Braid.verbose = verbose
-      Braid::Command.run(:remove, path)
+      Braid::Command.run(:remove, path, options)
     }
   }
 
-  mode(:setup) {
+  mode(:diff) {
     description <<-TXT
-      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.
+      Show diff of local changes to mirror.
     TXT
 
-    examples <<-TXT
-      . braid setup local/dir
+    mixin :argument_path, :option_verbose
+
+    run {
+      Braid::Command.run(:diff, path)
+    }
+  }
+
+  mode(:push) {
+    description <<-TXT
+      Push local mirror changes to remote.
     TXT
 
-    mixin :optional_path, :option_verbose
+    mixin :argument_path, :option_verbose
 
     run {
       Braid.verbose = verbose
-      Braid::Command.run(:setup, path)
+      Braid::Command.run(:push, path)
     }
   }
 
-  mode(:diff) {
+  mode(:setup) {
     description <<-TXT
-      Show diff of local changes to mirror.
-    TXT
-
-    examples <<-TXT
-      . braid diff local/dir
+      Set up git and git-svn remotes.
     TXT
 
-    mixin :argument_path, :option_verbose
+    mixin :optional_path, :option_verbose
 
     run {
-      Braid::Command.run(:diff, path)
+      Braid.verbose = verbose
+      Braid::Command.run(:setup, path)
     }
   }
 
@@ -226,5 +231,13 @@ Main {
     }
   }
 
+  mixin(:option_keep_remote) {
+    option(:keep) {
+      optional
+      desc 'do not remove the remote'
+      attr
+    }
+  }
+
   run { help! }
 }

data/braid.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{braid}
-  s.version = "0.5"
+  s.version = "0.6"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 

data/lib/braid/commands/add.rb

@@ -30,10 +30,8 @@ module Braid
           config.update(mirror)
           add_config_file
 
-          commit_message = "Added mirror '#{mirror.path}' at #{display_revision(mirror)}"
-
-          git.commit(commit_message)
-          msg commit_message
+          git.commit("Add mirror '#{mirror.path}' at #{display_revision(mirror)}")
+          msg "Added mirror at #{display_revision(mirror)}."
         end
       end
 

data/lib/braid/commands/remove.rb

@@ -1,7 +1,7 @@
 module Braid
   module Commands
     class Remove < Command
-      def run(path)
+      def run(path, options = {})
         mirror = config.get!(path)
 
         bail_on_local_changes!
@@ -11,15 +11,20 @@ module Braid
 
           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 = "Removed mirror '#{mirror.path}'"
-          git.commit(commit_message)
-          msg commit_message
+          if options[:keep]
+            msg "Not removing remote '#{mirror.remote}'" if verbose?
+          elsif git.remote_url(mirror.remote)
+            msg "Removed remote '#{mirror.path}'" if verbose?
+            git.remote_rm mirror.remote
+          else
+            msg "Remote '#{mirror.remote}' not found, nothing to cleanup" if verbose?
+          end
+
+          git.commit("Remove mirror '#{mirror.path}'")
+          msg "Removed mirror." if verbose?
         end
       end
     end

data/lib/braid/commands/update.rb

@@ -59,7 +59,7 @@ module Braid
           begin
             if mirror.squashed?
               local_hash = git.rev_parse("HEAD")
-              if diff
+              if !diff.empty?
                 base_hash = generate_tree_hash(mirror, base_revision)
               else
                 base_hash = local_hash
@@ -78,15 +78,14 @@ module Braid
           config.update(mirror)
           add_config_file
 
-          commit_message = "Updated mirror '#{mirror.path}' to #{display_revision(mirror)}"
-
+          commit_message = "Update mirror '#{mirror.path}' to #{display_revision(mirror)}"
           if error
             File.open(".git/MERGE_MSG", 'w') { |f| f.puts(commit_message) }
             return
           end
 
           git.commit(commit_message)
-          msg commit_message
+          msg "Updated mirror to #{display_revision(mirror)}."
         end
 
         def generate_tree_hash(mirror, revision)

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
@@ -99,7 +99,7 @@ module Braid
     end
 
     def cached?
-      git.remote_url(remote) == git_cache.path(url)
+      git.remote_url(remote) == cached_url
     end
 
     def base_revision
@@ -114,6 +114,10 @@ module Braid
       end
     end
 
+    def cached_url
+      git_cache.path(url)
+    end
+
     private
       def method_missing(name, *args)
         if ATTRIBUTES.find { |attribute| name.to_s =~ /^(#{attribute})(=)?$/ }

data/lib/braid/operations.rb

@@ -139,12 +139,16 @@ module Braid
 
     class Git < Proxy
       def commit(message, *args)
-
-        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
+        cmd = "git commit --no-verify"
+        if message # allow nil
+          message_file = Tempfile.new("braid_commit")
+          message_file.print("Braid: #{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
@@ -155,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)
@@ -185,6 +189,11 @@ module Braid
         true
       end
 
+      def remote_rm(remote)
+        invoke(:remote, "rm", remote)
+        true
+      end
+
       # Checks git and svn remotes.
       def remote_url(remote)
         key = "remote.#{remote}.url"

data/lib/braid.rb

@@ -1,7 +1,7 @@
-$:.unshift File.dirname(__FILE__)
+$:.unshift dirname = File.dirname(__FILE__)
 
 module Braid
-  VERSION = "0.5"
+  VERSION = "0.6"
 
   CONFIG_FILE = ".braids"
   REQUIRED_GIT_VERSION = "1.6"
@@ -20,10 +20,11 @@ module Braid
   end
 end
 
+require dirname + '/core_ext'
 require 'braid/operations'
 require 'braid/mirror'
 require 'braid/config'
 require 'braid/command'
-Dir[File.dirname(__FILE__) + '/braid/commands/*'].each do |file|
+Dir[dirname + '/braid/commands/*'].each do |file|
   require file
 end

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 =~ /Braid: Added mirror 'skit1' at '[0-9a-f]{7}'/
+      output[0].should =~ /Braid: Add 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 =~ /Braid: Added mirror 'skit1' at r1/
+      output[0].should =~ /Braid: Add 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 =~ /Braid: Updated mirror 'skit1' to '[0-9a-f]{7}'/
+      output[0].should =~ /Braid: Update 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 =~ /Braid: Updated mirror 'skit1' to r3/
+      output[0].should =~ /Braid: Update mirror 'skit1' to r3/
     end
 
   end

data/test/mirror_test.rb

@@ -61,7 +61,7 @@ describe "Braid::Mirror#diff" do
   it "should generate a diff when the hashes do not match" do
     set_hashes('b' * 40, 'c' * 40)
     diff = "diff --git a/path b/path\n"
-    git.expects(:diff_tree).with('b' * 40, 'c' * 40, @mirror.path).returns(diff)
+    git.expects(:diff_tree).with('b' * 40, 'c' * 40).returns(diff)
     @mirror.diff.should == diff
   end
 end

metadata

@@ -1,7 +1,11 @@
 --- !ruby/object:Gem::Specification 
 name: braid
 version: !ruby/object:Gem::Version 
-  version: "0.5"
+  prerelease: false
+  segments: 
+  - 0
+  - 6
+  version: "0.6"
 platform: ruby
 authors: 
 - Cristi Balan
@@ -10,29 +14,37 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-10-29 00:00:00 +02:00
+date: 2008-10-29 00:00:00 +01:00
 default_executable: braid
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: main
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 8
+        - 0
         version: 2.8.0
-    version: 
+  type: :runtime
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: open4
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 6
         version: 0.9.6
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: A simple tool for tracking vendor branches in git.
 email: evil@che.lu
 executables: 
@@ -70,8 +82,10 @@ files:
 - test/mirror_test.rb
 - test/operations_test.rb
 - test/test_helper.rb
-has_rdoc: false
+has_rdoc: true
 homepage: http://evil.che.lu/projects/braid
+licenses: []
+
 post_install_message: 
 rdoc_options: 
 - --line-numbers
@@ -85,18 +99,20 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: braid
-rubygems_version: 1.2.0
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 2
 summary: A simple tool for tracking vendor branches in git.