braid 0.7.1 → 1.0.0

data/lib/braid.rb

@@ -1,12 +1,11 @@
-$:.unshift dirname = File.dirname(__FILE__)
 require 'braid/version'
 
 module Braid
-  CONFIG_FILE          = ".braids"
-  REQUIRED_GIT_VERSION = "1.6"
+  CONFIG_FILE          = '.braids'
+  REQUIRED_GIT_VERSION = '1.6'
 
   def self.verbose
-    @verbose || false
+    !!@verbose
   end
 
   def self.verbose=(new_value)
@@ -14,7 +13,7 @@ module Braid
   end
 
   def self.force
-    @force || false
+    !!@force
   end
 
   def self.force=(new_value)
@@ -22,11 +21,11 @@ module Braid
   end
 
   def self.use_local_cache
-    [nil, "true", "1"].include?(ENV["BRAID_USE_LOCAL_CACHE"])
+    [nil, 'true', '1'].include?(ENV['BRAID_USE_LOCAL_CACHE'])
   end
 
   def self.local_cache_dir
-    File.expand_path(ENV["BRAID_LOCAL_CACHE_DIR"] || "#{ENV["HOME"]}/.braid/cache")
+    File.expand_path(ENV['BRAID_LOCAL_CACHE_DIR'] || "#{ENV['HOME']}/.braid/cache")
   end
 
   class BraidError < StandardError
@@ -37,12 +36,14 @@ module Braid
   end
 end
 
-require dirname + '/core_ext'
 require 'braid/operations'
 require 'braid/mirror'
 require 'braid/config'
 require 'braid/command'
-
-Dir[dirname + '/braid/commands/*'].each do |file|
-  require file
-end
+require 'braid/commands/add'
+require 'braid/commands/diff'
+require 'braid/commands/list'
+require 'braid/commands/push'
+require 'braid/commands/remove'
+require 'braid/commands/setup'
+require 'braid/commands/update'

data/lib/braid/command.rb

@@ -31,7 +31,7 @@ module Braid
     end
 
     def config
-      @config ||= load_and_migrate_config
+      @config ||= Config.new
     end
 
     def verbose?
@@ -61,6 +61,8 @@ module Braid
     end
 
     def with_reset_on_error
+      bail_on_local_changes!
+
       work_head = git.head
 
       begin
@@ -72,65 +74,30 @@ module Braid
       end
     end
 
-    def load_and_migrate_config
-      config = Config.new
-      unless config.valid?
-        msg "Configuration is outdated. Migrating."
-        bail_on_local_changes!
-        config.migrate!
-        git.commit("Upgrade .braids", "-- .braids")
-      end
-      config
-    end
-
     def add_config_file
       git.add(CONFIG_FILE)
     end
 
     def display_revision(mirror, revision = nil)
       revision ||= mirror.revision
-      mirror.type == "svn" ? "r#{revision}" : "'#{revision[0, 7]}'"
+      "'#{revision[0, 7]}'"
     end
 
     def validate_new_revision(mirror, new_revision)
-      unless new_revision
-        unless mirror.type == "svn"
-          return git.rev_parse(mirror.remote)
-        else
-          return svn.head_revision(mirror.url)
-        end
-      end
+      return git.rev_parse(mirror.remote) unless new_revision
 
-      unless mirror.type == "svn"
-        new_revision = git.rev_parse(new_revision)
-      else
-        new_revision = svn.clean_revision(new_revision)
-      end
+      new_revision = git.rev_parse(new_revision)
       old_revision = mirror.revision
 
       if new_revision == old_revision
-        raise InvalidRevision, "mirror is already at requested revision"
-      end
-
-      if mirror.type == "svn"
-        if old_revision && new_revision < old_revision
-          raise InvalidRevision, "local revision is higher than request revision"
-        end
-
-        if svn.head_revision(mirror.url) < new_revision
-          raise InvalidRevision, "requested revision is higher than remote revision"
-        end
+        raise InvalidRevision, 'mirror is already at requested revision'
       end
 
       new_revision
     end
 
-    def determine_target_revision(mirror, new_revision)
-      unless mirror.type == "svn"
-        git.rev_parse(new_revision)
-      else
-        git_svn.commit_hash(mirror.remote, new_revision)
-      end
+    def determine_target_revision(new_revision)
+      git.rev_parse(new_revision)
     end
   end
 end

data/lib/braid/commands/add.rb

@@ -2,14 +2,12 @@ module Braid
   module Commands
     class Add < Command
       def run(url, options = {})
-        bail_on_local_changes!
-
         with_reset_on_error do
           mirror           = config.add_from_options(url, options)
 
-          branch_message   = (mirror.type == "svn" || mirror.branch == "master") ? "" : " branch '#{mirror.branch}'"
-          revision_message = options["revision"] ? " at #{display_revision(mirror, options["revision"])}" : ""
-          msg "Adding #{mirror.type} mirror of '#{mirror.url}'#{branch_message}#{revision_message}."
+          branch_message   = (mirror.branch == 'master') ? '' : " branch '#{mirror.branch}'"
+          revision_message = options['revision'] ? " at #{display_revision(mirror, options['revision'])}" : ''
+          msg "Adding mirror of '#{mirror.url}'#{branch_message}#{revision_message}."
 
           # these commands are explained in the subtree merge guide
           # http://www.kernel.org/pub/software/scm/git/docs/howto/using-merge-subtree.html
@@ -17,8 +15,8 @@ module Braid
           setup_remote(mirror)
           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(new_revision)
 
           unless mirror.squashed?
             git.merge_ours(target_revision)
@@ -26,7 +24,7 @@ module Braid
           git.read_tree_prefix(target_revision, mirror.path)
 
           mirror.revision = new_revision
-          mirror.lock = new_revision if options["revision"]
+          mirror.lock = new_revision if options['revision']
           config.update(mirror)
           add_config_file
 

data/lib/braid/commands/list.rb

@@ -12,16 +12,21 @@ module Braid
         options.reject! { |k, v| %w(revision head).include?(k) }
         print "\n"
         msg "Listing all mirrors.\n=======================================================\n"
-        config.mirrors.each_with_index do |path, i|
+        config.mirrors.each do |path|
           mirror = config.get!(path)
-          print " #{i + 1}) #{path.to_s}"
-          print " [LOCKED]" if mirror.locked?
+          print path.to_s
+          print ' [LOCKED]' if mirror.locked?
           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)
-          print " !!! UPDATE AVAILABLE !!!" if new_revision.to_s != mirror.base_revision.to_s
+          new_revision    = validate_new_revision(mirror, options['revision'])
+          print ' (Remote Modified)' if new_revision.to_s != mirror.base_revision.to_s
+          local_file_count = git.read_ls_files(mirror.path).split.size
+          if 0 == local_file_count
+            print ' (Removed Locally)'
+          elsif !mirror.diff.empty?
+            print ' (Locally Modified)'
+          end
           print "\n"
         end
         print "\n"

data/lib/braid/commands/push.rb

@@ -11,13 +11,13 @@ module Braid
 
         base_revision = git.rev_parse(mirror.remote)
         unless mirror.merged?(base_revision)
-          msg "Mirror is not up to date. Stopping."
+          msg 'Mirror is not up to date. Stopping.'
           return
         end
 
         diff = mirror.diff
         if diff.empty?
-          msg "No local changes found. Stopping."
+          msg 'No local changes found. Stopping.'
           return
         end
 
@@ -31,14 +31,14 @@ module Braid
           remote_url = File.expand_path(remote_url)
         end
         Dir.chdir(clone_dir) do
-          msg "Cloning mirror with local changes."
+          msg 'Cloning mirror with local changes.'
           git.init
           git.fetch(source_dir)
           git.fetch(remote_url, "+refs/heads/#{mirror.branch}")
           git.checkout(base_revision)
           git.apply(diff)
-          system("git commit -v")
-          msg "Pushing changes to remote."
+          system('git commit -v')
+          msg 'Pushing changes to remote.'
           git.push(remote_url, "HEAD:#{mirror.branch}")
         end
         FileUtils.rm_r(clone_dir)

data/lib/braid/commands/remove.rb

@@ -4,8 +4,6 @@ module Braid
       def run(path, options = {})
         mirror = config.get!(path)
 
-        bail_on_local_changes!
-
         with_reset_on_error do
           msg "Removing mirror from '#{mirror.path}'."
 
@@ -24,7 +22,7 @@ module Braid
           end
 
           git.commit("Remove mirror '#{mirror.path}'")
-          msg "Removed mirror." if verbose?
+          msg 'Removed mirror.' if verbose?
         end
       end
     end

data/lib/braid/commands/setup.rb

@@ -6,9 +6,9 @@ module Braid
       end
 
       protected
-      
+
       def setup_all
-        msg "Setting up all mirrors."
+        msg 'Setting up all mirrors.'
         config.mirrors.each do |path|
           setup_one(path)
         end
@@ -28,12 +28,8 @@ module Braid
         end
 
         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)
-        else
-          git_svn.init(mirror.remote, mirror.url)
-        end
+        url = use_local_cache? ? git_cache.path(mirror.url) : mirror.url
+        git.remote_add(mirror.remote, url, mirror.branch)
       end
     end
   end

data/lib/braid/commands/update.rb

@@ -2,8 +2,6 @@ module Braid
   module Commands
     class Update < Command
       def run(path, options = {})
-        bail_on_local_changes!
-
         with_reset_on_error do
           path ? update_one(path, options) : update_all(options)
         end
@@ -13,7 +11,7 @@ module Braid
 
       def update_all(options = {})
         options.reject! { |k, v| %w(revision head).include?(k) }
-        msg "Updating all mirrors."
+        msg 'Updating all mirrors.'
         config.mirrors.each do |path|
           update_one(path, options)
         end
@@ -27,10 +25,10 @@ module Braid
 
         # check options for lock modification
         if mirror.locked?
-          if options["head"]
+          if options['head']
             msg "Unlocking mirror '#{mirror.path}'." if verbose?
             mirror.lock = nil
-          elsif !options["revision"]
+          elsif !options['revision']
             msg "Mirror '#{mirror.path}' is locked to #{display_revision(mirror, mirror.lock)}. Use --head to force."
             return
           end
@@ -40,8 +38,8 @@ module Braid
         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(new_revision)
 
         if mirror.merged?(target_revision)
           msg "Mirror '#{mirror.path}' is already up to date."
@@ -54,26 +52,26 @@ module Braid
         end
 
         mirror.revision = new_revision
-        mirror.lock = new_revision if options["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")
+            local_hash = git.rev_parse('HEAD')
             if !diff.empty?
               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_#{local_hash}"]  = 'HEAD'
             ENV["GITHEAD_#{remote_hash}"] = target_revision
             git.merge_recursive(base_hash, local_hash, remote_hash)
           else
             git.merge_subtree(target_revision)
           end
         rescue Operations::MergeError => error
-          msg "Caught merge error. Breaking."
+          msg 'Caught merge error. Breaking.'
         end
 
         config.update(mirror)
@@ -81,7 +79,7 @@ module Braid
 
         commit_message = "Update mirror '#{mirror.path}' to #{display_revision(mirror)}"
         if error
-          File.open(".git/MERGE_MSG", 'w') { |f| f.puts(commit_message) }
+          File.open('.git/MERGE_MSG', 'w') { |f| f.puts(commit_message) }
           return
         end
 
@@ -93,8 +91,8 @@ module Braid
         git.rm_r(mirror.path)
         git.read_tree_prefix(revision, mirror.path)
         success = git.commit("Temporary commit for mirror '#{mirror.path}'")
-        hash    = git.rev_parse("HEAD")
-        git.reset_hard("HEAD^") if success
+        hash    = git.rev_parse('HEAD')
+        git.reset_hard('HEAD^') if success
         hash
       end
     end

data/lib/braid/config.rb

@@ -1,4 +1,5 @@
 require 'yaml'
+require 'json'
 require 'yaml/store'
 
 module Braid
@@ -15,7 +16,18 @@ module Braid
     end
 
     def initialize(config_file = CONFIG_FILE)
-      @db = YAML::Store.new(config_file)
+      @config_file = config_file
+      begin
+        store = YAML::Store.new(@config_file)
+        @db = {}
+        store.transaction(true) do
+          store.roots.each do |path|
+            @db[path] = store[path]
+          end
+        end
+      rescue
+        @db = JSON.parse(@config_file)
+      end
     end
 
     def add_from_options(url, options)
@@ -26,17 +38,13 @@ module Braid
     end
 
     def mirrors
-      @db.transaction(true) do
-        @db.roots
-      end
+      @db.keys
     end
 
     def get(path)
-      @db.transaction(true) do
-        if attributes = @db[path.to_s.sub(/\/$/, '')]
-          Mirror.new(path, attributes)
-        end
-      end
+      key = path.to_s.sub(/\/$/, '')
+      attributes = @db[key]
+      return attributes ? Mirror.new(path, attributes) : nil
     end
 
     def get!(path)
@@ -46,52 +54,39 @@ module Braid
     end
 
     def add(mirror)
-      @db.transaction do
-        raise PathAlreadyInUse, mirror.path if @db[mirror.path]
-        write_mirror(mirror)
-      end
+      raise PathAlreadyInUse, mirror.path if get(mirror.path)
+      write_mirror(mirror)
     end
 
     def remove(mirror)
-      @db.transaction do
-        @db.delete(mirror.path)
-      end
+      @db.delete(mirror.path)
+      write_db
     end
 
     def update(mirror)
-      @db.transaction do
-        raise MirrorDoesNotExist, mirror.path unless @db[mirror.path]
-        @db.delete(mirror.path)
-        write_mirror(mirror)
-      end
+      raise MirrorDoesNotExist, mirror.path unless get(mirror.path)
+      @db.delete(mirror.path)
+      write_mirror(mirror)
     end
 
-    def valid?
-      @db.transaction(true) do
-        !@db.roots.any? do |path|
-          @db[path]["url"].nil?
-        end
-      end
+    private
+    def write_mirror(mirror)
+      @db[mirror.path] = clean_attributes(mirror.attributes)
+      write_db
     end
 
-    def migrate!
-      @db.transaction do
-        @db.roots.each do |path|
-          attributes = @db[path]
-          if attributes["local_branch"]
-            attributes["url"]      = attributes.delete("remote")
-            attributes["remote"]   = attributes.delete("local_branch")
-            attributes["squashed"] = attributes.delete("squash")
-            attributes["lock"]     = attributes["revision"] # so far this has always been true
-          end
-          @db[path] = clean_attributes(attributes)
+    def write_db
+      new_db = {}
+      @db.keys.sort.each do |key|
+        new_db[key] = @db[key]
+        new_db[key].keys.each do |k|
+          new_db[key].delete(k) if !Braid::Mirror::ATTRIBUTES.include?(k)
         end
       end
-    end
-
-    private
-    def write_mirror(mirror)
-      @db[mirror.path] = clean_attributes(mirror.attributes)
+      File.open(@config_file, "wb") do |f|
+        f.write JSON.pretty_generate(new_db)
+        f.write "\n"
+      end
     end
 
     def clean_attributes(hash)