server-blender 0.0.12 → 0.0.13

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 (4) hide show
  1. data/VERSION +1 -1
  2. data/files/mix.sh +15 -1
  3. data/server-blender.gemspec +2 -2
  4. metadata +3 -3
data/VERSION CHANGED
@@ -1 +1 @@
1
- 0.0.12
1
+ 0.0.13
data/files/mix.sh CHANGED
@@ -1,7 +1,7 @@
1
1
  #!/bin/bash -eu
2
2
 
3
3
  SHADOW_PUPPET_VERSION="0.3.2"
4
- MANIFEST_VERSION="0.0.12"
4
+ MANIFEST_VERSION="0.0.14"
5
5
 
6
6
  trap "echo FAILED" EXIT
7
7
 
@@ -23,13 +23,27 @@ function ensure_gem()
23
23
  fi
24
24
  }
25
25
 
26
+ function use_system_ruby() {
27
+ if [ -e /usr/local/rvm ]; then
28
+ echo RVM: Switch to system ruby
29
+ set +eu
30
+ . /usr/local/rvm/scripts/rvm
31
+ rvm use system
32
+ set -eu
33
+ fi
34
+ }
35
+
36
+ use_system_ruby
26
37
  ensure_gem shadow_puppet $SHADOW_PUPPET_VERSION
27
38
  ensure_gem ruby-debug
28
39
  ensure_gem server-blender-manifest $MANIFEST_VERSION
29
40
 
30
41
  echo "Mix: [recipe: $RECIPE, node: ${NODE:-}, roles: ${ROLES:-}]"
31
42
 
43
+ # rvm substitutes cd with its scripts/cd which accesses unbound variables
44
+ set +u
32
45
  cd /var/lib/blender/recipes
46
+ set -u
33
47
 
34
48
  ruby -rrubygems <<-RUBY
35
49
  gem 'server-blender-manifest', '$MANIFEST_VERSION'
@@ -5,11 +5,11 @@
5
5
 
6
6
  Gem::Specification.new do |s|
7
7
  s.name = %q{server-blender}
8
- s.version = "0.0.12"
8
+ s.version = "0.0.13"
9
9
 
10
10
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
11
11
  s.authors = ["Vitaly Kushner"]
12
- s.date = %q{2010-06-17}
12
+ s.date = %q{2010-06-23}
13
13
  s.default_executable = %q{blender}
14
14
  s.description = %q{Boostrap and manage servers with shadow_puppet
15
15
 
metadata CHANGED
@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
5
5
  segments:
6
6
  - 0
7
7
  - 0
8
- - 12
9
- version: 0.0.12
8
+ - 13
9
+ version: 0.0.13
10
10
  platform: ruby
11
11
  authors:
12
12
  - Vitaly Kushner
@@ -14,7 +14,7 @@ autorequire:
14
14
  bindir: bin
15
15
  cert_chain: []
16
16
 
17
- date: 2010-06-17 00:00:00 +03:00
17
+ date: 2010-06-23 00:00:00 +03:00
18
18
  default_executable: blender
19
19
  dependencies:
20
20
  - !ruby/object:Gem::Dependency