cf-copilot 0.0.4 → 0.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 111090a607e297c9032abbd2850d1df993fd6efe
-  data.tar.gz: 279e31f4249998ce9a0b83b275fdcc4032c2687b
+  metadata.gz: 263c111aaa50a83fbe120d5379ce7f7e400d9eb6
+  data.tar.gz: 4e822c834808cf2b3b97d640b896f2b84effbeab
 SHA512:
-  metadata.gz: a406ca97277e260a4b6358996edcfb9c6ee6f4feb977eb50956f93dd1088677abd008d302edb7fe72d29abd29b8bd8600fe87574cef9aeffc588f02adb45a4b8
-  data.tar.gz: a1830e80cbc245ad54661dd2d85968365012b9e18706f9363d784d808b1cb6c1cd6f10aa9b7c6737415b8611d219a74ab1e100f9acabf9df5deb65874150cb3a
+  metadata.gz: 57868ece58883157fc0286b8664ada0e51f593131af40aadd42730189de4d502143ad28f038bbb19c30c9e4a85751ddbf66660eef751644788b0ab988945bbc3
+  data.tar.gz: 968bdcce9ece3058c748fc48ff769b4b44b65ad4851d193c5d5523ca9e35a8849c3e9b7bfacae74ffc8229ed920de6e2a11e7053f68ae7427af0ad47c7ca0a64

data/README.md

@@ -1,29 +1,27 @@
-### How to build and run a Docker image containing the necessary dependencies
+# Ruby SDK
 
-Starting from the repo root:
-```
-export COPILOT_ROOT=$(pwd)
-cd sdk/ruby
-docker build -t protobuf-ruby-dependencies .
-docker run -v $COPILOT_ROOT:/tmp/copilot -it protobuf-ruby-dependencies /bin/bash
-cd /tmp/copilot
-```
+## Notes
+
+- All commands below from the root of this repo
+- There is no need to run `generate-protos` directly (use the script / docker image)
 
 ### How to generate services and messages from the `.proto` file
+```
+pushd sdk/ruby
+  bin/dockerized-rebuild-proto
+popd
+```
 
-Starting from the repo root:
+### Run all of the associated ruby specs
 ```
-cd api/protos
-protoc --ruby_out=../../sdk/ruby/lib/copilot/protos \
-  --grpc_out=../../sdk/ruby/lib/copilot/protos \
-  --plugin="protoc-gen-grpc=$(which grpc_tools_ruby_protoc_plugin)" \
-  ./cloud_controller.proto
+pushd sdk/ruby
+  bin/test
+popd
 ```
 
 ### How to build and install the `cf-copilot` ruby gem
-
-Starting from the repo root:
 ```
-cd sdk/ruby
-gem build ./cf-copilot.gemspec && gem install cf-copilot
+pushd sdk/ruby
+  bin/build-and-install-copilot-gem
+popd
 ```

data/bin/dockerized-rebuild-proto

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -eo pipefail
+
+docker build -t protobuf-ruby-dependencies .
+docker run -e BUILD_ROOT="/tmp/copilot" -v "${COPILOT_ROOT}:/tmp/copilot" protobuf-ruby-dependencies

data/bin/{generate_protos → generate-protos}

@@ -4,9 +4,9 @@ set -euo pipefail
 
 echo "Generating services and messages for cf-copilot..."
 
-pushd "${COPILOT_ROOT}/api/protos"
-  protoc --ruby_out="${COPILOT_ROOT}/sdk/ruby/lib/copilot/protos" \
-  --grpc_out="${COPILOT_ROOT}/sdk/ruby/lib/copilot/protos" \
+pushd "${BUILD_ROOT}/api/protos"
+  protoc --ruby_out="${BUILD_ROOT}/sdk/ruby/lib/copilot/protos" \
+  --grpc_out="${BUILD_ROOT}/sdk/ruby/lib/copilot/protos" \
   --plugin="protoc-gen-grpc=$(which grpc_tools_ruby_protoc_plugin)" \
   ./cloud_controller.proto
 popd

data/bin/push-gem

@@ -0,0 +1,6 @@
+#!/bin/bash
+
+set -euo pipefail
+
+VERSION="${1}"
+gem push "cf-copilot-${VERSION}.gem"

data/lib/cf-copilot.rb

@@ -25,8 +25,8 @@ module Cloudfoundry
         service.health(request)
       end
 
-      def upsert_route(guid:, host:)
-        route = Api::Route.new(guid: guid, host: host)
+      def upsert_route(guid:, host:, path: '')
+        route = Api::Route.new(guid: guid, host: host, path: path)
         request = Api::UpsertRouteRequest.new(route: route)
         service.upsert_route(request)
       rescue GRPC::BadStatus => e
@@ -61,7 +61,8 @@ module Cloudfoundry
           capi_diego_process_association: {
             capi_process_guid: capi_process_guid,
             diego_process_guids: diego_process_guids
-          })
+          }
+        )
 
         service.upsert_capi_diego_process_association(request)
       rescue GRPC::BadStatus => e

data/lib/copilot/protos/cloud_controller_pb.rb

@@ -26,6 +26,7 @@ Google::Protobuf::DescriptorPool.generated_pool.build do
   add_message "api.Route" do
     optional :guid, :string, 1
     optional :host, :string, 2
+    optional :path, :string, 3
   end
   add_message "api.UpsertRouteRequest" do
     optional :route, :message, 1, "api.Route"

data/lib/copilot/protos/common_pb.rb

@@ -4,14 +4,14 @@
 require 'google/protobuf'
 
 Google::Protobuf::DescriptorPool.generated_pool.build do
-  add_message "api.HealthResponse" do
+  add_message 'api.HealthResponse' do
     optional :healthy, :bool, 1
   end
-  add_message "api.HealthRequest" do
+  add_message 'api.HealthRequest' do
   end
 end
 
 module Api
-  HealthResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup("api.HealthResponse").msgclass
-  HealthRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup("api.HealthRequest").msgclass
+  HealthResponse = Google::Protobuf::DescriptorPool.generated_pool.lookup('api.HealthResponse').msgclass
+  HealthRequest = Google::Protobuf::DescriptorPool.generated_pool.lookup('api.HealthRequest').msgclass
 end

data/lib/copilot/version.rb

@@ -1,5 +1,5 @@
 module Cloudfoundry
   module Copilot
-    VERSION = '0.0.4'
+    VERSION = '0.0.5'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cf-copilot
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.5
 platform: ruby
 authors:
 - Cloud Foundry Routing Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-10 00:00:00.000000000 Z
+date: 2018-05-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: grpc
@@ -39,47 +39,47 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.16'
 - !ruby/object:Gem::Dependency
-  name: rake
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '10.0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '3.0'
 description: 
 email:
 - cf-routing@pivotal.io
@@ -90,9 +90,10 @@ files:
 - LICENSE
 - NOTICE
 - README.md
-- bin/build_and_install_copilot_gem
-- bin/build_and_run_docker
-- bin/generate_protos
+- bin/build-and-install-copilot-gem
+- bin/dockerized-rebuild-proto
+- bin/generate-protos
+- bin/push-gem
 - bin/test
 - lib/cf-copilot.rb
 - lib/copilot/protos/cloud_controller_pb.rb

data/bin/build_and_run_docker

@@ -1,7 +0,0 @@
-#!/bin/bash
-
-set -euo pipefail
-
-docker build -t protobuf-ruby-dependencies .
-docker run -v "${COPILOT_ROOT}:/tmp/copilot" -it protobuf-ruby-dependencies /bin/bash
-cd /tmp/copilot