Ruby/chef solo: fixes

Make ruby binaries more accessible by creating symlinks from
${libdir}/ruby/gems/${ruby version}/bin/ to /usr/bin

RDEPENDS needs to be package specific

coderay needs to depends on yard

Signed-off-by: Amy Fong <amy.fong@windriver.com>

10 files changed, 19 insertions, 9 deletions

diff --git a/meta-openstack/classes/ruby.bbclass b/meta-openstack/classes/ruby.bbclass
index 6161698..0f20deb 100644
--- a/meta-openstack/classes/ruby.bbclass
+++ b/meta-openstack/classes/ruby.bbclass
@@ -4,7 +4,7 @@
 DEPENDS += " \
     ruby-native \
 "
-RDEPENDS += " \
+RDEPENDS_${PN} += " \
     ruby \
 "
 
@@ -94,6 +94,15 @@ ruby_do_install() {
         for gem in ${RUBY_INSTALL_GEMS}; do
                 gem install --ignore-dependencies --local --env-shebang --install-dir ${D}/${libdir}/ruby/gems/${RUBY_GEM_VERSION}/ $gem
         done
+
+        # create symlink from the gems bin directory to /usr/bin
+        for i in ${D}/${libdir}/ruby/gems/${RUBY_GEM_VERSION}/bin/*; do
+                if [ -e "$i" ]; then
+                        if [ ! -d ${D}/${bindir} ]; then mkdir -p ${D}/${bindir}; fi
+                        b=`basename $i`
+                        ln -sf ${libdir}/ruby/gems/${RUBY_GEM_VERSION}/bin/$b ${D}/${bindir}/$b
+                fi
+        done
 }
 
 EXPORT_FUNCTIONS do_compile do_install
diff --git a/meta-openstack/recipes-devtools/ruby/chef-zero_git.bb b/meta-openstack/recipes-devtools/ruby/chef-zero_git.bb
index 7e8701d..1d8a240 100644
--- a/meta-openstack/recipes-devtools/ruby/chef-zero_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/chef-zero_git.bb
@@ -28,7 +28,7 @@ SRC_URI = " \
 
 inherit ruby
 
-RDEPENDS += " \
+RDEPENDS_${PN} += " \
         mixlib-log \
         json \
         hashie \
diff --git a/meta-openstack/recipes-devtools/ruby/coderay_git.bb b/meta-openstack/recipes-devtools/ruby/coderay_git.bb
index cbb743c..3253699 100644
--- a/meta-openstack/recipes-devtools/ruby/coderay_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/coderay_git.bb
@@ -24,3 +24,4 @@ inherit ruby
 RUBY_COMPILE_FLAGS += "RELEASE=1"
 
 BBCLASSEXTEND = "native"
+DEPENDS += "yard"
diff --git a/meta-openstack/recipes-devtools/ruby/mixlib-authentication_git.bb b/meta-openstack/recipes-devtools/ruby/mixlib-authentication_git.bb
index eb152e8..b380e01 100644
--- a/meta-openstack/recipes-devtools/ruby/mixlib-authentication_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/mixlib-authentication_git.bb
@@ -22,7 +22,7 @@ SRC_URI = " \
 
 inherit ruby
 
-RDEPENDS += " \
+RDEPENDS_${PN} += " \
         mixlib-log \
         "
 
diff --git a/meta-openstack/recipes-devtools/ruby/net-ssh-gateway_git.bb b/meta-openstack/recipes-devtools/ruby/net-ssh-gateway_git.bb
index 7c46b5a..b823a03 100644
--- a/meta-openstack/recipes-devtools/ruby/net-ssh-gateway_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/net-ssh-gateway_git.bb
@@ -26,7 +26,7 @@ SRC_URI = " \
 
 inherit ruby
 
-RDEPENDS += " \
+RDEPENDS_${PN} += " \
         net-ssh \
         "
 
diff --git a/meta-openstack/recipes-devtools/ruby/net-ssh-multi_git.bb b/meta-openstack/recipes-devtools/ruby/net-ssh-multi_git.bb
index 11527be..86f2807 100644
--- a/meta-openstack/recipes-devtools/ruby/net-ssh-multi_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/net-ssh-multi_git.bb
@@ -26,7 +26,7 @@ SRC_URI = " \
 
 inherit ruby
 
-RDEPENDS += " \
+RDEPENDS_${PN} += " \
         net-ssh \
         net-ssh-gateway \
         "
diff --git a/meta-openstack/recipes-devtools/ruby/ohai_git.bb b/meta-openstack/recipes-devtools/ruby/ohai_git.bb
index 3dbfe00..6bd31e1 100644
--- a/meta-openstack/recipes-devtools/ruby/ohai_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/ohai_git.bb
@@ -25,7 +25,7 @@ SRC_URI = " \
 
 inherit ruby
 
-RDEPENDS += " \
+RDEPENDS_${PN} += " \
         mime-types \
         ipaddress \
         mixlib-cli \
diff --git a/meta-openstack/recipes-devtools/ruby/pry_git.bb b/meta-openstack/recipes-devtools/ruby/pry_git.bb
index 91e3c43..2dc6234 100644
--- a/meta-openstack/recipes-devtools/ruby/pry_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/pry_git.bb
@@ -26,7 +26,7 @@ inherit ruby
 
 RUBY_COMPILE_FLAGS = ""
 
-RDEPENDS += " \
+RDEPENDS_${PN} += " \
         coderay \
         method-source \
         slop \
diff --git a/meta-openstack/recipes-devtools/ruby/rest-client_git.bb b/meta-openstack/recipes-devtools/ruby/rest-client_git.bb
index 9d31e65..0b79cfe 100644
--- a/meta-openstack/recipes-devtools/ruby/rest-client_git.bb
+++ b/meta-openstack/recipes-devtools/ruby/rest-client_git.bb
@@ -23,7 +23,7 @@ SRC_URI = " \
 
 inherit ruby
 
-RDEPENDS += " \
+RDEPENDS_${PN} += " \
         mime-types \
         "
 
diff --git a/meta-openstack/recipes-support/chef/chef_git.bb b/meta-openstack/recipes-support/chef/chef_git.bb
index b2b82e6..11c651d 100644
--- a/meta-openstack/recipes-support/chef/chef_git.bb
+++ b/meta-openstack/recipes-support/chef/chef_git.bb
@@ -33,7 +33,7 @@ DEPENDS += " \
         bundler-native \
         "
 
-RDEPENDS += " \
+RDEPENDS_${PN} += " \
         ruby \
         chef-zero \
         coderay \