dandelion 0.1.7 → 0.2.0
Sign up to get free protection for your applications and to get access to all the features.
- data/README.md +11 -8
- data/Rakefile +8 -1
- data/dandelion.gemspec +2 -2
- data/lib/dandelion/cli.rb +119 -74
- data/lib/dandelion/deployment.rb +5 -2
- data/lib/dandelion/service.rb +91 -15
- data/lib/dandelion/version.rb +1 -1
- data/test/fixtures/diff +3 -0
- data/test/fixtures/ls_tree +4 -0
- data/test/test_diff_deployment.rb +123 -0
- data/test/test_git.git/HEAD +1 -0
- data/test/test_git.git/config +5 -0
- data/test/test_git.git/description +1 -0
- data/test/test_git.git/hooks/applypatch-msg.sample +15 -0
- data/test/test_git.git/hooks/commit-msg.sample +24 -0
- data/test/test_git.git/hooks/post-commit.sample +8 -0
- data/test/test_git.git/hooks/post-receive.sample +15 -0
- data/test/test_git.git/hooks/post-update.sample +8 -0
- data/test/test_git.git/hooks/pre-applypatch.sample +14 -0
- data/test/test_git.git/hooks/pre-commit.sample +46 -0
- data/test/test_git.git/hooks/pre-rebase.sample +169 -0
- data/test/test_git.git/hooks/prepare-commit-msg.sample +36 -0
- data/test/test_git.git/hooks/update.sample +128 -0
- data/test/test_git.git/info/exclude +6 -0
- data/test/test_git.git/objects/0c/a605e9f0f1d42ce8193ac36db11ec3cc9efc08 +0 -0
- data/test/test_git.git/objects/11/bada4e36fd065c8d1d3ca97b8dffa496c8e021 +0 -0
- data/test/test_git.git/objects/57/16ca5987cbf97d6bb54920bea6adde242d87e6 +0 -0
- data/test/test_git.git/objects/88/d4480861346093048e08ce8dcc577d8aa69379 +1 -0
- data/test/test_git.git/objects/90/2dce0535b19f0c15ac8407fc4468256ad672d7 +0 -0
- data/test/test_git.git/objects/a6/394b3e8a82b76b0dd5b6b317f489dfe22426a6 +0 -0
- data/test/test_git.git/objects/a6/5140d5ec9f47064f614ecf8e43776baa5c0c11 +0 -0
- data/test/test_git.git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
- data/test/test_git.git/objects/ea/41dba10b54a794284e0be009a11f0ff3716a28 +0 -0
- data/test/test_git.git/objects/f5/5f3c44c89e5d215fbaaef9d33563117fe0b61b +1 -0
- data/test/test_git.git/objects/ff/1f1d4bd0c99e1c9cca047c46b2194accf89504 +4 -0
- data/test/test_git.git/refs/heads/master +1 -0
- data/test/test_git.rb +44 -0
- metadata +84 -9
data/lib/dandelion/version.rb
CHANGED
data/test/fixtures/diff
ADDED
@@ -0,0 +1,123 @@
|
|
1
|
+
require 'dandelion'
|
2
|
+
require 'dandelion/deployment'
|
3
|
+
require 'dandelion/service'
|
4
|
+
require 'test/unit'
|
5
|
+
|
6
|
+
def fixture(name)
|
7
|
+
File.read(File.join(File.dirname(__FILE__), 'fixtures', name))
|
8
|
+
end
|
9
|
+
|
10
|
+
# Mock classes
|
11
|
+
|
12
|
+
class MockGit
|
13
|
+
def native(cmd, options = {}, *args, &block)
|
14
|
+
if cmd == :ls_tree
|
15
|
+
fixture('ls_tree')
|
16
|
+
elsif cmd == :diff
|
17
|
+
fixture('diff')
|
18
|
+
end
|
19
|
+
end
|
20
|
+
end
|
21
|
+
|
22
|
+
class MockFile
|
23
|
+
attr_reader :data
|
24
|
+
|
25
|
+
def initialize(data)
|
26
|
+
@data = data
|
27
|
+
end
|
28
|
+
end
|
29
|
+
|
30
|
+
class MockTree
|
31
|
+
def /(file)
|
32
|
+
MockFile.new('bar')
|
33
|
+
end
|
34
|
+
end
|
35
|
+
|
36
|
+
class MockCommit
|
37
|
+
def initialize(revision)
|
38
|
+
@revision = revision
|
39
|
+
end
|
40
|
+
|
41
|
+
def tree
|
42
|
+
MockTree.new
|
43
|
+
end
|
44
|
+
|
45
|
+
def sha
|
46
|
+
@revision
|
47
|
+
end
|
48
|
+
end
|
49
|
+
|
50
|
+
class MockRepo
|
51
|
+
def commit(revision)
|
52
|
+
MockCommit.new(revision)
|
53
|
+
end
|
54
|
+
|
55
|
+
def git
|
56
|
+
MockGit.new
|
57
|
+
end
|
58
|
+
end
|
59
|
+
|
60
|
+
class MockService
|
61
|
+
attr_reader :reads, :writes, :deletes
|
62
|
+
|
63
|
+
def initialize(remote_revision)
|
64
|
+
@reads = {'.revision' => remote_revision}
|
65
|
+
@writes = {}
|
66
|
+
@deletes = []
|
67
|
+
end
|
68
|
+
|
69
|
+
def read(file)
|
70
|
+
@reads[file]
|
71
|
+
end
|
72
|
+
|
73
|
+
def write(file, data)
|
74
|
+
@writes[file] = data
|
75
|
+
end
|
76
|
+
|
77
|
+
def delete(file)
|
78
|
+
@deletes << file
|
79
|
+
end
|
80
|
+
end
|
81
|
+
|
82
|
+
# Tests
|
83
|
+
|
84
|
+
class TestDiffDeployment < Test::Unit::TestCase
|
85
|
+
def setup
|
86
|
+
Dandelion.logger.level = Logger::FATAL
|
87
|
+
@head_revision = '0ca605e9f0f1d42ce8193ac36db11ec3cc9efc08'
|
88
|
+
@remote_revision = 'ff1f1d4bd0c99e1c9cca047c46b2194accf89504'
|
89
|
+
@repo = MockRepo.new
|
90
|
+
@service = MockService.new(@remote_revision)
|
91
|
+
@diff_deployment = Dandelion::Deployment::DiffDeployment.new(@repo, @service, [], @head_revision)
|
92
|
+
end
|
93
|
+
|
94
|
+
def test_diff_deployment_local_revision
|
95
|
+
assert_equal @head_revision, @diff_deployment.local_revision
|
96
|
+
end
|
97
|
+
|
98
|
+
def test_diff_deployment_remote_revision
|
99
|
+
assert_equal @remote_revision, @diff_deployment.remote_revision
|
100
|
+
end
|
101
|
+
|
102
|
+
def test_diff_deployment_write_revision
|
103
|
+
@diff_deployment.write_revision
|
104
|
+
assert_equal @head_revision, @service.writes['.revision']
|
105
|
+
end
|
106
|
+
|
107
|
+
def test_diff_deployment_revisions_match
|
108
|
+
assert !@diff_deployment.revisions_match?
|
109
|
+
end
|
110
|
+
|
111
|
+
def test_diff_deployment_any
|
112
|
+
assert @diff_deployment.any?
|
113
|
+
end
|
114
|
+
|
115
|
+
def test_diff_deployment_deploy
|
116
|
+
@diff_deployment.deploy
|
117
|
+
assert_equal 3, @service.writes.length
|
118
|
+
assert_equal 'bar', @service.writes['foo']
|
119
|
+
assert_equal 'bar', @service.writes['baz/foo']
|
120
|
+
assert_equal @head_revision, @service.writes['.revision']
|
121
|
+
assert_equal ['foobar'], @service.deletes
|
122
|
+
end
|
123
|
+
end
|
@@ -0,0 +1 @@
|
|
1
|
+
ref: refs/heads/master
|
@@ -0,0 +1 @@
|
|
1
|
+
Unnamed repository; edit this file 'description' to name the repository.
|
@@ -0,0 +1,15 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script to check the commit log message taken by
|
4
|
+
# applypatch from an e-mail message.
|
5
|
+
#
|
6
|
+
# The hook should exit with non-zero status after issuing an
|
7
|
+
# appropriate message if it wants to stop the commit. The hook is
|
8
|
+
# allowed to edit the commit message file.
|
9
|
+
#
|
10
|
+
# To enable this hook, rename this file to "applypatch-msg".
|
11
|
+
|
12
|
+
. git-sh-setup
|
13
|
+
test -x "$GIT_DIR/hooks/commit-msg" &&
|
14
|
+
exec "$GIT_DIR/hooks/commit-msg" ${1+"$@"}
|
15
|
+
:
|
@@ -0,0 +1,24 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script to check the commit log message.
|
4
|
+
# Called by "git commit" with one argument, the name of the file
|
5
|
+
# that has the commit message. The hook should exit with non-zero
|
6
|
+
# status after issuing an appropriate message if it wants to stop the
|
7
|
+
# commit. The hook is allowed to edit the commit message file.
|
8
|
+
#
|
9
|
+
# To enable this hook, rename this file to "commit-msg".
|
10
|
+
|
11
|
+
# Uncomment the below to add a Signed-off-by line to the message.
|
12
|
+
# Doing this in a hook is a bad idea in general, but the prepare-commit-msg
|
13
|
+
# hook is more suited to it.
|
14
|
+
#
|
15
|
+
# SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
|
16
|
+
# grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
|
17
|
+
|
18
|
+
# This example catches duplicate Signed-off-by lines.
|
19
|
+
|
20
|
+
test "" = "$(grep '^Signed-off-by: ' "$1" |
|
21
|
+
sort | uniq -c | sed -e '/^[ ]*1[ ]/d')" || {
|
22
|
+
echo >&2 Duplicate Signed-off-by lines.
|
23
|
+
exit 1
|
24
|
+
}
|
@@ -0,0 +1,15 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script for the "post-receive" event.
|
4
|
+
#
|
5
|
+
# The "post-receive" script is run after receive-pack has accepted a pack
|
6
|
+
# and the repository has been updated. It is passed arguments in through
|
7
|
+
# stdin in the form
|
8
|
+
# <oldrev> <newrev> <refname>
|
9
|
+
# For example:
|
10
|
+
# aa453216d1b3e49e7f6f98441fa56946ddcd6a20 68f7abf4e6f922807889f52bc043ecd31b79f814 refs/heads/master
|
11
|
+
#
|
12
|
+
# see contrib/hooks/ for a sample, or uncomment the next line and
|
13
|
+
# rename the file to "post-receive".
|
14
|
+
|
15
|
+
#. /usr/share/doc/git-core/contrib/hooks/post-receive-email
|
@@ -0,0 +1,14 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script to verify what is about to be committed
|
4
|
+
# by applypatch from an e-mail message.
|
5
|
+
#
|
6
|
+
# The hook should exit with non-zero status after issuing an
|
7
|
+
# appropriate message if it wants to stop the commit.
|
8
|
+
#
|
9
|
+
# To enable this hook, rename this file to "pre-applypatch".
|
10
|
+
|
11
|
+
. git-sh-setup
|
12
|
+
test -x "$GIT_DIR/hooks/pre-commit" &&
|
13
|
+
exec "$GIT_DIR/hooks/pre-commit" ${1+"$@"}
|
14
|
+
:
|
@@ -0,0 +1,46 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# An example hook script to verify what is about to be committed.
|
4
|
+
# Called by "git commit" with no arguments. The hook should
|
5
|
+
# exit with non-zero status after issuing an appropriate message if
|
6
|
+
# it wants to stop the commit.
|
7
|
+
#
|
8
|
+
# To enable this hook, rename this file to "pre-commit".
|
9
|
+
|
10
|
+
if git rev-parse --verify HEAD >/dev/null 2>&1
|
11
|
+
then
|
12
|
+
against=HEAD
|
13
|
+
else
|
14
|
+
# Initial commit: diff against an empty tree object
|
15
|
+
against=4b825dc642cb6eb9a060e54bf8d69288fbee4904
|
16
|
+
fi
|
17
|
+
|
18
|
+
# If you want to allow non-ascii filenames set this variable to true.
|
19
|
+
allownonascii=$(git config hooks.allownonascii)
|
20
|
+
|
21
|
+
# Cross platform projects tend to avoid non-ascii filenames; prevent
|
22
|
+
# them from being added to the repository. We exploit the fact that the
|
23
|
+
# printable range starts at the space character and ends with tilde.
|
24
|
+
if [ "$allownonascii" != "true" ] &&
|
25
|
+
# Note that the use of brackets around a tr range is ok here, (it's
|
26
|
+
# even required, for portability to Solaris 10's /usr/bin/tr), since
|
27
|
+
# the square bracket bytes happen to fall in the designated range.
|
28
|
+
test "$(git diff --cached --name-only --diff-filter=A -z $against |
|
29
|
+
LC_ALL=C tr -d '[ -~]\0')"
|
30
|
+
then
|
31
|
+
echo "Error: Attempt to add a non-ascii file name."
|
32
|
+
echo
|
33
|
+
echo "This can cause problems if you want to work"
|
34
|
+
echo "with people on other platforms."
|
35
|
+
echo
|
36
|
+
echo "To be portable it is advisable to rename the file ..."
|
37
|
+
echo
|
38
|
+
echo "If you know what you are doing you can disable this"
|
39
|
+
echo "check using:"
|
40
|
+
echo
|
41
|
+
echo " git config hooks.allownonascii true"
|
42
|
+
echo
|
43
|
+
exit 1
|
44
|
+
fi
|
45
|
+
|
46
|
+
exec git diff-index --check --cached $against --
|
@@ -0,0 +1,169 @@
|
|
1
|
+
#!/bin/sh
|
2
|
+
#
|
3
|
+
# Copyright (c) 2006, 2008 Junio C Hamano
|
4
|
+
#
|
5
|
+
# The "pre-rebase" hook is run just before "git rebase" starts doing
|
6
|
+
# its job, and can prevent the command from running by exiting with
|
7
|
+
# non-zero status.
|
8
|
+
#
|
9
|
+
# The hook is called with the following parameters:
|
10
|
+
#
|
11
|
+
# $1 -- the upstream the series was forked from.
|
12
|
+
# $2 -- the branch being rebased (or empty when rebasing the current branch).
|
13
|
+
#
|
14
|
+
# This sample shows how to prevent topic branches that are already
|
15
|
+
# merged to 'next' branch from getting rebased, because allowing it
|
16
|
+
# would result in rebasing already published history.
|
17
|
+
|
18
|
+
publish=next
|
19
|
+
basebranch="$1"
|
20
|
+
if test "$#" = 2
|
21
|
+
then
|
22
|
+
topic="refs/heads/$2"
|
23
|
+
else
|
24
|
+
topic=`git symbolic-ref HEAD` ||
|
25
|
+
exit 0 ;# we do not interrupt rebasing detached HEAD
|
26
|
+
fi
|
27
|
+
|
28
|
+
case "$topic" in
|
29
|
+
refs/heads/??/*)
|
30
|
+
;;
|
31
|
+
*)
|
32
|
+
exit 0 ;# we do not interrupt others.
|
33
|
+
;;
|
34
|
+
esac
|
35
|
+
|
36
|
+
# Now we are dealing with a topic branch being rebased
|
37
|
+
# on top of master. Is it OK to rebase it?
|
38
|
+
|
39
|
+
# Does the topic really exist?
|
40
|
+
git show-ref -q "$topic" || {
|
41
|
+
echo >&2 "No such branch $topic"
|
42
|
+
exit 1
|
43
|
+
}
|
44
|
+
|
45
|
+
# Is topic fully merged to master?
|
46
|
+
not_in_master=`git rev-list --pretty=oneline ^master "$topic"`
|
47
|
+
if test -z "$not_in_master"
|
48
|
+
then
|
49
|
+
echo >&2 "$topic is fully merged to master; better remove it."
|
50
|
+
exit 1 ;# we could allow it, but there is no point.
|
51
|
+
fi
|
52
|
+
|
53
|
+
# Is topic ever merged to next? If so you should not be rebasing it.
|
54
|
+
only_next_1=`git rev-list ^master "^$topic" ${publish} | sort`
|
55
|
+
only_next_2=`git rev-list ^master ${publish} | sort`
|
56
|
+
if test "$only_next_1" = "$only_next_2"
|
57
|
+
then
|
58
|
+
not_in_topic=`git rev-list "^$topic" master`
|
59
|
+
if test -z "$not_in_topic"
|
60
|
+
then
|
61
|
+
echo >&2 "$topic is already up-to-date with master"
|
62
|
+
exit 1 ;# we could allow it, but there is no point.
|
63
|
+
else
|
64
|
+
exit 0
|
65
|
+
fi
|
66
|
+
else
|
67
|
+
not_in_next=`git rev-list --pretty=oneline ^${publish} "$topic"`
|
68
|
+
/usr/bin/perl -e '
|
69
|
+
my $topic = $ARGV[0];
|
70
|
+
my $msg = "* $topic has commits already merged to public branch:\n";
|
71
|
+
my (%not_in_next) = map {
|
72
|
+
/^([0-9a-f]+) /;
|
73
|
+
($1 => 1);
|
74
|
+
} split(/\n/, $ARGV[1]);
|
75
|
+
for my $elem (map {
|
76
|
+
/^([0-9a-f]+) (.*)$/;
|
77
|
+
[$1 => $2];
|
78
|
+
} split(/\n/, $ARGV[2])) {
|
79
|
+
if (!exists $not_in_next{$elem->[0]}) {
|
80
|
+
if ($msg) {
|
81
|
+
print STDERR $msg;
|
82
|
+
undef $msg;
|
83
|
+
}
|
84
|
+
print STDERR " $elem->[1]\n";
|
85
|
+
}
|
86
|
+
}
|
87
|
+
' "$topic" "$not_in_next" "$not_in_master"
|
88
|
+
exit 1
|
89
|
+
fi
|
90
|
+
|
91
|
+
exit 0
|
92
|
+
|
93
|
+
################################################################
|
94
|
+
|
95
|
+
This sample hook safeguards topic branches that have been
|
96
|
+
published from being rewound.
|
97
|
+
|
98
|
+
The workflow assumed here is:
|
99
|
+
|
100
|
+
* Once a topic branch forks from "master", "master" is never
|
101
|
+
merged into it again (either directly or indirectly).
|
102
|
+
|
103
|
+
* Once a topic branch is fully cooked and merged into "master",
|
104
|
+
it is deleted. If you need to build on top of it to correct
|
105
|
+
earlier mistakes, a new topic branch is created by forking at
|
106
|
+
the tip of the "master". This is not strictly necessary, but
|
107
|
+
it makes it easier to keep your history simple.
|
108
|
+
|
109
|
+
* Whenever you need to test or publish your changes to topic
|
110
|
+
branches, merge them into "next" branch.
|
111
|
+
|
112
|
+
The script, being an example, hardcodes the publish branch name
|
113
|
+
to be "next", but it is trivial to make it configurable via
|
114
|
+
$GIT_DIR/config mechanism.
|
115
|
+
|
116
|
+
With this workflow, you would want to know:
|
117
|
+
|
118
|
+
(1) ... if a topic branch has ever been merged to "next". Young
|
119
|
+
topic branches can have stupid mistakes you would rather
|
120
|
+
clean up before publishing, and things that have not been
|
121
|
+
merged into other branches can be easily rebased without
|
122
|
+
affecting other people. But once it is published, you would
|
123
|
+
not want to rewind it.
|
124
|
+
|
125
|
+
(2) ... if a topic branch has been fully merged to "master".
|
126
|
+
Then you can delete it. More importantly, you should not
|
127
|
+
build on top of it -- other people may already want to
|
128
|
+
change things related to the topic as patches against your
|
129
|
+
"master", so if you need further changes, it is better to
|
130
|
+
fork the topic (perhaps with the same name) afresh from the
|
131
|
+
tip of "master".
|
132
|
+
|
133
|
+
Let's look at this example:
|
134
|
+
|
135
|
+
o---o---o---o---o---o---o---o---o---o "next"
|
136
|
+
/ / / /
|
137
|
+
/ a---a---b A / /
|
138
|
+
/ / / /
|
139
|
+
/ / c---c---c---c B /
|
140
|
+
/ / / \ /
|
141
|
+
/ / / b---b C \ /
|
142
|
+
/ / / / \ /
|
143
|
+
---o---o---o---o---o---o---o---o---o---o---o "master"
|
144
|
+
|
145
|
+
|
146
|
+
A, B and C are topic branches.
|
147
|
+
|
148
|
+
* A has one fix since it was merged up to "next".
|
149
|
+
|
150
|
+
* B has finished. It has been fully merged up to "master" and "next",
|
151
|
+
and is ready to be deleted.
|
152
|
+
|
153
|
+
* C has not merged to "next" at all.
|
154
|
+
|
155
|
+
We would want to allow C to be rebased, refuse A, and encourage
|
156
|
+
B to be deleted.
|
157
|
+
|
158
|
+
To compute (1):
|
159
|
+
|
160
|
+
git rev-list ^master ^topic next
|
161
|
+
git rev-list ^master next
|
162
|
+
|
163
|
+
if these match, topic has not merged in next at all.
|
164
|
+
|
165
|
+
To compute (2):
|
166
|
+
|
167
|
+
git rev-list master..topic
|
168
|
+
|
169
|
+
if this is empty, it is fully merged to "master".
|