vendorificator 0.5.2 → 0.5.3

data/features/fixtures/git/remote.2/hooks/update.sample

@@ -0,0 +1,128 @@
+#!/bin/sh
+#
+# An example hook script to blocks unannotated tags from entering.
+# Called by "git receive-pack" with arguments: refname sha1-old sha1-new
+#
+# To enable this hook, rename this file to "update".
+#
+# Config
+# ------
+# hooks.allowunannotated
+#   This boolean sets whether unannotated tags will be allowed into the
+#   repository.  By default they won't be.
+# hooks.allowdeletetag
+#   This boolean sets whether deleting tags will be allowed in the
+#   repository.  By default they won't be.
+# hooks.allowmodifytag
+#   This boolean sets whether a tag may be modified after creation. By default
+#   it won't be.
+# hooks.allowdeletebranch
+#   This boolean sets whether deleting branches will be allowed in the
+#   repository.  By default they won't be.
+# hooks.denycreatebranch
+#   This boolean sets whether remotely creating branches will be denied
+#   in the repository.  By default this is allowed.
+#
+
+# --- Command line
+refname="$1"
+oldrev="$2"
+newrev="$3"
+
+# --- Safety check
+if [ -z "$GIT_DIR" ]; then
+	echo "Don't run this script from the command line." >&2
+	echo " (if you want, you could supply GIT_DIR then run" >&2
+	echo "  $0 <ref> <oldrev> <newrev>)" >&2
+	exit 1
+fi
+
+if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
+	echo "usage: $0 <ref> <oldrev> <newrev>" >&2
+	exit 1
+fi
+
+# --- Config
+allowunannotated=$(git config --bool hooks.allowunannotated)
+allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
+denycreatebranch=$(git config --bool hooks.denycreatebranch)
+allowdeletetag=$(git config --bool hooks.allowdeletetag)
+allowmodifytag=$(git config --bool hooks.allowmodifytag)
+
+# check for no description
+projectdesc=$(sed -e '1q' "$GIT_DIR/description")
+case "$projectdesc" in
+"Unnamed repository"* | "")
+	echo "*** Project description file hasn't been set" >&2
+	exit 1
+	;;
+esac
+
+# --- Check types
+# if $newrev is 0000...0000, it's a commit to delete a ref.
+zero="0000000000000000000000000000000000000000"
+if [ "$newrev" = "$zero" ]; then
+	newrev_type=delete
+else
+	newrev_type=$(git cat-file -t $newrev)
+fi
+
+case "$refname","$newrev_type" in
+	refs/tags/*,commit)
+		# un-annotated tag
+		short_refname=${refname##refs/tags/}
+		if [ "$allowunannotated" != "true" ]; then
+			echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
+			echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,delete)
+		# delete tag
+		if [ "$allowdeletetag" != "true" ]; then
+			echo "*** Deleting a tag is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/tags/*,tag)
+		# annotated tag
+		if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
+		then
+			echo "*** Tag '$refname' already exists." >&2
+			echo "*** Modifying a tag is not allowed in this repository." >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,commit)
+		# branch
+		if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
+			echo "*** Creating a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/heads/*,delete)
+		# delete branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	refs/remotes/*,commit)
+		# tracking branch
+		;;
+	refs/remotes/*,delete)
+		# delete tracking branch
+		if [ "$allowdeletebranch" != "true" ]; then
+			echo "*** Deleting a tracking branch is not allowed in this repository" >&2
+			exit 1
+		fi
+		;;
+	*)
+		# Anything else (is there anything else?)
+		echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
+		exit 1
+		;;
+esac
+
+# --- Finished
+exit 0

data/features/fixtures/git/remote.2/info/exclude

@@ -0,0 +1,6 @@
+# git ls-files --others --exclude-from=.git/info/exclude
+# Lines that start with '#' are comments.
+# For a project mostly in C, the following would be a good set of
+# exclude patterns (uncomment them if you want to use them):
+# *.[oa]
+# *~

data/features/fixtures/git/remote.2/info/refs

@@ -0,0 +1,14 @@
+978854b42893964cd861fa3a606b9bd1effcc5ed	refs/heads/master
+cef71af0c9e5a71f6c4a2db360147b00ec0faef4	refs/heads/vendor/example.html
+d6dfe467247ecb8fc1efdff47270c1ca9aebc0d2	refs/heads/vendor/stub
+9caaa083a2a3de2fddc0cc5dc841041ff90ee626	refs/notes/vendor
+8fa42dfde3bf120afbedb65758115c40077823f8	refs/remotes/origin/HEAD
+8fa42dfde3bf120afbedb65758115c40077823f8	refs/remotes/origin/master
+cef71af0c9e5a71f6c4a2db360147b00ec0faef4	refs/remotes/origin/vendor/example.html
+cfd7a7f8c5d25a3113bb4e2dc13cad1bf59f1fe5	refs/remotes/origin/vendor/stub
+b63fd7b7034f54c83f98f0eb607166883840b15b	refs/tags/vendor/example.html/0
+cef71af0c9e5a71f6c4a2db360147b00ec0faef4	refs/tags/vendor/example.html/0^{}
+e8e7b1b95249fbf213de8a300957322480c400d5	refs/tags/vendor/stub/1
+cfd7a7f8c5d25a3113bb4e2dc13cad1bf59f1fe5	refs/tags/vendor/stub/1^{}
+ca5ae665ed9b67e731dc5c281dac5c28c46f3fff	refs/tags/vendor/stub/2
+d6dfe467247ecb8fc1efdff47270c1ca9aebc0d2	refs/tags/vendor/stub/2^{}

data/features/fixtures/git/remote.2/objects/info/packs

@@ -0,0 +1,2 @@
+P pack-f9df9e80fe02b2e846c4ba5444b359121a8bcce6.pack
+

data/features/fixtures/git/remote.2/packed-refs

@@ -0,0 +1,15 @@
+# pack-refs with: peeled fully-peeled 
+978854b42893964cd861fa3a606b9bd1effcc5ed refs/heads/master
+cef71af0c9e5a71f6c4a2db360147b00ec0faef4 refs/heads/vendor/example.html
+d6dfe467247ecb8fc1efdff47270c1ca9aebc0d2 refs/heads/vendor/stub
+9caaa083a2a3de2fddc0cc5dc841041ff90ee626 refs/notes/vendor
+8fa42dfde3bf120afbedb65758115c40077823f8 refs/remotes/origin/HEAD
+8fa42dfde3bf120afbedb65758115c40077823f8 refs/remotes/origin/master
+cef71af0c9e5a71f6c4a2db360147b00ec0faef4 refs/remotes/origin/vendor/example.html
+cfd7a7f8c5d25a3113bb4e2dc13cad1bf59f1fe5 refs/remotes/origin/vendor/stub
+b63fd7b7034f54c83f98f0eb607166883840b15b refs/tags/vendor/example.html/0
+^cef71af0c9e5a71f6c4a2db360147b00ec0faef4
+e8e7b1b95249fbf213de8a300957322480c400d5 refs/tags/vendor/stub/1
+^cfd7a7f8c5d25a3113bb4e2dc13cad1bf59f1fe5
+ca5ae665ed9b67e731dc5c281dac5c28c46f3fff refs/tags/vendor/stub/2
+^d6dfe467247ecb8fc1efdff47270c1ca9aebc0d2

data/features/fixtures/git/remote.2.vendor.rb

@@ -0,0 +1,5 @@
+download 'example.html', version: 0, url: 'http://www.example.com/'
+
+vendor 'stub', version: 2 do
+  File.write('VERSION', '2')
+end

data/features/fixtures/git/testrepo/info/refs

@@ -3,3 +3,5 @@
 10e9ac58c77bc229d8c59a5b4eb7422916453148	refs/heads/master
 ecbfa229ba5f11c05b18bcc4f7c32b8f25d63f8c	refs/heads/topic/green
 ecbfa229ba5f11c05b18bcc4f7c32b8f25d63f8c	refs/heads/topic/pink
+53ac1a96882e666cee31504179abc21eac522f8d	refs/tags/email-v0
+f81247bde4ef7a1c7d280140cc0bcf0b8221a51f	refs/tags/email-v0^{}

data/features/fixtures/git/testrepo/objects/info/packs

@@ -1,2 +1,2 @@
-P pack-46f7621b6a6b9b1c22dd15c08d457dfedf76e55f.pack
+P pack-3a82989e3c58110681fd5713baa113ffc1176225.pack
 

data/features/fixtures/git/testrepo/packed-refs

@@ -1,6 +1,8 @@
-# pack-refs with: peeled 
+# pack-refs with: peeled fully-peeled 
 69389e336277bd81f9af75a565cc511eb6fb497f refs/heads/blue
 0989414c2aa7b529d3c9ede7ca4ccd940c77efe4 refs/heads/email
 10e9ac58c77bc229d8c59a5b4eb7422916453148 refs/heads/master
 ecbfa229ba5f11c05b18bcc4f7c32b8f25d63f8c refs/heads/topic/green
 ecbfa229ba5f11c05b18bcc4f7c32b8f25d63f8c refs/heads/topic/pink
+53ac1a96882e666cee31504179abc21eac522f8d refs/tags/email-v0
+^f81247bde4ef7a1c7d280140cc0bcf0b8221a51f

data/features/remote.feature

@@ -0,0 +1,43 @@
+Feature: collaboration over a remote repository
+
+Scenario: pulling from a remote repo that somebody has updated
+  Given a repository cloned from "remote.1"
+  Then a file named "vendor/example.html" should exist
+  And the file "vendor/stub/VERSION" should contain "1"
+  And tag "vendor/example.html/0" exists
+  And tag "vendor/stub/1" exists
+  And tag "vendor/stub/2" does not exist
+  And branch "vendor/example.html" does not exist
+  And branch "vendor/stub" does not exist
+
+  When I run `git pull --tags`
+  Then tag "vendor/example.html/0" exists
+  And tag "vendor/stub/1" exists
+  And tag "vendor/stub/2" does not exist
+  And branch "vendor/example.html" does not exist
+  And branch "vendor/stub" does not exist
+
+  When I run vendor command "pull"
+  Then tag "vendor/example.html/0" exists
+  And tag "vendor/stub/1" exists
+  And tag "vendor/stub/2" does not exist
+  And branch "vendor/example.html" exists
+  And branch "vendor/stub" exists
+  And the following has been conjured:
+    | Name      | example.html | stub    |
+    | Version   |            0 | 1       |
+    | With file |              | VERSION |
+
+  When remote repository is updated from "remote.2"
+  And I run vendor command "pull"
+  Then tag "vendor/stub/2" exists
+  And the file "vendor/stub/VERSION" should contain "1"
+  And the following has been conjured:
+    | Name      | example.html | stub    |
+    | Version   |            0 | 1       |
+    | With file |              | VERSION |
+  And the last vendor output should match /updated\s+stub/
+  And the last vendor output should match /unchanged\s+example\.html/
+
+  When I run `git pull origin master`
+  Then the file "vendor/stub/VERSION" should contain "2"

data/features/step_definitions/basic.rb

@@ -6,13 +6,17 @@ When /^nothing happens$/ do
   nil # NOP
 end
 
+# Configure Git username & email to unclutter console output
+def configure_git
+  run_simple 'git config user.name Cucumber'
+  run_simple 'git config user.email cucumber@`hostname --fqdn`'
+end
+
 Given /^a repository with following Vendorfile:$/ do |vendorfile_contents|
   create_dir 'working-repository'
   cd 'working-repository'
   run_simple 'git init'
-  # Configure Git username & email to unclutter console output
-  run_simple 'git config user.name Cucumber'
-  run_simple 'git config user.email cucumber@`hostname --fqdn`'
+  configure_git
   write_file('README', 'Lorem ipsum dolor sit amet')
   write_file('Vendorfile', vendorfile_contents)
   run_simple 'git add .'
@@ -23,13 +27,28 @@ Given /^a remote repository$/ do
   create_dir '../remote-repository'
   cd '../remote-repository'
   run_simple 'git init --bare'
-  # Configure Git username & email to unclutter console output
+  configure_git
   run_simple 'git config user.name Cucumber'
   run_simple 'git config user.email cucumber@`hostname --fqdn`'
   cd '../working-repository'
   run_simple 'git remote add origin ../remote-repository'
 end
 
+Given(/^a repository cloned from "(.*)"$/) do |fixture|
+  repo_path = File.join(ENV['FIXTURES_DIR'], 'git', fixture)
+  run_simple "git clone --mirror \"#{repo_path}\" remote-repository"
+  run_simple "git clone remote-repository working-repository"
+  cd 'working-repository'
+  configure_git
+end
+
+When(/^remote repository is updated from "(.*)"$/) do |fixture|
+  cd '../remote-repository'
+  repo_path = File.join(ENV['FIXTURES_DIR'], 'git', fixture)
+  run_simple "git fetch \"#{repo_path}\" 'refs/*:refs/*'"
+  cd '../working-repository'
+end
+
 When /^I set the fake mode variable$/ do
   Dir.chdir(current_dir) do
     MiniGit::Capturing.git :config, 'vendorificator.stub', 'true'

data/lib/vendorificator/environment.rb

@@ -72,10 +72,11 @@ module Vendorificator
     def pull(remote, options={})
       raise RuntimeError, "Unknown remote #{remote}" unless remotes.include?(remote)
 
-      git.fetch(remote)
-      git.fetch({:tags => true}, remote)
       begin
-        git.fetch(remote, 'refs/notes/vendor:refs/notes/vendor')
+        git.fetch({:quiet => true}, remote,
+          "refs/heads/#{config[:branch_prefix]}/*:refs/remotes/origin/#{config[:branch_prefix]}/*",
+          'refs/tags/*:refs/tags/*',
+          'refs/notes/vendor:refs/notes/vendor')
       rescue MiniGit::GitError  # ignore
       end
 
@@ -91,10 +92,10 @@ module Vendorificator
         theirs = remote_branches[mod.branch_name]
         if theirs
           if not ours
-            say_status :default, 'new', mod.branch_name, :yellow
-            git.branch({:track => true}, mod.branch_name, theirs) unless options[:dry_run]
+            say_status :default, 'new', mod.name, :yellow
+            git.branch({:track => true, :quiet => true}, mod.branch_name, "#{remote}/#{mod.branch_name}") unless options[:dry_run]
           elsif ours == theirs
-            say_status :default, 'unchanged', mod.branch_name
+            say_status :default, 'unchanged', mod.name
           elsif fast_forwardable?(theirs, ours)
             say_status :default, 'updated', mod.name, :yellow
             mod.fast_forward theirs unless options[:dry_run]

data/lib/vendorificator/segment/vendor.rb

@@ -59,6 +59,8 @@ module Vendorificator
             tmpdir_entries = (Dir.entries(tmpdir) - %w'. ..').
               map { |e| File.join(tmpdir, e) }
             FileUtils.mv tmpdir_entries, work_dir
+
+            @vendor.after_conjure!
             commit_and_annotate(options[:metadata] || {})
           ensure
             @git = nil

data/lib/vendorificator/segment.rb

@@ -6,7 +6,10 @@ module Vendorificator
     end
 
     def fast_forward(branch)
-      in_branch { |tmpgit| tmpgit.merge({:ff_only => true}, branch) }
+      in_branch do |tmpgit|
+        tmpgit.checkout(:quiet => true)
+        tmpgit.merge({:ff_only => true, :quiet => true}, branch)
+      end
     end
 
     def status
@@ -117,7 +120,7 @@ module Vendorificator
       return if config.fake_mode?
 
       git.capturing.add work_dir, *@vendor.git_add_extra_paths
-      git.capturing.commit :m => @vendor.conjure_commit_message
+      git.capturing.commit :m => @vendor.conjure_commit_message, :allow_empty => true
       git.capturing.notes({:ref => 'vendor'}, 'add', {:m => conjure_note(environment_metadata)}, 'HEAD')
       git.capturing.tag( { :a => true, :m => tag_message }, tag_name )
       say_status :default, :tag, tag_name
@@ -140,7 +143,6 @@ module Vendorificator
       Dir.mktmpdir do |tmpdir|
         tmpgit = create_temp_git_repo(branch, options, tmpdir)
         fetch_repo_data tmpgit
-        repo_cleanup tmpgit if options[:clean] || !branch_exists?(branch)
 
         Dir.chdir(tmpdir){ yield tmpgit }
 
@@ -149,24 +151,21 @@ module Vendorificator
     end
 
     def create_temp_git_repo(branch, options, dir)
-      clone_opts = {shared: true, no_checkout: true}
+      clone_opts = {shared: true, no_checkout: true, quiet: true}
       clone_opts[:branch] = branch if branch_exists? branch
-      say { MiniGit::Capturing.git :clone, clone_opts, git.git_dir, dir }
+      MiniGit.git(:clone, clone_opts, git.git_dir, dir)
 
       tmpgit = MiniGit.new(dir)
       unless branch_exists? branch
-        say { tmpgit.capturing.checkout({orphan: true}, branch) }
+        tmpgit.capturing.checkout({quiet: true}, {orphan: true}, branch)
+        tmpgit.capturing.rm({ :r => true, :f => true, :q => true, :ignore_unmatch => true }, '.')
       end
 
       tmpgit
     end
 
-    def repo_cleanup(tmpgit)
-      tmpgit.rm({ :r => true, :f => true, :q => true, :ignore_unmatch => true }, '.')
-    end
-
     def fetch_repo_data(tmpgit)
-      tmpgit.fetch git.git_dir, "refs/notes/vendor:refs/notes/vendor" if notes_exist?
+      tmpgit.fetch({quiet: true}, git.git_dir, "refs/notes/vendor:refs/notes/vendor") if notes_exist?
     end
 
     def propagate_repo_data_to_original(branch, clone_dir)
@@ -186,11 +185,10 @@ module Vendorificator
     #
     # Returns nothing.
     def fetch_back_from_temporary_clone(branch, clone_dir)
-      git.fetch clone_dir
-      git.fetch({tags: true}, clone_dir)
-      git.fetch clone_dir,
+      git.fetch({quiet: true}, clone_dir,
         "refs/heads/#{branch}:refs/heads/#{branch}",
-        "refs/notes/vendor:refs/notes/vendor"
+        "refs/tags/*:refs/tags/*",
+        "refs/notes/vendor:refs/notes/vendor")
     end
 
     # Private: Copies the conjured vendor files back to main repo, instead of
@@ -317,6 +315,7 @@ module Vendorificator
     end
 
     def merged_base
+      return nil if !head
       return @merged_base if defined? @merged_base
       base = git.capturing.merge_base(head, 'HEAD').strip
       @merged_base = base.empty? ? nil : base
@@ -347,7 +346,7 @@ module Vendorificator
     #
     # Returns true/false.
     def branch_exists?(branch = branch_name)
-      git.capturing.rev_parse({:verify => true}, "refs/heads/#{branch}")
+      git.capturing.rev_parse({:verify => true, :quiet => true}, "refs/heads/#{branch}")
       true
     rescue MiniGit::GitError
       false

data/lib/vendorificator/vendor/download.rb

@@ -16,14 +16,20 @@ module Vendorificator
 
     def conjure!
       say_status :default, :download, url
-      File.open name, 'w' do |outf|
+      File.open 'content', 'w' do |outf|
         outf.write( open(url).read )
       end
-      @conjured_checksum = Digest::SHA256.file(name).hexdigest
-      @conjured_filesize = File.size(name)
+      @conjured_checksum = Digest::SHA256.file('content').hexdigest
+      @conjured_filesize = File.size('content')
       add_download_metadata
     end
 
+    def after_conjure!
+      FileUtils.mv File.join(work_dir, 'content'), work_dir+'.content'
+      Dir.rmdir work_dir
+      FileUtils.mv work_dir+'.content', work_dir
+    end
+
     def upstream_version
       conjured_checksum || Digest::SHA256.hexdigest( open(url).read )
     end

data/lib/vendorificator/vendor.rb

@@ -66,6 +66,7 @@ module Vendorificator
     # Hook points
     def git_add_extra_paths ; [] ; end
     def before_conjure! ; end
+    def after_conjure! ; end
     def compute_dependencies! ; end
     def upstream_version ; end
 

data/lib/vendorificator/version.rb

@@ -1,3 +1,3 @@
 module Vendorificator
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

data/spec/vendorificator/environment_spec.rb

@@ -43,19 +43,21 @@ module Vendorificator
 
     describe '#pull' do
       before do
-        environment.git.expects(:fetch).with('origin')
-        environment.git.expects(:fetch).with({:tags => true}, 'origin')
-        @git_fetch_notes = environment.git.expects(:fetch).with('origin', 'refs/notes/vendor:refs/notes/vendor')
+        @fetch = environment.git.expects(:fetch).with({:quiet => true}, 'origin',
+          'refs/heads/vendor/*:refs/remotes/origin/vendor/*',
+          'refs/tags/*:refs/tags/*',
+          'refs/notes/vendor:refs/notes/vendor')
         environment.git.capturing.stubs(:show_ref).returns("602315 refs/remotes/origin/vendor/test\n")
       end
 
       it "creates a branch if it doesn't exist" do
         environment.segments << stub(
-          :branch_name => 'vendor/test', :head => nil,
-          :compute_dependencies! => nil
-        )
+          :name => 'test',
+          :branch_name => 'vendor/test',
+          :head => nil,
+          :compute_dependencies! => nil)
 
-        environment.git.expects(:branch).with({:track => true}, 'vendor/test', '602315')
+        environment.git.expects(:branch).with({:track => true, :quiet => true}, 'vendor/test', 'origin/vendor/test')
 
         environment.pull('origin')
       end
@@ -71,8 +73,7 @@ module Vendorificator
       end
 
       it "handles git error on fetching empty notes" do
-        @git_fetch_notes.raises(MiniGit::GitError)
-
+        @fetch.raises(MiniGit::GitError)
         environment.pull('origin')
       end
     end

data/vendorificator.gemspec

@@ -10,6 +10,7 @@ Gem::Specification.new do |gem|
   gem.description   = "Vendor everything. Stay sane."
   gem.summary       = "Integrate third-party vendor modules into your git repository"
   gem.homepage      = "https://github.com/3ofcoins/vendorificator/"
+  gem.license       = "MIT"
 
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }