summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSam Thursfield <sam.thursfield@codethink.co.uk>2014-09-03 16:51:38 (GMT)
committerSam Thursfield <sam.thursfield@codethink.co.uk>2014-09-03 16:51:38 (GMT)
commitfda6e93cb5cc1b11b06d35b8468ba7564d3af8cc (patch)
treec653b694c4880df8d378986e830cdd65de23a0ef
parentad4a5dfa3ec62e6717a11d51e0ea0aaca55a5697 (diff)
downloaddefinitions-baserock/sam/chef-from-git.tar.gz
If you deploy the chef system now and then 'gem install erubis' you seem to end up with a working Chef. Suksess!
-rw-r--r--strata/chef.morph2
-rw-r--r--strata/chef/coderay-1.1.0.morph8
-rw-r--r--strata/chef/net-ssh-gateway-1.2.0.morph12
3 files changed, 15 insertions, 7 deletions
diff --git a/strata/chef.morph b/strata/chef.morph
index a02f074..29408b8 100644
--- a/strata/chef.morph
+++ b/strata/chef.morph
@@ -116,7 +116,7 @@ chunks:
ref: 231c3abd052e606820297a97e4bc32bdab656a02
unpetrify-ref: v2.2
build-depends: []
-- name: coderay-1.1.0.rc1
+- name: coderay-1.1.0
morph: strata/chef/coderay-1.1.0.morph
repo: http://github.com/rubychan/coderay
ref: a48037b85a12228431b32103786456f36beb355f
diff --git a/strata/chef/coderay-1.1.0.morph b/strata/chef/coderay-1.1.0.morph
index 22c6000..3a98433 100644
--- a/strata/chef/coderay-1.1.0.morph
+++ b/strata/chef/coderay-1.1.0.morph
@@ -1,15 +1,15 @@
-name: coderay-1.1.0.rc1
+name: coderay-1.1.0
kind: chunk
description: Automatically generated by rubygem.import
products:
-- artifact: coderay-1.1.0.rc1-doc
+- artifact: coderay-1.1.0-doc
include:
- usr/lib/ruby/gems/2.0.0/doc/.*
build-commands:
-- gem build coderay.gemspec
+- RELEASE=yes gem build coderay.gemspec
install-commands:
- mkdir -p "$DESTDIR/$PREFIX/lib/ruby/gems/2.0.0"
- gem install --install-dir "$DESTDIR/$PREFIX/lib/ruby/gems/2.0.0" --bindir "$DESTDIR/$PREFIX/bin"
- --ignore-dependencies --local ./coderay-1.1.0.rc1.gem
+ --ignore-dependencies --local ./coderay-1.1.0.gem
x-build-dependencies-rubygem: {}
x-runtime-dependencies-rubygem: {}
diff --git a/strata/chef/net-ssh-gateway-1.2.0.morph b/strata/chef/net-ssh-gateway-1.2.0.morph
index c6f1e23..9cb0c36 100644
--- a/strata/chef/net-ssh-gateway-1.2.0.morph
+++ b/strata/chef/net-ssh-gateway-1.2.0.morph
@@ -6,9 +6,17 @@ products:
include:
- usr/lib/ruby/gems/2.0.0/doc/.*
configure-commands:
-- ruby ./setup.rb config --prefix="$PREFIX"
+# FIXME: this is a very simplistic way of disabling signing, the gemspec
+# is arbitrary Ruby code and these regexps are certainly inadequate, although
+# they tend to work. Better to fix `gem` so that it will build an unsigned
+# Gem.
+- sed -e '/signing_key =/ d' -e '/cert_chain =/ d' -i net-ssh-gateway.gemspec
+build-commands:
+- gem build net-ssh-gateway.gemspec
install-commands:
-- ruby ./setup.rb install --prefix="$DESTDIR"
+- mkdir -p "$DESTDIR/$PREFIX/lib/ruby/gems/2.0.0"
+- gem install --install-dir "$DESTDIR/$PREFIX/lib/ruby/gems/2.0.0" --bindir "$DESTDIR/$PREFIX/bin"
+ --ignore-dependencies --local ./net-ssh-gateway-1.2.0.gem
x-build-dependencies-rubygem: {}
x-runtime-dependencies-rubygem:
net-ssh: 2.9.1