Vendor gems

.gitmodules

@@ -1,6 +1,3 @@
 [submodule "src/admin_ui"]
 	path = src/admin_ui
 	url = https://github.com/cloudfoundry-incubator/admin-ui.git
-[submodule "src/vcap-common"]
-	path = src/vcap-common
-	url = https://github.com/cloudfoundry/vcap-common.git

config/blobs.yml

@@ -1,12 +1,12 @@
 ---
-ruby/bundler-1.2.1.gem:
-  object_id: 458d4d9f-aa0e-488d-94d9-ca8b50d6dfb3
-  sha: 0cbe6ad7a41f064d6c11c1058465fffb1bd58069
-  size: 226816
-ruby/ruby-1.9.3-p448.tar.gz:
-  object_id: 3fe8a983-f754-44c4-8694-0fba414eb5a7
-  sha: c7f736e3bc1ca1e6619a9121837dd0840aad77ce
-  size: 12559260
+ruby/ruby-2.3.3.tar.gz:
+  object_id: 1debe2c2-c008-4eeb-ace9-bdf1938e4e60
+  sha: 1014ee699071aa2ddd501907d18cbe15399c997d
+  size: 17813577
+ruby/bundler-1.14.6.gem:
+  object_id: ae911c63-3747-4cf1-a5ca-dee6f1f2103b
+  sha: 3e84d3a4dd43bfaec988b029f45c0d7ffa205ab8
+  size: 319488
 ruby/rubygems-1.8.24.tgz:
   object_id: 824b70e4-8269-4e4b-a347-de17333f7971
   sha: 30f27047e74f7943117736a0d3e224994fee0905
@@ -27,18 +27,6 @@ mysqlclient/mysql-connector-c-6.1.6-src.tar.gz:
   object_id: e640b8d3-ae0f-4103-8d44-c0f9644d7c41
   sha: 2444586365c2c58e7ca2397d4617e5fe19f9f246
   size: 3475044
-libyaml/yaml-0.1.5.tar.gz:
-  object_id: 3b7b6111-e9a6-468b-8035-46ff800224fd
-  sha: 8b78cb9f759c7d80db8a7328c0ebecfe34fde737
-  size: 504897
-ruby/bundler-1.11.2.gem:
-  object_id: 2c164a12-252b-402b-a21d-bc73cab1b438
-  sha: 8eb956dec72da753d3d2a2126c78508b17af434e
-  size: 263168
-ruby/ruby-2.2.4.tar.gz:
-  object_id: df2a8e6d-04cd-4801-b657-9f975aeca8c5
-  sha: 818e5e157f76d4912ba3a7c7b4fc5156105e83c3
-  size: 16638151
 libyaml/yaml-0.1.6.tar.gz:
   object_id: 5b63285a-fb3f-4508-bbbe-d5beedb7c109
   sha: f3d404e11bec3c4efcddfd14c42d46f1aabe0b5d

jobs/admin_ui/templates/cf-registrar_ctl.erb

@@ -4,7 +4,7 @@ export PATH=/var/vcap/packages/ruby/bin:$PATH
 RUN_DIR=/var/vcap/sys/run/admin_ui
 LOG_DIR=/var/vcap/sys/log/admin_ui
 PIDFILE=$RUN_DIR/cf-registrar.pid
-VCAP_COMMON_PATH=/var/vcap/packages/admin_ui/vcap-common
+VCAP_COMMON_PATH=/var/vcap/packages/admin_ui/vcap_common
 
 source /var/vcap/packages/common/utils.sh
 

packages/admin_ui/packaging

@@ -5,7 +5,8 @@ bundle_cmd=/var/vcap/packages/ruby/bin/bundle
 mysqlclient_dir=/var/vcap/packages/mysqlclient
 libpq_dir=/var/vcap/packages/libpq
 
-cp -a ${BOSH_COMPILE_TARGET}/{admin_ui,vcap-common} ${BOSH_INSTALL_TARGET}
+cp -a ${BOSH_COMPILE_TARGET}/{admin_ui,vcap_common} ${BOSH_INSTALL_TARGET}
+cp -a ${BOSH_COMPILE_TARGET}/admin_ui_gems/vendor ${BOSH_INSTALL_TARGET}/admin_ui
 
 cd ${BOSH_INSTALL_TARGET}/admin_ui
 $bundle_cmd config build.mysql2 --with-mysql-config=$mysqlclient_dir/bin/mysql_config
@@ -14,5 +15,5 @@ $bundle_cmd config build.sequel_pg --with-pg-lib=$libpq_dir/lib --with-pg-includ
 $bundle_cmd config build.sqlite3 --with-sqlite3-dir=/var/vcap/packages/sqlite
 $bundle_cmd install --local --deployment --without=development test
 
-cd ${BOSH_INSTALL_TARGET}/vcap-common
-$bundle_cmd install --local --deployment --without=development test
+cd ${BOSH_INSTALL_TARGET}/vcap_common
+$bundle_cmd install --local --deployment --binstubs --without=development test

packages/admin_ui/spec

@@ -1,13 +1,12 @@
 ---
 name: admin_ui
-
 dependencies:
-  - ruby
-  - libpq
-  - sqlite
-  - mysqlclient
-
+- ruby
+- libpq
+- sqlite
+- mysqlclient
 files:
-  - admin_ui/{Gemfile,Gemfile.lock}
-  - admin_ui/{lib,bin,db}/**/*
-  - vcap-common/**/*
+- admin_ui/{Gemfile,Gemfile.lock}
+- admin_ui/{lib,bin,db}/**/*
+- admin_ui_gems/**/*
+- vcap_common/**/*

packages/ruby/packaging

@@ -1,10 +1,10 @@
 set -e -x
 
-tar xzf ruby/ruby-2.2.4.tar.gz
-pushd ruby-2.2.4
+tar xzf ruby/ruby-2.3.3.tar.gz
+pushd ruby-2.3.3
   ./configure --prefix=${BOSH_INSTALL_TARGET} --disable-install-doc --with-opt-dir=/var/vcap/packages/libyaml
   make
   make install
 popd
 
-${BOSH_INSTALL_TARGET}/bin/gem install ruby/bundler-1.11.2.gem --no-ri --no-rdoc
+${BOSH_INSTALL_TARGET}/bin/gem install ruby/bundler-1.14.6.gem --no-ri --no-rdoc

packages/ruby/spec

@@ -1,8 +1,7 @@
-
 ---
 name: ruby
 dependencies:
-  - libyaml
+- libyaml
 files:
-- ruby/ruby-2.2.4.tar.gz
-- ruby/bundler-1.11.2.gem
+- ruby/ruby-2.3.3.tar.gz
+- ruby/bundler-1.14.6.gem

packages/uaac/spec

@@ -1,7 +1,6 @@
 ---
 name: uaac
 dependencies:
-  - ruby
+- ruby
 files:
-  - uaac/Gemfile*
-
+- uaac/**/*

src/admin_ui_gems/.bundle/config

@@ -0,0 +1,3 @@
+---
+BUNDLE_CACHE_ALL: "true"
+BUNDLE_WITHOUT: "development:test"

src/admin_ui_gems/Gemfile

@@ -0,0 +1 @@
+../admin_ui/Gemfile

src/admin_ui_gems/Gemfile.lock

@@ -0,0 +1 @@
+../admin_ui/Gemfile.lock

src/uaac/.bundle/config

@@ -0,0 +1,3 @@
+---
+BUNDLE_CACHE_ALL: true
+BUNDLE_WITHOUT: development:test

src/vcap_common/.bundle/config

@@ -0,0 +1,3 @@
+---
+BUNDLE_CACHE_ALL: "true"
+BUNDLE_WITHOUT: "development:test"

src/vcap_common/Gemfile

@@ -0,0 +1,7 @@
+source "https://rubygems.org"
+
+gem "vcap_common",
+  :git => "https://github.com/cloudfoundry/vcap-common.git",
+  :ref => "bdd2eac66b6e4f43ff5b943d94cb462a60323a35"
+
+gem "cf-registrar"

src/vcap_common/Gemfile.lock

@@ -0,0 +1,91 @@
+GIT
+  remote: https://github.com/cloudfoundry/vcap-common.git
+  revision: bdd2eac66b6e4f43ff5b943d94cb462a60323a35
+  ref: bdd2eac66b6e4f43ff5b943d94cb462a60323a35
+  specs:
+    vcap_common (2.3.0)
+      addressable (~> 2.2)
+      em-http-request (~> 1.0)
+      eventmachine
+      httpclient
+      membrane (~> 0.0.2)
+      mime-types
+      multipart-post
+      nats (>= 0.5.0.beta.12, < 0.6)
+      posix-spawn (~> 0.3.6)
+      squash_ruby
+      steno
+      thin
+      uuidtools
+      vmstat (~> 2.0)
+      yajl-ruby
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    addressable (2.5.0)
+      public_suffix (~> 2.0, >= 2.0.2)
+    cf-message-bus (0.3.4)
+      eventmachine (~> 1.0.0)
+      nats (>= 0.5.0, < 0.6)
+      vcap-concurrency
+      yajl-ruby
+    cf-registrar (1.0.3)
+      cf-message-bus (~> 0.3.0)
+      eventmachine (~> 1.0.0)
+      steno
+      vcap-concurrency
+    cookiejar (0.3.3)
+    daemons (1.2.4)
+    em-http-request (1.1.5)
+      addressable (>= 2.3.4)
+      cookiejar (!= 0.3.1)
+      em-socksify (>= 0.3)
+      eventmachine (>= 1.0.3)
+      http_parser.rb (>= 0.6.0)
+    em-socksify (0.3.1)
+      eventmachine (>= 1.0.0.beta.4)
+    eventmachine (1.0.7)
+    fluent-logger (0.6.2)
+      msgpack (>= 0.5.6, < 2)
+    http_parser.rb (0.6.0)
+    httpclient (2.8.3)
+    json (2.0.3)
+    json_pure (1.8.6)
+    membrane (0.0.5)
+    mime-types (3.1)
+      mime-types-data (~> 3.2015)
+    mime-types-data (3.2016.0521)
+    msgpack (1.1.0)
+    multipart-post (2.0.0)
+    nats (0.5.1)
+      daemons (~> 1.1, >= 1.2.2)
+      eventmachine (~> 1.0, = 1.0.7)
+      json_pure (~> 1.8, >= 1.8.1)
+      thin (~> 1.6, >= 1.6.3)
+    posix-spawn (0.3.13)
+    public_suffix (2.0.5)
+    rack (2.0.1)
+    squash_ruby (2.0.1)
+      json
+    steno (1.3.4)
+      fluent-logger
+      yajl-ruby (~> 1.0)
+    thin (1.7.0)
+      daemons (~> 1.0, >= 1.0.9)
+      eventmachine (~> 1.0, >= 1.0.4)
+      rack (>= 1, < 3)
+    uuidtools (2.1.5)
+    vcap-concurrency (0.1.0)
+    vmstat (2.3.0)
+    yajl-ruby (1.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  cf-registrar
+  vcap_common!
+
+BUNDLED WITH
+   1.14.6

src/vcap_common/vendor/cache/vcap-common-bdd2eac66b6e/.gitignore

@@ -0,0 +1,3 @@
+/*.gem
+.idea/
+Gemfile.lock

src/vcap_common/vendor/cache/vcap-common-bdd2eac66b6e/.rspec

@@ -0,0 +1,2 @@
+--color
+--order random

src/vcap_common/vendor/cache/vcap-common-bdd2eac66b6e/.ruby-version

@@ -0,0 +1 @@
+1.9.3-p484

src/vcap_common/vendor/cache/vcap-common-bdd2eac66b6e/.travis.yml

@@ -0,0 +1,6 @@
+language: ruby
+
+rvm:
+  - 1.9.3-p484
+
+script: bundle exec rake --trace spec

src/vcap_common/vendor/cache/vcap-common-bdd2eac66b6e/Gemfile

@@ -0,0 +1,6 @@
+source 'http://rubygems.org'
+
+gemspec
+
+gem 'vcap-concurrency', github: 'cloudfoundry/vcap-concurrency'
+gem 'cf-message-bus', github: 'cloudfoundry/cf-message-bus'