dreamcat4-braid 0.53 → 0.531

data/bin/braid

@@ -197,7 +197,7 @@ Main {
   }
 
   mixin(:option_rails_gem) {
-    option(:rails_gem, :p) {
+    option(:rails_gem, :g) {
       optional
       desc 'added mirror is a Rails gem'
       attr

data/braid.gemspec

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

data/lib/braid/commands/add.rb

@@ -18,7 +18,8 @@ module Braid
           
           if mirror.type == "git-clone"
             gitclone.add_gitignore(mirror.path)
-            mirror.rspec_git.update
+            mirror.rspec_git.update options["revision"]
+            commit_message = "Added clone repository #{mirror.rspec_git.url} in #{mirror.path}"
           else
             mirror.fetch
 
@@ -32,11 +33,12 @@ module Braid
 
             mirror.revision = new_revision
             mirror.lock = new_revision if options["revision"]
-          end
+            commit_message = "Added mirror '#{mirror.path}' at #{display_revision(mirror)}"
+        end
+          
           config.update(mirror)
           add_config_file
 
-          commit_message = "Added mirror '#{mirror.path}' at #{display_revision(mirror)}"
 
           git.commit(commit_message)
           msg commit_message

data/lib/braid/commands/remove.rb

@@ -14,6 +14,7 @@ module Braid
             FileUtils.rm_rf(mirror.path)
             config.remove(mirror)
             add_config_file
+            commit_message = "Removed clone repository '#{mirror.path}'"
           else
             git.rm_r(mirror.path)
 
@@ -28,9 +29,9 @@ module Braid
             else
               msg "Remote '#{mirror.remote}' not found, nothing to cleanup" if verbose?
             end
+            commit_message = "Removed mirror '#{mirror.path}'"
           end
 
-          commit_message = "Removed mirror '#{mirror.path}'"
           git.commit(commit_message)
           msg commit_message
         end

data/lib/braid/mirror.rb

@@ -1,3 +1,4 @@
+$:.unshift File.dirname(__FILE__)
 require 'rspec_git.rb'
 
 module Braid
@@ -28,7 +29,7 @@ module Braid
     def initialize(path, attributes = {})
       @path = path.sub(/\/$/, '')
       @attributes = attributes
-      @rspec_git = RSpec::Git.new File.basename(@path) @path attributes["url"]
+      @rspec_git = RSpec::Git.new(File.basename(@path), @path, attributes["url"])
     end
 
     def self.new_from_options(url, options = {})
@@ -45,19 +46,21 @@ module Braid
       unless path = options["path"] || extract_path_from_url(url)
         raise PathRequired
       end
-
-      if options["rails_plugin"] && ! path =~ /vendor\/plugins.*/
+      
+      if options["rails_plugin"] && ( path =~ /vendor\/plugins.*/ ) == nil
         path = "vendor/plugins/#{path}"
       end
 
-      if options["rails_gem"] && ! path =~ /vendor\/gems.*/
+      if options["rails_gem"] &&  (path =~ /vendor\/gems.*/ ) == nil
         path = "vendor/gems/#{path}"
       end
-
-      remote = "braid/#{path}".gsub("_", '-') # stupid git svn changes all _ to ., weird
-      squashed = !options["full"]
-      branch = nil if type == "svn"
-
+      
+      if type != "git-clone"
+        remote = "braid/#{path}".gsub("_", '-') # stupid git svn changes all _ to ., weird
+        squashed = !options["full"]
+        branch = nil if type == "svn"
+      end
+      
       attributes = { "url" => url, "remote" => remote, "type" => type, "branch" => branch, "squashed" => squashed }
       self.new(path, attributes)
     end

data/lib/braid/operations.rb

@@ -137,60 +137,71 @@ module Braid
         end
     end
 
-    class GitClone < Proxy
+    class GitClone 
+      
+      include Singleton
+
       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
+        # remove mirror from .gitignore file
         in_rep_root_check
-        if ! File.exists?(".gitignore") 
-          f = File.new(".gitignore",  "w+")
-        else
-          f = File.open( 'index', 'w+') 
+        if File.exists?(".gitignore") 
+          f = File.open( '.gitignore', 'r+') 
+          path_ignored = nil
+          f.each { |line| 
+            if line == path+"\n"
+              path_ignored = line
+            end 
+          }
+          f.rewind
+          f.close
+          
+          if ! path_ignored
+            date_str = Date.new.to_s
+            f = File.open( '.gitignore', 'r+') 
+            n = File.new(".gitignore-#{date_str}",  "w+")
+            f.each { |line| n.puts line }
+            n.puts path+"\n"
+            n.close            
+            f.close
+            File.rename( ".gitignore-#{date_str}", ".gitignore" )
+            Git.instance.add(".gitignore")
+          end
         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 = File.open( '.gitignore', 'r+') 
+          path_ignored = nil
           f.each { |line| 
-            if line == path
+            if line == path+"\n"
               path_ignored = line
             end 
           }
           f.rewind
-          
+          f.close
+
           if path_ignored
             date_str= Date.new.to_s
+            f = File.open( '.gitignore', 'r+') 
             n = File.new(".gitignore-#{date_str}",  "w+")
             f.each { |line| 
               n.puts line unless line == path_ignored
             }
             n.close            
+            f.close
+            File.rename( ".gitignore-#{date_str}", ".gitignore" )
+            Git.instance.add(".gitignore")
           end
-          f.close
-          File.rename( ".gitignore-#{date_str}", ".gitignore" )
-          git.add(".gitignore")
         end        
-        
       end
       
       private
@@ -198,7 +209,7 @@ module Braid
           "#{self.class.command} #{name}"
         end
 
-        def git
+        def gitclone
           GitClone.instance
         end
     end
@@ -436,6 +447,10 @@ module Braid
     end
 
     module VersionControl
+      def gitclone
+        GitClone.instance
+      end
+
       def git
         Git.instance
       end

data/lib/braid/rspec_git.rb

@@ -9,6 +9,10 @@ module RSpec
       @url = url
     end
     
+    def msg(str)
+      puts "RSpec: #{str}"
+    end
+
     def plugins_fetched?
       submodules.all? {|s| File.directory?(s[:path]) }
     end
@@ -19,8 +23,9 @@ module RSpec
       repos.each do |r|
         if File.exist?(r[:path])
           msg "** Updating #{r[:name]}"
-          # target = ENV['REMOTE'] ? "#{ENV['REMOTE']} master" : ""
-          unless system("cd #{r[:path]} && git pull --rebase #{target}")
+          target = target ? target : "master" 
+          # unless system("cd #{r[:path]} && git pull --rebase #{target}")
+          unless system("cd #{r[:path]} && git pull --rebase #{r[:url]} #{target}")
             msg "Error updating #{r[:name]}"
             exit 1
           end

data/lib/braid.rb

@@ -9,7 +9,8 @@ module Braid
   def self.verbose; @verbose || false; end
   def self.verbose=(new_value); @verbose = !!new_value; end
 
-  def self.use_local_cache; [nil, "true", "1"].include?(ENV["BRAID_USE_LOCAL_CACHE"]); end
+  # def self.use_local_cache; [nil, "true", "1"].include?(ENV["BRAID_USE_LOCAL_CACHE"]); end
+  def self.use_local_cache; false; end
   def self.local_cache_dir; File.expand_path(ENV["BRAID_LOCAL_CACHE_DIR"] || "#{ENV["HOME"]}/.braid/cache"); end
 
   class BraidError < StandardError

metadata

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