notifications-ruby-client 1.1.1 → 1.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 526cd293f41883133d625d11f5ec463e437cd7a5
-  data.tar.gz: a1cfba8086a71c42f4ad27830e713005d1e667d9
+  metadata.gz: c878b94e8c21c7ab8709764b27e242de18dccc1e
+  data.tar.gz: 4a3a9fad24a4b0685841bf7bfceadb05efe8339b
 SHA512:
-  metadata.gz: 0dc3d6e520d552d4bbf162258783308f7040db46304bd493563d09e6387638a334feac1930edaa6b8d91786e3619d12dc86cc0d4ee1e2756c509c69908fcf23a
-  data.tar.gz: 5222d707f9cb24b316466976ca2c447eeac5a4a1ee65bdc2cf105862c6d2d8fb0a03aec533f9f86e9af9897882f1210a7eebbf50cb4410e091c2bb17a3bc2de3
+  metadata.gz: f03bef489bf792cf544f05c457a07066fd93cdb4a80be7fa8a83fc9ecda165f19a7ddacac5095fad24b93db92d5d62bc2c31c33fbd02e536f25caa3b5bad49d7
+  data.tar.gz: 6702179d9bb960e7935060b87185dcc1f6eeaf77b4887e52acee009715807d0a00282fc2f52bb6cb1bfab8f3e4b2bcaecd9e55c9f756e656a493d626e78aa17b

data/Makefile

@@ -25,7 +25,7 @@ test: ## Run tests
 .PHONY: integration-test
 integration-test: ## Run integration tests
 	bundle exec bin/test_client.rb
-	
+
 .PHONY: generate-env-file
 generate-env-file: ## Generate the environment file for running the tests inside a Docker container
 	bin/generate_docker_env.sh
@@ -39,6 +39,11 @@ build-with-docker: prepare-docker-runner-image ## Build inside a Docker containe
 	docker run -i --rm \
 		--name "${DOCKER_CONTAINER_PREFIX}-build" \
 		-v `pwd`:/var/project \
+		-e http_proxy="${HTTP_PROXY}" \
+		-e HTTP_PROXY="${HTTP_PROXY}" \
+		-e https_proxy="${HTTPS_PROXY}" \
+		-e HTTPS_PROXY="${HTTPS_PROXY}" \
+		-e NO_PROXY="${NO_PROXY}" \
 		${DOCKER_BUILDER_IMAGE_NAME} \
 		make build
 
@@ -47,6 +52,11 @@ test-with-docker: prepare-docker-runner-image generate-env-file ## Run tests ins
 	docker run -i --rm \
 		--name "${DOCKER_CONTAINER_PREFIX}-test" \
 		-v `pwd`:/var/project \
+		-e http_proxy="${HTTP_PROXY}" \
+		-e HTTP_PROXY="${HTTP_PROXY}" \
+		-e https_proxy="${HTTPS_PROXY}" \
+		-e HTTPS_PROXY="${HTTPS_PROXY}" \
+		-e NO_PROXY="${NO_PROXY}" \
 		--env-file docker.env \
 		${DOCKER_BUILDER_IMAGE_NAME} \
 		make test
@@ -56,6 +66,11 @@ integration-test-with-docker: prepare-docker-runner-image generate-env-file ## R
 	docker run -i --rm \
 		--name "${DOCKER_CONTAINER_PREFIX}-integration-test" \
 		-v `pwd`:/var/project \
+		-e http_proxy="${HTTP_PROXY}" \
+		-e HTTP_PROXY="${HTTP_PROXY}" \
+		-e https_proxy="${HTTPS_PROXY}" \
+		-e HTTPS_PROXY="${HTTPS_PROXY}" \
+		-e NO_PROXY="${NO_PROXY}" \
 		--env-file docker.env \
 		${DOCKER_BUILDER_IMAGE_NAME} \
 		make integration-test
@@ -65,4 +80,4 @@ clean-docker-containers: ## Clean up any remaining docker containers
 	docker rm -f $(shell docker ps -q -f "name=${DOCKER_CONTAINER_PREFIX}") 2> /dev/null || true
 
 clean:
-	rm -rf vendor
+	rm -rf vendor

data/README.md

@@ -40,10 +40,8 @@ sms = client.send_sms(to: number,
 
 Email:
 ```ruby
-email = client.send_email(to: number, template: template_id)
-
-sms = client.send_sms(
-  to: number,
+email = client.send_email(
+  to: email_address, 
   template: template_id,
   personalisation: {
     name: "name",

data/docker/Dockerfile

@@ -1,7 +1,10 @@
 FROM ruby:2.3.1-slim
 
+ARG APT_HTTP_PROXY
+
 RUN \
 	echo "Install Debian packages" \
+	&& ([ -z "$APT_HTTP_PROXY" ] || echo "Acquire::http::Proxy \"${APT_HTTP_PROXY}\";\n" > /etc/apt/apt.conf.d/99HttpProxy) \
 	&& apt-get update \
 	&& apt-get install -y --no-install-recommends \
 		make \

data/docker/Makefile

@@ -7,4 +7,4 @@ help:
 
 .PHONY: build
 build:
-	docker build --pull -t govuk/notify-ruby-client-builder .
+	docker build --pull -t govuk/notify-ruby-client-builder --build-arg APT_HTTP_PROXY="${HTTP_PROXY}" .

data/lib/notifications/client/speaker.rb

@@ -84,7 +84,7 @@ module Notifications
 
       def open(request)
         uri = URI.parse(@base_url)
-        Net::HTTP.start(uri.host, uri.port, use_ssl: uri.scheme == 'https') do |http|
+        Net::HTTP.start(uri.host, uri.port, :ENV, use_ssl: uri.scheme == 'https') do |http|
           http.request(request)
         end
       end

data/lib/notifications/client/version.rb

@@ -1,5 +1,5 @@
 module Notifications
   class Client
-    VERSION = "1.1.1".freeze
+    VERSION = "1.1.2".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: notifications-ruby-client
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
 platform: ruby
 authors:
 - bitzesty
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-26 00:00:00.000000000 Z
+date: 2016-12-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt