Rename ruby_next -> ruby

cloudfoundry-attic · Jul 24, 2013 · c3e8c11 · c3e8c11
1 parent 5ac0364
commit c3e8c11
Show file tree

Hide file tree

Showing 47 changed files with 54 additions and 54 deletions.
diff --git a/jobs/cloud_controller_ng/spec b/jobs/cloud_controller_ng/spec
@@ -19,7 +19,7 @@ packages:
   - libpq
   - mysqlclient
   - sqlite
-  - ruby_next
+  - ruby
   - syslog_aggregator
 
 properties:

diff --git a/jobs/cloud_controller_ng/templates/cloud_controller_ng_ctl.erb b/jobs/cloud_controller_ng/templates/cloud_controller_ng_ctl.erb
@@ -1,7 +1,7 @@
 #!/bin/bash
 
 export CC_JOB_DIR=/var/vcap/jobs/cloud_controller_ng
-export PATH=/var/vcap/packages/ruby_next/bin:$PATH
+export PATH=/var/vcap/packages/ruby/bin:$PATH
 
 CC_PACKAGE_DIR=/var/vcap/packages/cloud_controller_ng
 NFS_SHARE=/var/vcap/shared

diff --git a/jobs/collector/spec b/jobs/collector/spec
@@ -7,7 +7,7 @@ templates:
 packages:
 - common
 - collector
-- ruby_next
+- ruby
 - syslog_aggregator
 properties:
   collector.aws_access_key_id:

diff --git a/jobs/collector/templates/collector_ctl b/jobs/collector/templates/collector_ctl
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-export PATH=/var/vcap/packages/ruby_next/bin:$PATH
+export PATH=/var/vcap/packages/ruby/bin:$PATH
 
 RUN_DIR=/var/vcap/sys/run/collector
 LOG_DIR=/var/vcap/sys/log/collector
@@ -28,7 +28,7 @@ case $1 in
 
     cd /var/vcap/packages/collector
 
-    exec /var/vcap/packages/ruby_next/bin/ruby \
+    exec /var/vcap/packages/ruby/bin/ruby \
          /var/vcap/packages/collector/bin/collector \
          >>$LOG_DIR/collector.stdout.log \
          2>>$LOG_DIR/collector.stderr.log

diff --git a/jobs/dashboard/spec b/jobs/dashboard/spec
@@ -12,7 +12,7 @@ templates:
   syslog_forwarder.conf.erb: config/syslog_forwarder.conf
 packages:
 - common
-- ruby_next
+- ruby
 - dea_jvm
 - syslog_aggregator
 - dashboard
diff --git a/jobs/dashboard/templates/router_registrar_ctl.erb b/jobs/dashboard/templates/router_registrar_ctl.erb
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-export PATH=/var/vcap/packages/ruby_next/bin:$PATH
+export PATH=/var/vcap/packages/ruby/bin:$PATH
 RUN_DIR=/var/vcap/sys/run/router_registrar
 LOG_DIR=/var/vcap/sys/log/router_registrar
 JOB_DIR=/var/vcap/jobs/dashboard
@@ -25,7 +25,7 @@ case $1 in
 
     cd /var/vcap/packages/dashboard/router_registrar
 
-    exec /var/vcap/packages/ruby_next/bin/ruby \
+    exec /var/vcap/packages/ruby/bin/ruby \
          /var/vcap/packages/dashboard/router_registrar/bin/router_registrar \
          >>$LOG_DIR/router_registrar.stdout.log \
          2>>$LOG_DIR/router_registrar.stderr.log

diff --git a/jobs/dea_next/spec b/jobs/dea_next/spec
@@ -18,7 +18,7 @@ packages:
 - dea_next
 - warden
 - rootfs_lucid64
-- ruby_next
+- ruby
 - golang
 - sqlite
 - mysqlclient

diff --git a/jobs/dea_next/templates/dea_ctl b/jobs/dea_next/templates/dea_ctl
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-export PATH=/var/vcap/packages/ruby_next/bin:$PATH
+export PATH=/var/vcap/packages/ruby/bin:$PATH
 RUN_DIR=/var/vcap/sys/run/dea_next
 LOG_DIR=/var/vcap/sys/log/dea_next
 PIDFILE=$RUN_DIR/dea_next.pid
@@ -59,7 +59,7 @@ case $1 in
     /var/vcap/packages/syslog_aggregator/setup_syslog_forwarder.sh $JOB_DIR/config
     <% end %>
 
-    exec chpst -u vcap:vcap /var/vcap/packages/ruby_next/bin/ruby /var/vcap/packages/dea_next/bin/dea \
+    exec chpst -u vcap:vcap /var/vcap/packages/ruby/bin/ruby /var/vcap/packages/dea_next/bin/dea \
          $JOB_DIR/config/dea.yml \
          >>$LOG_DIR/dea.stdout.log \
          2>>$LOG_DIR/dea.stderr.log

diff --git a/jobs/dea_next/templates/drain.rb b/jobs/dea_next/templates/drain.rb
@@ -1,4 +1,4 @@
-#!/var/vcap/packages/ruby_next/bin/ruby --disable-all
+#!/var/vcap/packages/ruby/bin/ruby --disable-all
 
 require "logger"
 require "fileutils"

diff --git a/jobs/dea_next/templates/warden_ctl b/jobs/dea_next/templates/warden_ctl
@@ -43,11 +43,11 @@ case $1 in
       find $depot -mindepth 1 -maxdepth 1 -type d | xargs -t -n1 --no-run-if-empty root/linux/destroy.sh
     fi
 
-    export PATH=/var/vcap/packages/ruby_next/bin:$PATH
+    export PATH=/var/vcap/packages/ruby/bin:$PATH
 
     echo $$ > $PIDFILE
 
-    exec /var/vcap/packages/ruby_next/bin/bundle exec \
+    exec /var/vcap/packages/ruby/bin/bundle exec \
          rake warden:start[$WARDEN_CONF_DIR/warden.yml] \
          1>>$LOG_DIR/warden.stdout.log \
          2>>$LOG_DIR/warden.stderr.log

diff --git a/jobs/health_manager_next/spec b/jobs/health_manager_next/spec
@@ -7,7 +7,7 @@ templates:
 packages:
   - health_manager_next
   - common
-  - ruby_next
+  - ruby
   - syslog_aggregator
 properties:
   cc_props:

diff --git a/jobs/health_manager_next/templates/health_manager_next_ctl b/jobs/health_manager_next/templates/health_manager_next_ctl
@@ -7,7 +7,7 @@ RUN_DIR=/var/vcap/sys/run/health_manager_next
 LOG_DIR=/var/vcap/sys/log/health_manager_next
 PIDFILE=$RUN_DIR/health_manager_next.pid
 
-export PATH=/var/vcap/packages/ruby_next/bin:$PATH
+export PATH=/var/vcap/packages/ruby/bin:$PATH
 
 source /var/vcap/packages/common/utils.sh
 

diff --git a/jobs/login/spec b/jobs/login/spec
@@ -14,7 +14,7 @@ templates:
 
 packages:
   - common
-  - ruby_next
+  - ruby
   - syslog_aggregator
   - login
   - git

diff --git a/jobs/login/templates/cf-registrar_ctl b/jobs/login/templates/cf-registrar_ctl
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-export PATH=/var/vcap/packages/ruby_next/bin:$PATH
+export PATH=/var/vcap/packages/ruby/bin:$PATH
 export PATH=/var/vcap/packages/git/bin:$PATH
 RUN_DIR=/var/vcap/sys/run/login
 LOG_DIR=/var/vcap/sys/log/login
@@ -22,7 +22,7 @@ case $1 in
     export CONFIG_FILE=/var/vcap/jobs/login/config/cf-registrar/config.yml
 
     cd $VCAP_COMMON_PATH
-    exec /var/vcap/packages/ruby_next/bin/bundle exec \
+    exec /var/vcap/packages/ruby/bin/bundle exec \
          $VCAP_COMMON_PATH/bin/cf-registrar \
          --register-with-router \
          --register-varz-credentials \

diff --git a/jobs/nats/spec b/jobs/nats/spec
@@ -6,7 +6,7 @@ templates:
 packages:
   - common
   - nats
-  - ruby_next
+  - ruby
 properties:
   nats_props:
     description:

diff --git a/jobs/nats/templates/nats_ctl.erb b/jobs/nats/templates/nats_ctl.erb
@@ -1,6 +1,6 @@
 #!/bin/bash
 
-export PATH=/var/vcap/packages/ruby_next/bin:$PATH
+export PATH=/var/vcap/packages/ruby/bin:$PATH
 export BUNDLE_GEMFILE=/var/vcap/packages/nats/Gemfile
 
 RUN_DIR=/var/vcap/sys/run/nats

diff --git a/jobs/saml_login/spec b/jobs/saml_login/spec
@@ -14,7 +14,7 @@ templates:
 
 packages:
   - common
-  - ruby_next
+  - ruby
   - syslog_aggregator
   - saml_login
   - git

diff --git a/jobs/saml_login/templates/cf-registrar_ctl b/jobs/saml_login/templates/cf-registrar_ctl
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-export PATH=/var/vcap/packages/ruby_next/bin:$PATH
+export PATH=/var/vcap/packages/ruby/bin:$PATH
 export PATH=/var/vcap/packages/git/bin:$PATH
 RUN_DIR=/var/vcap/sys/run/saml_login
 LOG_DIR=/var/vcap/sys/log/saml_login
@@ -22,7 +22,7 @@ case $1 in
     export CONFIG_FILE=/var/vcap/jobs/saml_login/config/cf-registrar/config.yml
 
     cd $VCAP_COMMON_PATH
-    exec /var/vcap/packages/ruby_next/bin/bundle exec \
+    exec /var/vcap/packages/ruby/bin/bundle exec \
          $VCAP_COMMON_PATH/bin/cf-registrar \
          --register-with-router \
          --register-varz-credentials \

diff --git a/jobs/syslog_aggregator/spec b/jobs/syslog_aggregator/spec
@@ -13,7 +13,7 @@ templates:
 packages:
 - common
 - syslog_aggregator
-- ruby_next
+- ruby
 - nats
 properties:
   domain:

diff --git a/jobs/syslog_aggregator/templates/nats_capture_run.erb b/jobs/syslog_aggregator/templates/nats_capture_run.erb
@@ -2,5 +2,5 @@
 
 export PKG_DIR=/var/vcap/packages
 exec chpst -u vcap:vcap \
-   $PKG_DIR/ruby_next/bin/ruby $PKG_DIR/nats/bin/nats-sub ">" \
+   $PKG_DIR/ruby/bin/ruby $PKG_DIR/nats/bin/nats-sub ">" \
    -s nats://<%= p("nats.user") %>:<%= p("nats.password") %>@<%= p("nats.address") %>:<%= p("nats.port") %>
diff --git a/jobs/uaa/spec b/jobs/uaa/spec
@@ -17,7 +17,7 @@ templates:
 
 packages:
   - common
-  - ruby_next
+  - ruby
   - syslog_aggregator
   - uaa
 

diff --git a/jobs/uaa/templates/cf-registrar_ctl b/jobs/uaa/templates/cf-registrar_ctl
@@ -1,6 +1,6 @@
 #!/bin/bash -e
 
-export PATH=/var/vcap/packages/ruby_next/bin:$PATH
+export PATH=/var/vcap/packages/ruby/bin:$PATH
 export PATH=/var/vcap/packages/git/bin:$PATH
 RUN_DIR=/var/vcap/sys/run/uaa
 LOG_DIR=/var/vcap/sys/log/uaa
@@ -22,7 +22,7 @@ case $1 in
     export CONFIG_FILE=/var/vcap/jobs/uaa/config/cf-registrar/config.yml
 
     cd $VCAP_COMMON_PATH
-    exec /var/vcap/packages/ruby_next/bin/bundle exec \
+    exec /var/vcap/packages/ruby/bin/bundle exec \
          $VCAP_COMMON_PATH/bin/cf-registrar \
          --register-with-router \
          --register-varz-credentials \

diff --git a/packages/cloud_controller_ng/packaging b/packages/cloud_controller_ng/packaging
@@ -6,7 +6,7 @@ cp -a * ${BOSH_INSTALL_TARGET}
 (
   cd ${BOSH_INSTALL_TARGET}/cloud_controller_ng
 
-  bundle_cmd=/var/vcap/packages/ruby_next/bin/bundle
+  bundle_cmd=/var/vcap/packages/ruby/bin/bundle
   mysqlclient_dir=/var/vcap/packages/mysqlclient
   libpq_dir=/var/vcap/packages/libpq
 

diff --git a/packages/cloud_controller_ng/spec b/packages/cloud_controller_ng/spec
@@ -4,7 +4,7 @@ dependencies:
 - libpq
 - mysqlclient
 - sqlite
-- ruby_next
+- ruby
 files:
 - cloud_controller_ng/{Rakefile,Gemfile,Gemfile.lock}
 - cloud_controller_ng/bin/cloud_controller

diff --git a/packages/collector/packaging b/packages/collector/packaging
@@ -5,4 +5,4 @@ cp -a collector/* ${BOSH_INSTALL_TARGET}
 
 cd ${BOSH_INSTALL_TARGET}
 
-/var/vcap/packages/ruby_next/bin/bundle install --local --deployment --without development test
+/var/vcap/packages/ruby/bin/bundle install --local --deployment --without development test
diff --git a/packages/collector/spec b/packages/collector/spec
@@ -1,7 +1,7 @@
 ---
 name: collector
 dependencies:
-- ruby_next
+- ruby
 files:
 - collector/{Rakefile,Gemfile,Gemfile.lock}
 - collector/bin/collector

diff --git a/packages/dashboard/packaging b/packages/dashboard/packaging
@@ -14,4 +14,4 @@ cp -a ${BOSH_COMPILE_TARGET}/dashboard/dashboard-1.0-SNAPSHOT-d7c8acf9.war webap
 cd ${BOSH_INSTALL_TARGET}
 cp -a ${BOSH_COMPILE_TARGET}/tools/router_registrar router_registrar
 cd router_registrar
-/var/vcap/packages/ruby_next/bin/bundle install --local --deployment --without=development test
+/var/vcap/packages/ruby/bin/bundle install --local --deployment --without=development test
diff --git a/packages/dashboard/spec b/packages/dashboard/spec
@@ -1,7 +1,7 @@
 ---
 name: dashboard
 dependencies:
-- ruby_next
+- ruby
 - dea_jvm
 files:
 - dashboard/apache-tomcat-7.0.25.tar.gz

diff --git a/packages/dea_next/packaging b/packages/dea_next/packaging
@@ -5,7 +5,7 @@ cp -a dea_next/* ${BOSH_INSTALL_TARGET}
 
 (
   cd ${BOSH_INSTALL_TARGET}
-  /var/vcap/packages/ruby_next/bin/bundle install --local --deployment --without=development test
+  /var/vcap/packages/ruby/bin/bundle install --local --deployment --without=development test
 
   GOLANG_PATH=`readlink -nf /var/vcap/packages/golang`
   PATH=$GOLANG_PATH/bin:$PATH

diff --git a/packages/dea_next/spec b/packages/dea_next/spec
@@ -1,7 +1,7 @@
 ---
 name: dea_next
 dependencies:
-- ruby_next
+- ruby
 - buildpack_cache
 - warden
 - golang

diff --git a/packages/health_manager_next/packaging b/packages/health_manager_next/packaging
@@ -5,5 +5,5 @@ cp -a * ${BOSH_INSTALL_TARGET}
 
 (
   cd ${BOSH_INSTALL_TARGET}/health_manager_next
-  /var/vcap/packages/ruby_next/bin/bundle install --local --deployment
+  /var/vcap/packages/ruby/bin/bundle install --local --deployment
 )
diff --git a/packages/health_manager_next/spec b/packages/health_manager_next/spec
@@ -1,7 +1,7 @@
 ---
 name: health_manager_next
 dependencies:
-- ruby_next
+- ruby
 files:
 - health_manager_next/Gemfile*
 - health_manager_next/bin/*

diff --git a/packages/login/packaging b/packages/login/packaging
@@ -29,4 +29,4 @@ cp -a ${BOSH_COMPILE_TARGET}/uaa/cloudfoundry-identity-varz-1.0.2.war webapps/va
 cd ${BOSH_INSTALL_TARGET}
 cp -a ${BOSH_COMPILE_TARGET}/vcap-common vcap-common
 cd vcap-common
-/var/vcap/packages/ruby_next/bin/bundle install --local --deployment --without=development test
+/var/vcap/packages/ruby/bin/bundle install --local --deployment --without=development test
diff --git a/packages/login/spec b/packages/login/spec
@@ -1,7 +1,7 @@
 ---
 name: login
 dependencies:
-- ruby_next
+- ruby
 files:
 - login/**/*
 - uaa/**/*

diff --git a/packages/nats/packaging b/packages/nats/packaging
@@ -4,5 +4,5 @@ set -e
 cp -a nats/* ${BOSH_INSTALL_TARGET}
 (
   cd ${BOSH_INSTALL_TARGET}
-  /var/vcap/packages/ruby_next/bin/bundle install --binstubs --local --deployment
+  /var/vcap/packages/ruby/bin/bundle install --binstubs --local --deployment
 )
diff --git a/packages/nats/spec b/packages/nats/spec
@@ -1,6 +1,6 @@
 name: nats
 dependencies:
-  - ruby_next
+  - ruby
 files:
   - nats/**/*
 
diff --git a/packages/ruby_next/packaging → packages/ruby/packaging b/packages/ruby_next/packaging → packages/ruby/packaging
diff --git a/packages/ruby_next/spec → packages/ruby/spec b/packages/ruby_next/spec → packages/ruby/spec
@@ -1,5 +1,5 @@
 ---
-name: ruby_next
+name: ruby
 dependencies:
   - libyaml
 files:

diff --git a/packages/saml_login/packaging b/packages/saml_login/packaging
@@ -30,4 +30,4 @@ cd ${BOSH_INSTALL_TARGET}
 cp -a ${BOSH_COMPILE_TARGET}/vcap-common vcap-common
 cd vcap-common
 export PATH=/var/vcap/packages/git/bin:$PATH
-/var/vcap/packages/ruby_next/bin/bundle install --local --deployment --without=development test
+/var/vcap/packages/ruby/bin/bundle install --local --deployment --without=development test
diff --git a/packages/saml_login/spec b/packages/saml_login/spec
@@ -1,7 +1,7 @@
 ---
 name: saml_login
 dependencies:
-- ruby_next
+- ruby
 - git
 files:
 - saml_login/**/*

diff --git a/packages/syslog_aggregator/spec b/packages/syslog_aggregator/spec
@@ -1,7 +1,7 @@
 ---
 name: syslog_aggregator
 dependencies:
-- ruby_next
+- ruby
 files:
 - syslog_aggregator/setup_syslog_forwarder.sh
 - syslog_aggregator/send_error_mail
diff --git a/packages/uaa/packaging b/packages/uaa/packaging
@@ -30,4 +30,4 @@ cp -a ${BOSH_COMPILE_TARGET}/uaa/cloudfoundry-identity-varz-1.0.2.war webapps/va
 cd ${BOSH_INSTALL_TARGET}
 cp -a ${BOSH_COMPILE_TARGET}/vcap-common vcap-common
 cd vcap-common
-/var/vcap/packages/ruby_next/bin/bundle install --local --deployment --without=development test
+/var/vcap/packages/ruby/bin/bundle install --local --deployment --without=development test