deep_thought-heroku 0.1.0

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (34) hide show
  1. checksums.yaml +7 -0
  2. data/Gemfile +3 -0
  3. data/LICENSE.txt +22 -0
  4. data/README.md +73 -0
  5. data/Rakefile +1 -0
  6. data/deep_thought-heroku.gemspec +27 -0
  7. data/examples/base/.deepthought.yml +6 -0
  8. data/lib/deep_thought-heroku.rb +6 -0
  9. data/lib/deep_thought-heroku/deployer/heroku.rb +71 -0
  10. data/lib/deep_thought-heroku/version.rb +3 -0
  11. data/script/bootstrap +3 -0
  12. data/script/test +3 -0
  13. data/test/deep_thought_heroku_test.rb +49 -0
  14. data/test/fixtures/project-test/HEAD +1 -0
  15. data/test/fixtures/project-test/config +8 -0
  16. data/test/fixtures/project-test/description +1 -0
  17. data/test/fixtures/project-test/hooks/applypatch-msg.sample +15 -0
  18. data/test/fixtures/project-test/hooks/commit-msg.sample +24 -0
  19. data/test/fixtures/project-test/hooks/post-update.sample +8 -0
  20. data/test/fixtures/project-test/hooks/pre-applypatch.sample +14 -0
  21. data/test/fixtures/project-test/hooks/pre-commit.sample +49 -0
  22. data/test/fixtures/project-test/hooks/pre-push.sample +54 -0
  23. data/test/fixtures/project-test/hooks/pre-rebase.sample +169 -0
  24. data/test/fixtures/project-test/hooks/prepare-commit-msg.sample +36 -0
  25. data/test/fixtures/project-test/hooks/update.sample +128 -0
  26. data/test/fixtures/project-test/info/exclude +6 -0
  27. data/test/fixtures/project-test/objects/2e/820512c40c9bc82626fa65b7012a8a8f16cf65 +2 -0
  28. data/test/fixtures/project-test/objects/66/2e179a8ea5f03d6a778ae850d466537f7b8c24 +0 -0
  29. data/test/fixtures/project-test/objects/6c/b295f5287afebc5f3758e3069f682db8dbd4b9 +2 -0
  30. data/test/fixtures/project-test/packed-refs +2 -0
  31. data/test/fixtures/project-test/refs/heads/.gitkeep +0 -0
  32. data/test/fixtures/project-test/refs/tags/.gitkeep +0 -0
  33. data/test/test_helper.rb +22 -0
  34. metadata +166 -0
checksums.yaml ADDED
@@ -0,0 +1,7 @@
1
+ ---
2
+ SHA1:
3
+ metadata.gz: a06d126a544bee885c06ccb2407ca5dd9d77cb66
4
+ data.tar.gz: ef1d26b29a54ce182c5cdc6401412621de03c969
5
+ SHA512:
6
+ metadata.gz: 852270b69bb2b6be890279710eb74210a4398d06d78e729da8b29cb06886ad367c478fe4903c104af1cdd39343d5c3638d84954690a29638052f514cebdd35a6
7
+ data.tar.gz: 0cba8ba853ff53da2d87513193d9896d21d0e2135a54b7902f6099850ca44f1bae8f1c6f48fd28ea76ca5fa1721bd9c842b8ea6f2eec1c9d701ea0182b21a54c
data/Gemfile ADDED
@@ -0,0 +1,3 @@
1
+ source 'https://rubygems.org'
2
+
3
+ gemspec
data/LICENSE.txt ADDED
@@ -0,0 +1,22 @@
1
+ Copyright (c) 2013 Ian Lollar
2
+
3
+ MIT License
4
+
5
+ Permission is hereby granted, free of charge, to any person obtaining
6
+ a copy of this software and associated documentation files (the
7
+ "Software"), to deal in the Software without restriction, including
8
+ without limitation the rights to use, copy, modify, merge, publish,
9
+ distribute, sublicense, and/or sell copies of the Software, and to
10
+ permit persons to whom the Software is furnished to do so, subject to
11
+ the following conditions:
12
+
13
+ The above copyright notice and this permission notice shall be
14
+ included in all copies or substantial portions of the Software.
15
+
16
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
17
+ EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
18
+ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
19
+ NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
20
+ LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
21
+ OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
22
+ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
data/README.md ADDED
@@ -0,0 +1,73 @@
1
+ # Deep Thought Heroku Deployer
2
+
3
+ Deploy to Heroku with Deep Thought.
4
+
5
+ ## Install it
6
+
7
+ gem install deep_thought-heroku
8
+
9
+ ## Require it
10
+
11
+ In your Deep Thought's `config.ru`:
12
+
13
+ require "deep_thought"
14
+ require "deep_thought-heroku"
15
+
16
+ DeepThought.setup(ENV)
17
+
18
+ run DeepThought.app
19
+
20
+ ## .deepthought.yml it
21
+
22
+ In your Heroku-bound projects, set the `deploy_type` to "heroku":
23
+
24
+ deploy_type: heroku
25
+
26
+ Additionally, the Heroku deployer needs the remote repos for each environment's Heroku app:
27
+
28
+ heroku:
29
+ environments:
30
+ development: git@heroku.com:development.git
31
+ staging: git@heroku.com:staging.git
32
+ production: git@heroku.com:production.git
33
+
34
+ ## Use it
35
+
36
+ Pretty much Deep Thought as usual - deploy any branch to any environment.
37
+
38
+ As of right now, deploy actions do not do anything. In the roadmap is to map actions to `heroku run` tasks.
39
+
40
+ The only deploy variable recognized right now is "force" - setting `force = true` will do a force push to Heroku.
41
+
42
+ ## Hack it
43
+
44
+ Find an issue? Want to make the deployer more robust?
45
+
46
+ Set it up:
47
+
48
+ script/bootstrap
49
+
50
+ Create an `.env`:
51
+
52
+ echo RACK_ENV=development > .env
53
+
54
+ Set up the databases (PostgreSQL):
55
+
56
+ createuser deep_thought
57
+ createdb -O deep_thought -E utf8 deep_thought_development
58
+ createdb -O deep_thought -E utf8 deep_thought_test
59
+ rake db:migrate
60
+
61
+ Test it:
62
+
63
+ script/test
64
+
65
+ ## Contribute it
66
+
67
+ 1. Fork
68
+ 2. Create
69
+ 3. Code
70
+ 4. Test
71
+ 5. Push
72
+ 6. Submit
73
+ 7. Yay!
data/Rakefile ADDED
@@ -0,0 +1 @@
1
+ require "bundler/gem_tasks"
@@ -0,0 +1,27 @@
1
+ # -*- encoding: utf-8 -*-
2
+ lib = File.expand_path('../lib', __FILE__)
3
+ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
4
+ require 'deep_thought/version'
5
+
6
+ Gem::Specification.new do |gem|
7
+ gem.name = "deep_thought-heroku"
8
+ gem.version = DeepThought::VERSION
9
+ gem.authors = ["Ian Lollar"]
10
+ gem.email = ["rhv@redhotvengeance.com"]
11
+ gem.description = "Deep Thought deployer for Heroku."
12
+ gem.summary = "Deep Thought deployer for Heroku."
13
+ gem.homepage = "https://github.com/redhotvengeance/deep_thought-heroku"
14
+
15
+ gem.files = `git ls-files`.split("\n") - %w[.gitignore]
16
+ gem.executables = gem.files.grep(%r{^bin/}).map{ |f| File.basename(f) }
17
+ gem.test_files = gem.files.grep(%r{^(test|spec|features)/})
18
+ gem.require_paths = ["lib"]
19
+
20
+ gem.add_dependency "deep_thought", "~>0.1"
21
+
22
+ # # testing
23
+ gem.add_development_dependency "minitest", "~>4.7"
24
+ gem.add_development_dependency "mocha", "~>0.14"
25
+ gem.add_development_dependency "database_cleaner", "~>1.2"
26
+ gem.add_development_dependency "turn", "~>0.9"
27
+ end
@@ -0,0 +1,6 @@
1
+ deploy_type: heroku
2
+ heroku:
3
+ environments:
4
+ development: git@heroku.com:development.git
5
+ staging: git@heroku.com:staging.git
6
+ production: git@heroku.com:production.git
@@ -0,0 +1,6 @@
1
+ require 'deep_thought'
2
+ require 'deep_thought-heroku/deployer/heroku'
3
+
4
+ module DeepThought
5
+ DeepThought::Deployer.register_adapter('heroku', DeepThought::Deployer::Heroku)
6
+ end
@@ -0,0 +1,71 @@
1
+ require 'deep_thought/deployer/deployer'
2
+
3
+ module DeepThought
4
+ module Deployer
5
+ class Heroku < DeepThought::Deployer::Deployer
6
+ def setup?(project, config)
7
+ environments = config['heroku']['environments']
8
+
9
+ if environments
10
+ environments.each do |k, v|
11
+ system "cd ./.projects/#{project.name} && git remote add #{k} #{v} > /dev/null 2>&1"
12
+ end
13
+ else
14
+ false
15
+ end
16
+ end
17
+
18
+ def execute?(deploy, config)
19
+ environment = deploy.environment || "development"
20
+
21
+ variables = Hash.new
22
+
23
+ if deploy.variables
24
+ YAML.load(deploy.variables).each do |k, v|
25
+ variables[k] = v;
26
+ end
27
+ end
28
+
29
+ force = false
30
+
31
+ if variables['force']
32
+ force = true
33
+ end
34
+
35
+ result = push_to_heroku(deploy.project.name, environment, deploy.branch, force)
36
+
37
+ deploy.log = result['log']
38
+
39
+ result['success']
40
+ end
41
+
42
+ private
43
+
44
+ def push_to_heroku(name, environment, branch, force = false)
45
+ push_command = "git push"
46
+
47
+ if force
48
+ push_command += " -f"
49
+ end
50
+
51
+ push_command += " #{environment} #{branch}:master"
52
+
53
+ commands = []
54
+
55
+ commands << "cd ./.projects/#{name}"
56
+ commands << "#{push_command} 2>&1"
57
+
58
+ command = commands.join(" && ")
59
+
60
+ log = `#{command}`
61
+
62
+ result = Hash.new
63
+
64
+ result['log'] = log
65
+ result['success'] = $?.success?
66
+
67
+ result
68
+ end
69
+ end
70
+ end
71
+ end
@@ -0,0 +1,3 @@
1
+ module DeepThought
2
+ VERSION = "0.1.0"
3
+ end
data/script/bootstrap ADDED
@@ -0,0 +1,3 @@
1
+ #!/bin/sh
2
+
3
+ bundle install --binstubs
data/script/test ADDED
@@ -0,0 +1,3 @@
1
+ #!/bin/sh
2
+
3
+ testrb ./test/*_test.rb
@@ -0,0 +1,49 @@
1
+ require File.expand_path '../test_helper.rb', __FILE__
2
+
3
+ class DeepThoughtHerokuTest < MiniTest::Unit::TestCase
4
+ def setup
5
+ DatabaseCleaner.start
6
+
7
+ if File.directory?(".projects/_test")
8
+ FileUtils.rm_rf(".projects/_test")
9
+ end
10
+
11
+ DeepThought::Deploy.any_instance.stubs(:queue)
12
+
13
+ @project = DeepThought::Project.create(:name => '_test', :repo_url => './test/fixtures/project-test')
14
+ @user = DeepThought::User.create(:email => 'test@test.com', :password => 'secret', :password_confirmation => 'secret')
15
+ @deploy = DeepThought::Deploy.create(:project_id => @project.id, :user_id => @user.id, :branch => 'master', :commit => '12345')
16
+ @deployer = DeepThought::Deployer::Heroku.new
17
+ @project.setup
18
+ end
19
+
20
+ def teardown
21
+ if File.directory?(".projects/_test")
22
+ FileUtils.rm_rf(".projects/_test")
23
+ end
24
+
25
+ DatabaseCleaner.clean
26
+ end
27
+
28
+ def test_heroku_execute_success
29
+ @deployer.stubs(:push_to_heroku).with(@project.name, 'development', @deploy.branch, false).returns({'log' => '', 'success' => true})
30
+ assert @deployer.setup?(@project, YAML.load_file(".projects/#{@project.name}/.deepthought.yml"))
31
+ assert @deployer.execute?(@deploy, {})
32
+ assert @deploy.log
33
+ end
34
+
35
+ def test_heroku_execute_failed
36
+ @deployer.stubs(:push_to_heroku).with(@project.name, 'development', @deploy.branch, false).returns({'log' => '', 'success' => false})
37
+ assert @deployer.setup?(@project, YAML.load_file(".projects/#{@project.name}/.deepthought.yml"))
38
+ assert !@deployer.execute?(@deploy, {})
39
+ assert @deploy.log
40
+ end
41
+
42
+ def test_heroku_force_push
43
+ @deploy.variables = {'force' => true}.to_yaml
44
+ @deployer.stubs(:push_to_heroku).with(@project.name, 'development', @deploy.branch, true).returns({'log' => '', 'success' => true})
45
+ assert @deployer.setup?(@project, YAML.load_file(".projects/#{@project.name}/.deepthought.yml"))
46
+ assert @deployer.execute?(@deploy, {})
47
+ assert @deploy.log
48
+ end
49
+ end
@@ -0,0 +1 @@
1
+ ref: refs/heads/master
@@ -0,0 +1,8 @@
1
+ [core]
2
+ repositoryformatversion = 0
3
+ filemode = true
4
+ bare = true
5
+ ignorecase = true
6
+ precomposeunicode = false
7
+ [remote "origin"]
8
+ url = /Users/ianlollar/Documents/projects/deep_thought-heroku/test/fixtures/project-test
@@ -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 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,49 @@
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
+ cat <<\EOF
35
+ Error: Attempt to add a non-ASCII file name.
36
+
37
+ This can cause problems if you want to work with people on other platforms.
38
+
39
+ To be portable it is advisable to rename the file.
40
+
41
+ If you know what you are doing you can disable this check using:
42
+
43
+ git config hooks.allownonascii true
44
+ EOF
45
+ exit 1
46
+ fi
47
+
48
+ # If there are whitespace errors, print the offending file names and fail.
49
+ exec git diff-index --check --cached $against --
@@ -0,0 +1,54 @@
1
+ #!/bin/sh
2
+
3
+ # An example hook script to verify what is about to be pushed. Called by "git
4
+ # push" after it has checked the remote status, but before anything has been
5
+ # pushed. If this script exits with a non-zero status nothing will be pushed.
6
+ #
7
+ # This hook is called with the following parameters:
8
+ #
9
+ # $1 -- Name of the remote to which the push is being done
10
+ # $2 -- URL to which the push is being done
11
+ #
12
+ # If pushing without using a named remote those arguments will be equal.
13
+ #
14
+ # Information about the commits which are being pushed is supplied as lines to
15
+ # the standard input in the form:
16
+ #
17
+ # <local ref> <local sha1> <remote ref> <remote sha1>
18
+ #
19
+ # This sample shows how to prevent push of commits where the log message starts
20
+ # with "WIP" (work in progress).
21
+
22
+ remote="$1"
23
+ url="$2"
24
+
25
+ z40=0000000000000000000000000000000000000000
26
+
27
+ IFS=' '
28
+ while read local_ref local_sha remote_ref remote_sha
29
+ do
30
+ if [ "$local_sha" = $z40 ]
31
+ then
32
+ # Handle delete
33
+ :
34
+ else
35
+ if [ "$remote_sha" = $z40 ]
36
+ then
37
+ # New branch, examine all commits
38
+ range="$local_sha"
39
+ else
40
+ # Update to existing branch, examine new commits
41
+ range="$remote_sha..$local_sha"
42
+ fi
43
+
44
+ # Check for WIP commit
45
+ commit=`git rev-list -n 1 --grep '^WIP' "$range"`
46
+ if [ -n "$commit" ]
47
+ then
48
+ echo "Found WIP commit in $local_ref, not pushing"
49
+ exit 1
50
+ fi
51
+ fi
52
+ done
53
+
54
+ exit 0
@@ -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,2 @@
1
+ x��=!@akN1��0�l���aVH�{~7���}��b��LPOs0�s��Lv�&9B���ʴ8g
2
+ �x��h��,����z�_���2 �ૉ�uB�
@@ -0,0 +1,2 @@
1
+ xe�K
2
+ �0 EQ�]EV 8R:r'�6�b��w���{:�e����FֈL<��:Z -.1$�������h�N� �=�i��N?Ikٟ�����f��1��N�EBY
@@ -0,0 +1,2 @@
1
+ # pack-refs with: peeled fully-peeled
2
+ 2e820512c40c9bc82626fa65b7012a8a8f16cf65 refs/heads/master
File without changes
File without changes
@@ -0,0 +1,22 @@
1
+ $LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
2
+
3
+ ENV['RACK_ENV'] = 'test'
4
+ ENV['SESSION_SECRET'] = 'secret'
5
+
6
+ require 'deep_thought'
7
+ require 'deep_thought-heroku'
8
+ require 'rubygems'
9
+ require 'fileutils'
10
+ gem 'minitest'
11
+ require 'minitest/autorun'
12
+ require 'mocha/setup'
13
+ require 'database_cleaner'
14
+
15
+ begin; require 'turn/autorun'; rescue LoadError; end
16
+
17
+ DeepThought.setup(ENV)
18
+
19
+ DatabaseCleaner.clean_with(:truncation)
20
+ DatabaseCleaner.strategy = :transaction
21
+
22
+ BCrypt::Engine.cost = BCrypt::Engine::MIN_COST
metadata ADDED
@@ -0,0 +1,166 @@
1
+ --- !ruby/object:Gem::Specification
2
+ name: deep_thought-heroku
3
+ version: !ruby/object:Gem::Version
4
+ version: 0.1.0
5
+ platform: ruby
6
+ authors:
7
+ - Ian Lollar
8
+ autorequire:
9
+ bindir: bin
10
+ cert_chain: []
11
+ date: 2013-12-12 00:00:00.000000000 Z
12
+ dependencies:
13
+ - !ruby/object:Gem::Dependency
14
+ name: deep_thought
15
+ requirement: !ruby/object:Gem::Requirement
16
+ requirements:
17
+ - - ~>
18
+ - !ruby/object:Gem::Version
19
+ version: '0.1'
20
+ type: :runtime
21
+ prerelease: false
22
+ version_requirements: !ruby/object:Gem::Requirement
23
+ requirements:
24
+ - - ~>
25
+ - !ruby/object:Gem::Version
26
+ version: '0.1'
27
+ - !ruby/object:Gem::Dependency
28
+ name: minitest
29
+ requirement: !ruby/object:Gem::Requirement
30
+ requirements:
31
+ - - ~>
32
+ - !ruby/object:Gem::Version
33
+ version: '4.7'
34
+ type: :development
35
+ prerelease: false
36
+ version_requirements: !ruby/object:Gem::Requirement
37
+ requirements:
38
+ - - ~>
39
+ - !ruby/object:Gem::Version
40
+ version: '4.7'
41
+ - !ruby/object:Gem::Dependency
42
+ name: mocha
43
+ requirement: !ruby/object:Gem::Requirement
44
+ requirements:
45
+ - - ~>
46
+ - !ruby/object:Gem::Version
47
+ version: '0.14'
48
+ type: :development
49
+ prerelease: false
50
+ version_requirements: !ruby/object:Gem::Requirement
51
+ requirements:
52
+ - - ~>
53
+ - !ruby/object:Gem::Version
54
+ version: '0.14'
55
+ - !ruby/object:Gem::Dependency
56
+ name: database_cleaner
57
+ requirement: !ruby/object:Gem::Requirement
58
+ requirements:
59
+ - - ~>
60
+ - !ruby/object:Gem::Version
61
+ version: '1.2'
62
+ type: :development
63
+ prerelease: false
64
+ version_requirements: !ruby/object:Gem::Requirement
65
+ requirements:
66
+ - - ~>
67
+ - !ruby/object:Gem::Version
68
+ version: '1.2'
69
+ - !ruby/object:Gem::Dependency
70
+ name: turn
71
+ requirement: !ruby/object:Gem::Requirement
72
+ requirements:
73
+ - - ~>
74
+ - !ruby/object:Gem::Version
75
+ version: '0.9'
76
+ type: :development
77
+ prerelease: false
78
+ version_requirements: !ruby/object:Gem::Requirement
79
+ requirements:
80
+ - - ~>
81
+ - !ruby/object:Gem::Version
82
+ version: '0.9'
83
+ description: Deep Thought deployer for Heroku.
84
+ email:
85
+ - rhv@redhotvengeance.com
86
+ executables: []
87
+ extensions: []
88
+ extra_rdoc_files: []
89
+ files:
90
+ - Gemfile
91
+ - LICENSE.txt
92
+ - README.md
93
+ - Rakefile
94
+ - deep_thought-heroku.gemspec
95
+ - examples/base/.deepthought.yml
96
+ - lib/deep_thought-heroku.rb
97
+ - lib/deep_thought-heroku/deployer/heroku.rb
98
+ - lib/deep_thought-heroku/version.rb
99
+ - script/bootstrap
100
+ - script/test
101
+ - test/deep_thought_heroku_test.rb
102
+ - test/fixtures/project-test/HEAD
103
+ - test/fixtures/project-test/config
104
+ - test/fixtures/project-test/description
105
+ - test/fixtures/project-test/hooks/applypatch-msg.sample
106
+ - test/fixtures/project-test/hooks/commit-msg.sample
107
+ - test/fixtures/project-test/hooks/post-update.sample
108
+ - test/fixtures/project-test/hooks/pre-applypatch.sample
109
+ - test/fixtures/project-test/hooks/pre-commit.sample
110
+ - test/fixtures/project-test/hooks/pre-push.sample
111
+ - test/fixtures/project-test/hooks/pre-rebase.sample
112
+ - test/fixtures/project-test/hooks/prepare-commit-msg.sample
113
+ - test/fixtures/project-test/hooks/update.sample
114
+ - test/fixtures/project-test/info/exclude
115
+ - test/fixtures/project-test/objects/2e/820512c40c9bc82626fa65b7012a8a8f16cf65
116
+ - test/fixtures/project-test/objects/66/2e179a8ea5f03d6a778ae850d466537f7b8c24
117
+ - test/fixtures/project-test/objects/6c/b295f5287afebc5f3758e3069f682db8dbd4b9
118
+ - test/fixtures/project-test/packed-refs
119
+ - test/fixtures/project-test/refs/heads/.gitkeep
120
+ - test/fixtures/project-test/refs/tags/.gitkeep
121
+ - test/test_helper.rb
122
+ homepage: https://github.com/redhotvengeance/deep_thought-heroku
123
+ licenses: []
124
+ metadata: {}
125
+ post_install_message:
126
+ rdoc_options: []
127
+ require_paths:
128
+ - lib
129
+ required_ruby_version: !ruby/object:Gem::Requirement
130
+ requirements:
131
+ - - '>='
132
+ - !ruby/object:Gem::Version
133
+ version: '0'
134
+ required_rubygems_version: !ruby/object:Gem::Requirement
135
+ requirements:
136
+ - - '>='
137
+ - !ruby/object:Gem::Version
138
+ version: '0'
139
+ requirements: []
140
+ rubyforge_project:
141
+ rubygems_version: 2.0.14
142
+ signing_key:
143
+ specification_version: 4
144
+ summary: Deep Thought deployer for Heroku.
145
+ test_files:
146
+ - test/deep_thought_heroku_test.rb
147
+ - test/fixtures/project-test/HEAD
148
+ - test/fixtures/project-test/config
149
+ - test/fixtures/project-test/description
150
+ - test/fixtures/project-test/hooks/applypatch-msg.sample
151
+ - test/fixtures/project-test/hooks/commit-msg.sample
152
+ - test/fixtures/project-test/hooks/post-update.sample
153
+ - test/fixtures/project-test/hooks/pre-applypatch.sample
154
+ - test/fixtures/project-test/hooks/pre-commit.sample
155
+ - test/fixtures/project-test/hooks/pre-push.sample
156
+ - test/fixtures/project-test/hooks/pre-rebase.sample
157
+ - test/fixtures/project-test/hooks/prepare-commit-msg.sample
158
+ - test/fixtures/project-test/hooks/update.sample
159
+ - test/fixtures/project-test/info/exclude
160
+ - test/fixtures/project-test/objects/2e/820512c40c9bc82626fa65b7012a8a8f16cf65
161
+ - test/fixtures/project-test/objects/66/2e179a8ea5f03d6a778ae850d466537f7b8c24
162
+ - test/fixtures/project-test/objects/6c/b295f5287afebc5f3758e3069f682db8dbd4b9
163
+ - test/fixtures/project-test/packed-refs
164
+ - test/fixtures/project-test/refs/heads/.gitkeep
165
+ - test/fixtures/project-test/refs/tags/.gitkeep
166
+ - test/test_helper.rb