docman 0.0.32 → 0.0.33
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.
- checksums.yaml +4 -4
- data/bin/bump-version.sh +3 -1
- data/lib/docman/info.rb +1 -1
- data/lib/docman/version.rb +1 -1
- metadata +2 -2
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA1:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 60f35da305d3762ad05a4d33cb81e6752d50fdf7
|
|
4
|
+
data.tar.gz: 7a822f7232773f00a3b49999aa9b1b04aa3c6cc8
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 9d78656781c71bb6a4647f2d557143e606ef927d9f7ae262933a2111a1a30354b652be41de75d1bf82ea5631e28d949b7a391f2081b57874aa0c8c47dc1ced3c
|
|
7
|
+
data.tar.gz: 1434e1dc3ebcf169365bec5132d6c763a55afda1c23c20d2d9b282e2969e3c386702e3e6aa1b5a9c416181796c13861300715a543caae9e82a670e597b8c9807
|
data/bin/bump-version.sh
CHANGED
|
@@ -66,8 +66,10 @@ else
|
|
|
66
66
|
fi
|
|
67
67
|
|
|
68
68
|
if [ -n "$1" ]; then
|
|
69
|
+
git fetch
|
|
69
70
|
BRANCH="state_$1"
|
|
70
|
-
git show-ref --verify --quiet "refs/heads/${BRANCH}"
|
|
71
|
+
#git show-ref --verify --quiet "refs/heads/${BRANCH}"
|
|
72
|
+
git ls-remote --exit-code . origin/state_stable &> /dev/null
|
|
71
73
|
if [ $? == 0 ]; then
|
|
72
74
|
git checkout ${BRANCH}
|
|
73
75
|
git pull
|
data/lib/docman/info.rb
CHANGED
|
@@ -22,7 +22,7 @@ module Docman
|
|
|
22
22
|
if state['source']['type'] == :retrieve_from_repo
|
|
23
23
|
repo = state['source']['repo'] == :project_repo ? self['repo'] : state['source']['repo']
|
|
24
24
|
external_state_info = read_yaml_from_file(repo, self['states_path'], state['source']['branch'], state['source']['file'])
|
|
25
|
-
state.deep_merge! external_state_info
|
|
25
|
+
state.deep_merge! external_state_info unless external_state_info.nil?
|
|
26
26
|
end
|
|
27
27
|
end
|
|
28
28
|
end
|
data/lib/docman/version.rb
CHANGED
metadata
CHANGED
|
@@ -1,14 +1,14 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: docman
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 0.0.
|
|
4
|
+
version: 0.0.33
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Alexander Tolstikov
|
|
8
8
|
autorequire:
|
|
9
9
|
bindir: bin
|
|
10
10
|
cert_chain: []
|
|
11
|
-
date: 2014-08-
|
|
11
|
+
date: 2014-08-26 00:00:00.000000000 Z
|
|
12
12
|
dependencies:
|
|
13
13
|
- !ruby/object:Gem::Dependency
|
|
14
14
|
name: bundler
|