vendorificator 0.5.2 → 0.5.3

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzgxYzI5ZDQxNjE5M2Q2NDhmYWQ1OTY4N2EwYjg0YzFmOTU2MzcxMA==
+    OWU4MzczODMxMGY1Y2NjZGQ1MWQxMWRhOWM3Y2VmZGQ5Y2NhNDZhOQ==
   data.tar.gz: !binary |-
-    NzhjZWY3NDg0NWUyY2M2NGFhMDk3YWY5ODMzNmI3YjM0MDQ3ZWMwOQ==
+    Yzc5ZWM0ZmQwMjI2YmRiYjRkZGJhN2U2ZDkyYTI3OTg4NzYyNzZjYg==
 SHA512:
   metadata.gz: !binary |-
-    N2I2MzRkZDk5MjM0ZWYwYmU4YjNkNjIxZWRkNzdmNGU5M2E4NTk0ZWE3MDMx
-    N2NkZDk1MjI5ODhkZTY3M2NmODQ1OTI4YWI3OTQ1MDEzN2Q1MjUzYTYwNDVh
-    MDA0ZGY1MTJkMzVkOWQyZWRiYTMxNjJhN2YyOTBiMGM1MTFmNDg=
+    NjMxNzIwYzRlY2M2NGFjMjZmNTZhOWU5Y2E0MTMyY2UzNzMyNmViNzdlOTFl
+    MWQwNTkxMjkzN2NlZDNiNjg5NmJiMTJkNDNiY2M4NzUyNDM3ODYwODUyNzA4
+    MTA5YTM1YmE0NmU1ZWVmZDNjMGI1MmIzZTIxOTYyNzczOWM3NDQ=
   data.tar.gz: !binary |-
-    ODZmYzQzMzY4ZTdhZDgzY2RlY2NmMmUyMjNhODkzNjcwOGE1MjBkYTMzZDA4
-    YjNjM2U4ZTJlYjZmZWZkMjY1OTU2MTZlY2IwZWVmODQ3ZDA2OWQ1M2I1ODQ1
-    NjMyNjM5MDg1YWVjOGFlMDBmZWRhYzVlM2U4ZGExZDk5NjZhNGE=
+    ZGRkNzQ3ZGI3ZDFmNGY4YTFmMGZiOTY3OGI1OGFkZWNkNWE1ZGNjMjZmNTQw
+    NThiZGZjNDEwOTMyNDVlNGExZTdjYWRhNjVmYmMzZGU4MjMzNjM4N2U3NjUx
+    MThlN2I0ZDdkMDY0MTIxMmQ1NjBlMzU3MDljMzdiOWRkNzAyN2U=

data/.travis.yml

@@ -5,7 +5,7 @@ rvm:
   - 1.9.3
   - 2.0.0
   - 2.1.0
-  - jruby-19mode
+  - jruby-1.7.10
   - rbx
 notifications:
   hipchat:

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changes
 
+## 0.5.3
+
+ - Fixed `vendor pull` from a clone that haven't run vendor commands
+   yet
+ - Don't break if new version of a module is same as previous one
+ - Fixed regression with downloads: files are downloaded to a file
+   rather than subdirectory again
+
 ## 0.5.2
 
  - Fixed `vendor push`

data/Gemfile

@@ -6,7 +6,6 @@ gemspec
 platforms :rbx do
   gem 'racc'
   gem 'rubysl', '~> 2.0'
-  gem 'psych'
 end
 
 group :development_workstation do

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2012 Maciej Pasternacki
+Copyright (c) 2012-2014 Maciej Pasternacki, Wojciech Ogrodowczyk
 
 MIT License
 
@@ -19,4 +19,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/Rakefile

@@ -23,7 +23,7 @@ begin
   desc 'Run Cucumber features'
   Cucumber::Rake::Task.new(:features) do |t|
     # t.fork = false
-    t.cucumber_opts = %w{--format progress}
+    t.cucumber_opts = %w{--format progress --exclude features/fixtures}
     t.cucumber_opts += %w{--tags ~@berkshelf} unless defined?(Berkshelf)
     t.cucumber_opts += ENV['CUCUMBER_OPTS'].split if ENV['CUCUMBER_OPTS']
   end

data/cucumber.yml

@@ -1,2 +1,2 @@
 ---
-default: --format pretty
+default: --format pretty --exclude features/fixtures

data/features/download.feature

@@ -8,6 +8,7 @@ Scenario: just URL as name
   When I run vendor command "install"
   Then following has been conjured:
     | Name      | testrepo-0.1.tar.gz        |
+  And a file named "vendor/testrepo-0.1.tar.gz" should exist
   And there's a git commit note including "ea207a" in "download_checksum"
   And there's a git commit note including "20480" in "download_filesize"
   And there's a git commit note including "test-assets.3ofcoins" in "download_url"

data/features/edgecases.feature

@@ -47,3 +47,28 @@ Scenario: Git overlay in root directory
     | Version   | 10e9ac58c77bc229d8c59a5b4eb7422916453148 |
     | With file | test/alias.c                             |
     | Path      | .                                        |
+
+Scenario: a new version of vendor module is same as previous
+  Given a repository with following Vendorfile:
+    """ruby
+    vendor 'hello', :version => 1 do
+      File.open('README', 'w') { |f| f.puts 'Hello, World!' }
+    end
+    """
+  When I run vendor command "install"
+  Then following has been conjured:
+    | Name      | hello  |
+    | Version   | 1      |
+    | With file | README |
+  When I change Vendorfile to:
+    """ruby
+    vendor 'hello', :version => 2 do
+      File.open('README', 'w') { |f| f.puts 'Hello, World!' }
+    end
+    """
+  And I run vendor command "update"
+  Then following has been conjured:
+    | Name      | hello  |
+    | Version   | 2      |
+    | With file | README |
+ 

data/features/fixtures/git/Makefile

@@ -0,0 +1,35 @@
+all: remote.1/HEAD remote.2/HEAD
+
+remote.1/HEAD : remote.1.vendor.rb
+	rm -rf remote.1 remote.wip
+	mkdir remote.wip
+	cp remote.1.vendor.rb remote.wip/Vendorfile
+	@set -e -x ; \
+	    cd remote.wip ; \
+	    git init ; \
+	    git add Vendorfile ; \
+	    git commit -m Vendorfile ; \
+	    vendor install
+	git clone --mirror --bare remote.wip remote.1
+	cd remote.1 ; git gc --aggressive
+ifndef KEEP_WIP
+	rm -rf remote.wip
+endif
+
+remote.2/HEAD: remote.2.vendor.rb remote.1/HEAD
+	rm -rf remote.2 remote.wip
+	git clone remote.1 remote.wip
+	cp remote.2.vendor.rb remote.wip/Vendorfile
+	@set -e -x ; \
+	    cd remote.wip ; \
+	    git checkout --detach ; \
+	    git fetch origin '+refs/*:refs/*' ; \
+	    git checkout master ; \
+	    git add Vendorfile ; \
+	    git commit -m bump ; \
+	    vendor update
+	git clone --mirror --bare remote.wip remote.2
+	cd remote.2 ; git gc --aggressive
+ifndef KEEP_WIP
+	rm -rf remote.wip
+endif

data/features/fixtures/git/remote.1/HEAD

@@ -0,0 +1 @@
+ref: refs/heads/master

data/features/fixtures/git/remote.1/config

@@ -0,0 +1,10 @@
+[core]
+	repositoryformatversion = 0
+	filemode = true
+	bare = true
+	ignorecase = true
+	precomposeunicode = true
+[remote "origin"]
+	url = /Users/japhy/Projekty/vendorificator/features/fixtures/git/remote.wip
+	fetch = +refs/*:refs/*
+	mirror = true

data/features/fixtures/git/remote.1/description

@@ -0,0 +1 @@
+Unnamed repository; edit this file 'description' to name the repository.

data/features/fixtures/git/remote.1/hooks/applypatch-msg.sample

@@ -0,0 +1,15 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message taken by
+# applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.  The hook is
+# allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "applypatch-msg".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/commit-msg" &&
+	exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
+:

data/features/fixtures/git/remote.1/hooks/commit-msg.sample

@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# An example hook script to check the commit log message.
+# Called by "git commit" with one argument, the name of the file
+# that has the commit message.  The hook should exit with non-zero
+# status after issuing an appropriate message if it wants to stop the
+# commit.  The hook is allowed to edit the commit message file.
+#
+# To enable this hook, rename this file to "commit-msg".
+
+# Uncomment the below to add a Signed-off-by line to the message.
+# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
+# hook is more suited to it.
+#
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
+
+# This example catches duplicate Signed-off-by lines.
+
+test "" = "$(grep '^Signed-off-by: ' "$1" |
+	 sort | uniq -c | sed -e '/^[ 	]*1[ 	]/d')" || {
+	echo >&2 Duplicate Signed-off-by lines.
+	exit 1
+}

data/features/fixtures/git/remote.1/hooks/post-update.sample

@@ -0,0 +1,8 @@
+#!/bin/sh
+#
+# An example hook script to prepare a packed repository for use over
+# dumb transports.
+#
+# To enable this hook, rename this file to "post-update".
+
+exec git update-server-info

data/features/fixtures/git/remote.1/hooks/pre-applypatch.sample

@@ -0,0 +1,14 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed
+# by applypatch from an e-mail message.
+#
+# The hook should exit with non-zero status after issuing an
+# appropriate message if it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-applypatch".
+
+. git-sh-setup
+test -x "$GIT_DIR/hooks/pre-commit" &&
+	exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
+:

data/features/fixtures/git/remote.1/hooks/pre-commit.sample

@@ -0,0 +1,49 @@
+#!/bin/sh
+#
+# An example hook script to verify what is about to be committed.
+# Called by "git commit" with no arguments.  The hook should
+# exit with non-zero status after issuing an appropriate message if
+# it wants to stop the commit.
+#
+# To enable this hook, rename this file to "pre-commit".
+
+if git rev-parse --verify HEAD >/dev/null 2>&1
+then
+	against=HEAD
+else
+	# Initial commit: diff against an empty tree object
+	against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
+fi
+
+# If you want to allow non-ASCII filenames set this variable to true.
+allownonascii=$(git config --bool hooks.allownonascii)
+
+# Redirect output to stderr.
+exec 1>&2
+
+# Cross platform projects tend to avoid non-ASCII filenames; prevent
+# them from being added to the repository. We exploit the fact that the
+# printable range starts at the space character and ends with tilde.
+if [ "$allownonascii" != "true" ] &&
+	# Note that the use of brackets around a tr range is ok here, (it's
+	# even required, for portability to Solaris 10's /usr/bin/tr), since
+	# the square bracket bytes happen to fall in the designated range.
+	test $(git diff --cached --name-only --diff-filter=A -z $against |
+	  LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
+then
+	cat <<\EOF
+Error: Attempt to add a non-ASCII file name.
+
+This can cause problems if you want to work with people on other platforms.
+
+To be portable it is advisable to rename the file.
+
+If you know what you are doing you can disable this check using:
+
+  git config hooks.allownonascii true
+EOF
+	exit 1
+fi
+
+# If there are whitespace errors, print the offending file names and fail.
+exec git diff-index --check --cached $against --

data/features/fixtures/git/remote.1/hooks/pre-push.sample

@@ -0,0 +1,54 @@
+#!/bin/sh
+
+# An example hook script to verify what is about to be pushed.  Called by "git
+# push" after it has checked the remote status, but before anything has been
+# pushed.  If this script exits with a non-zero status nothing will be pushed.
+#
+# This hook is called with the following parameters:
+#
+# $1 -- Name of the remote to which the push is being done
+# $2 -- URL to which the push is being done
+#
+# If pushing without using a named remote those arguments will be equal.
+#
+# Information about the commits which are being pushed is supplied as lines to
+# the standard input in the form:
+#
+#   <local ref> <local sha1> <remote ref> <remote sha1>
+#
+# This sample shows how to prevent push of commits where the log message starts
+# with "WIP" (work in progress).
+
+remote="$1"
+url="$2"
+
+z40=0000000000000000000000000000000000000000
+
+IFS=' '
+while read local_ref local_sha remote_ref remote_sha
+do
+	if [ "$local_sha" = $z40 ]
+	then
+		# Handle delete
+		:
+	else
+		if [ "$remote_sha" = $z40 ]
+		then
+			# New branch, examine all commits
+			range="$local_sha"
+		else
+			# Update to existing branch, examine new commits
+			range="$remote_sha..$local_sha"
+		fi
+
+		# Check for WIP commit
+		commit=`git rev-list -n 1 --grep '^WIP' "$range"`
+		if [ -n "$commit" ]
+		then
+			echo "Found WIP commit in $local_ref, not pushing"
+			exit 1
+		fi
+	fi
+done
+
+exit 0

data/features/fixtures/git/remote.1/hooks/pre-rebase.sample

@@ -0,0 +1,169 @@
+#!/bin/sh
+#
+# Copyright (c) 2006, 2008 Junio C Hamano
+#
+# The "pre-rebase" hook is run just before "git rebase" starts doing
+# its job, and can prevent the command from running by exiting with
+# non-zero status.
+#
+# The hook is called with the following parameters:
+#
+# $1 -- the upstream the series was forked from.
+# $2 -- the branch being rebased (or empty when rebasing the current branch).
+#
+# This sample shows how to prevent topic branches that are already
+# merged to 'next' branch from getting rebased, because allowing it
+# would result in rebasing already published history.
+
+publish=next
+basebranch="$1"
+if test "$#" = 2
+then
+	topic="refs/heads/$2"
+else
+	topic=`git symbolic-ref HEAD` ||
+	exit 0 ;# we do not interrupt rebasing detached HEAD
+fi
+
+case "$topic" in
+refs/heads/??/*)
+	;;
+*)
+	exit 0 ;# we do not interrupt others.
+	;;
+esac
+
+# Now we are dealing with a topic branch being rebased
+# on top of master.  Is it OK to rebase it?
+
+# Does the topic really exist?
+git show-ref -q "$topic" || {
+	echo >&2 "No such branch $topic"
+	exit 1
+}
+
+# Is topic fully merged to master?
+not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
+if test -z "$not_in_master"
+then
+	echo >&2 "$topic is fully merged to master; better remove it."
+	exit 1 ;# we could allow it, but there is no point.
+fi
+
+# Is topic ever merged to next?  If so you should not be rebasing it.
+only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
+only_next_2=`git rev-list ^master           ${publish} | sort`
+if test "$only_next_1" = "$only_next_2"
+then
+	not_in_topic=`git rev-list "^$topic" master`
+	if test -z "$not_in_topic"
+	then
+		echo >&2 "$topic is already up-to-date with master"
+		exit 1 ;# we could allow it, but there is no point.
+	else
+		exit 0
+	fi
+else
+	not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
+	/usr/bin/perl -e '
+		my $topic = $ARGV[0];
+		my $msg = "* $topic has commits already merged to public branch:\n";
+		my (%not_in_next) = map {
+			/^([0-9a-f]+) /;
+			($1 => 1);
+		} split(/\n/, $ARGV[1]);
+		for my $elem (map {
+				/^([0-9a-f]+) (.*)$/;
+				[$1 => $2];
+			} split(/\n/, $ARGV[2])) {
+			if (!exists $not_in_next{$elem->[0]}) {
+				if ($msg) {
+					print STDERR $msg;
+					undef $msg;
+				}
+				print STDERR " $elem->[1]\n";
+			}
+		}
+	' "$topic" "$not_in_next" "$not_in_master"
+	exit 1
+fi
+
+exit 0
+
+################################################################
+
+This sample hook safeguards topic branches that have been
+published from being rewound.
+
+The workflow assumed here is:
+
+ * Once a topic branch forks from "master", "master" is never
+   merged into it again (either directly or indirectly).
+
+ * Once a topic branch is fully cooked and merged into "master",
+   it is deleted.  If you need to build on top of it to correct
+   earlier mistakes, a new topic branch is created by forking at
+   the tip of the "master".  This is not strictly necessary, but
+   it makes it easier to keep your history simple.
+
+ * Whenever you need to test or publish your changes to topic
+   branches, merge them into "next" branch.
+
+The script, being an example, hardcodes the publish branch name
+to be "next", but it is trivial to make it configurable via
+$GIT_DIR/config mechanism.
+
+With this workflow, you would want to know:
+
+(1) ... if a topic branch has ever been merged to "next".  Young
+    topic branches can have stupid mistakes you would rather
+    clean up before publishing, and things that have not been
+    merged into other branches can be easily rebased without
+    affecting other people.  But once it is published, you would
+    not want to rewind it.
+
+(2) ... if a topic branch has been fully merged to "master".
+    Then you can delete it.  More importantly, you should not
+    build on top of it -- other people may already want to
+    change things related to the topic as patches against your
+    "master", so if you need further changes, it is better to
+    fork the topic (perhaps with the same name) afresh from the
+    tip of "master".
+
+Let's look at this example:
+
+		   o---o---o---o---o---o---o---o---o---o "next"
+		  /       /           /           /
+		 /   a---a---b A     /           /
+		/   /               /           /
+	       /   /   c---c---c---c B         /
+	      /   /   /             \         /
+	     /   /   /   b---b C     \       /
+	    /   /   /   /             \     /
+    ---o---o---o---o---o---o---o---o---o---o---o "master"
+
+
+A, B and C are topic branches.
+
+ * A has one fix since it was merged up to "next".
+
+ * B has finished.  It has been fully merged up to "master" and "next",
+   and is ready to be deleted.
+
+ * C has not merged to "next" at all.
+
+We would want to allow C to be rebased, refuse A, and encourage
+B to be deleted.
+
+To compute (1):
+
+	git rev-list ^master ^topic next
+	git rev-list ^master        next
+
+	if these match, topic has not merged in next at all.
+
+To compute (2):
+
+	git rev-list master..topic
+
+	if this is empty, it is fully merged to "master".

data/features/fixtures/git/remote.1/hooks/prepare-commit-msg.sample

@@ -0,0 +1,36 @@
+#!/bin/sh
+#
+# An example hook script to prepare the commit log message.
+# Called by "git commit" with the name of the file that has the
+# commit message, followed by the description of the commit
+# message's source.  The hook's purpose is to edit the commit
+# message file.  If the hook fails with a non-zero status,
+# the commit is aborted.
+#
+# To enable this hook, rename this file to "prepare-commit-msg".
+
+# This hook includes three examples.  The first comments out the
+# "Conflicts:" part of a merge commit.
+#
+# The second includes the output of "git diff --name-status -r"
+# into the message, just before the "git status" output.  It is
+# commented because it doesn't cope with --amend or with squashed
+# commits.
+#
+# The third example adds a Signed-off-by line to the message, that can
+# still be edited.  This is rarely a good idea.
+
+case "$2,$3" in
+  merge,)
+    /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
+
+# ,|template,)
+#   /usr/bin/perl -i.bak -pe '
+#      print "\n" . `git diff --cached --name-status -r`
+#	 if /^#/ && $first++ == 0' "$1" ;;
+
+  *) ;;
+esac
+
+# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
+# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"