evilchelu-braid 0.4.11 → 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,12 +1,12 @@
 Gem::Specification.new do |s|
   s.name = %q{braid}
-  s.version = "0.4.11"
+  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-26}
+  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}

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
@@ -129,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
@@ -254,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
@@ -286,6 +298,11 @@ module Braid
     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")
@@ -294,7 +311,7 @@ module Braid
           FileUtils.mkdir_p(Braid::LOCAL_CACHE_DIR)
 
           msg "Caching '#{url}' into '#{dir}'."
-          status, out, err = exec!("git clone --no-checkout #{url} #{dir}")
+          status, out, err = exec!("git clone --mirror #{url} #{dir}")
         end
       end
     end

data/lib/braid.rb

@@ -1,12 +1,12 @@
 $:.unshift File.dirname(__FILE__)
 
 module Braid
-  VERSION = "0.4.11"
+  VERSION = "0.4.12"
 
   CONFIG_FILE = ".braids"
-  USE_LOCAL_CACHE = ENV["BRAID_USE_LOCAL_CACHE"] || true
+  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.5.4.5"
+  REQUIRED_GIT_VERSION = "1.6"
 
   class BraidError < StandardError
     def message

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: evilchelu-braid
 version: !ruby/object:Gem::Version 
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors: 
 - Cristi Balan
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-09-26 00:00:00 -07:00
+date: 2008-10-04 00:00:00 -07:00
 default_executable: braid
 dependencies: 
 - !ruby/object:Gem::Dependency