dreamcat4-braid 0.50 → 0.52

data/bin/braid

@@ -51,11 +51,11 @@ 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, :option_verbose
+    mixin :argument_url, :option_type, :optional_path, :option_branch, :option_rails_plugin, :option_rails_gem, :option_revision, :option_full, :option_verbose
 
     run {
       Braid.verbose = verbose
-      Braid::Command.run(:add, url, { "type" => type, "path" => path, "branch" => branch, "rails_plugin" => rails_plugin, "revision" => revision, "full" => full })
+      Braid::Command.run(:add, url, { "type" => type, "path" => path, "branch" => branch, "rails_plugin" => rails_plugin, "rails_gem" => rails_gem, "revision" => revision, "full" => full })
     }
   }
 
@@ -196,6 +196,14 @@ Main {
     }
   }
 
+  mixin(:option_rails_gem) {
+    option(:rails_gem, :p) {
+      optional
+      desc 'added mirror is a Rails gem'
+      attr
+    }
+  }
+
   mixin(:option_revision) {
     option(:revision, :r) {
       optional

data/braid.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |s|
   s.name = %q{braid}
-  s.version = "0.50"
+  s.version = "0.52"
 
   s.specification_version = 2 if s.respond_to? :specification_version=
 
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   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}
+  s.rubygems_version = %q{1.3.1}
   s.summary = %q{A simple tool for tracking vendor branches in git.}
 
   s.add_dependency(%q<main>, [">= 2.8.0"])

data/lib/braid/commands/add.rb

@@ -15,18 +15,24 @@ module Braid
           # http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html
 
           setup_remote(mirror)
-          mirror.fetch
-
-          new_revision = validate_new_revision(mirror, options["revision"])
-          target_revision = determine_target_revision(mirror, new_revision)
-
-          unless mirror.squashed?
-            git.merge_ours(target_revision)
+          
+          if mirror.type == "git-clone"
+            gitclone.add_gitignore(mirror.path)
+            mirror.rspec_git.update
+          else
+            mirror.fetch
+
+            new_revision = validate_new_revision(mirror, options["revision"])
+            target_revision = determine_target_revision(mirror, new_revision)
+
+            unless mirror.squashed?
+              git.merge_ours(target_revision)
+            end
+            git.read_tree_prefix(target_revision, mirror.path)
+
+            mirror.revision = new_revision
+            mirror.lock = new_revision if options["revision"]
           end
-          git.read_tree_prefix(target_revision, mirror.path)
-
-          mirror.revision = new_revision
-          mirror.lock = new_revision if options["revision"]
           config.update(mirror)
           add_config_file
 

data/lib/braid/commands/diff.rb

@@ -3,10 +3,17 @@ module Braid
     class Diff < Command
       def run(path)
         mirror = config.get!(path)
-        setup_remote(mirror)
+        if mirror.type == "git-clone"
+          unless system("cd #{mirror.path} && git diff")
+            msg "Error diffing \"#{path}\" in \"#{mirror.path}\""
+            exit 1
+          end
+        else
+          setup_remote(mirror)
 
-        diff = mirror.diff
-        puts diff unless diff.empty?
+          diff = mirror.diff
+          puts diff unless diff.empty?
+        end
       end
     end
   end

data/lib/braid/commands/remove.rb

@@ -9,18 +9,25 @@ module Braid
         with_reset_on_error do
           msg "Removing mirror from '#{mirror.path}'."
 
-          git.rm_r(mirror.path)
+          if mirror.type == "git-clone"
+            gitclone.remove_gitignore(mirror.path)
+            FileUtils.rm_rf(mirror.path)
+            config.remove(mirror)
+            add_config_file
+          else
+            git.rm_r(mirror.path)
 
-          config.remove(mirror)
-          add_config_file
+            config.remove(mirror)
+            add_config_file
 
-          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?
+            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
           end
 
           commit_message = "Removed mirror '#{mirror.path}'"

data/lib/braid/commands/setup.rb

@@ -16,6 +16,10 @@ module Braid
         def setup_one(path)
           mirror = config.get!(path)
 
+          if mirror.type == "git-clone"
+            return
+          end
+
           if git.remote_url(mirror.remote)
             msg "Setup: Mirror '#{mirror.path}' already has a remote. Reusing it." if verbose?
             return

data/lib/braid/commands/update.rb

@@ -20,73 +20,78 @@ 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}'." if verbose?
-              mirror.lock = nil
-            elsif !options["revision"]
-              msg "Mirror '#{mirror.path}' is locked to #{display_revision(mirror, mirror.lock)}. Use --head to force."
-              return
+          if mirror.type == "git-clone"
+            mirror.rspec_git.update options["revision"]
+          else
+            
+            # check options for lock modification
+            if mirror.locked?
+              if options["head"]
+                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)}. Use --head to force."
+                return
+              end
             end
-          end
 
-          setup_remote(mirror)
-          msg "Fetching new commits for '#{mirror.path}'." if verbose?
-          mirror.fetch
+            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)
+            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."
-            return
-          end
-
-          if mirror.squashed?
-            diff = mirror.diff
-            base_revision = mirror.base_revision
-          end
-
-          mirror.revision = new_revision
-          mirror.lock = new_revision if options["revision"]
+            if mirror.merged?(target_revision)
+              msg "Mirror '#{mirror.path}' is already up to date."
+              return
+            end
 
-          msg "Merging in mirror '#{mirror.path}'." if verbose?
-          begin
             if mirror.squashed?
-              local_hash = git.rev_parse("HEAD")
-              if diff
-                base_hash = generate_tree_hash(mirror, base_revision)
+              diff = mirror.diff
+              base_revision = mirror.base_revision
+            end
+
+            mirror.revision = new_revision
+            mirror.lock = new_revision if options["revision"]
+
+            msg "Merging in mirror '#{mirror.path}'." if verbose?
+            begin
+              if mirror.squashed?
+                local_hash = git.rev_parse("HEAD")
+                if diff
+                  base_hash = generate_tree_hash(mirror, base_revision)
+                else
+                  base_hash = local_hash
+                end
+                remote_hash = generate_tree_hash(mirror, target_revision)
+                ENV["GITHEAD_#{local_hash}"] = "HEAD"
+                ENV["GITHEAD_#{remote_hash}"] = target_revision
+                git.merge_recursive(base_hash, local_hash, remote_hash)
               else
-                base_hash = local_hash
+                git.merge_subtree(target_revision)
               end
-              remote_hash = generate_tree_hash(mirror, target_revision)
-              ENV["GITHEAD_#{local_hash}"] = "HEAD"
-              ENV["GITHEAD_#{remote_hash}"] = target_revision
-              git.merge_recursive(base_hash, local_hash, remote_hash)
-            else
-              git.merge_subtree(target_revision)
+            rescue Operations::MergeError => error
+              msg "Caught merge error. Breaking."
             end
-          rescue Operations::MergeError => error
-            msg "Caught merge error. Breaking."
-          end
 
-          config.update(mirror)
-          add_config_file
+            config.update(mirror)
+            add_config_file
 
-          commit_message = "Updated 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
-          end
+            if error
+              File.open(".git/MERGE_MSG", 'w') { |f| f.puts(commit_message) }
+              return
+            end
 
-          git.commit(commit_message)
-          msg commit_message
+            git.commit(commit_message)
+            msg commit_message
+          end
         end
 
         def generate_tree_hash(mirror, revision)

data/lib/braid/mirror.rb

@@ -1,6 +1,8 @@
+require 'rspec_git.rb'
+
 module Braid
   class Mirror
-    TYPES = %w(git svn)
+    TYPES = %w(git svn git-clone)
     ATTRIBUTES = %w(url remote type branch squashed revision lock)
 
     class UnknownType < BraidError
@@ -21,11 +23,12 @@ module Braid
 
     include Operations::VersionControl
 
-    attr_reader :path, :attributes
+    attr_reader :path, :attributes, :rspec_git
 
     def initialize(path, attributes = {})
       @path = path.sub(/\/$/, '')
       @attributes = attributes
+      @rspec_git = RSpec::Git.new File.basename(@path) @path attributes["url"]
     end
 
     def self.new_from_options(url, options = {})
@@ -43,10 +46,14 @@ module Braid
         raise PathRequired
       end
 
-      if options["rails_plugin"]
+      if options["rails_plugin"] && ! path =~ /vendor\/plugins.*/
         path = "vendor/plugins/#{path}"
       end
 
+      if options["rails_gem"] && ! path =~ /vendor\/gems.*/
+        path = "vendor/gems/#{path}"
+      end
+
       remote = "braid/#{path}".gsub("_", '-') # stupid git svn changes all _ to ., weird
       squashed = !options["full"]
       branch = nil if type == "svn"
@@ -152,7 +159,7 @@ module Braid
         return url_scheme if TYPES.include?(url_scheme)
 
         return "svn" if url[-6..-1] == "/trunk"
-        return "git" if url[-4..-1] == ".git"
+        return "git-clone" if url[-4..-1] == ".git"
       end
 
       def self.extract_path_from_url(url)

data/lib/braid/operations.rb

@@ -137,6 +137,72 @@ module Braid
         end
     end
 
+    class GitClone < Proxy
+      def in_rep_root_check
+        if ! File.exists?(".git") 
+          raise("Not in root repository.")
+        end        
+      end
+      
+      def add_gitignore(path)
+        # add mirror to .gitignore file
+        in_rep_root_check
+        if ! File.exists?(".gitignore") 
+          f = File.new(".gitignore",  "w+")
+        else
+          f = File.open( 'index', 'w+') 
+        end        
+
+        f.each { |line| 
+          if line == path
+            path_ignored = line
+          end 
+        }
+        if ! ignored
+          f.puts path
+          git.add(".gitignore")
+        end
+        f.close
+      end
+
+      def remove_gitignore(path)
+        # remove mirror from .gitignore file
+        in_rep_root_check
+        if File.exists?(".gitignore") 
+          f = File.open( 'index', 'w+') 
+          
+          f.each { |line| 
+            if line == path
+              path_ignored = line
+            end 
+          }
+          f.rewind
+          
+          if path_ignored
+            date_str= Date.new.to_s
+            n = File.new(".gitignore-#{date_str}",  "w+")
+            f.each { |line| 
+              n.puts line unless line == path_ignored
+            }
+            n.close            
+          end
+          f.close
+          File.rename( ".gitignore-#{date_str}", ".gitignore" )
+          git.add(".gitignore")
+        end        
+        
+      end
+      
+      private
+        def command(name)
+          "#{self.class.command} #{name}"
+        end
+
+        def git
+          GitClone.instance
+        end
+    end
+
     class Git < Proxy
       def commit(message, *args)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: dreamcat4-braid
 version: !ruby/object:Gem::Version 
-  version: "0.50"
+  version: "0.52"
 platform: ruby
 authors: 
 - Cristi Balan