rspectacles 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bed36b5ed54e49e097fc5acd5c1f76a9c38f871b
-  data.tar.gz: fe4eb46b844447fefc22fcbf47262003f4603123
+  metadata.gz: 1a11e46720615db03ab64f004c98feef3d72ca01
+  data.tar.gz: bddfb9c9be4d000a0bf98c4159a8daa196999eff
 SHA512:
-  metadata.gz: d42a3ef4e41aed539941636df7ad9424a569c872c2ee70bd151746ad4b2e16027662688fea01aac6e3ecd2f4154792bbe347b178df38ae13ca5931a6f15b4ef2
-  data.tar.gz: 4694609c39573db2cd5d222f9ba6cf135e9c016962dd9bd15934e77e30eb33e9e6966daa8632e3b8f00f534f3c971856d4781b644d58c305bcda2872d6995842
+  metadata.gz: 3f64c551d1430a41e95aa4253d4110636ad904705f128521982b83fdaed38320992802bdbfbd221389972c7b1c61f3b75dfa69a32cd16856d74f5af23c2c9160
+  data.tar.gz: 646ea8a1b97d395603222c6820ba36502a72b033fcbd5e7709818ea65f57726b8c831df876a2d38f26a803532f6e7cc1933283bdcf907ae7141cbc80111e7816

data/Gemfile.lock

@@ -1,13 +1,13 @@
 PATH
   remote: .
   specs:
-    rspectacles (0.3.0)
+    rspectacles (0.3.1)
       httparty
       pg
+      puma
       rake
       sinatra (>= 1.4.5)
       sinatra-activerecord
-      thin (>= 1.5.1)
 
 GEM
   remote: https://rubygems.org/
@@ -26,9 +26,7 @@ GEM
     arel (8.0.0)
     coderay (1.1.1)
     concurrent-ruby (1.0.5)
-    daemons (1.2.4)
     diff-lcs (1.1.3)
-    eventmachine (1.2.5)
     httparty (0.15.6)
       multi_xml (>= 0.5.2)
     i18n (0.8.6)
@@ -41,6 +39,7 @@ GEM
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    puma (3.8.2)
     rack (2.0.3)
     rack-protection (2.0.0)
       rack
@@ -62,10 +61,6 @@ GEM
       activerecord (>= 3.2)
       sinatra (>= 1.0)
     slop (3.6.0)
-    thin (1.7.2)
-      daemons (~> 1.0, >= 1.0.9)
-      eventmachine (~> 1.0, >= 1.0.4)
-      rack (>= 1, < 3)
     thread_safe (0.3.6)
     tilt (2.0.8)
     tzinfo (1.2.3)

data/Procfile

@@ -0,0 +1 @@
+web: bundle exec puma -t ${PUMA_MIN_THREADS:-1}:${PUMA_MAX_THREADS:-1} -w ${PUMA_WORKERS:-1} -p $PORT -e ${RACK_ENV:-development} -C puma.rb

data/lib/rspectacles/adapter/batched_logger.rb

@@ -26,10 +26,7 @@ module RSpectacles
         return unless active?
         return unless queued_messages.size > 0
 
-        HTTParty.post(full_uri, timeout: 5,
-                                body: { examples: queued_messages }.to_json,
-                                headers: { 'Content-Type' => 'application/json' })
-
+        post_results queued_messages
         @queued_messages = []
       end
     end

data/lib/rspectacles/adapter/logger.rb

@@ -35,7 +35,15 @@ module RSpectacles
 
       def queue(message)
         return unless active?
-        HTTParty.post(uri, timeout: 5, data: { examples: Array.wrap(message) })
+        post_results Array.wrap(message)
+      end
+
+      def post_results(messages)
+        HTTParty.post(full_uri, timeout: 5,
+                                body: { examples: messages }.to_json,
+                                headers: { 'Content-Type' => 'application/json' })
+      rescue Net::ReadTimeout
+        puts "RSpectacles Timeout! Failed to send #{messages.size} messages"
       end
 
       def active?

data/lib/rspectacles/app.rb

@@ -2,9 +2,9 @@ require 'rubygems'
 require 'sinatra/base'
 require 'json'
 require 'sinatra/activerecord'
-require 'thin'
 require 'rspectacles/config.rb'
 require 'rspectacles/app/models/example'
+require 'puma'
 
 module RSpectacles
   class App < Sinatra::Base
@@ -13,7 +13,6 @@ module RSpectacles
 
     set :database_file, 'config/database.yml'
 
-    connections = []
     config = RSpectacles.config
     dir = File.dirname(File.expand_path(__FILE__))
     set :app_file, __FILE__
@@ -48,7 +47,7 @@ module RSpectacles
         { rspec_run: args['rspec_run'], properties: args }
       end
 
-      Example.create(data)
+      { errors: Example.create(data).count { |i| !i.persisted? } }.to_json
     end
   end
 end

data/lib/rspectacles/config/database.yml

@@ -22,7 +22,7 @@ production: &production
   adapter: postgresql
   database: rspectacles_prod
   username: postgres
-  pool: 10
+  pool: 2
   host: localhost
   timeout: 5000
   variables:

data/lib/rspectacles/version.rb

@@ -1,3 +1,3 @@
 module RSpectacles
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/puma.rb

@@ -0,0 +1,4 @@
+preload_app!
+on_worker_boot do
+  ActiveRecord::Base.establish_connection
+end

data/rspectacles.gemspec

@@ -25,7 +25,7 @@ Gem::Specification.new do |s|
   s.add_dependency 'rake'
   s.add_dependency 'pg'
   s.add_dependency 'sinatra-activerecord'
-  s.add_dependency 'thin', '>= 1.5.1'
+  s.add_dependency 'puma'
   s.add_dependency 'sinatra', '>= 1.4.5'
   s.add_dependency 'httparty'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rspectacles
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Michael Wheeler
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-07 00:00:00.000000000 Z
+date: 2017-09-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -81,19 +81,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thin
+  name: puma
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sinatra
   requirement: !ruby/object:Gem::Requirement
@@ -135,6 +135,7 @@ files:
 - Gemfile
 - Gemfile.lock
 - LICENSE
+- Procfile
 - README.md
 - Rakefile
 - bin/rspectacles
@@ -165,6 +166,7 @@ files:
 - lib/rspectacles/formatter/batched.rb
 - lib/rspectacles/formatter/legacy/base.rb
 - lib/rspectacles/version.rb
+- puma.rb
 - rspectacles.gemspec
 - spec/javascripts/resources/qunit.css
 - spec/javascripts/resources/qunit.js