toxiproxy 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c4abc83dd0b261de59236fbfe5a2e3a0660ca2b0
-  data.tar.gz: 67d9083dd5672fd70cf53365b5d550d86edfca82
+  metadata.gz: 841ffa13a93004733dc2adfa28c71bc641ee5981
+  data.tar.gz: dbbf44472e95affc62b5143685ce50429924ce9e
 SHA512:
-  metadata.gz: f0cd49f6f4b93c88a532ca43087a8c54a46907210ccf5693d970b3f8edbdf73a6a5efc550623a8e9ac9fe02be8a59c5790403fc59a52f662907c1a11aa8aa752
-  data.tar.gz: d6dd0670c4505efdf609e41e8938053a6318595ea8176a89724d5e768156ec9f03d5e8043442dd952af83f3f42a54ec110dd6cd3754a7035b9c161719578a1f2
+  metadata.gz: d27b3bec80952c35dec464d1b9cc3d952651af99e209d397a80695f0bd6573749e10846785866f6bb851bd02e4a7437a88f2d27979b46a2b42e3a616a913c2dc
+  data.tar.gz: b4171531e74753276229f73163afcb44a41b0e4df88929c4746deabed8d4114c5e12060705034e3221a43d6bdc640d7d1a7018303d9f3a06ce91c5be51fdd759

data/README.md

@@ -17,7 +17,12 @@ documentation](https://github.com/shopify/toxiproxy)
 
 ## Usage
 
-The Ruby client communicates with the Toxiproxy daemon via HTTP.
+The Ruby client communicates with the Toxiproxy daemon via HTTP. By default it
+connects to `http://127.0.0.1:8474`, but you can point to any host:
+
+```ruby
+Toxiproxy.host = 'http://toxiproxy.local:5665'
+```
 
 For example, to simulate 1000ms latency on a database server you can use the
 `latency` toxic with the `latency` argument (see the Toxiproxy project for a
@@ -79,7 +84,7 @@ Toxiproxy.populate([{
   name: "mysql_read_only",
   listen: "localhost:21213",
   upstream: "localhost:3306",
-})
+}])
 ```
 
 This will create the proxies passed, or replace the proxies if they already exist in Toxiproxy.

data/bin/start-toxiproxy.sh

@@ -1,8 +1,9 @@
 #!/bin/bash -e
 
 VERSION='21a264cc75549c3ae837b606eb6e17ea'
+TOXIPROXY_LOG_DIR=${CIRCLE_ARTIFACTS:-'/tmp'}
 
 echo "[start toxiproxy]"
 curl --silent http://shopify-vagrant.s3.amazonaws.com/toxiproxy/toxiproxy-$VERSION -o ./bin/toxiproxy
 chmod +x ./bin/toxiproxy
-nohup bash -c "./bin/toxiproxy > ${CIRCLE_ARTIFACTS}/toxiproxy.log 2>&1 &"
+nohup bash -c "./bin/toxiproxy > ${TOXIPROXY_LOG_DIR}/toxiproxy.log 2>&1 &"

data/lib/toxiproxy.rb

@@ -1,13 +1,16 @@
 require "json"
 require "uri"
 require "net/http"
+require "forwardable"
 
 require "toxiproxy/collection"
 require "toxiproxy/toxic"
 require "toxiproxy/toxic_collection"
 
 class Toxiproxy
-  URI = ::URI.parse("http://127.0.0.1:8474")
+  extend SingleForwardable
+
+  DEFAULT_URI = 'http://127.0.0.1:8474'
   VALID_DIRECTIONS = [:upstream, :downstream]
 
   class NotFound < StandardError; end
@@ -23,16 +26,7 @@ class Toxiproxy
     @enabled  = options[:enabled]
   end
 
-  # Forwardable doesn't support delegating class methods, so we resort to
-  # `define_method` to delegate from Toxiproxy to #all, and from there to the
-  # proxy collection.
-  class << self
-    Collection::METHODS.each do |method|
-      define_method(method) do |*args, &block|
-        self.all.send(method, *args, &block)
-      end
-    end
-  end
+  def_delegators :all, *Collection::METHODS
 
   # Re-enables all proxies and disables all toxics.
   def self.reset
@@ -60,6 +54,11 @@ class Toxiproxy
     Collection.new(proxies)
   end
 
+  # Sets the toxiproxy host to use.
+  def self.host=(host)
+    @uri = host.is_a?(::URI) ? host : ::URI.parse(host)
+  end
+
   # Convenience method to create a proxy.
   def self.create(options)
     self.new(options).create
@@ -99,7 +98,7 @@ class Toxiproxy
   end
 
   def self.running?
-    TCPSocket.new(URI.host, URI.port).close
+    TCPSocket.new(uri.host, uri.port).close
     true
   rescue Errno::ECONNREFUSED, Errno::ECONNRESET
     false
@@ -126,11 +125,9 @@ class Toxiproxy
   # failure, such as a data store becoming completely unavailable.
   def down(&block)
     disable
-    begin
-      yield
-    ensure
-      enable
-    end
+    yield
+  ensure
+    enable
   end
 
   # Disables a Toxiproxy. This will drop all active connections and stop the proxy from listening.
@@ -207,8 +204,12 @@ class Toxiproxy
 
   private
 
+  def self.uri
+    @uri ||= ::URI.parse(DEFAULT_URI)
+  end
+
   def self.http
-    @http ||= Net::HTTP.new(URI.host, URI.port)
+    @http ||= Net::HTTP.new(uri.host, uri.port)
   end
 
   def http

data/lib/toxiproxy/collection.rb

@@ -1,5 +1,3 @@
-require "forwardable"
-
 class Toxiproxy
   # ProxyCollection represents a set of proxies. This allows to easily perform
   # actions on every proxy in the collection.

data/lib/toxiproxy/version.rb

@@ -1,3 +1,3 @@
 class Toxiproxy
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end

data/test/toxiproxy_test.rb

@@ -24,6 +24,13 @@ class ToxiproxyTest < MiniTest::Unit::TestCase
     assert_equal "test_mysql_master", proxy.name
   end
 
+  def test_proxy_not_running_with_bad_host
+    Toxiproxy.host = 'http://0.0.0.0:12345'
+    assert !Toxiproxy.running?, 'toxiproxy should not be running'
+  ensure
+    Toxiproxy.host = Toxiproxy::DEFAULT_URI
+  end
+
   def test_enable_and_disable_proxy
     with_tcpserver do |port|
       proxy = Toxiproxy.create(upstream: "localhost:#{port}", name: "test_rubby_server")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toxiproxy
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Simon Eskildsen
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-02 00:00:00.000000000 Z
+date: 2016-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler