Merge pull request oesmith#123 from springleaf/cut-0-6-1

Cut v0.6.1, update eventmachine
dscataglini · Aug 25, 2015 · 38010b6 · 38010b6
2 parents c04d6fc + 4e0d3b0
commit 38010b6
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 7 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,11 @@
+v0.6.1, 2015-08-25
+------------------
+
+  * Fix `instance variable not initialized` warnings (#107)
+  * Add regex support to whitelist (#111)
+  * Support basic auth in requests (#121)
+  * Added alternative to run VCR in parallel (#122)
+
 v0.6.0, 2015-08-25
 ------------------
 

diff --git a/Gemfile.lock b/Gemfile.lock
@@ -1,11 +1,11 @@
 PATH
   remote: .
   specs:
-    puffing-billy (0.5.1)
+    puffing-billy (0.6.1)
       addressable
       em-http-request (~> 1.1.0)
       em-synchrony
-      eventmachine (= 1.0.4)
+      eventmachine (~> 1.0.4)
       eventmachine_httpserver
       http_parser.rb (~> 0.6.0)
       multi_json
@@ -50,7 +50,7 @@ GEM
       eventmachine (>= 1.0.0.beta.4)
     em-synchrony (1.0.4)
       eventmachine (>= 1.0.0.beta.1)
-    eventmachine (1.0.4)
+    eventmachine (1.0.8)
     eventmachine_httpserver (0.2.1)
     faraday (0.9.1)
       multipart-post (>= 1.2, < 3)

diff --git a/lib/billy/version.rb b/lib/billy/version.rb
@@ -1,3 +1,3 @@
 module Billy
-  VERSION = '0.6.0'
+  VERSION = '0.6.1'
 end
diff --git a/puffing-billy.gemspec b/puffing-billy.gemspec
@@ -28,7 +28,7 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'pry'
   gem.add_development_dependency 'cucumber'
   gem.add_runtime_dependency 'addressable'
-  gem.add_runtime_dependency 'eventmachine', '= 1.0.4'
+  gem.add_runtime_dependency 'eventmachine', '~> 1.0.4'
   gem.add_runtime_dependency 'em-synchrony'
   gem.add_runtime_dependency 'em-http-request', '~> 1.1.0'
   gem.add_runtime_dependency 'eventmachine_httpserver'

diff --git a/spec/lib/billy/handlers/proxy_handler_spec.rb b/spec/lib/billy/handlers/proxy_handler_spec.rb
@@ -60,14 +60,14 @@
             expect(subject.handles_request?(request[:method],
                                             'http://example.test/a',
                                             request[:headers],
-                                            request[:body])).to be_true
+                                            request[:body])).to be true
           end
 
           it 'handles requests for the host with a port' do
             expect(subject.handles_request?(request[:method],
                                             'http://example.test:8080/a',
                                             request[:headers],
-                                            request[:body])).to be_true
+                                            request[:body])).to be true
           end
         end