Manual fixes to make chef actually build.

7 files changed, 85 insertions, 14 deletions

diff --git a/strata/chef.morph b/strata/chef.morph
index aa2756d0..a02f074c 100644
--- a/strata/chef.morph
+++ b/strata/chef.morph
@@ -4,12 +4,19 @@ description: Autogenerated by Baserock import tool
 build-depends:
 - morph: strata/ruby.morph
 chunks:
+- name: yajl
+  morph: strata/chef/yajl.morph
+  repo: http://github.com/lloyd/yajl
+  ref: a0ecdde0c042b9256170f2f8890dd9451a4240aa
+  unpetrify-ref: 2.1.0
+  build-depends: []
 - name: libyajl2-1.0.1
   morph: strata/chef/libyajl2-1.0.1.morph
   repo: https://github.com/lamont-granquist/libyajl2-gem
   ref: 98aef032f536d13775bc7b3b69a25ebac9bdee0a
   unpetrify-ref: 1.0.1
-  build-depends: []
+  build-depends:
+    - yajl
 - name: ffi-yajl-1.0.2
   morph: strata/chef/ffi-yajl-master.morph
   repo: http://github.com/opscode/ffi-yajl
diff --git a/strata/chef/erubis-master.morph b/strata/chef/erubis-master.morph
index 372f50da..d1f21749 100644
--- a/strata/chef/erubis-master.morph
+++ b/strata/chef/erubis-master.morph
@@ -7,11 +7,9 @@ products:
 - artifact: erubis-master-doc
   include:
   - usr/lib/ruby/gems/2.0.0/doc/.*
-build-commands:
-- gem build erubis.gemspec
+configure-commands:
+- ruby ./setup.rb config --prefix="$PREFIX"
 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 ./erubis-master.gem
+- ruby ./setup.rb install --prefix="$DESTDIR"
 x-build-dependencies-rubygem: {}
 x-runtime-dependencies-rubygem: {}
diff --git a/strata/chef/ipaddress-0.8.0.morph b/strata/chef/ipaddress-0.8.0.morph
index cc1f0be3..64db4e50 100644
--- a/strata/chef/ipaddress-0.8.0.morph
+++ b/strata/chef/ipaddress-0.8.0.morph
@@ -5,11 +5,65 @@ products:
 - artifact: ipaddress-0.7.5-doc
   include:
   - usr/lib/ruby/gems/2.0.0/doc/.*
+configure-commands:
+- |
+  # This is ugly ... the .gemspec in the Git repo is out of date. I
+  # generated this new one using 'rake gemspec'. That requires the
+  # 'jeweler' Gem and all its dependencies to be available, so it can't
+  # necessarily be run at configure time here.
+  #
+  # It'd be simpler to just run 'rake install' instead of making a .gem
+  # and then installing it, but that would also require Jeweler !
+
+  cat > ipaddress.gemspec <<'EOF'
+  # Generated by jeweler
+  # DO NOT EDIT THIS FILE DIRECTLY
+  # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
+  # -*- encoding: utf-8 -*-
+  # stub: ipaddress 0.8.0 ruby lib
+
+  Gem::Specification.new do |s|
+    s.name = "ipaddress"
+    s.version = "0.8.0"
+
+    s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+    s.require_paths = ["lib"]
+    s.authors = ["Marco Ceresa"]
+    s.date = "2014-09-03"
+    s.description = "      IPAddress is a Ruby library designed to make manipulation \n      of IPv4 and IPv6 addresses both powerful and simple. It mantains\n      a layer of compatibility with Ruby's own IPAddr, while \n      addressing many of its issues.\n"
+    s.email = "ceresa@gmail.com"
+    s.extra_rdoc_files = [
+      "LICENSE",
+      "README.rdoc"
+    ]
+    s.files = [
+      ".document",
+      "CHANGELOG.rdoc",
+      "LICENSE",
+      "README.rdoc",
+      "Rakefile",
+      "VERSION",
+      "ipaddress.gemspec",
+      "lib/ipaddress.rb",
+      "lib/ipaddress/ipv4.rb",
+      "lib/ipaddress/ipv6.rb",
+      "lib/ipaddress/prefix.rb",
+      "test/ipaddress/ipv4_test.rb",
+      "test/ipaddress/ipv6_test.rb",
+      "test/ipaddress/prefix_test.rb",
+      "test/ipaddress_test.rb",
+      "test/test_helper.rb"
+    ]
+    s.homepage = "http://github.com/bluemonk/ipaddress"
+    s.rubygems_version = "2.3.0"
+    s.summary = "IPv4/IPv6 addresses manipulation library"
+  end
+  EOF
 build-commands:
 - gem build ipaddress.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 ./ipaddress-0.7.5.gem
+  --ignore-dependencies --local ./ipaddress-0.8.0.gem
 x-build-dependencies-rubygem: {}
 x-runtime-dependencies-rubygem: {}
diff --git a/strata/chef/libyajl2-1.0.1.morph b/strata/chef/libyajl2-1.0.1.morph
index 2685999f..1039ee35 100644
--- a/strata/chef/libyajl2-1.0.1.morph
+++ b/strata/chef/libyajl2-1.0.1.morph
@@ -9,7 +9,9 @@ build-commands:
 - gem build libyajl2.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 ./libyajl2-1.0.1.gem
+- USE_SYSTEM_LIBYAJL2=yes gem install
+    --install-dir "$DESTDIR/$PREFIX/lib/ruby/gems/2.0.0"
+    --bindir "$DESTDIR/$PREFIX/bin"
+    --ignore-dependencies --local ./libyajl2-1.0.1.gem
 x-build-dependencies-rubygem: {}
 x-runtime-dependencies-rubygem: {}
diff --git a/strata/chef/net-ssh-2.9.1.morph b/strata/chef/net-ssh-2.9.1.morph
index 54396676..6425939c 100644
--- a/strata/chef/net-ssh-2.9.1.morph
+++ b/strata/chef/net-ssh-2.9.1.morph
@@ -5,6 +5,12 @@ products:
 - artifact: net-ssh-2.9.1-doc
   include:
   - usr/lib/ruby/gems/2.0.0/doc/.*
+configure-commands:
+# 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.gemspec
 build-commands:
 - gem build net-ssh.gemspec
 install-commands:
diff --git a/strata/chef/net-ssh-gateway-1.2.0.morph b/strata/chef/net-ssh-gateway-1.2.0.morph
index 3d390751..c6f1e236 100644
--- a/strata/chef/net-ssh-gateway-1.2.0.morph
+++ b/strata/chef/net-ssh-gateway-1.2.0.morph
@@ -5,12 +5,10 @@ products:
 - artifact: net-ssh-gateway-1.2.0-doc
   include:
   - usr/lib/ruby/gems/2.0.0/doc/.*
-build-commands:
-- gem build net-ssh-gateway.gemspec
+configure-commands:
+- ruby ./setup.rb config --prefix="$PREFIX"
 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 ./net-ssh-gateway-1.2.0.gem
+- ruby ./setup.rb install --prefix="$DESTDIR"
 x-build-dependencies-rubygem: {}
 x-runtime-dependencies-rubygem:
   net-ssh: 2.9.1
diff --git a/strata/chef/net-ssh-multi-1.2.0.morph b/strata/chef/net-ssh-multi-1.2.0.morph
index e6c18e22..7425b45f 100644
--- a/strata/chef/net-ssh-multi-1.2.0.morph
+++ b/strata/chef/net-ssh-multi-1.2.0.morph
@@ -5,6 +5,12 @@ products:
 - artifact: net-ssh-multi-1.2.0-doc
   include:
   - usr/lib/ruby/gems/2.0.0/doc/.*
+configure-commands:
+# 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-multi.gemspec
 build-commands:
 - gem build net-ssh-multi.gemspec
 install-commands: