toxiproxy 1.0.3 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dd7714ade2b3e653fabba43c36dc025fd36a6377
-  data.tar.gz: bc0fa5de828b70a14da8797ce672245bfd91c760
+SHA256:
+  metadata.gz: 87ada93994d565f7179ecf9b542e20d98c0e8d0a147ebb96ad9a6db91a1af343
+  data.tar.gz: 2f4a626ed0b4db30f596963485749b22a754695bea9d94de3ee872f233eaae1d
 SHA512:
-  metadata.gz: 0247200fb5ee43f9d46d3a73af053ba4b5bddd5ce238eec0d8cc6e32415363f14c6053abafc52b42d46bddc51ff0f6c74d0a0b4a86261e43c58ffc44d8f62ffe
-  data.tar.gz: c08a860ae38e8e375478df95d891b351614bf766dca25d582a076f8a55b871a1b2630d5cbe2678555f2a9b17d532ec8dcdb4cf22fafff57dd30b3d12a07eb67e
+  metadata.gz: e95bfdfa0351fad12ea9b5baf9020ec34bb1948e3d1d97afa9dcc1fc231d15520b1b937a493a7e3a87bdb4ec8e7f42234e22f5318c8fc564ceb7dd8bc7609348
+  data.tar.gz: 944defb2bfee5378844b38a51400164be70f0ee39806d6f5cded3585ddd61ac6f4bb75229786f948bd5b3afc35a437d09c326575f0ac4e89f24a7f880f2badc9

data/.github/probots.yml

@@ -0,0 +1,2 @@
+enabled:
+  - cla

data/.github/workflows/ci.yml

@@ -0,0 +1,19 @@
+name: Run tests
+on: [push]
+jobs:
+  test:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        ruby: [ '2.5', '2.6', '2.7' ]
+    name: Ruby ${{ matrix.ruby }}
+    steps:
+      - uses: actions/checkout@v2
+      - uses: ruby/setup-ruby@v1
+        with:
+          ruby-version: ${{ matrix.ruby }}
+          bundler-cache: true # runs 'bundle install' and caches installed gems automatically
+      - name: Install and start toxiproxy
+        run: ./bin/start-toxiproxy.sh
+      - name: Run tests
+        run: bundle exec rake test

data/lib/toxiproxy.rb

@@ -98,14 +98,23 @@ class Toxiproxy
   def self.populate(*proxies)
     proxies = proxies.first if proxies.first.is_a?(Array)
 
-    proxies.map { |proxy|
-      existing = find_by_name(proxy[:name])
-      if existing && (existing.upstream != proxy[:upstream] || existing.listen != proxy[:listen])
-        existing.destroy
-        existing = false
-      end
-      self.create(proxy) unless existing
-    }.compact
+    request = Net::HTTP::Post.new("/populate")
+    request.body = proxies.to_json
+    request["Content-Type"] = "application/json"
+
+    response = http_request(request)
+    assert_response(response)
+
+    proxies = JSON.parse(response.body).fetch('proxies', []).map do |attrs|
+      self.new({
+        upstream: attrs["upstream"],
+        listen: attrs["listen"],
+        name: attrs["name"],
+        enabled: attrs["enabled"]
+      })
+    end
+
+    ProxyCollection.new(proxies)
   end
 
   def self.running?

data/lib/toxiproxy/version.rb

@@ -1,3 +1,3 @@
 class Toxiproxy
-  VERSION = "1.0.3"
+  VERSION = "2.0.0"
 end

data/test/toxiproxy_test.rb

@@ -358,26 +358,31 @@ class ToxiproxyTest < MiniTest::Unit::TestCase
   end
 
   def test_populate_creates_proxies_update_upstream
-    proxies = [{
-        name: "test_toxiproxy_populate1",
+    proxy_name = "test_toxiproxy_populate1"
+    proxies_config = [{
+        name: proxy_name,
         upstream: "localhost:3306",
         listen: "localhost:22222",
       },
     ]
 
-    proxies = Toxiproxy.populate(proxies)
+    proxies = Toxiproxy.populate(proxies_config)
 
-    proxies = [{
-        name: "test_toxiproxy_populate1",
+    proxies_config = [{
+        name: proxy_name,
         upstream: "localhost:3307",
         listen: "localhost:22222",
       },
     ]
 
-    proxies2 = Toxiproxy.populate(proxies)
+    proxies2 = Toxiproxy.populate(proxies_config)
+
+    refute_equal proxies.find(name: proxy_name).first.upstream,
+      proxies2.find(name: proxy_name).first.upstream
 
-    assert_equal proxies.first[:upstream], proxies2.first.upstream
-    assert_proxy_available(proxies2.first)
+    proxies2.each do |proxy|
+      assert_proxy_available(proxy)
+    end
   end
 
   def test_running_helper

data/toxiproxy.gemspec

@@ -10,11 +10,13 @@ Gem::Specification.new do |spec|
   spec.homepage = "https://github.com/Shopify/toxiproxy"
   spec.license = "MIT"
 
+  spec.metadata['allowed_push_host'] = 'https://rubygems.org'
+
   spec.files = `git ls-files`.split("\n")
   spec.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
   spec.require_paths = ["lib"]
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "minitest"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "webmock"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: toxiproxy
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 2.0.0
 platform: ruby
 authors:
 - Simon Eskildsen
@@ -9,22 +9,22 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-07-27 00:00:00.000000000 Z
+date: 2020-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -73,13 +73,14 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".github/probots.yml"
+- ".github/workflows/ci.yml"
 - ".gitignore"
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/start-toxiproxy.sh
-- circle.yml
 - lib/toxiproxy.rb
 - lib/toxiproxy/proxy_collection.rb
 - lib/toxiproxy/toxic.rb
@@ -92,7 +93,8 @@ files:
 homepage: https://github.com/Shopify/toxiproxy
 licenses:
 - MIT
-metadata: {}
+metadata:
+  allowed_push_host: https://rubygems.org
 post_install_message: 
 rdoc_options: []
 require_paths:
@@ -108,8 +110,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Ruby library for Toxiproxy

data/circle.yml

@@ -1,11 +0,0 @@
-dependencies:
-  override:
-    - bundle install
-    - ./bin/start-toxiproxy.sh
-test:
-  override:
-    - bundle exec rake test
-
-machine:
-  ruby:
-    version: 2.4.0