toxiproxy 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 75c5cd8a2dd3d9a8f0b932d7f50e0359c77c0fda
-  data.tar.gz: a6585a9edf06bc9888943292d8784c8aab61685c
+  metadata.gz: a5162d845ab2d8f5b1e1b9af5bf6254957bf9730
+  data.tar.gz: 0390171e4205337d2c37987980abeffd3c748735
 SHA512:
-  metadata.gz: 11f4d1e556c4f942838e3c7d7484e25ed6defecb77985d4609739f25ec383c51aa07c505f64313fb197cfac96611d8ab97d688f6bb8a09a2169112acdf0e763b
-  data.tar.gz: 87df2064d0189804a8e84820304a5a9312c767b1337bf3d7941c9ea929bdbaa25de654188ba8cdf9d0a361e0087c86ce5a096c428ec0f1d4b7d073a019f218c6
+  metadata.gz: 6328fbcc0977e717ea1dfc596c9388865d86ad3913ca9f1671cd568418c3acf9c5f297bb45fe7b306065a5f232c4a2bc1bb8cb4aefc64c022e68bf6daedc027f
+  data.tar.gz: 28e150d00c44ff1cc25cece0c148d52d9e54538750045ed53b944baac01ac44b3a33d0737383d3c297b8d28769ef9f2f58e40862ba28f0e49ec7e89dba864c3c

data/README.md

@@ -4,7 +4,7 @@
 and system conditions. The Ruby API aims to make it simple to write tests that
 ensure your application behaves appropriately under harsh conditions. Before you
 can use the Ruby library, you need to read the [Usage section of the Toxiproxy
-README](https://githubcom/shopify/toxiproxy#Usage).
+README](https://github.com/shopify/toxiproxy#usage).
 
 ```
 gem install toxiproxy
@@ -61,14 +61,28 @@ You can apply many toxics to many connections:
 Toxiproxy[/redis/].upstream(:slow_close, delay: 100).downstream(:latency, jitter: 300).apply do
   # all redises are now slow at responding and closing
 end
+```
+
+See the [Toxiproxy README](https://github.com/shopify/toxiproxy#Toxics) for a
+list of toxics.
 
 ## Populate
 
-To populate Toxiproxy with the proxies from `config/toxiproxy.json`:
+To populate Toxiproxy pass the proxy configurations to `Toxiproxy#populate`:
 
 ```ruby
-Toxiproxy.populate("./config/toxiproxy.json")
+Toxiproxy.populate([{
+  name: "mysql_master",
+  listen: "localhost:21212",
+  upstream: "localhost:3306",
+},{
+  name: "mysql_read_only",
+  listen: "localhost:21213",
+  upstream: "localhost:3306",
+})
 ```
 
+This will create the proxies passed, if they don't 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)..
+[Toxiproxy README](https://github.com/shopify/toxiproxy#Usage). If you have many
+proxies, we recommend storing the Toxiproxy configs in a configuration file.

data/lib/toxiproxy.rb

@@ -85,13 +85,12 @@ class Toxiproxy
     find_by_name!(query)
   end
 
-  def self.populate(path)
-    proxies = JSON.parse(File.read(path), symbolize_names: true)
-    proxies = proxies.map { |proxy| self.new(proxy) }
+  def self.populate(*proxies)
+    proxies = proxies.first if proxies.first.is_a?(Array)
 
-    proxies.each do |proxy|
-      proxy.create unless find_by_name(proxy.name)
-    end
+    proxies.map { |proxy|
+      self.create(proxy) unless find_by_name(proxy[:name])
+    }.compact
   end
 
   # Set an upstream toxic.

data/lib/toxiproxy/version.rb

@@ -1,3 +1,3 @@
 class Toxiproxy
-  VERSION = "0.1.0"
+  VERSION = "0.1.1"
 end

data/test/test_helper.rb

@@ -1,3 +1,2 @@
-require 'minitest'
 require 'minitest/autorun'
 require_relative "../lib/toxiproxy"

data/test/toxiproxy_test.rb

@@ -263,8 +263,40 @@ class ToxiproxyTest < MiniTest::Unit::TestCase
     end
   end
 
-  def test_populate_creates_proxies
-    proxies = Toxiproxy.populate("./test/fixtures/toxiproxy.json")
+  def test_populate_creates_proxies_array
+    proxies = [{
+        name: "test_toxiproxy_populate1",
+        upstream: "localhost:3306",
+        listen: "localhost:22222",
+      },
+      {
+        name: "test_toxiproxy_populate2",
+        upstream: "localhost:3306",
+        listen: "localhost:22223",
+      },
+    ]
+
+    proxies = Toxiproxy.populate(proxies)
+
+    proxies.each do |proxy|
+      assert_proxy_available(proxy)
+    end
+  end
+
+  def test_populate_creates_proxies_args
+    proxies = [{
+        name: "test_toxiproxy_populate1",
+        upstream: "localhost:3306",
+        listen: "localhost:22222",
+      },
+      {
+        name: "test_toxiproxy_populate2",
+        upstream: "localhost:3306",
+        listen: "localhost:22223",
+      },
+    ]
+
+    proxies = Toxiproxy.populate(*proxies)
 
     proxies.each do |proxy|
       assert_proxy_available(proxy)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toxiproxy
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Simon Eskildsen
@@ -31,7 +31,7 @@ cert_chain:
   fl3hbtVFTqbOlwL9vy1fudXcolIE/ZTcxQ+er07ZFZdKCXayR9PPs64heamfn0fp
   TConQSX2BnZdhIEYW+cKzEC/bLc=
   -----END CERTIFICATE-----
-date: 2015-01-07 00:00:00.000000000 Z
+date: 2015-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -94,7 +94,6 @@ files:
 - lib/toxiproxy/toxic_collection.rb
 - lib/toxiproxy/version.rb
 - shipit.rubygems.yml
-- test/fixtures/toxiproxy.json
 - test/test_helper.rb
 - test/toxiproxy_test.rb
 - toxiproxy.gemspec

data/test/fixtures/toxiproxy.json

@@ -1,7 +0,0 @@
-[
-  {
-    "name": "toxiproxy_test_mysql",
-    "upstream": "localhost:3306",
-    "listen": "localhost:22222"
-  }
-]