toxiproxy 1.0.0 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3198b51c84d89ef6d0b26c989ee633e4def9c4e9
-  data.tar.gz: 65dd1628c34e6e4ba4ff7b387b9f1136ff66cfa1
+  metadata.gz: 2c94b91428b8f1e4b982ae184a2e022748eb7902
+  data.tar.gz: abe80ecccc2bb359a74f2614403316741a208c72
 SHA512:
-  metadata.gz: 4c91be80c0853f0ad1a8ce5b504f757a99e2b458c61e0a809da82c6918d8f796e8f51377d6580f100cde96b27b16adbf2f686befc67e2a0167c92a28b5582875
-  data.tar.gz: b44f5c8d012507b5b4321c80f3ced96f19c9d33114941c6a7ef924b858ce6596324744d2c805aa494b23d049d7119e213d0928f3c100a2f944b0b38d1bd896b4
+  metadata.gz: 84344059667bddf413e3521cb7cdd35ee99fdda1e9d80f50311ce5916dc5dfcf8117420fe7b89451df799905d731f8d7b67193bc8c83106871a274e830a5316b
+  data.tar.gz: bb9a1bec25d40ae9062823a72fd92b4a4e21ec9ffd869e9bbc0a6d3439324addaeeae0b29d59caeed7c9dde0cf8f7e0fd87bf6736c31f178edca510a2285885a

data/README.md

@@ -93,7 +93,7 @@ Toxiproxy.populate([{
 
 This will create the proxies passed, or replace the proxies if they already exist in Toxiproxy.
 It's recommended to do this early as early in boot as possible, see the
-[Toxiproxy README](https://github.com/shopify/toxiproxy#Usage). If you have many
+[Toxiproxy README](https://github.com/shopify/toxiproxy#usage). If you have many
 proxies, we recommend storing the Toxiproxy configs in a configuration file and
 deserializing it into `Toxiproxy.populate`.
 

data/bin/start-toxiproxy.sh

@@ -1,9 +1,17 @@
 #!/bin/bash -e
 
-VERSION='v2.0.0rc2'
+VERSION='v2.0.0'
 TOXIPROXY_LOG_DIR=${CIRCLE_ARTIFACTS:-'/tmp'}
 
+if [[ "$OSTYPE" == "linux"* ]]; then
+    DOWNLOAD_TYPE="linux-amd64"
+elif [[ "$OSTYPE" == "darwin"* ]]; then
+    DOWNLOAD_TYPE="darwin-amd64"
+fi
+
+echo "[dowload toxiproxy for $DOWNLOAD_TYPE]"
+curl --silent -L https://github.com/Shopify/toxiproxy/releases/download/$VERSION/toxiproxy-server-$DOWNLOAD_TYPE -o ./bin/toxiproxy-server
+
 echo "[start toxiproxy]"
-curl --silent -L https://github.com/Shopify/toxiproxy/releases/download/$VERSION/toxiproxy-server-linux-amd64 -o ./bin/toxiproxy-server
 chmod +x ./bin/toxiproxy-server
 nohup bash -c "./bin/toxiproxy-server > ${TOXIPROXY_LOG_DIR}/toxiproxy.log 2>&1 &"

data/circle.yml

@@ -5,3 +5,7 @@ dependencies:
 test:
   override:
     - bundle exec rake test
+
+machine:
+  ruby:
+    version: 2.4.0

data/lib/toxiproxy.rb

@@ -31,7 +31,7 @@ class Toxiproxy
   # Re-enables all proxies and disables all toxics.
   def self.reset
     request = Net::HTTP::Post.new("/reset")
-    response = http.request(request)
+    response = http_request(request)
     assert_response(response)
     self
   end
@@ -40,7 +40,7 @@ class Toxiproxy
     return false unless running?
 
     request = Net::HTTP::Get.new("/version")
-    response = http.request(request)
+    response = http_request(request)
     assert_response(response)
     response.body
   end
@@ -48,7 +48,7 @@ class Toxiproxy
   # Returns a collection of all currently active Toxiproxies.
   def self.all
     request = Net::HTTP::Get.new("/proxies")
-    response = http.request(request)
+    response = http_request(request)
     assert_response(response)
 
     proxies = JSON.parse(response.body).map { |name, attrs|
@@ -148,7 +148,7 @@ class Toxiproxy
     hash = {enabled: false}
     request.body = hash.to_json
 
-    response = http.request(request)
+    response = http_request(request)
     assert_response(response)
     self
   end
@@ -160,7 +160,7 @@ class Toxiproxy
     hash = {enabled: true}
     request.body = hash.to_json
 
-    response = http.request(request)
+    response = http_request(request)
     assert_response(response)
     self
   end
@@ -174,7 +174,7 @@ class Toxiproxy
     hash = {upstream: upstream, name: name, listen: listen, enabled: enabled}
     request.body = hash.to_json
 
-    response = http.request(request)
+    response = http_request(request)
     assert_response(response)
 
     new = JSON.parse(response.body)
@@ -186,7 +186,7 @@ class Toxiproxy
   # Destroys a Toxiproxy.
   def destroy
     request = Net::HTTP::Delete.new("/proxies/#{name}")
-    response = http.request(request)
+    response = http_request(request)
     assert_response(response)
     self
   end
@@ -194,7 +194,7 @@ class Toxiproxy
   # Returns an array of the current toxics for a direction.
   def toxics
     request = Net::HTTP::Get.new("/proxies/#{name}/toxics")
-    response = http.request(request)
+    response = http_request(request)
     assert_response(response)
 
     JSON.parse(response.body).map { |attrs|
@@ -211,6 +211,23 @@ class Toxiproxy
 
   private
 
+  def self.http_request(request)
+    ensure_webmock_whitelists_toxiproxy if defined? WebMock
+    http.request(request)
+  end
+
+  def http_request(request)
+    self.class.http_request(request)
+  end
+
+  def self.ensure_webmock_whitelists_toxiproxy
+    endpoint = "#{uri.host}:#{uri.port}"
+    WebMock::Config.instance.allow ||= []
+    unless WebMock::Config.instance.allow.include?(endpoint)
+      WebMock::Config.instance.allow << endpoint
+    end
+  end
+
   def self.uri
     @uri ||= ::URI.parse(DEFAULT_URI)
   end

data/lib/toxiproxy/toxic.rb

@@ -18,7 +18,7 @@ class Toxiproxy
 
       request.body = as_json
 
-      response = Toxiproxy.http.request(request)
+      response = Toxiproxy.http_request(request)
       Toxiproxy.assert_response(response)
 
       json = JSON.parse(response.body)
@@ -30,7 +30,7 @@ class Toxiproxy
 
     def destroy
       request = Net::HTTP::Delete.new("/proxies/#{proxy.name}/toxics/#{name}")
-      response = Toxiproxy.http.request(request)
+      response = Toxiproxy.http_request(request)
       Toxiproxy.assert_response(response)
       self
     end

data/lib/toxiproxy/version.rb

@@ -1,3 +1,3 @@
 class Toxiproxy
-  VERSION = "1.0.0"
+  VERSION = "1.0.2"
 end

data/test/test_helper.rb

@@ -1,2 +1,4 @@
 require 'minitest/autorun'
 require_relative "../lib/toxiproxy"
+require 'webmock/minitest'
+WebMock.disable!

data/test/toxiproxy_test.rb

@@ -426,8 +426,39 @@ class ToxiproxyTest < MiniTest::Unit::TestCase
     end
   end
 
+  def test_whitelists_webmock_when_allow_is_nil
+    with_webmock_enabled do
+      WebMock::Config.instance.allow = nil
+      Toxiproxy.version # This should initialize the list.
+      assert WebMock::Config.instance.allow.include?(@endpoint)
+    end
+  end
+
+  def test_whitelisting_webmock_does_not_override_other_configuration
+    with_webmock_enabled do
+      WebMock::Config.instance.allow = ['some-other-host']
+      Toxiproxy.version
+      # 'some-other-host' should not be overriden.
+      assert WebMock::Config.instance.allow.include?('some-other-host')
+      assert WebMock::Config.instance.allow.include?(@endpoint)
+
+      Toxiproxy.version
+      # Endpoint should not be duplicated.
+      assert_equal 1, WebMock::Config.instance.allow.count(@endpoint)
+    end
+  end
+
   private
 
+  def with_webmock_enabled
+    WebMock.enable!
+    WebMock.disable_net_connect!
+    @endpoint = "#{Toxiproxy.uri.host}:#{Toxiproxy.uri.port}"
+    yield
+  ensure
+    WebMock.disable!
+  end
+
   def assert_proxy_available(proxy)
     connect_to_proxy proxy
   end

data/toxiproxy.gemspec

@@ -17,4 +17,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "bundler", "~> 1.3"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "rake"
+  spec.add_development_dependency "webmock"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toxiproxy
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.2
 platform: ruby
 authors:
 - Simon Eskildsen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-25 00:00:00.000000000 Z
+date: 2017-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,6 +53,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: webmock
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: A Ruby library for controlling Toxiproxy. Can be used in resiliency testing.
 email: simon.eskildsen@shopify.com
 executables: []
@@ -95,7 +109,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.3
+rubygems_version: 2.5.2
 signing_key: 
 specification_version: 4
 summary: Ruby library for Toxiproxy