deployments 0.0.10 → 0.1.0

Sign up to get free protection for your applications and to get access to all the features.
Files changed (48) hide show
  1. data/.gitignore +1 -0
  2. data/Gemfile +1 -0
  3. data/deployments.gemspec +1 -0
  4. data/lib/deployments.rb +3 -0
  5. data/lib/deployments/build.rb +2 -2
  6. data/lib/deployments/project.rb +25 -7
  7. data/lib/deployments/public_version.rb +14 -0
  8. data/lib/deployments/version.rb +1 -1
  9. data/lib/tasks/deployments.rake +8 -3
  10. data/spec/build_spec.rb +5 -11
  11. data/spec/dispatcher_spec.rb +2 -1
  12. data/spec/fixtures/repositories/tags/README +1 -0
  13. data/spec/fixtures/repositories/tags/dot_git/COMMIT_EDITMSG +1 -0
  14. data/spec/fixtures/repositories/tags/dot_git/HEAD +1 -0
  15. data/spec/fixtures/repositories/tags/dot_git/config +6 -0
  16. data/spec/fixtures/repositories/tags/dot_git/description +1 -0
  17. data/spec/fixtures/repositories/tags/dot_git/hooks/applypatch-msg.sample +15 -0
  18. data/spec/fixtures/repositories/tags/dot_git/hooks/commit-msg.sample +24 -0
  19. data/spec/fixtures/repositories/tags/dot_git/hooks/post-commit.sample +8 -0
  20. data/spec/fixtures/repositories/tags/dot_git/hooks/post-receive.sample +15 -0
  21. data/spec/fixtures/repositories/tags/dot_git/hooks/post-update.sample +8 -0
  22. data/spec/fixtures/repositories/tags/dot_git/hooks/pre-applypatch.sample +14 -0
  23. data/spec/fixtures/repositories/tags/dot_git/hooks/pre-commit.sample +50 -0
  24. data/spec/fixtures/repositories/tags/dot_git/hooks/pre-rebase.sample +169 -0
  25. data/spec/fixtures/repositories/tags/dot_git/hooks/prepare-commit-msg.sample +36 -0
  26. data/spec/fixtures/repositories/tags/dot_git/hooks/update.sample +128 -0
  27. data/spec/fixtures/repositories/tags/dot_git/index +0 -0
  28. data/spec/fixtures/repositories/tags/dot_git/info/exclude +6 -0
  29. data/spec/fixtures/repositories/tags/dot_git/logs/HEAD +3 -0
  30. data/spec/fixtures/repositories/tags/dot_git/logs/refs/heads/master +3 -0
  31. data/spec/fixtures/repositories/tags/dot_git/objects/54/3b9bebdc6bd5c4b22136034a95dd097a57d3dd +0 -0
  32. data/spec/fixtures/repositories/tags/dot_git/objects/65/1e42f03dc3715c6614a25ebfc6cb18748672e2 +4 -0
  33. data/spec/fixtures/repositories/tags/dot_git/objects/70/aff36d6a3587824575d5b8ed255dc2b526e197 +0 -0
  34. data/spec/fixtures/repositories/tags/dot_git/objects/77/9122ddab982d8732a9ef12426585c1f72a81a9 +0 -0
  35. data/spec/fixtures/repositories/tags/dot_git/objects/7d/03e7c4131c2ae95ee6fcc04ae1366699142967 +0 -0
  36. data/spec/fixtures/repositories/tags/dot_git/objects/8d/1c8b69c3fce7bea45c73efd06983e3c419a92f +0 -0
  37. data/spec/fixtures/repositories/tags/dot_git/objects/c6/c8c005ba322f95e03cf9ec2110bf5ffd5e1f36 +0 -0
  38. data/spec/fixtures/repositories/tags/dot_git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391 +0 -0
  39. data/spec/fixtures/repositories/tags/dot_git/objects/e8/45566c06f9bf557d35e8292c37cf05d97a9769 +0 -0
  40. data/spec/fixtures/repositories/tags/dot_git/refs/heads/master +1 -0
  41. data/spec/fixtures/repositories/tags/dot_git/refs/tags/1.1.1 +1 -0
  42. data/spec/fixtures/repositories/tags/dot_git/refs/tags/1.15.1 +1 -0
  43. data/spec/fixtures/repositories/tags/dot_git/refs/tags/1.2.1 +1 -0
  44. data/spec/project_spec.rb +26 -4
  45. data/spec/public_version_spec.rb +26 -0
  46. data/spec/spec_helper.rb +1 -0
  47. data/spec/support/stub_repository.rb +5 -0
  48. metadata +87 -2
data/.gitignore CHANGED
@@ -15,3 +15,4 @@ spec/reports
15
15
  test/tmp
16
16
  test/version_tmp
17
17
  tmp
18
+ public/
data/Gemfile CHANGED
@@ -6,6 +6,7 @@ gem 'curb'
6
6
  gem 'grit'
7
7
  gem 'simple-conf'
8
8
  gem 'capistrano'
9
+ gem 'versionomy'
9
10
 
10
11
  group :development do
11
12
  gem 'ruby_gntp'
data/deployments.gemspec CHANGED
@@ -17,6 +17,7 @@ Gem::Specification.new do |gem|
17
17
 
18
18
  gem.add_dependency('curb')
19
19
  gem.add_dependency('grit')
20
+ gem.add_dependency('versionomy')
20
21
  gem.add_dependency('simple-conf')
21
22
  gem.add_dependency('capistrano')
22
23
  end
data/lib/deployments.rb CHANGED
@@ -2,6 +2,7 @@ require "deployments/version"
2
2
  require "deployments/project"
3
3
  require "deployments/build"
4
4
  require "deployments/dispatcher"
5
+ require "deployments/public_version"
5
6
 
6
7
  require "deployments/railtie" if defined?(Rails) and Rails.version > "3.0.0"
7
8
 
@@ -9,5 +10,7 @@ require 'simple-conf'
9
10
 
10
11
  module Deployments
11
12
  include SimpleConf
13
+
14
+ VERSION_FILE = './public/version.txt'
12
15
  end
13
16
 
@@ -4,9 +4,9 @@ module Deployments
4
4
  class Build
5
5
  attr_reader :env, :project
6
6
 
7
- def initialize(env)
7
+ def initialize(env, project)
8
8
  @env = env
9
- @project = Project.new('./')
9
+ @project = project
10
10
  end
11
11
 
12
12
  def to_params
@@ -1,12 +1,19 @@
1
1
  require 'grit'
2
+ require 'versionomy'
2
3
 
3
4
  module Deployments
4
5
  class Project
5
- attr_reader :path, :repo
6
+ attr_reader :path, :repo, :tag_names
6
7
 
7
8
  def initialize(path)
8
9
  @path = path
9
10
  @repo = Grit::Repo.new(path)
11
+
12
+ versions = @repo.tags.map do |tag|
13
+ Versionomy.parse(tag.name)
14
+ end.sort
15
+
16
+ @tag_names = versions.map {|v| v.to_s}
10
17
  end
11
18
 
12
19
  def commits
@@ -19,23 +26,34 @@ module Deployments
19
26
  end
20
27
 
21
28
  def tag
22
- repo.tags.last.name if has_tags?
29
+ tag_names.last if has_tags?
30
+ end
31
+
32
+ def previous_tag
33
+ tag_name = File.read(VERSION_FILE) if File.exists?(VERSION_FILE)
34
+ tag_name ||= tag_names[tag_names.size - 2]
35
+
36
+ find_repo_tag(tag_name)
23
37
  end
24
38
 
25
39
  private
26
40
 
27
41
  def between_tags(repo)
28
- last = repo.tags.last
29
- previous = repo.tags[repo.tags.size - 2]
30
- repo.commits_between(previous.commit.id, last.commit.id)
42
+ last = find_repo_tag(tag_names.last)
43
+
44
+ repo.commits_between(previous_tag.commit.id, last.commit.id)
45
+ end
46
+
47
+ def find_repo_tag(name)
48
+ repo.tags.find {|t| t.name == name}
31
49
  end
32
50
 
33
51
  def has_commits_between_tags?
34
- repo.tags.size > 1
52
+ tag_names.size > 1
35
53
  end
36
54
 
37
55
  def has_tags?
38
- not repo.tags.empty?
56
+ not tag_names.empty?
39
57
  end
40
58
  end
41
59
  end
@@ -0,0 +1,14 @@
1
+ module Deployments
2
+ class PublicVersion
3
+ def initialize(project)
4
+ @project = project
5
+ end
6
+
7
+ def generate
8
+ File.open(VERSION_FILE, 'w') do |file|
9
+ file.write @project.tag_names.last
10
+ end
11
+ end
12
+ end
13
+ end
14
+
@@ -1,3 +1,3 @@
1
1
  module Deployments
2
- VERSION = "0.0.10"
2
+ VERSION = "0.1.0"
3
3
  end
@@ -2,14 +2,19 @@ require 'deployments'
2
2
  require 'rake'
3
3
 
4
4
  include Rake::DSL if defined?(Rake::DSL)
5
+ include Deployments
5
6
 
6
7
  namespace :deployments do
7
-
8
8
  desc "Push deployments details to the server"
9
9
  task :push do
10
- build = Deployments::Build.new(ENV['app_env'])
11
- dispatcher = Deployments::Dispatcher.new(build)
10
+ project = Project.new('./')
11
+ build = Build.new(ENV['app_env'], project)
12
+
13
+ dispatcher = Dispatcher.new(build)
12
14
  dispatcher.run
15
+
16
+ public_version = PublicVersion.new(project)
17
+ public_version.generate
13
18
  end
14
19
  end
15
20
 
data/spec/build_spec.rb CHANGED
@@ -3,7 +3,11 @@ require 'spec_helper'
3
3
  include Deployments
4
4
 
5
5
  describe Build do
6
- let(:build) { Build.new("staging") }
6
+ let(:project_path) { './spec/fixtures/repositories/commits_tag/dot_git' }
7
+ let(:project) { Project.new(project_path) }
8
+ let(:build) { Build.new("staging", project) }
9
+
10
+ before { stub_repository }
7
11
 
8
12
  describe "interface for getting build information as json params" do
9
13
  let(:params) { build.to_params[:deployment] }
@@ -28,16 +32,6 @@ describe Build do
28
32
  end
29
33
 
30
34
  context "in the current git project" do
31
- let(:project_path) { './spec/fixtures/repositories/commits_tag/dot_git' }
32
-
33
- before do
34
- @repo = Grit::Repo.new(project_path, :is_bare => true)
35
- Grit::Repo.should_receive(:new).and_return(@repo)
36
-
37
- @project = Project.new(project_path)
38
- Project.should_receive(:new).and_return(@project)
39
- end
40
-
41
35
  it "should return current tag of the git project" do
42
36
  params[:version].should == "0.0.1"
43
37
  end
@@ -3,7 +3,8 @@ require 'spec_helper'
3
3
  include Deployments
4
4
 
5
5
  describe Dispatcher do
6
- let(:build) { Build.new("staging") }
6
+ let(:project) { Project.new('./') }
7
+ let(:build) { Build.new("staging", project) }
7
8
  let(:dispatcher) { Dispatcher.new(build) }
8
9
 
9
10
  before { build.should_receive(:to_params).and_return(fields) }
@@ -0,0 +1 @@
1
+ Add empty space to readme file
@@ -0,0 +1 @@
1
+ ref: refs/heads/master
@@ -0,0 +1,6 @@
1
+ [core]
2
+ repositoryformatversion = 0
3
+ filemode = true
4
+ bare = false
5
+ logallrefupdates = true
6
+ ignorecase = true
@@ -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,8 @@
1
+ #!/bin/sh
2
+ #
3
+ # An example hook script that is called after a successful
4
+ # commit is made.
5
+ #
6
+ # To enable this hook, rename this file to "post-commit".
7
+
8
+ : Nothing
@@ -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,8 @@
1
+ #!/bin/sh
2
+ #
3
+ # An example hook script to prepare a packed repository for use over
4
+ # dumb transports.
5
+ #
6
+ # To enable this hook, rename this file to "post-update".
7
+
8
+ exec git update-server-info
@@ -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,50 @@
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
+ # Redirect output to stderr.
22
+ exec 1>&2
23
+
24
+ # Cross platform projects tend to avoid non-ascii filenames; prevent
25
+ # them from being added to the repository. We exploit the fact that the
26
+ # printable range starts at the space character and ends with tilde.
27
+ if [ "$allownonascii" != "true" ] &&
28
+ # Note that the use of brackets around a tr range is ok here, (it's
29
+ # even required, for portability to Solaris 10's /usr/bin/tr), since
30
+ # the square bracket bytes happen to fall in the designated range.
31
+ test $(git diff --cached --name-only --diff-filter=A -z $against |
32
+ LC_ALL=C tr -d '[ -~]\0' | wc -c) != 0
33
+ then
34
+ echo "Error: Attempt to add a non-ascii file name."
35
+ echo
36
+ echo "This can cause problems if you want to work"
37
+ echo "with people on other platforms."
38
+ echo
39
+ echo "To be portable it is advisable to rename the file ..."
40
+ echo
41
+ echo "If you know what you are doing you can disable this"
42
+ echo "check using:"
43
+ echo
44
+ echo " git config hooks.allownonascii true"
45
+ echo
46
+ exit 1
47
+ fi
48
+
49
+ # If there are whitespace errors, print the offending file names and fail.
50
+ 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".
@@ -0,0 +1,36 @@
1
+ #!/bin/sh
2
+ #
3
+ # An example hook script to prepare the commit log message.
4
+ # Called by "git commit" with the name of the file that has the
5
+ # commit message, followed by the description of the commit
6
+ # message's source. The hook's purpose is to edit the commit
7
+ # message file. If the hook fails with a non-zero status,
8
+ # the commit is aborted.
9
+ #
10
+ # To enable this hook, rename this file to "prepare-commit-msg".
11
+
12
+ # This hook includes three examples. The first comments out the
13
+ # "Conflicts:" part of a merge commit.
14
+ #
15
+ # The second includes the output of "git diff --name-status -r"
16
+ # into the message, just before the "git status" output. It is
17
+ # commented because it doesn't cope with --amend or with squashed
18
+ # commits.
19
+ #
20
+ # The third example adds a Signed-off-by line to the message, that can
21
+ # still be edited. This is rarely a good idea.
22
+
23
+ case "$2,$3" in
24
+ merge,)
25
+ /usr/bin/perl -i.bak -ne 's/^/# /, s/^# #/#/ if /^Conflicts/ .. /#/; print' "$1" ;;
26
+
27
+ # ,|template,)
28
+ # /usr/bin/perl -i.bak -pe '
29
+ # print "\n" . `git diff --cached --name-status -r`
30
+ # if /^#/ && $first++ == 0' "$1" ;;
31
+
32
+ *) ;;
33
+ esac
34
+
35
+ # SOB=$(git var GIT_AUTHOR_IDENT | sed -n 's/^\(.*>\).*$/Signed-off-by: \1/p')
36
+ # grep -qs "^$SOB" "$1" || echo "$SOB" >> "$1"
@@ -0,0 +1,128 @@
1
+ #!/bin/sh
2
+ #
3
+ # An example hook script to blocks unannotated tags from entering.
4
+ # Called by "git receive-pack" with arguments: refname sha1-old sha1-new
5
+ #
6
+ # To enable this hook, rename this file to "update".
7
+ #
8
+ # Config
9
+ # ------
10
+ # hooks.allowunannotated
11
+ # This boolean sets whether unannotated tags will be allowed into the
12
+ # repository. By default they won't be.
13
+ # hooks.allowdeletetag
14
+ # This boolean sets whether deleting tags will be allowed in the
15
+ # repository. By default they won't be.
16
+ # hooks.allowmodifytag
17
+ # This boolean sets whether a tag may be modified after creation. By default
18
+ # it won't be.
19
+ # hooks.allowdeletebranch
20
+ # This boolean sets whether deleting branches will be allowed in the
21
+ # repository. By default they won't be.
22
+ # hooks.denycreatebranch
23
+ # This boolean sets whether remotely creating branches will be denied
24
+ # in the repository. By default this is allowed.
25
+ #
26
+
27
+ # --- Command line
28
+ refname="$1"
29
+ oldrev="$2"
30
+ newrev="$3"
31
+
32
+ # --- Safety check
33
+ if [ -z "$GIT_DIR" ]; then
34
+ echo "Don't run this script from the command line." >&2
35
+ echo " (if you want, you could supply GIT_DIR then run" >&2
36
+ echo " $0 <ref> <oldrev> <newrev>)" >&2
37
+ exit 1
38
+ fi
39
+
40
+ if [ -z "$refname" -o -z "$oldrev" -o -z "$newrev" ]; then
41
+ echo "Usage: $0 <ref> <oldrev> <newrev>" >&2
42
+ exit 1
43
+ fi
44
+
45
+ # --- Config
46
+ allowunannotated=$(git config --bool hooks.allowunannotated)
47
+ allowdeletebranch=$(git config --bool hooks.allowdeletebranch)
48
+ denycreatebranch=$(git config --bool hooks.denycreatebranch)
49
+ allowdeletetag=$(git config --bool hooks.allowdeletetag)
50
+ allowmodifytag=$(git config --bool hooks.allowmodifytag)
51
+
52
+ # check for no description
53
+ projectdesc=$(sed -e '1q' "$GIT_DIR/description")
54
+ case "$projectdesc" in
55
+ "Unnamed repository"* | "")
56
+ echo "*** Project description file hasn't been set" >&2
57
+ exit 1
58
+ ;;
59
+ esac
60
+
61
+ # --- Check types
62
+ # if $newrev is 0000...0000, it's a commit to delete a ref.
63
+ zero="0000000000000000000000000000000000000000"
64
+ if [ "$newrev" = "$zero" ]; then
65
+ newrev_type=delete
66
+ else
67
+ newrev_type=$(git cat-file -t $newrev)
68
+ fi
69
+
70
+ case "$refname","$newrev_type" in
71
+ refs/tags/*,commit)
72
+ # un-annotated tag
73
+ short_refname=${refname##refs/tags/}
74
+ if [ "$allowunannotated" != "true" ]; then
75
+ echo "*** The un-annotated tag, $short_refname, is not allowed in this repository" >&2
76
+ echo "*** Use 'git tag [ -a | -s ]' for tags you want to propagate." >&2
77
+ exit 1
78
+ fi
79
+ ;;
80
+ refs/tags/*,delete)
81
+ # delete tag
82
+ if [ "$allowdeletetag" != "true" ]; then
83
+ echo "*** Deleting a tag is not allowed in this repository" >&2
84
+ exit 1
85
+ fi
86
+ ;;
87
+ refs/tags/*,tag)
88
+ # annotated tag
89
+ if [ "$allowmodifytag" != "true" ] && git rev-parse $refname > /dev/null 2>&1
90
+ then
91
+ echo "*** Tag '$refname' already exists." >&2
92
+ echo "*** Modifying a tag is not allowed in this repository." >&2
93
+ exit 1
94
+ fi
95
+ ;;
96
+ refs/heads/*,commit)
97
+ # branch
98
+ if [ "$oldrev" = "$zero" -a "$denycreatebranch" = "true" ]; then
99
+ echo "*** Creating a branch is not allowed in this repository" >&2
100
+ exit 1
101
+ fi
102
+ ;;
103
+ refs/heads/*,delete)
104
+ # delete branch
105
+ if [ "$allowdeletebranch" != "true" ]; then
106
+ echo "*** Deleting a branch is not allowed in this repository" >&2
107
+ exit 1
108
+ fi
109
+ ;;
110
+ refs/remotes/*,commit)
111
+ # tracking branch
112
+ ;;
113
+ refs/remotes/*,delete)
114
+ # delete tracking branch
115
+ if [ "$allowdeletebranch" != "true" ]; then
116
+ echo "*** Deleting a tracking branch is not allowed in this repository" >&2
117
+ exit 1
118
+ fi
119
+ ;;
120
+ *)
121
+ # Anything else (is there anything else?)
122
+ echo "*** Update hook: unknown type of update to ref $refname of type $newrev_type" >&2
123
+ exit 1
124
+ ;;
125
+ esac
126
+
127
+ # --- Finished
128
+ exit 0
@@ -0,0 +1,6 @@
1
+ # git ls-files --others --exclude-from=.git/info/exclude
2
+ # Lines that start with '#' are comments.
3
+ # For a project mostly in C, the following would be a good set of
4
+ # exclude patterns (uncomment them if you want to use them):
5
+ # *.[oa]
6
+ # *~
@@ -0,0 +1,3 @@
1
+ 0000000000000000000000000000000000000000 70aff36d6a3587824575d5b8ed255dc2b526e197 Alexandr Korsak <alex.korsak@gmail.com> 1339747091 +0300 commit (initial): Add readme file
2
+ 70aff36d6a3587824575d5b8ed255dc2b526e197 7d03e7c4131c2ae95ee6fcc04ae1366699142967 Alexandr Korsak <alex.korsak@gmail.com> 1339747150 +0300 commit: Change readme file
3
+ 7d03e7c4131c2ae95ee6fcc04ae1366699142967 651e42f03dc3715c6614a25ebfc6cb18748672e2 Alexandr Korsak <alex.korsak@gmail.com> 1339747182 +0300 commit: Add empty space to readme file
@@ -0,0 +1,3 @@
1
+ 0000000000000000000000000000000000000000 70aff36d6a3587824575d5b8ed255dc2b526e197 Alexandr Korsak <alex.korsak@gmail.com> 1339747091 +0300 commit (initial): Add readme file
2
+ 70aff36d6a3587824575d5b8ed255dc2b526e197 7d03e7c4131c2ae95ee6fcc04ae1366699142967 Alexandr Korsak <alex.korsak@gmail.com> 1339747150 +0300 commit: Change readme file
3
+ 7d03e7c4131c2ae95ee6fcc04ae1366699142967 651e42f03dc3715c6614a25ebfc6cb18748672e2 Alexandr Korsak <alex.korsak@gmail.com> 1339747182 +0300 commit: Add empty space to readme file
@@ -0,0 +1,4 @@
1
+ x��Aj1 E��)�/��1�Ҭ{
2
+ E��!�xp\hoߡW��=x����u��i3ШgE Wa�k��5�z"��Pk F���e�}B*Ȗt!&�bG`���"Fc̙�cr�5?���f�r/��x�
3
+ ĜӒ�����8:��R
4
+ X��<vQ��a��fP���/��R�
@@ -0,0 +1 @@
1
+ 651e42f03dc3715c6614a25ebfc6cb18748672e2
@@ -0,0 +1 @@
1
+ 70aff36d6a3587824575d5b8ed255dc2b526e197
@@ -0,0 +1 @@
1
+ 651e42f03dc3715c6614a25ebfc6cb18748672e2
@@ -0,0 +1 @@
1
+ 7d03e7c4131c2ae95ee6fcc04ae1366699142967
data/spec/project_spec.rb CHANGED
@@ -5,10 +5,7 @@ include Deployments
5
5
  describe Project do
6
6
  let(:project) { Project.new(project_path) }
7
7
 
8
- before do
9
- @repo = Grit::Repo.new(project_path, :is_bare => true)
10
- Grit::Repo.should_receive(:new).and_return(@repo)
11
- end
8
+ before { stub_repository }
12
9
 
13
10
  context "with one commit" do
14
11
  let(:project_path) { './spec/fixtures/repositories/one_commit/dot_git' }
@@ -61,6 +58,23 @@ describe Project do
61
58
  end
62
59
  end
63
60
 
61
+ context "when we have version.txt file in public folder" do
62
+ let(:project_path) { './spec/fixtures/repositories/tags/dot_git' }
63
+
64
+ before do
65
+ File.open(VERSION_FILE, "w") do |file|
66
+ file.write "1.1.1"
67
+ end
68
+ end
69
+
70
+ after { File.delete(VERSION_FILE) }
71
+
72
+ it "should use version file for collecting commits" do
73
+ project.commits.to_s.should include("Change readme file")
74
+ project.commits.to_s.should include("Add empty space to readme file")
75
+ end
76
+ end
77
+
64
78
  context "with one commit between tags" do
65
79
  let(:project_path) { './spec/fixtures/repositories/one_commit_tags/dot_git' }
66
80
 
@@ -72,5 +86,13 @@ describe Project do
72
86
  project.tag.should == "0.0.2"
73
87
  end
74
88
  end
89
+
90
+ context "with various tags" do
91
+ let(:project_path) { './spec/fixtures/repositories/tags/dot_git' }
92
+
93
+ it "should return the latest tag" do
94
+ project.tag.should == "1.15.1"
95
+ end
96
+ end
75
97
  end
76
98
 
@@ -0,0 +1,26 @@
1
+ require 'spec_helper'
2
+
3
+ include Deployments
4
+
5
+ describe PublicVersion do
6
+ let(:project_path) { './spec/fixtures/repositories/tags/dot_git' }
7
+ let(:project) { Project.new(project_path) }
8
+ let(:public_version) { PublicVersion.new(project) }
9
+
10
+ before { stub_repository }
11
+
12
+ context "on generate version.txt" do
13
+ before { public_version.generate }
14
+
15
+ after { File.delete(VERSION_FILE) }
16
+
17
+ it "should create file in public folder" do
18
+ File.exists?(VERSION_FILE).should be_true
19
+ end
20
+
21
+ it "should contain the latest tag of the repository" do
22
+ File.read(VERSION_FILE).should == "1.15.1"
23
+ end
24
+ end
25
+ end
26
+
data/spec/spec_helper.rb CHANGED
@@ -3,4 +3,5 @@ $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
3
3
 
4
4
  require 'rubygems'
5
5
  require 'deployments'
6
+ require './spec/support/stub_repository.rb'
6
7
 
@@ -0,0 +1,5 @@
1
+ def stub_repository
2
+ @repo = Grit::Repo.new(project_path, :is_bare => true)
3
+ Grit::Repo.should_receive(:new).and_return(@repo)
4
+ end
5
+
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: deployments
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.10
4
+ version: 0.1.0
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,7 +9,7 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-06-14 00:00:00.000000000 Z
12
+ date: 2012-06-15 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: curb
@@ -43,6 +43,22 @@ dependencies:
43
43
  - - ! '>='
44
44
  - !ruby/object:Gem::Version
45
45
  version: '0'
46
+ - !ruby/object:Gem::Dependency
47
+ name: versionomy
48
+ requirement: !ruby/object:Gem::Requirement
49
+ none: false
50
+ requirements:
51
+ - - ! '>='
52
+ - !ruby/object:Gem::Version
53
+ version: '0'
54
+ type: :runtime
55
+ prerelease: false
56
+ version_requirements: !ruby/object:Gem::Requirement
57
+ none: false
58
+ requirements:
59
+ - - ! '>='
60
+ - !ruby/object:Gem::Version
61
+ version: '0'
46
62
  - !ruby/object:Gem::Dependency
47
63
  name: simple-conf
48
64
  requirement: !ruby/object:Gem::Requirement
@@ -97,6 +113,7 @@ files:
97
113
  - lib/deployments/build.rb
98
114
  - lib/deployments/dispatcher.rb
99
115
  - lib/deployments/project.rb
116
+ - lib/deployments/public_version.rb
100
117
  - lib/deployments/railtie.rb
101
118
  - lib/deployments/recipes.rb
102
119
  - lib/deployments/version.rb
@@ -243,8 +260,42 @@ files:
243
260
  - spec/fixtures/repositories/one_commit_tags/dot_git/refs/heads/master
244
261
  - spec/fixtures/repositories/one_commit_tags/dot_git/refs/tags/0.0.1
245
262
  - spec/fixtures/repositories/one_commit_tags/dot_git/refs/tags/0.0.2
263
+ - spec/fixtures/repositories/tags/README
264
+ - spec/fixtures/repositories/tags/dot_git/COMMIT_EDITMSG
265
+ - spec/fixtures/repositories/tags/dot_git/HEAD
266
+ - spec/fixtures/repositories/tags/dot_git/config
267
+ - spec/fixtures/repositories/tags/dot_git/description
268
+ - spec/fixtures/repositories/tags/dot_git/hooks/applypatch-msg.sample
269
+ - spec/fixtures/repositories/tags/dot_git/hooks/commit-msg.sample
270
+ - spec/fixtures/repositories/tags/dot_git/hooks/post-commit.sample
271
+ - spec/fixtures/repositories/tags/dot_git/hooks/post-receive.sample
272
+ - spec/fixtures/repositories/tags/dot_git/hooks/post-update.sample
273
+ - spec/fixtures/repositories/tags/dot_git/hooks/pre-applypatch.sample
274
+ - spec/fixtures/repositories/tags/dot_git/hooks/pre-commit.sample
275
+ - spec/fixtures/repositories/tags/dot_git/hooks/pre-rebase.sample
276
+ - spec/fixtures/repositories/tags/dot_git/hooks/prepare-commit-msg.sample
277
+ - spec/fixtures/repositories/tags/dot_git/hooks/update.sample
278
+ - spec/fixtures/repositories/tags/dot_git/index
279
+ - spec/fixtures/repositories/tags/dot_git/info/exclude
280
+ - spec/fixtures/repositories/tags/dot_git/logs/HEAD
281
+ - spec/fixtures/repositories/tags/dot_git/logs/refs/heads/master
282
+ - spec/fixtures/repositories/tags/dot_git/objects/54/3b9bebdc6bd5c4b22136034a95dd097a57d3dd
283
+ - spec/fixtures/repositories/tags/dot_git/objects/65/1e42f03dc3715c6614a25ebfc6cb18748672e2
284
+ - spec/fixtures/repositories/tags/dot_git/objects/70/aff36d6a3587824575d5b8ed255dc2b526e197
285
+ - spec/fixtures/repositories/tags/dot_git/objects/77/9122ddab982d8732a9ef12426585c1f72a81a9
286
+ - spec/fixtures/repositories/tags/dot_git/objects/7d/03e7c4131c2ae95ee6fcc04ae1366699142967
287
+ - spec/fixtures/repositories/tags/dot_git/objects/8d/1c8b69c3fce7bea45c73efd06983e3c419a92f
288
+ - spec/fixtures/repositories/tags/dot_git/objects/c6/c8c005ba322f95e03cf9ec2110bf5ffd5e1f36
289
+ - spec/fixtures/repositories/tags/dot_git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
290
+ - spec/fixtures/repositories/tags/dot_git/objects/e8/45566c06f9bf557d35e8292c37cf05d97a9769
291
+ - spec/fixtures/repositories/tags/dot_git/refs/heads/master
292
+ - spec/fixtures/repositories/tags/dot_git/refs/tags/1.1.1
293
+ - spec/fixtures/repositories/tags/dot_git/refs/tags/1.15.1
294
+ - spec/fixtures/repositories/tags/dot_git/refs/tags/1.2.1
246
295
  - spec/project_spec.rb
296
+ - spec/public_version_spec.rb
247
297
  - spec/spec_helper.rb
298
+ - spec/support/stub_repository.rb
248
299
  homepage: ''
249
300
  licenses: []
250
301
  post_install_message:
@@ -412,5 +463,39 @@ test_files:
412
463
  - spec/fixtures/repositories/one_commit_tags/dot_git/refs/heads/master
413
464
  - spec/fixtures/repositories/one_commit_tags/dot_git/refs/tags/0.0.1
414
465
  - spec/fixtures/repositories/one_commit_tags/dot_git/refs/tags/0.0.2
466
+ - spec/fixtures/repositories/tags/README
467
+ - spec/fixtures/repositories/tags/dot_git/COMMIT_EDITMSG
468
+ - spec/fixtures/repositories/tags/dot_git/HEAD
469
+ - spec/fixtures/repositories/tags/dot_git/config
470
+ - spec/fixtures/repositories/tags/dot_git/description
471
+ - spec/fixtures/repositories/tags/dot_git/hooks/applypatch-msg.sample
472
+ - spec/fixtures/repositories/tags/dot_git/hooks/commit-msg.sample
473
+ - spec/fixtures/repositories/tags/dot_git/hooks/post-commit.sample
474
+ - spec/fixtures/repositories/tags/dot_git/hooks/post-receive.sample
475
+ - spec/fixtures/repositories/tags/dot_git/hooks/post-update.sample
476
+ - spec/fixtures/repositories/tags/dot_git/hooks/pre-applypatch.sample
477
+ - spec/fixtures/repositories/tags/dot_git/hooks/pre-commit.sample
478
+ - spec/fixtures/repositories/tags/dot_git/hooks/pre-rebase.sample
479
+ - spec/fixtures/repositories/tags/dot_git/hooks/prepare-commit-msg.sample
480
+ - spec/fixtures/repositories/tags/dot_git/hooks/update.sample
481
+ - spec/fixtures/repositories/tags/dot_git/index
482
+ - spec/fixtures/repositories/tags/dot_git/info/exclude
483
+ - spec/fixtures/repositories/tags/dot_git/logs/HEAD
484
+ - spec/fixtures/repositories/tags/dot_git/logs/refs/heads/master
485
+ - spec/fixtures/repositories/tags/dot_git/objects/54/3b9bebdc6bd5c4b22136034a95dd097a57d3dd
486
+ - spec/fixtures/repositories/tags/dot_git/objects/65/1e42f03dc3715c6614a25ebfc6cb18748672e2
487
+ - spec/fixtures/repositories/tags/dot_git/objects/70/aff36d6a3587824575d5b8ed255dc2b526e197
488
+ - spec/fixtures/repositories/tags/dot_git/objects/77/9122ddab982d8732a9ef12426585c1f72a81a9
489
+ - spec/fixtures/repositories/tags/dot_git/objects/7d/03e7c4131c2ae95ee6fcc04ae1366699142967
490
+ - spec/fixtures/repositories/tags/dot_git/objects/8d/1c8b69c3fce7bea45c73efd06983e3c419a92f
491
+ - spec/fixtures/repositories/tags/dot_git/objects/c6/c8c005ba322f95e03cf9ec2110bf5ffd5e1f36
492
+ - spec/fixtures/repositories/tags/dot_git/objects/e6/9de29bb2d1d6434b8b29ae775ad8c2e48c5391
493
+ - spec/fixtures/repositories/tags/dot_git/objects/e8/45566c06f9bf557d35e8292c37cf05d97a9769
494
+ - spec/fixtures/repositories/tags/dot_git/refs/heads/master
495
+ - spec/fixtures/repositories/tags/dot_git/refs/tags/1.1.1
496
+ - spec/fixtures/repositories/tags/dot_git/refs/tags/1.15.1
497
+ - spec/fixtures/repositories/tags/dot_git/refs/tags/1.2.1
415
498
  - spec/project_spec.rb
499
+ - spec/public_version_spec.rb
416
500
  - spec/spec_helper.rb
501
+ - spec/support/stub_repository.rb