braid 1.0.13 → 1.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f7da0717c5630a66b413b1017a48faab2c8985eb
-  data.tar.gz: 370241cf4019745d32295bc81540a938b92a7c6c
+  metadata.gz: 2ea7f832727df1483b0ba45181553cf061f2539a
+  data.tar.gz: dab214bf42041f02f3b6edd29cc8229866689199
 SHA512:
-  metadata.gz: ee8069fa55924180bbb01ba8c8ccd6896260b5676cd193a4049c895bb9a89005057f99ef7857968a3a791dedd7546137a155a4a4047d0916016ed2df23284416
-  data.tar.gz: 5cd58bac89bc692b33e9c9cc6ff39c11847b29f15a33dbb41f734010fd9a186189d86ac8f1bb8dfd7dcf10fb8bcd9c2498dfe3d91bb5da787f2e8de5a28fd775
+  metadata.gz: 5aba65dd373480d84c90ea6d4ff7c1e664fcf360d1c344339dccf1a5f92c20f8c2c392793dce5f58cbad7c081d35044a55e64b6871067dbb861080dc796b4d8f
+  data.tar.gz: 190985839fe84ff0157dda1debcd3021c547e1a5d8164f011fab647ba644323957e62158f462dcd6a115da1f40797c418f054da5e9791a016d9f69f5c9dafdd0

data/.travis.yml

@@ -1,10 +1,20 @@
 language: ruby
+sudo: false
 rvm:
-  - 2.1.3
+  - 2.3.1
   - 1.9.3
   - jruby-19mode
   - jruby-18mode
+addons:
+  apt:
+    sources:
+    - git-core
+    packages:
+    - git
 git:
   depth: 10
 before_install:
+  - git --version
+  - git config --global user.name "Somebody"
+  - git config --global user.email "you@example.com"
   - gem update bundler

data/bin/braid

@@ -122,11 +122,12 @@ Main {
       Push local mirror changes to remote.
     TXT
 
-    mixin :argument_path, :option_verbose, :option_keep_remote
+    mixin :argument_path, :option_branch, :option_verbose, :option_keep_remote
 
     run {
       options = {
-        'keep' => keep
+        'keep' => keep,
+        'branch' => branch
       }
       Braid.verbose = verbose
       Braid::Command.run(:push, path, options)

data/lib/braid/commands/push.rb

@@ -7,6 +7,8 @@ module Braid
       def run(path, options = {})
         mirror = config.get!(path)
 
+        branch = options['branch'] || mirror.branch
+
         setup_remote(mirror)
         mirror.fetch
 
@@ -40,8 +42,8 @@ module Braid
           git.checkout(base_revision)
           git.apply(diff)
           system('git commit -v')
-          msg 'Pushing changes to remote.'
-          git.push(remote_url, "HEAD:#{mirror.branch}")
+          msg "Pushing changes to remote branch #{branch}."
+          git.push(remote_url, "HEAD:refs/heads/#{branch}")
         end
         FileUtils.rm_r(clone_dir)
 

data/lib/braid/commands/update.rb

@@ -41,7 +41,7 @@ module Braid
 
         new_revision = options['revision']
         begin
-          new_revision = validate_new_revision(mirror, options['revision'])
+          new_revision = validate_new_revision(mirror, new_revision)
         rescue InvalidRevision
           # Ignored as it means the revision matches expected
         end

data/lib/braid/operations.rb

@@ -152,7 +152,7 @@ module Braid
       end
 
       def log(cmd)
-        msg "Executing `#{cmd}`" if verbose?
+        msg "Executing `#{cmd}` in #{Dir.pwd}" if verbose?
       end
 
       def verbose?

data/lib/braid/version.rb

@@ -1,3 +1,3 @@
 module Braid
-  VERSION = '1.0.13'
+  VERSION = '1.0.14'
 end

data/spec/integration/push_spec.rb

@@ -0,0 +1,88 @@
+require File.dirname(__FILE__) + '/../integration_helper'
+
+describe 'Pushing to a mirror' do
+
+  before do
+    FileUtils.rm_rf(TMP_PATH)
+    FileUtils.mkdir_p(TMP_PATH)
+  end
+
+  describe 'from a git repository' do
+    before do
+      @repository_dir = create_git_repo_from_fixture('shiny')
+      @vendor_repository_dir = create_git_repo_from_fixture('skit1')
+      @file_name = 'layouts/layout.liquid'
+
+      in_dir(@repository_dir) do
+        run_command("#{BRAID_BIN} add #{@vendor_repository_dir}")
+      end
+
+      in_dir(@vendor_repository_dir) do
+        run_command('git config receive.denyCurrentBranch updateInstead')
+      end
+
+      update_dir_from_fixture('shiny/skit1', 'skit1.1')
+      in_dir(@repository_dir) do
+        run_command('git add *')
+        run_command('git commit -m "Make some changes to vendored files"')
+      end
+    end
+
+    context 'with remote updtodate' do
+      it 'should push changes successfully' do
+        braid_output = nil
+        in_dir(@repository_dir) do
+          set_editor_message('Make some changes')
+          braid_output = run_command("#{EDITOR_CMD_PREFIX} #{BRAID_BIN} push skit1")
+        end
+        braid_output.should =~ /Braid: Cloning mirror with local changes./
+        braid_output.should =~ /Make some changes/
+        braid_output.should =~ /Braid: Pushing changes to remote branch master./
+
+        assert_no_diff("#{FIXTURE_PATH}/skit1.1/#{@file_name}", "#{@repository_dir}/skit1/#{@file_name}")
+        assert_no_diff("#{FIXTURE_PATH}/skit1.1/#{@file_name}", "#{@vendor_repository_dir}/#{@file_name}")
+      end
+
+      it 'should push changes to specified branch successfully' do
+        braid_output = nil
+        in_dir(@repository_dir) do
+          set_editor_message('Make some changes')
+          braid_output = run_command("#{EDITOR_CMD_PREFIX} #{BRAID_BIN} push skit1 --branch MyBranch")
+        end
+        braid_output.should =~ /Braid: Cloning mirror with local changes./
+        braid_output.should =~ /Make some changes/
+        braid_output.should =~ /Braid: Pushing changes to remote branch MyBranch./
+
+        assert_no_diff("#{FIXTURE_PATH}/skit1/#{@file_name}", "#{@vendor_repository_dir}/#{@file_name}")
+        assert_no_diff("#{FIXTURE_PATH}/skit1.1/#{@file_name}", "#{@repository_dir}/skit1/#{@file_name}")
+
+        in_dir(@vendor_repository_dir) do
+          run_command('git checkout MyBranch 2>&1')
+        end
+
+        assert_no_diff("#{FIXTURE_PATH}/skit1.1/#{@file_name}", "#{@vendor_repository_dir}/#{@file_name}")
+      end
+    end
+
+    context 'with remote having changes' do
+      before do
+        update_dir_from_fixture('skit1', 'skit1.1')
+        update_dir_from_fixture('skit1', 'skit1.2')
+        in_dir(@vendor_repository_dir) do
+          run_command('git add *')
+          run_command('git commit -m "Update vendored directory"')
+        end
+      end
+      it 'should push changes successfully' do
+        braid_output = nil
+        in_dir(@repository_dir) do
+          set_editor_message('Make some changes')
+          braid_output = run_command("#{EDITOR_CMD_PREFIX} #{BRAID_BIN} push skit1")
+        end
+        braid_output.should =~ /Braid: Mirror is not up to date. Stopping./
+
+        assert_no_diff("#{FIXTURE_PATH}/skit1.2/#{@file_name}", "#{TMP_PATH}/skit1/#{@file_name}")
+      end
+    end
+  end
+end

data/spec/integration/updating_spec.rb

@@ -97,9 +97,9 @@ describe 'Updating a mirror' do
           run_command('git commit -m "delete here too"')
         end
 
-	# Without the fix, when git diffs the base and local trees, it will
-	# think skit1/layouts/layout.liquid was renamed to
-	# other-skit/layout.liquid, resulting in a rename-delete conflict.
+        # Without the fix, when git diffs the base and local trees, it will
+        # think skit1/layouts/layout.liquid was renamed to
+        # other-skit/layout.liquid, resulting in a rename-delete conflict.
         braid_output = nil
         in_dir(@shiny) do
           braid_output = run_command("#{BRAID_BIN} update skit1")

data/spec/integration_helper.rb

@@ -7,6 +7,8 @@ require 'fileutils'
 require 'pathname'
 
 TMP_PATH     = File.join(Dir.tmpdir, 'braid_integration')
+EDITOR_CMD   = "#{TMP_PATH}/editor"
+EDITOR_CMD_PREFIX = "GIT_EDITOR=#{EDITOR_CMD}"
 BRAID_PATH   = Pathname.new(File.dirname(__FILE__)).parent.realpath
 FIXTURE_PATH = File.join(BRAID_PATH, 'spec', 'fixtures')
 FileUtils.rm_rf(TMP_PATH)
@@ -14,6 +16,18 @@ FileUtils.mkdir_p(TMP_PATH)
 
 BRAID_BIN = ((defined?(JRUBY_VERSION) || Gem.win_platform?) ? 'ruby ' : '') + File.join(BRAID_PATH, 'bin', 'braid')
 
+def set_editor_message(message = 'Make some changes')
+  File.write(EDITOR_CMD, <<CMD)
+#!/usr/bin/env ruby
+File.write(ARGV[0], #{message.inspect})
+CMD
+  FileUtils.chmod 0755, EDITOR_CMD
+end
+
+def assert_no_diff(file1, file2)
+  run_command("diff -U 3 #{file1} #{file2}")
+end
+
 def in_dir(dir = TMP_PATH)
   Dir.chdir(dir)
   yield
@@ -31,8 +45,8 @@ def update_dir_from_fixture(dir, fixture = dir)
   FileUtils.cp_r(File.join(FIXTURE_PATH, fixture) + '/.', to_dir)
 end
 
-def create_git_repo_from_fixture(fixture_name)
-  git_repo = File.join(TMP_PATH, fixture_name)
+def create_git_repo_from_fixture(fixture_name, directory = fixture_name)
+  git_repo = File.join(TMP_PATH, directory)
   update_dir_from_fixture(fixture_name)
 
   in_dir(git_repo) do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: braid
 version: !ruby/object:Gem::Version
-  version: 1.0.13
+  version: 1.0.14
 platform: ruby
 authors:
 - Cristi Balan
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-03-11 00:00:00.000000000 Z
+date: 2017-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: main
@@ -113,6 +113,7 @@ files:
 - spec/fixtures/skit1/layouts/layout.liquid
 - spec/fixtures/skit1/preview.png
 - spec/integration/adding_spec.rb
+- spec/integration/push_spec.rb
 - spec/integration/updating_spec.rb
 - spec/integration_helper.rb
 - spec/mirror_spec.rb