rails-perftest 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: da19c0ca237ad8cb825991af265c338b2ed7e818
-  data.tar.gz: bf9bc9fef0d44b135e5a9d90684f2b1065898b8f
+  metadata.gz: c08c629a72988e3937014d0605fa9fbe269245f0
+  data.tar.gz: 9de321dca3ea0b0e2faeabd8c75b570215f87b77
 SHA512:
-  metadata.gz: 18b018be3b94c3df0bb9487682033f5d1897d76e1e9495708e4c05c75ec5a27a516b1f980bc83c0658713b84966e9c9b3c471922a9df9f688fc329c9c5a2865f
-  data.tar.gz: 732c232645fb1d453fe929979eeff23099c1e85e4f5e8d7456b89e26bb063cba62cedbcb2d9b81f8da034fbcac76361c3ccb859a0bfd762ee71baa28f3c8616f
+  metadata.gz: 6455e133273a288dc1ed778971453437081cecf9e034c0c25cc4bff625dc758faa2f9803f9bdf8205dd4f6ddfbdb3383d0955b430a765a2669424f5d3df3f5ce
+  data.tar.gz: 1450f39dfb84d085f0821b19ecb6258a1e2ca6d45a3b134d825914fdd9a5cafbf9111c4969d8b0640491ac1e5abcd3f354c03bbae3d1cd905ed5c8a1aa88d2fd

data/.travis.yml

@@ -0,0 +1,11 @@
+language: ruby
+before_install:
+  - gem install bundler
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.1
+gemfile:
+  - gemfiles/Gemfile-rails-4.0
+  - gemfiles/Gemfile-rails-4.1
+  - Gemfile

data/gemfiles/Gemfile-rails-4.0

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'rails', github: 'rails/rails', branch: '4-0-stable'
+
+gemspec path: '..'

data/gemfiles/Gemfile-rails-4.1

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gem 'rails', github: 'rails/rails', branch: '4-1-stable'
+
+gemspec path: '..'

data/lib/rails/perftest/action_dispatch/performance_test.rb

@@ -6,5 +6,11 @@ module ActionDispatch
   # output format are written to your tmp/performance directory.
   class PerformanceTest < ActionDispatch::IntegrationTest
     include ActiveSupport::Testing::Performance
+
+    if Gem.loaded_specs["minitest"].version < Gem::Version.create('5.0.0')
+      include Minitest4AndLower
+    else
+      include Minitest5AndGreater
+    end
   end
 end

data/lib/rails/perftest/active_support/testing/performance.rb

@@ -35,9 +35,35 @@ module ActiveSupport
         "#{self.class.name}##{method_name}"
       end
 
-      def run(runner)
-        @runner = runner
+      module Minitest4AndLower
+        def run(runner)
+          @runner = runner
+          _performance_run
+          return
+        end
+
+        def performance_failure(e)
+          @runner.puke(self.class, method_name, e)
+        end
+      end
+
+      module Minitest5AndGreater
+        def run
+          _performance_run
+          self
+        end
 
+        def performance_failure(e)
+          case e
+          when Minitest::Assertion
+            self.failures << e
+          else
+            self.failures << Minitest::UnexpectedError.new(e)
+          end
+        end
+      end
+
+      def _performance_run
         run_warmup
         if full_profile_options && metrics = full_profile_options[:metrics]
           metrics.each do |metric_name|
@@ -46,8 +72,6 @@ module ActiveSupport
             end
           end
         end
-
-        return
       end
 
       def run_test(metric, mode)
@@ -57,13 +81,13 @@ module ActiveSupport
           setup
           metric.send(mode) { __send__ method_name }
         rescue Exception => e
-          result = @runner.puke(self.class, method_name, e)
+          result = performance_failure(e)
         ensure
           begin
             teardown
             run_callbacks :teardown
           rescue Exception => e
-            result = @runner.puke(self.class, method_name, e)
+            result = performance_failure(e)
           end
         end
         result

data/lib/rails/perftest/version.rb

@@ -1,5 +1,5 @@
 module Rails
   module Perftest
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/rails-perftest.gemspec

@@ -7,8 +7,9 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Rails performance tests (removed from core in Rails 4.0)}
   gem.summary       = %q{ActionDispatch::PerformanceTest, ActiveSupport::Testing::Performance extracted from Rails.}
   gem.homepage      = "https://github.com/rails/rails-perftest"
+  gem.license       = "MIT"
 
-  gem.files         = [".gitignore","Gemfile","LICENSE","README.md","Rakefile","bin/perftest","lib/generators/rails/app/templates/test/performance/browsing_test.rb","lib/generators/rails/performance_test/USAGE","lib/generators/rails/performance_test/performance_test_generator.rb","lib/generators/rails/performance_test/templates/performance_test.rb","lib/rails-perftest.rb","lib/rails/performance_test_help.rb","lib/rails/perftest/action_controller.rb","lib/rails/perftest/action_controller/performance_test.rb","lib/rails/perftest/action_dispatch.rb","lib/rails/perftest/action_dispatch/performance_test.rb","lib/rails/perftest/active_support/testing/performance.rb","lib/rails/perftest/active_support/testing/performance/jruby.rb","lib/rails/perftest/active_support/testing/performance/rubinius.rb","lib/rails/perftest/active_support/testing/performance/ruby.rb","lib/rails/perftest/commands.rb","lib/rails/perftest/commands/benchmarker.rb","lib/rails/perftest/commands/profiler.rb","lib/rails/perftest/railtie.rb","lib/rails/perftest/railties/testing.tasks","lib/rails/perftest/version.rb","rails-perftest.gemspec","rails-perftest.gemspec.erb","test/generators/generators_test_helper.rb","test/generators/performance_test_generator_test.rb","test/helper.rb","test/performance_test.rb"]
+  gem.files         = [".gitignore",".travis.yml","Gemfile","LICENSE","README.md","Rakefile","bin/perftest","gemfiles/Gemfile-rails-4.0","gemfiles/Gemfile-rails-4.1","lib/generators/rails/app/templates/test/performance/browsing_test.rb","lib/generators/rails/performance_test/USAGE","lib/generators/rails/performance_test/performance_test_generator.rb","lib/generators/rails/performance_test/templates/performance_test.rb","lib/rails-perftest.rb","lib/rails/performance_test_help.rb","lib/rails/perftest/action_controller.rb","lib/rails/perftest/action_controller/performance_test.rb","lib/rails/perftest/action_dispatch.rb","lib/rails/perftest/action_dispatch/performance_test.rb","lib/rails/perftest/active_support/testing/performance.rb","lib/rails/perftest/active_support/testing/performance/jruby.rb","lib/rails/perftest/active_support/testing/performance/rubinius.rb","lib/rails/perftest/active_support/testing/performance/ruby.rb","lib/rails/perftest/commands.rb","lib/rails/perftest/commands/benchmarker.rb","lib/rails/perftest/commands/profiler.rb","lib/rails/perftest/railtie.rb","lib/rails/perftest/railties/testing.tasks","lib/rails/perftest/version.rb","rails-perftest.gemspec","rails-perftest.gemspec.erb","test/generators/generators_test_helper.rb","test/generators/performance_test_generator_test.rb","test/helper.rb","test/performance_test.rb"]
   gem.executables   = ["perftest"]
   gem.test_files    = ["test/generators/generators_test_helper.rb","test/generators/performance_test_generator_test.rb","test/helper.rb","test/performance_test.rb"]
   gem.name          = "rails-perftest"

data/rails-perftest.gemspec.erb

@@ -7,6 +7,7 @@ Gem::Specification.new do |gem|
   gem.description   = %q{Rails performance tests (removed from core in Rails 4.0)}
   gem.summary       = %q{ActionDispatch::PerformanceTest, ActiveSupport::Testing::Performance extracted from Rails.}
   gem.homepage      = "https://github.com/rails/rails-perftest"
+  gem.license       = "MIT"
 
   gem.files         = [<%= files.map(&:inspect).join ',' %>]
   gem.executables   = [<%= executables.map(&:inspect).join ',' %>]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-perftest
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Yves Senn
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-25 00:00:00.000000000 Z
+date: 2014-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ruby-prof
@@ -131,11 +131,14 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .travis.yml
 - Gemfile
 - LICENSE
 - README.md
 - Rakefile
 - bin/perftest
+- gemfiles/Gemfile-rails-4.0
+- gemfiles/Gemfile-rails-4.1
 - lib/generators/rails/app/templates/test/performance/browsing_test.rb
 - lib/generators/rails/performance_test/USAGE
 - lib/generators/rails/performance_test/performance_test_generator.rb
@@ -163,7 +166,8 @@ files:
 - test/helper.rb
 - test/performance_test.rb
 homepage: https://github.com/rails/rails-perftest
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []
@@ -181,7 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: ActionDispatch::PerformanceTest, ActiveSupport::Testing::Performance extracted