openteam-commons 0.1.3 → 0.1.4

Sign up to get free protection for your applications and to get access to all the features.
Files changed (3) hide show
  1. data/lib/generators/openteam_commons/install/script/update_site +56 -20
  2. data/lib/openteam-commons/version.rb +1 -1
  3. metadata +12 -12
data/lib/generators/openteam_commons/install/script/update_site CHANGED
@@ -1,36 +1,72 @@
1
1
  #!/usr/bin/env bash
2
2
 
3
- CURRENT_PATH=$(dirname $(dirname $(realpath $0)))
3
+ load_rvm_rc() {
4
+ if [ -f ~/.rvm/scripts/rvm ]; then
5
+ source ~/.rvm/scripts/rvm
6
+ fi
7
+
8
+ RVMRC_DIR=${CURRENT_PATH}
9
+ for ((;;)); do
10
+ if [ -f ${RVMRC_DIR}/.rvmrc ]; then
11
+ . ${RVMRC_DIR}/.rvmrc
12
+ break
13
+ elif [ "${RVMRC_DIR}" == "/" ]; then
14
+ break
15
+ fi
16
+ RVMRC_DIR=$(dirname ${RVMRC_DIR})
17
+ done
18
+ }
19
+
20
+ exec_git() {
21
+ /usr/bin/env git --git-dir=${CURRENT_PATH}/.git --work-tree=${CURRENT_PATH} $@
22
+ }
23
+
24
+ exec_rake() {
25
+ RAILS_ENV=production ${CURRENT_PATH}/bin/rake -f ${CURRENT_PATH}/Rakefile $@
26
+ }
27
+
28
+ reload_rc_script() {
29
+ if [ $(/usr/bin/uname) == "FreeBSD" ]; then
30
+ RC_PATH=/usr/local/etc/rc.d/
31
+ else
32
+ RC_PATH=/etc/init.d/
33
+ fi
34
+
35
+ RC_SCRIPT=${RC_PATH}/${PROJECT_GROUP}-${PROJECT_NAME}
4
36
 
5
- PROJECT_GROUP=$(basename $(dirname $CURRENT_PATH))
6
- PROJECT_NAME=$(basename $(dirname $(dirname $(realpath $0))))
37
+ if [ -f ${RC_SCRIPT} ]; then
38
+ ${RC_SCRIPT} reload
39
+ fi
40
+ }
7
41
 
8
- pushd $CURRENT_PATH
42
+ bundle_update() {
43
+ BUNDLE_GEMFILE=${CURRENT_PATH}/Gemfile bundle --path .bundle --binstubs --clean --without test:development
44
+ }
45
+
46
+ CURRENT_PATH=$(dirname $(dirname $(realpath $0)))
47
+
48
+ PROJECT_GROUP=$(basename $(dirname ${CURRENT_PATH}))
49
+ PROJECT_NAME=$(basename ${CURRENT_PATH})
9
50
 
10
51
  if [ $(/usr/bin/uname) == "FreeBSD" ]; then
11
- git checkout Gemfile.lock
12
- RC_PATH=/usr/local/etc/rc.d/
13
- else
14
- RC_PATH=/etc/init.d/
52
+ exec_git checkout Gemfile.lock
15
53
  fi
16
- RC_SCRIPT=${RC_PATH}/${PROJECT_GROUP}-${PROJECT_NAME}
17
54
 
18
- git pull
55
+ exec_git fetch
56
+ exec_git merge origin/master
19
57
 
20
- bundle --path .bundle --binstubs --clean --without test:development
58
+ load_rvm_rc
21
59
 
22
- if [ -f "config/database.yml" ]; then
23
- bin/rake db:migrate
24
- fi
60
+ bundle_update
25
61
 
26
- if [ "x${1}" == "x--assets" ]; then
27
- bin/rake assets:clean assets:precompile
62
+ if [ -f "${CURRENT_PATH}/config/database.yml" ]; then
63
+ exec_rake db:migrate
28
64
  fi
29
65
 
30
- if [ -f ${RC_SCRIPT} ]; then
31
- ${RC_SCRIPT} reload
66
+ if [ "x${1}" == "x--assets" ]; then
67
+ exec_rake assets:clean assets:precompile
32
68
  fi
33
69
 
34
- bin/rake airbrake:deploy TO=production
70
+ reload_rc_script
35
71
 
36
- popd
72
+ exec_rake airbrake:deploy TO=production
data/lib/openteam-commons/version.rb CHANGED
@@ -1,3 +1,3 @@
1
1
  module OpenteamCommons
2
- VERSION = "0.1.3"
2
+ VERSION = "0.1.4"
3
3
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: openteam-commons
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.1.3
4
+ version: 0.1.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-03-29 00:00:00.000000000 Z
12
+ date: 2012-03-30 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: airbrake
16
- requirement: &16411500 !ruby/object:Gem::Requirement
16
+ requirement: &4965760 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *16411500
24
+ version_requirements: *4965760
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: configliere
27
- requirement: &16409980 !ruby/object:Gem::Requirement
27
+ requirement: &4965180 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *16409980
35
+ version_requirements: *4965180
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rails
38
- requirement: &16408000 !ruby/object:Gem::Requirement
38
+ requirement: &4963700 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *16408000
46
+ version_requirements: *4963700
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: unicorn
49
- requirement: &16406500 !ruby/object:Gem::Requirement
49
+ requirement: &4961520 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
54
54
  version: '0'
55
55
  type: :runtime
56
56
  prerelease: false
57
- version_requirements: *16406500
57
+ version_requirements: *4961520
58
58
  description: Description of OpenteamCommons.
59
59
  email:
60
60
  - mail@openteam.ru
@@ -90,7 +90,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
90
90
  version: '0'
91
91
  segments:
92
92
  - 0
93
- hash: -316006890504474889
93
+ hash: 1076760912677677937
94
94
  required_rubygems_version: !ruby/object:Gem::Requirement
95
95
  none: false
96
96
  requirements:
@@ -99,7 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
99
99
  version: '0'
100
100
  segments:
101
101
  - 0
102
- hash: -316006890504474889
102
+ hash: 1076760912677677937
103
103
  requirements: []
104
104
  rubyforge_project:
105
105
  rubygems_version: 1.8.15