nvd3-rails 0.0.1
Sign up to get free protection for your applications and to get access to all the features.
- data/.gitmodules +3 -0
- data/README.md +101 -0
- data/lib/nvd3-rails.rb +1 -0
- data/lib/nvd3/rails.rb +8 -0
- data/lib/nvd3/rails/engine.rb +6 -0
- data/lib/nvd3/rails/version.rb +5 -0
- data/nvd3-rails.gemspec +21 -0
- data/vendor/assets/javascripts/nvd3-rails.js +7 -0
- data/vendor/assets/javascripts/nvd3/.git.sample/HEAD +1 -0
- data/vendor/assets/javascripts/nvd3/.git.sample/config +13 -0
- data/vendor/assets/javascripts/nvd3/.git.sample/description +1 -0
- data/vendor/assets/javascripts/nvd3/.git.sample/hooks/applypatch-msg.sample +15 -0
- data/vendor/assets/javascripts/nvd3/.git.sample/hooks/commit-msg.sample +24 -0
- data/vendor/assets/javascripts/nvd3/.git.sample/hooks/post-update.sample +8 -0
- data/vendor/assets/javascripts/nvd3/.git.sample/hooks/pre-applypatch.sample +14 -0
- data/vendor/assets/javascripts/nvd3/.git.sample/hooks/pre-commit.sample +50 -0
- data/vendor/assets/javascripts/nvd3/.git.sample/hooks/pre-push.sample +53 -0
- data/vendor/assets/javascripts/nvd3/.git.sample/hooks/pre-rebase.sample +169 -0
- data/vendor/assets/javascripts/nvd3/.git.sample/hooks/prepare-commit-msg.sample +36 -0
- data/vendor/assets/javascripts/nvd3/.git.sample/hooks/update.sample +128 -0
- data/vendor/assets/javascripts/nvd3/.git.sample/index +0 -0
- data/vendor/assets/javascripts/nvd3/.git.sample/info/exclude +6 -0
- data/vendor/assets/javascripts/nvd3/.git.sample/logs/HEAD +1 -0
- data/vendor/assets/javascripts/nvd3/.git.sample/logs/refs/heads/master +1 -0
- data/vendor/assets/javascripts/nvd3/.git.sample/logs/refs/remotes/origin/HEAD +1 -0
- data/vendor/assets/javascripts/nvd3/.git.sample/objects/pack/pack-babbb312d58dd7f03870b530a1b9a84c80918be3.idx +0 -0
- data/vendor/assets/javascripts/nvd3/.git.sample/objects/pack/pack-babbb312d58dd7f03870b530a1b9a84c80918be3.pack +0 -0
- data/vendor/assets/javascripts/nvd3/.git.sample/packed-refs +5 -0
- data/vendor/assets/javascripts/nvd3/.git.sample/refs/heads/master +1 -0
- data/vendor/assets/javascripts/nvd3/.git.sample/refs/remotes/origin/HEAD +1 -0
- data/vendor/assets/javascripts/nvd3/.gitignore +24 -0
- data/vendor/assets/javascripts/nvd3/LICENSE.md +49 -0
- data/vendor/assets/javascripts/nvd3/Makefile +56 -0
- data/vendor/assets/javascripts/nvd3/README.md +43 -0
- data/vendor/assets/javascripts/nvd3/build.bat +6 -0
- data/vendor/assets/javascripts/nvd3/deprecated/bar.html +198 -0
- data/vendor/assets/javascripts/nvd3/deprecated/bar.js +250 -0
- data/vendor/assets/javascripts/nvd3/deprecated/charts/cumulativeLineChart.js +174 -0
- data/vendor/assets/javascripts/nvd3/deprecated/charts/discreteBarChart.js +157 -0
- data/vendor/assets/javascripts/nvd3/deprecated/charts/lineChart.js +159 -0
- data/vendor/assets/javascripts/nvd3/deprecated/charts/lineChartDaily.js +168 -0
- data/vendor/assets/javascripts/nvd3/deprecated/charts/stackedAreaChart.js +177 -0
- data/vendor/assets/javascripts/nvd3/deprecated/cumulativeLine.html +171 -0
- data/vendor/assets/javascripts/nvd3/deprecated/cumulativeLine.js +334 -0
- data/vendor/assets/javascripts/nvd3/deprecated/discreteBarChartWithEnabledTooltip.html +129 -0
- data/vendor/assets/javascripts/nvd3/deprecated/discreteBarChartWithEnabledTooltip.js +222 -0
- data/vendor/assets/javascripts/nvd3/deprecated/discreteBarWithAxes.html +172 -0
- data/vendor/assets/javascripts/nvd3/deprecated/discreteBarWithAxes.js +152 -0
- data/vendor/assets/javascripts/nvd3/deprecated/lineChart-old.html +83 -0
- data/vendor/assets/javascripts/nvd3/deprecated/lineChartDaily.html +109 -0
- data/vendor/assets/javascripts/nvd3/deprecated/linePlusBar.html +173 -0
- data/vendor/assets/javascripts/nvd3/deprecated/linePlusBar.js +250 -0
- data/vendor/assets/javascripts/nvd3/deprecated/lineWithFocus.html +137 -0
- data/vendor/assets/javascripts/nvd3/deprecated/lineWithFocus.js +354 -0
- data/vendor/assets/javascripts/nvd3/deprecated/lineWithFourAxes.html +144 -0
- data/vendor/assets/javascripts/nvd3/deprecated/lineWithFourAxes.js +218 -0
- data/vendor/assets/javascripts/nvd3/deprecated/lineWithLegend.html +142 -0
- data/vendor/assets/javascripts/nvd3/deprecated/lineWithLegend.js +176 -0
- data/vendor/assets/javascripts/nvd3/deprecated/monthendAxis.html +99 -0
- data/vendor/assets/javascripts/nvd3/deprecated/multiBarHorizontalWithLegend.html +258 -0
- data/vendor/assets/javascripts/nvd3/deprecated/multiBarHorizontalWithLegend.js +226 -0
- data/vendor/assets/javascripts/nvd3/deprecated/multiBarWithLegend.html +162 -0
- data/vendor/assets/javascripts/nvd3/deprecated/multiBarWithLegend.js +249 -0
- data/vendor/assets/javascripts/nvd3/deprecated/pie.js +263 -0
- data/vendor/assets/javascripts/nvd3/deprecated/scatterChart.html +110 -0
- data/vendor/assets/javascripts/nvd3/deprecated/scatterChart.js +294 -0
- data/vendor/assets/javascripts/nvd3/deprecated/scatterFisheyeChart.js +418 -0
- data/vendor/assets/javascripts/nvd3/deprecated/scatterWithLegend.html +167 -0
- data/vendor/assets/javascripts/nvd3/deprecated/scatterWithLegend.js +261 -0
- data/vendor/assets/javascripts/nvd3/deprecated/stackedArea.js +286 -0
- data/vendor/assets/javascripts/nvd3/deprecated/stackedAreaChart.html +183 -0
- data/vendor/assets/javascripts/nvd3/deprecated/stackedAreaChart_old.html +137 -0
- data/vendor/assets/javascripts/nvd3/deprecated/stackedAreaWithLegend.html +222 -0
- data/vendor/assets/javascripts/nvd3/deprecated/stackedAreaWithLegend.js +297 -0
- data/vendor/assets/javascripts/nvd3/examples/bullet.html +96 -0
- data/vendor/assets/javascripts/nvd3/examples/bulletChart.html +94 -0
- data/vendor/assets/javascripts/nvd3/examples/crossfilter.html +167 -0
- data/vendor/assets/javascripts/nvd3/examples/crossfilterWithDimentions.html +180 -0
- data/vendor/assets/javascripts/nvd3/examples/crossfilterWithTables.html +288 -0
- data/vendor/assets/javascripts/nvd3/examples/cumulativeLineChart.html +155 -0
- data/vendor/assets/javascripts/nvd3/examples/discreteBarChart.html +116 -0
- data/vendor/assets/javascripts/nvd3/examples/dynamicTimeSeries.html +148 -0
- data/vendor/assets/javascripts/nvd3/examples/historicalBar.html +157 -0
- data/vendor/assets/javascripts/nvd3/examples/horizon.html +163 -0
- data/vendor/assets/javascripts/nvd3/examples/images/grey-minus.png +0 -0
- data/vendor/assets/javascripts/nvd3/examples/images/grey-plus.png +0 -0
- data/vendor/assets/javascripts/nvd3/examples/indentedtree.html +126 -0
- data/vendor/assets/javascripts/nvd3/examples/legend.html +75 -0
- data/vendor/assets/javascripts/nvd3/examples/line.html +95 -0
- data/vendor/assets/javascripts/nvd3/examples/lineChart.html +112 -0
- data/vendor/assets/javascripts/nvd3/examples/lineChartSVGResize.html +151 -0
- data/vendor/assets/javascripts/nvd3/examples/linePlusBarChart.html +114 -0
- data/vendor/assets/javascripts/nvd3/examples/linePlusBarWithFocusChart.html +128 -0
- data/vendor/assets/javascripts/nvd3/examples/lineTimeSeries.html +142 -0
- data/vendor/assets/javascripts/nvd3/examples/lineWithFisheyeChart.html +101 -0
- data/vendor/assets/javascripts/nvd3/examples/lineWithFocusChart.html +87 -0
- data/vendor/assets/javascripts/nvd3/examples/multiBar.html +92 -0
- data/vendor/assets/javascripts/nvd3/examples/multiBarChart.html +93 -0
- data/vendor/assets/javascripts/nvd3/examples/multiBarHorizontalChart.html +388 -0
- data/vendor/assets/javascripts/nvd3/examples/multiChart.html +93 -0
- data/vendor/assets/javascripts/nvd3/examples/nations.json +1 -0
- data/vendor/assets/javascripts/nvd3/examples/pie.html +93 -0
- data/vendor/assets/javascripts/nvd3/examples/pieChart.html +114 -0
- data/vendor/assets/javascripts/nvd3/examples/scatter.html +95 -0
- data/vendor/assets/javascripts/nvd3/examples/scatterChart.html +115 -0
- data/vendor/assets/javascripts/nvd3/examples/scatterPlusLineChart.html +116 -0
- data/vendor/assets/javascripts/nvd3/examples/sparkline.html +62 -0
- data/vendor/assets/javascripts/nvd3/examples/sparklinePlus.html +67 -0
- data/vendor/assets/javascripts/nvd3/examples/stackedArea.html +155 -0
- data/vendor/assets/javascripts/nvd3/examples/stackedAreaChart.html +245 -0
- data/vendor/assets/javascripts/nvd3/examples/stream_layers.js +35 -0
- data/vendor/assets/javascripts/nvd3/lib/cie.js +155 -0
- data/vendor/assets/javascripts/nvd3/lib/crossfilter.js +1180 -0
- data/vendor/assets/javascripts/nvd3/lib/crossfilter.min.js +1 -0
- data/vendor/assets/javascripts/nvd3/lib/d3.v2.js +7033 -0
- data/vendor/assets/javascripts/nvd3/lib/d3.v2.min.js +4 -0
- data/vendor/assets/javascripts/nvd3/lib/fisheye.js +86 -0
- data/vendor/assets/javascripts/nvd3/lib/hive.js +80 -0
- data/vendor/assets/javascripts/nvd3/lib/horizon.js +192 -0
- data/vendor/assets/javascripts/nvd3/lib/sankey.js +292 -0
- data/vendor/assets/javascripts/nvd3/nv.d3.js +11762 -0
- data/vendor/assets/javascripts/nvd3/src/core.js +117 -0
- data/vendor/assets/javascripts/nvd3/src/models/axis.js +398 -0
- data/vendor/assets/javascripts/nvd3/src/models/backup/bullet.js +250 -0
- data/vendor/assets/javascripts/nvd3/src/models/backup/bulletChart.js +349 -0
- data/vendor/assets/javascripts/nvd3/src/models/bullet.js +377 -0
- data/vendor/assets/javascripts/nvd3/src/models/bulletChart.js +341 -0
- data/vendor/assets/javascripts/nvd3/src/models/cumulativeLineChart.js +609 -0
- data/vendor/assets/javascripts/nvd3/src/models/discreteBar.js +327 -0
- data/vendor/assets/javascripts/nvd3/src/models/discreteBarChart.js +290 -0
- data/vendor/assets/javascripts/nvd3/src/models/distribution.js +146 -0
- data/vendor/assets/javascripts/nvd3/src/models/historicalBar.js +289 -0
- data/vendor/assets/javascripts/nvd3/src/models/indentedTree.js +306 -0
- data/vendor/assets/javascripts/nvd3/src/models/legend.js +203 -0
- data/vendor/assets/javascripts/nvd3/src/models/line.js +286 -0
- data/vendor/assets/javascripts/nvd3/src/models/lineChart.js +359 -0
- data/vendor/assets/javascripts/nvd3/src/models/lineDynTimeSeriesChart.js +434 -0
- data/vendor/assets/javascripts/nvd3/src/models/linePlusBarChart.js +422 -0
- data/vendor/assets/javascripts/nvd3/src/models/linePlusBarWithFocusChart.js +657 -0
- data/vendor/assets/javascripts/nvd3/src/models/lineTimeSeriesChart.js +340 -0
- data/vendor/assets/javascripts/nvd3/src/models/lineWithFisheye.js +197 -0
- data/vendor/assets/javascripts/nvd3/src/models/lineWithFisheyeChart.js +324 -0
- data/vendor/assets/javascripts/nvd3/src/models/lineWithFocusChart.js +565 -0
- data/vendor/assets/javascripts/nvd3/src/models/multiAxisLineChart.js +312 -0
- data/vendor/assets/javascripts/nvd3/src/models/multiBar.js +416 -0
- data/vendor/assets/javascripts/nvd3/src/models/multiBarChart.js +445 -0
- data/vendor/assets/javascripts/nvd3/src/models/multiBarHorizontal.js +420 -0
- data/vendor/assets/javascripts/nvd3/src/models/multiBarHorizontalChart.js +415 -0
- data/vendor/assets/javascripts/nvd3/src/models/multiBarTimeSeries.js +371 -0
- data/vendor/assets/javascripts/nvd3/src/models/multiBarTimeSeriesChart.js +403 -0
- data/vendor/assets/javascripts/nvd3/src/models/multiChart.js +444 -0
- data/vendor/assets/javascripts/nvd3/src/models/ohlcBar.js +365 -0
- data/vendor/assets/javascripts/nvd3/src/models/pie.js +358 -0
- data/vendor/assets/javascripts/nvd3/src/models/pieChart.js +281 -0
- data/vendor/assets/javascripts/nvd3/src/models/scatter.js +622 -0
- data/vendor/assets/javascripts/nvd3/src/models/scatterChart.js +576 -0
- data/vendor/assets/javascripts/nvd3/src/models/scatterPlusLineChart.js +577 -0
- data/vendor/assets/javascripts/nvd3/src/models/sparkline.js +179 -0
- data/vendor/assets/javascripts/nvd3/src/models/sparklinePlus.js +291 -0
- data/vendor/assets/javascripts/nvd3/src/models/stackedArea.js +336 -0
- data/vendor/assets/javascripts/nvd3/src/models/stackedAreaChart.js +453 -0
- data/vendor/assets/javascripts/nvd3/src/nv.d3.css +671 -0
- data/vendor/assets/javascripts/nvd3/src/tooltip.js +129 -0
- data/vendor/assets/javascripts/nvd3/src/utils.js +105 -0
- data/vendor/assets/javascripts/set-nvd3-env.js.erb +5 -0
- data/vendor/assets/stylesheets/nvd3-rails.css +3 -0
- metadata +233 -0
data/.gitmodules
ADDED
data/README.md
ADDED
@@ -0,0 +1,101 @@
|
|
1
|
+
# NVD3 Rails - reusable charts for rails 3
|
2
|
+
|
3
|
+
## Install
|
4
|
+
|
5
|
+
To include nvd3-rails into your rails project add
|
6
|
+
|
7
|
+
gem "nvd3-rails", :git => "git@github.com:adeven/nvd3-rails.git", :submodules => true
|
8
|
+
|
9
|
+
To your Projects Gemfile.
|
10
|
+
|
11
|
+
To add the necessary javascript files into your asset pipeline add
|
12
|
+
|
13
|
+
//= require nvd3-rails
|
14
|
+
|
15
|
+
in ```app/assets/javascripts/application.js```
|
16
|
+
|
17
|
+
also add
|
18
|
+
|
19
|
+
*= require nvd3-rails
|
20
|
+
|
21
|
+
in ```app/assets/stylesheets/application.css```
|
22
|
+
|
23
|
+
Note as of today nvd3 clutters the model naming e.g. lineWithFisheyeChart.js and lineChart.js export their model both as lineChart.
|
24
|
+
If you only need a subset of models e.g. lineChart you can add
|
25
|
+
|
26
|
+
//= require nvd3/lib/d3.v2
|
27
|
+
//= require nvd3/src/core
|
28
|
+
//= require nvd3/src/tooltip
|
29
|
+
//= require nvd3/src/utils.js
|
30
|
+
//= require nvd3/src/models/lineChart
|
31
|
+
//= require nvd3/src/models/legend.js
|
32
|
+
//= require nvd3/src/models/axis.js
|
33
|
+
//= require nvd3/src/models/scatter.js
|
34
|
+
//= require nvd3/src/models/line.js
|
35
|
+
|
36
|
+
to your ```application.js```
|
37
|
+
|
38
|
+
## Contribution Guide
|
39
|
+
|
40
|
+
### Updating Submodules
|
41
|
+
|
42
|
+
The repository uses submodules following are the steps to manually get the submodules:
|
43
|
+
|
44
|
+
git clone https://github.com/adeven/nvd3-rails.git
|
45
|
+
cd nvd3-rails
|
46
|
+
git submodule init
|
47
|
+
git submodule update
|
48
|
+
|
49
|
+
Or:
|
50
|
+
|
51
|
+
git clone https://github.com/adeven/nvd3-rails.git
|
52
|
+
cd nvd3-rails
|
53
|
+
git submodule update --init
|
54
|
+
|
55
|
+
Or:
|
56
|
+
|
57
|
+
git clone --recursive https://github.com/adeven/nvd3-rails.git
|
58
|
+
cd nvd3-rails
|
59
|
+
|
60
|
+
|
61
|
+
If you want to work inside a submodule, it is possible, but first you need to checkout a branch:
|
62
|
+
|
63
|
+
cd vendor/assets/javascripts/nvd3
|
64
|
+
git checkout master
|
65
|
+
|
66
|
+
After you've committed your changes to the submodule, you'll update the nvd3-rails project to point to the new commit, but remember to push the submodule changes before pushing the new nvd3-rails commit:
|
67
|
+
|
68
|
+
cd vendor/assets/javascripts/nvd3
|
69
|
+
git push origin master
|
70
|
+
cd ..
|
71
|
+
git add vendor/assets/javascripts/nvd3
|
72
|
+
git commit
|
73
|
+
|
74
|
+
### cleaning
|
75
|
+
|
76
|
+
If you want to purge your working directory back to the status of upstream, following commands can be used (remember everything you've worked on is gone after these):
|
77
|
+
|
78
|
+
git reset --hard upstream/master
|
79
|
+
git clean -fdx
|
80
|
+
|
81
|
+
### Using a local copy during development
|
82
|
+
|
83
|
+
Nvd3-rails gets added as a Rails::Engine to your project.
|
84
|
+
|
85
|
+
Generally during development you want your main application to include a local development copy of your engine.
|
86
|
+
You should be able to add gem groups for each Rails environment to your Gemfile, like this:
|
87
|
+
|
88
|
+
```ruby
|
89
|
+
group :development do
|
90
|
+
gem "nvd3-rails", :path => "../nvd3-rails"
|
91
|
+
end
|
92
|
+
|
93
|
+
group :production do
|
94
|
+
gem "nvd3-rails", :git => "git://github.com/adeven/nvd3-rails.git"
|
95
|
+
end
|
96
|
+
```
|
97
|
+
|
98
|
+
In Bundler 1.1 and earlier, that generates this error message: "You cannot specify the same gem twice coming from different sources."
|
99
|
+
This should be fixed in 1.2 https://github.com/carlhuda/bundler/issues/751
|
100
|
+
|
101
|
+
There are several work arounds for this, however I sugest to update to the latest version of bundle.
|
data/lib/nvd3-rails.rb
ADDED
@@ -0,0 +1 @@
|
|
1
|
+
require 'nvd3/rails'
|
data/lib/nvd3/rails.rb
ADDED
data/nvd3-rails.gemspec
ADDED
@@ -0,0 +1,21 @@
|
|
1
|
+
# -*- encoding: utf-8 -*-
|
2
|
+
require File.expand_path('../lib/nvd3/rails/version', __FILE__)
|
3
|
+
|
4
|
+
Gem::Specification.new do |s|
|
5
|
+
s.name = "nvd3-rails"
|
6
|
+
s.version = NVD3::Rails::VERSION
|
7
|
+
s.platform = Gem::Platform::RUBY
|
8
|
+
s.authors = ["Manuel Knie"]
|
9
|
+
s.email = ["manuel@adeven.com"]
|
10
|
+
s.homepage = "http://adeven.com"
|
11
|
+
s.summary = "Use nvd3 with Rails 3"
|
12
|
+
s.description = "This gem provides nvd3 for your Rails 3 application."
|
13
|
+
|
14
|
+
s.required_rubygems_version = ">= 1.3.6"
|
15
|
+
|
16
|
+
s.add_dependency "railties", ">= 3.2.0", "< 5.0"
|
17
|
+
|
18
|
+
s.files = `git ls-files`.split("\n")
|
19
|
+
s.executables = `git ls-files -- bin/*`.split("\n").map { |f| File.basename(f) }
|
20
|
+
s.require_path = 'lib'
|
21
|
+
end
|
@@ -0,0 +1 @@
|
|
1
|
+
ref: refs/heads/master
|
@@ -0,0 +1,13 @@
|
|
1
|
+
[core]
|
2
|
+
repositoryformatversion = 0
|
3
|
+
filemode = true
|
4
|
+
bare = false
|
5
|
+
logallrefupdates = true
|
6
|
+
ignorecase = true
|
7
|
+
precomposeunicode = false
|
8
|
+
[remote "origin"]
|
9
|
+
url = git@github.com:NealKemp/nvd3.git
|
10
|
+
fetch = +refs/heads/*:refs/remotes/origin/*
|
11
|
+
[branch "master"]
|
12
|
+
remote = origin
|
13
|
+
merge = 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,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,53 @@
|
|
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
|
+
else
|
34
|
+
if [ "$remote_sha" = $z40 ]
|
35
|
+
then
|
36
|
+
# New branch, examine all commits
|
37
|
+
range="$local_sha"
|
38
|
+
else
|
39
|
+
# Update to existing branch, examine new commits
|
40
|
+
range="$remote_sha..$local_sha"
|
41
|
+
fi
|
42
|
+
|
43
|
+
# Check for WIP commit
|
44
|
+
commit=`git rev-list -n 1 --grep '^WIP' "$range"`
|
45
|
+
if [ -n "$commit" ]
|
46
|
+
then
|
47
|
+
echo "Found WIP commit in $local_ref, not pushing"
|
48
|
+
exit 1
|
49
|
+
fi
|
50
|
+
fi
|
51
|
+
done
|
52
|
+
|
53
|
+
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".
|