braid 1.0.10 → 1.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 37be2b94c125a05dd9b215f3146a4938cebcc5ed
-  data.tar.gz: 9b83f817454c020924e75e88fe2aa19cef967b81
+  metadata.gz: cab5b4a0635df158bf25ffe1fa9d32f5b7f3bf30
+  data.tar.gz: b435890d0ed321e80b89cb56b71a46c6e638add8
 SHA512:
-  metadata.gz: 06a6f9f7aefd950057e3708c3c86d0d98222fff882740d8efa82c36ef1e77eb1a8c9f618b6bd865b7e294fc6b8f4adc1db3cbcca9d48ab8aba07d325a45935b1
-  data.tar.gz: 22ba789027b7a1612fa4f84fcbacf4fdd90ec8c8867d612a9d0182cbd0492337354e2771b44ddee79a0fb27fd9fd08d3db60556b44d27bf01c4a72a603ede5e4
+  metadata.gz: 16333b71784a667c94a8250e26f0ce82c5edf73060b388538cb5fbdf9cd892aab10fef7375e50592d358c0e8e90cc4cd693ec94120e7c448169fb639a47cdf76
+  data.tar.gz: c65b7965793f1a0350e480f9eb395073e2a875a7a42f2d5c4d900effe63a9d3af8c70ae092c043829815ecfd73afbbf1e19f806c2cd1ac1840b6c4595ece9301

data/bin/braid

@@ -55,6 +55,7 @@ Main {
         * get new changes from remote
         * always creates a merge commit
         * updates metadata in .braids.json when revisions are changed
+        * removes the git remote by default, --keep can be used to suppress that
 
       Defaults to updating all unlocked mirrors if none is specified.
     TXT
@@ -64,11 +65,16 @@ Main {
       . braid update local/dir
     TXT
 
-    mixin :optional_path, :option_revision, :option_head, :option_verbose
+    mixin :optional_path, :option_revision, :option_head, :option_verbose, :option_keep_remote
 
     run {
+      options = {
+        'revision' => revision,
+        'head' => head,
+        'keep' => keep
+      }
       Braid.verbose = verbose
-      Braid::Command.run(:update, path, {'revision' => revision, 'head' => head})
+      Braid::Command.run(:update, path, options)
     }
   }
 
@@ -88,8 +94,8 @@ Main {
     mixin :argument_path, :option_verbose, :option_keep_remote
 
     run {
-      options       = {
-          :keep => keep
+      options = {
+        :keep => keep
       }
       Braid.verbose = verbose
       Braid::Command.run(:remove, path, options)
@@ -101,10 +107,13 @@ Main {
       Show diff of local changes to mirror.
     TXT
 
-    mixin :argument_path, :option_verbose
+    mixin :optional_path, :option_verbose, :option_keep_remote
 
     run {
-      Braid::Command.run(:diff, path)
+      options = {
+        'keep' => keep
+      }
+      Braid::Command.run(:diff, path, options)
     }
   }
 
@@ -113,11 +122,14 @@ Main {
       Push local mirror changes to remote.
     TXT
 
-    mixin :argument_path, :option_verbose
+    mixin :argument_path, :option_verbose, :option_keep_remote
 
     run {
+      options = {
+        'keep' => keep
+      }
       Braid.verbose = verbose
-      Braid::Command.run(:push, path)
+      Braid::Command.run(:push, path, options)
     }
   }
 
@@ -154,6 +166,17 @@ Main {
     }
   }
 
+  mode(:status) {
+    description 'Show the status of all tracked mirrors (and if updates are available).'
+
+    mixin :optional_path, :option_verbose
+
+    run {
+      Braid.verbose = verbose
+      Braid::Command.run(:status, path)
+    }
+  }
+
   mixin(:argument_path) {
     argument(:path) {
       attr

data/lib/braid.rb

@@ -48,3 +48,4 @@ require 'braid/commands/push'
 require 'braid/commands/remove'
 require 'braid/commands/setup'
 require 'braid/commands/update'
+require 'braid/commands/status'

data/lib/braid/command.rb

@@ -48,6 +48,10 @@ module Braid
       Command.run(:setup, mirror.path)
     end
 
+    def clear_remote(mirror, options)
+      git.remote_rm(mirror.remote) unless options['keep']
+    end
+
     def use_local_cache?
       Braid.use_local_cache
     end

data/lib/braid/commands/add.rb

@@ -30,6 +30,8 @@ module Braid
 
           git.commit("Add mirror '#{mirror.path}' at #{display_revision(mirror)}")
           msg "Added mirror at #{display_revision(mirror)}."
+
+          clear_remote(mirror, options)
         end
       end
     end

data/lib/braid/commands/diff.rb

@@ -1,12 +1,33 @@
 module Braid
   module Commands
     class Diff < Command
-      def run(path)
+      def run(path = nil, options = {})
+        with_reset_on_error do
+          path ? diff_one(path, options) : diff_all(options)
+        end
+      end
+
+      protected
+
+       def diff_all(options = {})
+        print "\n"
+        msg "Diffing all mirrors.\n=======================================================\n"
+        config.mirrors.each do |path|
+          msg "Diffing #{path}\n=======================================================\n"
+          diff_one(path, options)
+          msg "=======================================================\n"
+        end
+        print "\n"
+      end
+
+      def diff_one(path, options = {})
         mirror = config.get!(path)
         setup_remote(mirror)
 
         diff = mirror.diff
         puts diff unless diff.empty?
+
+        clear_remote(mirror, options)
       end
     end
   end

data/lib/braid/commands/list.rb

@@ -2,37 +2,9 @@ module Braid
   module Commands
     class List < Command
       def run(path = nil, options = {})
-        with_reset_on_error do
-          path ? list_one(path, options) : list_all(options)
-        end
+        msg "WARNING: list command is deprecated. Please use \"braid status\" instead.\n"
+        Command.run(:status, path, options)
       end
-
-      protected
-      def list_all(options = {})
-        options.reject! { |k, v| %w(revision head).include?(k) }
-        print "\n"
-        msg "Listing all mirrors.\n=======================================================\n"
-        config.mirrors.each do |path|
-          mirror = config.get!(path)
-          print path.to_s
-          print ' (' + mirror.base_revision + ')'
-          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'])
-          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"
-      end
-
     end
   end
 end

data/lib/braid/commands/push.rb

@@ -41,6 +41,8 @@ module Braid
           git.push(remote_url, "HEAD:#{mirror.branch}")
         end
         FileUtils.rm_r(clone_dir)
+
+        clear_remote(mirror, options)
       end
     end
   end

data/lib/braid/commands/setup.rb

@@ -27,7 +27,7 @@ module Braid
           end
         end
 
-        msg "Setup: Creating remote for '#{mirror.path}'."
+        msg "Setup: Creating remote for '#{mirror.path}'." if verbose?
         url = use_local_cache? ? git_cache.path(mirror.url) : mirror.url
         git.remote_add(mirror.remote, url, mirror.branch)
       end

data/lib/braid/commands/status.rb

@@ -0,0 +1,42 @@
+module Braid
+  module Commands
+    class Status < Command
+      def run(path = nil, options = {})
+        with_reset_on_error do
+          path ? status_one(path, options) : status_all(options)
+        end
+      end
+
+      protected
+
+      def status_all(options = {})
+        print "\n"
+        msg "Listing all mirrors.\n=======================================================\n"
+        config.mirrors.each do |path|
+          list_one(path, options)
+        end
+        print "\n"
+      end
+
+      def status_one(path, options = {})
+        mirror = config.get!(path)
+        setup_remote(mirror)
+        mirror.fetch
+        print path.to_s
+        print ' (' + mirror.base_revision + ')'
+        print ' [LOCKED]' if mirror.locked?
+        msg "Fetching new commits for '#{mirror.path}'." if verbose?
+        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"
+        clear_remote(mirror, options)
+      end
+    end
+  end
+end

data/lib/braid/commands/update.rb

@@ -2,9 +2,7 @@ module Braid
   module Commands
     class Update < Command
       def run(path, options = {})
-        with_reset_on_error do
-          path ? update_one(path, options) : update_all(options)
-        end
+        path ? update_one(path, options) : update_all(options)
       end
 
       protected
@@ -13,6 +11,7 @@ module Braid
         options.reject! { |k, v| %w(revision head).include?(k) }
         msg 'Updating all mirrors.'
         config.mirrors.each do |path|
+          bail_on_local_changes!
           update_one(path, options)
         end
       end
@@ -44,13 +43,14 @@ module Braid
         begin
           new_revision = validate_new_revision(mirror, options['revision'])
         rescue InvalidRevision
-          # Ignored as it means the revision matches expecte
+          # Ignored as it means the revision matches expected
         end
         target_revision = determine_target_revision(new_revision)
 
         if (options['revision'] && was_locked && target_revision == mirror.base_revision) ||
           (options['revision'].nil? && !was_locked && mirror.merged?(target_revision))
           msg "Mirror '#{mirror.path}' is already up to date."
+          clear_remote(mirror, options)
           return
         end
 
@@ -63,6 +63,7 @@ module Braid
         mirror.lock = new_revision if options['revision']
 
         msg "Merging in mirror '#{mirror.path}'." if verbose?
+        in_error = false
         begin
           if mirror.squashed?
             local_hash                    = git.rev_parse('HEAD')
@@ -75,6 +76,7 @@ module Braid
             git.merge_subtree(target_revision)
           end
         rescue Operations::MergeError => error
+          in_error = true
           print error.conflicts_text
           msg 'Caught merge error. Breaking.'
         end
@@ -83,13 +85,14 @@ module Braid
         add_config_file
 
         commit_message = "Update mirror '#{mirror.path}' to #{display_revision(mirror)}"
-        if error
+        if in_error
           File.open('.git/MERGE_MSG', 'w') { |f| f.puts(commit_message) }
           return
         end
 
         git.commit(commit_message)
         msg "Updated mirror to #{display_revision(mirror)}."
+        clear_remote(mirror, options)
       end
 
       def generate_tree_hash(mirror, revision)
@@ -97,7 +100,7 @@ module Braid
           git.read_tree_im('HEAD')
           git.rm_r_cached(mirror.path)
           git.read_tree_prefix_i(revision, mirror.path)
-          git.write_tree()
+          git.write_tree
         end
       end
     end

data/lib/braid/mirror.rb

@@ -1,6 +1,6 @@
 module Braid
   class Mirror
-    ATTRIBUTES = %w(url remote branch squashed revision lock)
+    ATTRIBUTES = %w(url branch squashed revision lock)
 
     class UnknownType < BraidError
       def message
@@ -27,14 +27,12 @@ module Braid
 
       branch = options['branch'] || 'master'
 
-      unless path = options['path'] || extract_path_from_url(url)
-        raise PathRequired
-      end
+      path = (options['path'] || extract_path_from_url(url)).sub(/\/$/, '')
+      raise PathRequired unless path
 
-      remote   = "#{branch}/braid/#{path}"
       squashed = !options['full']
 
-      attributes = {'url' => url, 'remote' => remote, 'branch' => branch, 'squashed' => squashed}
+      attributes = {'url' => url, 'branch' => branch, 'squashed' => squashed}
       self.new(path, attributes)
     end
 
@@ -90,11 +88,7 @@ module Braid
     end
 
     def remote
-      if (attributes['remote'] && attributes['remote'] =~ /^braid\//)
-        attributes['remote'] = "#{branch}/#{attributes['remote']}"
-      else
-        attributes['remote']
-      end
+      "#{branch}/braid/#{path}"
     end
 
     private

data/lib/braid/operations.rb

@@ -147,14 +147,6 @@ module Braid
         [status, out, err]
       end
 
-      def sh(cmd, message = nil)
-        message ||= 'could not fetch' if cmd =~ /fetch/
-        log(cmd)
-        `#{cmd}`
-        raise ShellExecutionError, message unless $?.exitstatus == 0
-        true
-      end
-
       def msg(str)
         puts "Braid: #{str}"
       end
@@ -193,8 +185,7 @@ module Braid
 
       def fetch(remote = nil, *args)
         args.unshift "-n #{remote}" if remote
-        # open4 messes with the pipes of index-pack
-        sh("git fetch #{args.join(' ')} > #{Gem.win_platform? ? 'nul' : '/dev/null'}")
+        exec!("git fetch #{args.join(' ')} > #{Gem.win_platform? ? 'nul' : '/dev/null'}")
       end
 
       def checkout(treeish)

data/lib/braid/version.rb

@@ -1,3 +1,3 @@
 module Braid
-  VERSION = '1.0.10'
+  VERSION = '1.0.11'
 end

data/spec/integration/adding_spec.rb

@@ -36,7 +36,6 @@ describe 'Adding a mirror in a clean repository' do
       braids['skit1']['url'].should == @skit1
       braids['skit1']['revision'].should_not be_nil
       braids['skit1']['branch'].should == 'master'
-      braids['skit1']['remote'].should == 'master/braid/skit1'
     end
   end
 end

data/spec/mirror_spec.rb

@@ -10,6 +10,11 @@ describe 'Braid::Mirror.new_from_options' do
     new_from_options('http://path.git')
     @mirror.path.should == 'path'
   end
+
+  it 'should strip trailing slash from specified path' do
+    new_from_options('http://path.git', 'path' => 'vendor/tools/mytool/')
+    @mirror.path.should == 'vendor/tools/mytool'
+  end
 end
 
 describe 'Braid::Mirror#diff' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braid
 version: !ruby/object:Gem::Version
-  version: 1.0.10
+  version: 1.0.11
 platform: ruby
 authors:
 - Cristi Balan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-22 00:00:00.000000000 Z
+date: 2017-03-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
@@ -93,6 +93,7 @@ files:
 - lib/braid/commands/push.rb
 - lib/braid/commands/remove.rb
 - lib/braid/commands/setup.rb
+- lib/braid/commands/status.rb
 - lib/braid/commands/update.rb
 - lib/braid/config.rb
 - lib/braid/mirror.rb