active_model_serializers 0.10.0.rc4 → 0.10.0.rc5
Sign up to get free protection for your applications and to get access to all the features.
- checksums.yaml +4 -4
- data/.github/ISSUE_TEMPLATE.md +29 -0
- data/.github/PULL_REQUEST_TEMPLATE.md +15 -0
- data/.gitignore +1 -0
- data/.rubocop.yml +19 -1
- data/.rubocop_todo.yml +30 -103
- data/.simplecov +0 -1
- data/.travis.yml +20 -8
- data/CHANGELOG.md +89 -5
- data/CONTRIBUTING.md +54 -179
- data/Gemfile +7 -2
- data/{LICENSE.txt → MIT-LICENSE} +0 -0
- data/README.md +27 -5
- data/Rakefile +44 -16
- data/active_model_serializers.gemspec +9 -1
- data/appveyor.yml +1 -0
- data/bin/bench +171 -0
- data/bin/bench_regression +316 -0
- data/bin/serve_benchmark +39 -0
- data/docs/ARCHITECTURE.md +13 -7
- data/docs/README.md +5 -1
- data/docs/STYLE.md +58 -0
- data/docs/general/adapters.md +99 -16
- data/docs/general/configuration_options.md +87 -14
- data/docs/general/deserialization.md +100 -0
- data/docs/general/getting_started.md +35 -0
- data/docs/general/instrumentation.md +1 -1
- data/docs/general/key_transforms.md +40 -0
- data/docs/general/rendering.md +115 -13
- data/docs/general/serializers.md +138 -6
- data/docs/howto/add_pagination_links.md +36 -18
- data/docs/howto/outside_controller_use.md +4 -4
- data/docs/howto/passing_arbitrary_options.md +27 -0
- data/docs/jsonapi/errors.md +56 -0
- data/docs/jsonapi/schema.md +29 -18
- data/docs/rfcs/0000-namespace.md +106 -0
- data/docs/rfcs/template.md +15 -0
- data/lib/action_controller/serialization.rb +10 -19
- data/lib/active_model/serializable_resource.rb +4 -65
- data/lib/active_model/serializer.rb +73 -18
- data/lib/active_model/serializer/adapter.rb +15 -82
- data/lib/active_model/serializer/adapter/attributes.rb +5 -56
- data/lib/active_model/serializer/adapter/base.rb +5 -47
- data/lib/active_model/serializer/adapter/json.rb +6 -12
- data/lib/active_model/serializer/adapter/json_api.rb +5 -213
- data/lib/active_model/serializer/adapter/null.rb +7 -3
- data/lib/active_model/serializer/array_serializer.rb +3 -3
- data/lib/active_model/serializer/association.rb +4 -5
- data/lib/active_model/serializer/attributes.rb +1 -1
- data/lib/active_model/serializer/caching.rb +56 -5
- data/lib/active_model/serializer/collection_serializer.rb +30 -13
- data/lib/active_model/serializer/configuration.rb +7 -0
- data/lib/active_model/serializer/error_serializer.rb +10 -0
- data/lib/active_model/serializer/errors_serializer.rb +27 -0
- data/lib/active_model/serializer/links.rb +4 -2
- data/lib/active_model/serializer/lint.rb +14 -0
- data/lib/active_model/serializer/meta.rb +29 -0
- data/lib/active_model/serializer/null.rb +17 -0
- data/lib/active_model/serializer/reflection.rb +57 -1
- data/lib/active_model/serializer/type.rb +1 -1
- data/lib/active_model/serializer/version.rb +1 -1
- data/lib/active_model_serializers.rb +17 -0
- data/lib/active_model_serializers/adapter.rb +92 -0
- data/lib/active_model_serializers/adapter/attributes.rb +94 -0
- data/lib/active_model_serializers/adapter/base.rb +90 -0
- data/lib/active_model_serializers/adapter/json.rb +11 -0
- data/lib/active_model_serializers/adapter/json_api.rb +513 -0
- data/lib/active_model_serializers/adapter/json_api/deserialization.rb +213 -0
- data/lib/active_model_serializers/adapter/json_api/error.rb +96 -0
- data/lib/active_model_serializers/adapter/json_api/jsonapi.rb +49 -0
- data/lib/active_model_serializers/adapter/json_api/link.rb +83 -0
- data/lib/active_model_serializers/adapter/json_api/meta.rb +37 -0
- data/lib/active_model_serializers/adapter/json_api/pagination_links.rb +57 -0
- data/lib/active_model_serializers/adapter/json_api/relationship.rb +52 -0
- data/lib/active_model_serializers/adapter/json_api/resource_identifier.rb +37 -0
- data/lib/active_model_serializers/adapter/null.rb +10 -0
- data/lib/active_model_serializers/cached_serializer.rb +87 -0
- data/lib/active_model_serializers/callbacks.rb +1 -1
- data/lib/active_model_serializers/deprecate.rb +55 -0
- data/lib/active_model_serializers/deserialization.rb +2 -2
- data/lib/active_model_serializers/fragment_cache.rb +118 -0
- data/lib/active_model_serializers/json_pointer.rb +14 -0
- data/lib/active_model_serializers/key_transform.rb +70 -0
- data/lib/active_model_serializers/logging.rb +4 -1
- data/lib/active_model_serializers/model.rb +11 -1
- data/lib/active_model_serializers/railtie.rb +9 -1
- data/lib/active_model_serializers/register_jsonapi_renderer.rb +64 -0
- data/lib/active_model_serializers/serializable_resource.rb +81 -0
- data/lib/active_model_serializers/serialization_context.rb +24 -2
- data/lib/active_model_serializers/test/schema.rb +2 -2
- data/lib/grape/formatters/active_model_serializers.rb +1 -1
- data/test/action_controller/adapter_selector_test.rb +1 -1
- data/test/action_controller/json_api/deserialization_test.rb +56 -3
- data/test/action_controller/json_api/errors_test.rb +41 -0
- data/test/action_controller/json_api/linked_test.rb +10 -9
- data/test/action_controller/json_api/pagination_test.rb +2 -2
- data/test/action_controller/json_api/transform_test.rb +180 -0
- data/test/action_controller/serialization_scope_name_test.rb +201 -35
- data/test/action_controller/serialization_test.rb +39 -7
- data/test/active_model_serializers/adapter_for_test.rb +208 -0
- data/test/active_model_serializers/cached_serializer_test.rb +80 -0
- data/test/active_model_serializers/fragment_cache_test.rb +34 -0
- data/test/active_model_serializers/json_pointer_test.rb +20 -0
- data/test/active_model_serializers/key_transform_test.rb +263 -0
- data/test/active_model_serializers/logging_test.rb +8 -8
- data/test/active_model_serializers/railtie_test_isolated.rb +6 -0
- data/test/active_model_serializers/serialization_context_test_isolated.rb +58 -0
- data/test/adapter/deprecation_test.rb +100 -0
- data/test/adapter/json/belongs_to_test.rb +32 -34
- data/test/adapter/json/collection_test.rb +73 -75
- data/test/adapter/json/has_many_test.rb +36 -38
- data/test/adapter/json/transform_test.rb +93 -0
- data/test/adapter/json_api/belongs_to_test.rb +127 -129
- data/test/adapter/json_api/collection_test.rb +80 -82
- data/test/adapter/json_api/errors_test.rb +78 -0
- data/test/adapter/json_api/fields_test.rb +68 -70
- data/test/adapter/json_api/has_many_embed_ids_test.rb +32 -34
- data/test/adapter/json_api/has_many_explicit_serializer_test.rb +75 -77
- data/test/adapter/json_api/has_many_test.rb +121 -123
- data/test/adapter/json_api/has_one_test.rb +59 -61
- data/test/adapter/json_api/json_api_test.rb +28 -30
- data/test/adapter/json_api/linked_test.rb +319 -321
- data/test/adapter/json_api/links_test.rb +75 -50
- data/test/adapter/json_api/pagination_links_test.rb +115 -82
- data/test/adapter/json_api/parse_test.rb +114 -116
- data/test/adapter/json_api/relationship_test.rb +161 -0
- data/test/adapter/json_api/relationships_test.rb +199 -0
- data/test/adapter/json_api/resource_identifier_test.rb +85 -0
- data/test/adapter/json_api/resource_meta_test.rb +100 -0
- data/test/adapter/json_api/toplevel_jsonapi_test.rb +61 -63
- data/test/adapter/json_api/transform_test.rb +500 -0
- data/test/adapter/json_api/type_test.rb +61 -0
- data/test/adapter/json_test.rb +35 -37
- data/test/adapter/null_test.rb +13 -15
- data/test/adapter/polymorphic_test.rb +72 -0
- data/test/adapter_test.rb +27 -29
- data/test/array_serializer_test.rb +7 -8
- data/test/benchmark/app.rb +65 -0
- data/test/benchmark/benchmarking_support.rb +67 -0
- data/test/benchmark/bm_caching.rb +117 -0
- data/test/benchmark/bm_transform.rb +34 -0
- data/test/benchmark/config.ru +3 -0
- data/test/benchmark/controllers.rb +77 -0
- data/test/benchmark/fixtures.rb +167 -0
- data/test/cache_test.rb +388 -0
- data/test/collection_serializer_test.rb +10 -0
- data/test/fixtures/active_record.rb +12 -0
- data/test/fixtures/poro.rb +28 -3
- data/test/grape_test.rb +5 -5
- data/test/lint_test.rb +9 -0
- data/test/serializable_resource_test.rb +59 -3
- data/test/serializers/associations_test.rb +8 -8
- data/test/serializers/attribute_test.rb +7 -7
- data/test/serializers/caching_configuration_test_isolated.rb +170 -0
- data/test/serializers/meta_test.rb +74 -6
- data/test/serializers/read_attribute_for_serialization_test.rb +79 -0
- data/test/serializers/serialization_test.rb +55 -0
- data/test/support/isolated_unit.rb +3 -0
- data/test/support/rails5_shims.rb +26 -8
- data/test/support/rails_app.rb +38 -18
- data/test/support/serialization_testing.rb +5 -5
- data/test/test_helper.rb +6 -10
- metadata +132 -37
- data/docs/DESIGN.textile +7 -1
- data/lib/active_model/serializer/adapter/cached_serializer.rb +0 -45
- data/lib/active_model/serializer/adapter/fragment_cache.rb +0 -111
- data/lib/active_model/serializer/adapter/json/fragment_cache.rb +0 -13
- data/lib/active_model/serializer/adapter/json_api/deserialization.rb +0 -207
- data/lib/active_model/serializer/adapter/json_api/fragment_cache.rb +0 -21
- data/lib/active_model/serializer/adapter/json_api/link.rb +0 -44
- data/lib/active_model/serializer/adapter/json_api/pagination_links.rb +0 -58
- data/test/active_model_serializers/serialization_context_test.rb +0 -18
- data/test/adapter/fragment_cache_test.rb +0 -38
- data/test/adapter/json_api/resource_type_config_test.rb +0 -71
- data/test/serializers/adapter_for_test.rb +0 -166
- data/test/serializers/cache_test.rb +0 -209
- data/test/support/simplecov.rb +0 -6
- data/test/support/stream_capture.rb +0 -50
- data/test/support/test_case.rb +0 -19
data/bin/bench
ADDED
@@ -0,0 +1,171 @@
|
|
1
|
+
#!/usr/bin/env ruby
|
2
|
+
# ActiveModelSerializers Benchmark driver
|
3
|
+
# Adapted from
|
4
|
+
# https://github.com/ruby-bench/ruby-bench-suite/blob/8ad567f7e43a044ae48c36833218423bb1e2bd9d/rails/benchmarks/driver.rb
|
5
|
+
require 'bundler'
|
6
|
+
Bundler.setup
|
7
|
+
require 'json'
|
8
|
+
require 'pathname'
|
9
|
+
require 'optparse'
|
10
|
+
require 'digest'
|
11
|
+
require 'pathname'
|
12
|
+
require 'shellwords'
|
13
|
+
require 'logger'
|
14
|
+
require 'English'
|
15
|
+
|
16
|
+
class BenchmarkDriver
|
17
|
+
ROOT = Pathname File.expand_path(File.join('..', '..'), __FILE__)
|
18
|
+
BASE = ENV.fetch('BASE') { ROOT.join('test', 'benchmark') }
|
19
|
+
ESCAPED_BASE = Shellwords.shellescape(BASE)
|
20
|
+
|
21
|
+
def self.benchmark(options)
|
22
|
+
new(options).run
|
23
|
+
end
|
24
|
+
|
25
|
+
def self.parse_argv_and_run(argv = ARGV, options = {})
|
26
|
+
options = {
|
27
|
+
repeat_count: 1,
|
28
|
+
pattern: [],
|
29
|
+
env: 'CACHE_ON=on'
|
30
|
+
}.merge!(options)
|
31
|
+
|
32
|
+
OptionParser.new do |opts|
|
33
|
+
opts.banner = 'Usage: bin/bench [options]'
|
34
|
+
|
35
|
+
opts.on('-r', '--repeat-count [NUM]', 'Run benchmarks [NUM] times taking the best result') do |value|
|
36
|
+
options[:repeat_count] = value.to_i
|
37
|
+
end
|
38
|
+
|
39
|
+
opts.on('-p', '--pattern <PATTERN1,PATTERN2,PATTERN3>', 'Benchmark name pattern') do |value|
|
40
|
+
options[:pattern] = value.split(',')
|
41
|
+
end
|
42
|
+
|
43
|
+
opts.on('-e', '--env <var1=val1,var2=val2,var3=vale>', 'ENV variables to pass in') do |value|
|
44
|
+
options[:env] = value.split(',')
|
45
|
+
end
|
46
|
+
end.parse!(argv)
|
47
|
+
|
48
|
+
benchmark(options)
|
49
|
+
end
|
50
|
+
|
51
|
+
attr_reader :commit_hash, :base
|
52
|
+
|
53
|
+
# Based on logfmt:
|
54
|
+
# https://www.brandur.org/logfmt
|
55
|
+
# For more complete implementation see:
|
56
|
+
# see https://github.com/arachnid-cb/logfmtr/blob/master/lib/logfmtr/base.rb
|
57
|
+
# For usage see:
|
58
|
+
# https://blog.codeship.com/logfmt-a-log-format-thats-easy-to-read-and-write/
|
59
|
+
# https://engineering.heroku.com/blogs/2014-09-05-hutils-explore-your-structured-data-logs/
|
60
|
+
# For Ruby parser see:
|
61
|
+
# https://github.com/cyberdelia/logfmt-ruby
|
62
|
+
def self.summary_logger(device = 'output.txt')
|
63
|
+
require 'time'
|
64
|
+
logger = Logger.new(device)
|
65
|
+
logger.level = Logger::INFO
|
66
|
+
logger.formatter = proc { |severity, datetime, progname, msg|
|
67
|
+
msg = "'#{msg}'"
|
68
|
+
"level=#{severity} time=#{datetime.utc.iso8601(6)} pid=#{Process.pid} progname=#{progname} msg=#{msg}#{$INPUT_RECORD_SEPARATOR}"
|
69
|
+
}
|
70
|
+
logger
|
71
|
+
end
|
72
|
+
|
73
|
+
def self.stdout_logger
|
74
|
+
logger = Logger.new(STDOUT)
|
75
|
+
logger.level = Logger::INFO
|
76
|
+
logger.formatter = proc { |_, _, _, msg| "#{msg}#{$INPUT_RECORD_SEPARATOR}" }
|
77
|
+
logger
|
78
|
+
end
|
79
|
+
|
80
|
+
def initialize(options)
|
81
|
+
@writer = ENV['SUMMARIZE'] ? self.class.summary_logger : self.class.stdout_logger
|
82
|
+
@repeat_count = options[:repeat_count]
|
83
|
+
@pattern = options[:pattern]
|
84
|
+
@commit_hash = options.fetch(:commit_hash) { `git rev-parse --short HEAD`.chomp }
|
85
|
+
@base = options.fetch(:base) { ESCAPED_BASE }
|
86
|
+
@env = Array(options[:env]).join(' ')
|
87
|
+
@rubyopt = options[:rubyopt] # TODO: rename
|
88
|
+
end
|
89
|
+
|
90
|
+
def run
|
91
|
+
files.each do |path|
|
92
|
+
next if !@pattern.empty? && /#{@pattern.join('|')}/ !~ File.basename(path)
|
93
|
+
run_single(Shellwords.shellescape(path))
|
94
|
+
end
|
95
|
+
end
|
96
|
+
|
97
|
+
private
|
98
|
+
|
99
|
+
def files
|
100
|
+
Dir[File.join(base, 'bm_*')]
|
101
|
+
end
|
102
|
+
|
103
|
+
def run_single(path)
|
104
|
+
script = "RAILS_ENV=production #{@env} ruby #{@rubyopt} #{path}"
|
105
|
+
environment = `ruby -v`.chomp.strip[/\d+\.\d+\.\d+\w+/]
|
106
|
+
|
107
|
+
runs_output = measure(script)
|
108
|
+
if runs_output.empty?
|
109
|
+
results = { error: :no_results }
|
110
|
+
return
|
111
|
+
end
|
112
|
+
|
113
|
+
results = {}
|
114
|
+
results['commit_hash'] = commit_hash
|
115
|
+
results['version'] = runs_output.first['version']
|
116
|
+
results['rails_version'] = runs_output.first['rails_version']
|
117
|
+
results['benchmark_run[environment]'] = environment
|
118
|
+
results['runs'] = []
|
119
|
+
|
120
|
+
runs_output.each do |output|
|
121
|
+
results['runs'] << {
|
122
|
+
'benchmark_type[category]' => output['label'],
|
123
|
+
'benchmark_run[result][iterations_per_second]' => output['iterations_per_second'].round(3),
|
124
|
+
'benchmark_run[result][total_allocated_objects_per_iteration]' => output['total_allocated_objects_per_iteration']
|
125
|
+
}
|
126
|
+
end
|
127
|
+
ensure
|
128
|
+
results && report(results)
|
129
|
+
end
|
130
|
+
|
131
|
+
def report(results)
|
132
|
+
@writer.info { 'Benchmark results:' }
|
133
|
+
@writer.info { JSON.pretty_generate(results) }
|
134
|
+
end
|
135
|
+
|
136
|
+
def summarize(result)
|
137
|
+
puts "#{result['label']} #{result['iterations_per_second']}/ips; #{result['total_allocated_objects_per_iteration']} objects"
|
138
|
+
end
|
139
|
+
|
140
|
+
# FIXME: ` provides the full output but it'll return failed output as well.
|
141
|
+
def measure(script)
|
142
|
+
results = Hash.new { |h, k| h[k] = [] }
|
143
|
+
|
144
|
+
@repeat_count.times do
|
145
|
+
output = sh(script)
|
146
|
+
output.each_line do |line|
|
147
|
+
next if line.nil?
|
148
|
+
begin
|
149
|
+
result = JSON.parse(line)
|
150
|
+
rescue JSON::ParserError
|
151
|
+
result = { error: line } # rubocop:disable Lint/UselessAssignment
|
152
|
+
else
|
153
|
+
summarize(result)
|
154
|
+
results[result['label']] << result
|
155
|
+
end
|
156
|
+
end
|
157
|
+
end
|
158
|
+
|
159
|
+
results.map do |_, bm_runs|
|
160
|
+
bm_runs.sort_by do |run|
|
161
|
+
run['iterations_per_second']
|
162
|
+
end.last
|
163
|
+
end
|
164
|
+
end
|
165
|
+
|
166
|
+
def sh(cmd)
|
167
|
+
`#{cmd}`
|
168
|
+
end
|
169
|
+
end
|
170
|
+
|
171
|
+
BenchmarkDriver.parse_argv_and_run if $PROGRAM_NAME == __FILE__
|
@@ -0,0 +1,316 @@
|
|
1
|
+
#!/usr/bin/env ruby
|
2
|
+
require 'fileutils'
|
3
|
+
require 'pathname'
|
4
|
+
require 'shellwords'
|
5
|
+
require 'English'
|
6
|
+
|
7
|
+
############################
|
8
|
+
# USAGE
|
9
|
+
#
|
10
|
+
# bundle exec bin/bench_regression <ref1> <ref2>
|
11
|
+
# <ref1> defaults to the current branch
|
12
|
+
# <ref2> defaults to the master branch
|
13
|
+
# bundle exec bin/bench_regression current # will run on the current branch
|
14
|
+
# bundle exec bin/bench_regression revisions 792fb8a90 master # every revision inclusive
|
15
|
+
# bundle exec bin/bench_regression 792fb8a90 master --repeat-count 2 --env CACHE_ON=off
|
16
|
+
# bundle exec bin/bench_regression vendor
|
17
|
+
###########################
|
18
|
+
|
19
|
+
class BenchRegression
|
20
|
+
ROOT = Pathname File.expand_path(File.join(*['..', '..']), __FILE__)
|
21
|
+
TMP_DIR_NAME = File.join('tmp', 'bench')
|
22
|
+
TMP_DIR = File.join(ROOT, TMP_DIR_NAME)
|
23
|
+
E_TMP_DIR = Shellwords.shellescape(TMP_DIR)
|
24
|
+
load ROOT.join('bin', 'bench')
|
25
|
+
|
26
|
+
attr_reader :source_stasher
|
27
|
+
|
28
|
+
def initialize
|
29
|
+
@source_stasher = SourceStasher.new
|
30
|
+
end
|
31
|
+
|
32
|
+
class SourceStasher
|
33
|
+
attr_reader :gem_require_paths, :gem_paths
|
34
|
+
attr_writer :vendor
|
35
|
+
|
36
|
+
def initialize
|
37
|
+
@gem_require_paths = []
|
38
|
+
@gem_paths = []
|
39
|
+
refresh_temp_dir
|
40
|
+
@vendor = false
|
41
|
+
end
|
42
|
+
|
43
|
+
def temp_dir_empty?
|
44
|
+
File.directory?(TMP_DIR) &&
|
45
|
+
Dir[File.join(TMP_DIR, '*')].none?
|
46
|
+
end
|
47
|
+
|
48
|
+
def empty_temp_dir
|
49
|
+
return if @vendor
|
50
|
+
return if temp_dir_empty?
|
51
|
+
FileUtils.mkdir_p(TMP_DIR)
|
52
|
+
Dir[File.join(TMP_DIR, '*')].each do |file|
|
53
|
+
if File.directory?(file)
|
54
|
+
FileUtils.rm_rf(file)
|
55
|
+
else
|
56
|
+
FileUtils.rm(file)
|
57
|
+
end
|
58
|
+
end
|
59
|
+
end
|
60
|
+
|
61
|
+
def fill_temp_dir
|
62
|
+
vendor_files(Dir[File.join(ROOT, 'test', 'benchmark', '*.{rb,ru}')])
|
63
|
+
# vendor_file(File.join('bin', 'bench'))
|
64
|
+
housekeeping { empty_temp_dir }
|
65
|
+
vendor_gem('benchmark-ips')
|
66
|
+
end
|
67
|
+
|
68
|
+
def vendor_files(files)
|
69
|
+
files.each do |file|
|
70
|
+
vendor_file(file)
|
71
|
+
end
|
72
|
+
end
|
73
|
+
|
74
|
+
def vendor_file(file)
|
75
|
+
FileUtils.cp(file, File.join(TMP_DIR, File.basename(file)))
|
76
|
+
end
|
77
|
+
|
78
|
+
def vendor_gem(gem_name)
|
79
|
+
directory_name = `bundle exec gem unpack benchmark-ips --target=#{E_TMP_DIR}`[/benchmark-ips.+\d/]
|
80
|
+
gem_paths << File.join(TMP_DIR, directory_name)
|
81
|
+
gem_require_paths << File.join(TMP_DIR_NAME, directory_name, 'lib')
|
82
|
+
housekeeping { remove_vendored_gems }
|
83
|
+
end
|
84
|
+
|
85
|
+
def remove_vendored_gems
|
86
|
+
return if @vendor
|
87
|
+
FileUtils.rm_rf(*gem_paths)
|
88
|
+
end
|
89
|
+
|
90
|
+
def refresh_temp_dir
|
91
|
+
empty_temp_dir
|
92
|
+
fill_temp_dir
|
93
|
+
end
|
94
|
+
|
95
|
+
def housekeeping
|
96
|
+
at_exit { yield }
|
97
|
+
end
|
98
|
+
end
|
99
|
+
|
100
|
+
module RevisionMethods
|
101
|
+
module_function
|
102
|
+
def current_branch
|
103
|
+
@current_branch ||= `cat .git/HEAD | cut -d/ -f3,4,5`.chomp
|
104
|
+
end
|
105
|
+
|
106
|
+
def current_revision
|
107
|
+
`git rev-parse --short HEAD`.chomp
|
108
|
+
end
|
109
|
+
|
110
|
+
def revision_description(rev)
|
111
|
+
`git log --oneline -1 #{rev}`.chomp
|
112
|
+
end
|
113
|
+
|
114
|
+
def revisions(start_ref, end_ref)
|
115
|
+
cmd = "git rev-list --reverse #{start_ref}..#{end_ref}"
|
116
|
+
`#{cmd}`.chomp.split("\n")
|
117
|
+
end
|
118
|
+
|
119
|
+
def checkout_ref(ref)
|
120
|
+
`git checkout #{ref}`.chomp
|
121
|
+
if $CHILD_STATUS
|
122
|
+
STDERR.puts "Checkout failed: #{ref}, #{$CHILD_STATUS.exitstatus}" unless $CHILD_STATUS.success?
|
123
|
+
$CHILD_STATUS.success?
|
124
|
+
else
|
125
|
+
true
|
126
|
+
end
|
127
|
+
end
|
128
|
+
|
129
|
+
def clean_head
|
130
|
+
system('git reset --hard --quiet')
|
131
|
+
end
|
132
|
+
end
|
133
|
+
module ShellMethods
|
134
|
+
|
135
|
+
def sh(cmd)
|
136
|
+
puts cmd
|
137
|
+
# system(cmd)
|
138
|
+
run(cmd)
|
139
|
+
# env = {}
|
140
|
+
# # out = STDOUT
|
141
|
+
# pid = spawn(env, cmd)
|
142
|
+
# Process.wait(pid)
|
143
|
+
# pid = fork do
|
144
|
+
# exec cmd
|
145
|
+
# end
|
146
|
+
# Process.waitpid2(pid)
|
147
|
+
# puts $CHILD_STATUS.exitstatus
|
148
|
+
end
|
149
|
+
|
150
|
+
require 'pty'
|
151
|
+
# should consider trapping SIGINT in here
|
152
|
+
def run(cmd)
|
153
|
+
puts cmd
|
154
|
+
child_process = ''
|
155
|
+
result = ''
|
156
|
+
# http://stackoverflow.com/a/1162850
|
157
|
+
# stream output of subprocess
|
158
|
+
begin
|
159
|
+
PTY.spawn(cmd) do |stdin, _stdout, pid|
|
160
|
+
begin
|
161
|
+
# Do stuff with the output here. Just printing to show it works
|
162
|
+
stdin.each do |line|
|
163
|
+
print line
|
164
|
+
result << line
|
165
|
+
end
|
166
|
+
child_process = PTY.check(pid)
|
167
|
+
rescue Errno::EIO
|
168
|
+
puts 'Errno:EIO error, but this probably just means ' \
|
169
|
+
'that the process has finished giving output'
|
170
|
+
end
|
171
|
+
end
|
172
|
+
rescue PTY::ChildExited
|
173
|
+
puts 'The child process exited!'
|
174
|
+
end
|
175
|
+
unless (child_process && child_process.success?)
|
176
|
+
exitstatus = child_process.exitstatus
|
177
|
+
puts "FAILED: #{child_process.pid} exited with status #{exitstatus.inspect} due to failed command #{cmd}"
|
178
|
+
exit exitstatus || 1
|
179
|
+
end
|
180
|
+
result
|
181
|
+
end
|
182
|
+
|
183
|
+
def bundle(ref)
|
184
|
+
system("rm -f Gemfile.lock")
|
185
|
+
# This is absolutely critical for bundling to work
|
186
|
+
Bundler.with_clean_env do
|
187
|
+
system("bundle check ||
|
188
|
+
bundle install --local ||
|
189
|
+
bundle install ||
|
190
|
+
bundle update")
|
191
|
+
end
|
192
|
+
|
193
|
+
# if $CHILD_STATUS
|
194
|
+
# STDERR.puts "Bundle failed at: #{ref}, #{$CHILD_STATUS.exitstatus}" unless $CHILD_STATUS.success?
|
195
|
+
# $CHILD_STATUS.success?
|
196
|
+
# else
|
197
|
+
# false
|
198
|
+
# end
|
199
|
+
end
|
200
|
+
end
|
201
|
+
include ShellMethods
|
202
|
+
include RevisionMethods
|
203
|
+
|
204
|
+
def benchmark_refs(ref1: nil, ref2: nil, cmd:)
|
205
|
+
checking_out = false
|
206
|
+
ref0 = current_branch
|
207
|
+
ref1 ||= current_branch
|
208
|
+
ref2 ||= 'master'
|
209
|
+
p [ref0, ref1, ref2, current_revision]
|
210
|
+
|
211
|
+
run_benchmark_at_ref(cmd, ref1)
|
212
|
+
p [ref0, ref1, ref2, current_revision]
|
213
|
+
run_benchmark_at_ref(cmd, ref2)
|
214
|
+
p [ref0, ref1, ref2, current_revision]
|
215
|
+
|
216
|
+
checking_out = true
|
217
|
+
checkout_ref(ref0)
|
218
|
+
rescue Exception # rubocop:disable Lint/RescueException
|
219
|
+
STDERR.puts "[ERROR] #{$!.message}"
|
220
|
+
checkout_ref(ref0) unless checking_out
|
221
|
+
raise
|
222
|
+
end
|
223
|
+
|
224
|
+
def benchmark_revisions(ref1: nil, ref2: nil, cmd:)
|
225
|
+
checking_out = false
|
226
|
+
ref0 = current_branch
|
227
|
+
ref1 ||= current_branch
|
228
|
+
ref2 ||= 'master'
|
229
|
+
|
230
|
+
revisions(ref1, ref2).each do |rev|
|
231
|
+
STDERR.puts "Checking out: #{revision_description(rev)}"
|
232
|
+
|
233
|
+
run_benchmark_at_ref(cmd, rev)
|
234
|
+
clean_head
|
235
|
+
end
|
236
|
+
checking_out = true
|
237
|
+
checkout_ref(ref0)
|
238
|
+
rescue Exception # rubocop:disable Lint/RescueException
|
239
|
+
STDERR.puts "[ERROR]: #{$!.message}"
|
240
|
+
checkout_ref(ref0) unless checking_out
|
241
|
+
raise
|
242
|
+
end
|
243
|
+
|
244
|
+
def run_benchmark_at_ref(cmd, ref)
|
245
|
+
checkout_ref(ref)
|
246
|
+
run_benchmark(cmd, ref)
|
247
|
+
end
|
248
|
+
|
249
|
+
def run_benchmark(cmd, ref = nil)
|
250
|
+
ref ||= current_revision
|
251
|
+
bundle(ref) &&
|
252
|
+
benchmark_tests(cmd, ref)
|
253
|
+
end
|
254
|
+
|
255
|
+
def benchmark_tests(cmd, ref)
|
256
|
+
base = E_TMP_DIR
|
257
|
+
# cmd.sub('bin/bench', 'tmp/revision_runner/bench')
|
258
|
+
# bundle = Gem.bin('bunle'
|
259
|
+
# Bundler.with_clean_env(&block)
|
260
|
+
|
261
|
+
# cmd = Shellwords.shelljoin(cmd)
|
262
|
+
# cmd = "COMMIT_HASH=#{ref} BASE=#{base} bundle exec ruby -rbenchmark/ips #{cmd}"
|
263
|
+
# Add vendoring benchmark/ips to load path
|
264
|
+
|
265
|
+
# CURRENT THINKING: IMPORTANT
|
266
|
+
# Pass into require statement as RUBYOPTS i.e. via env rather than command line argument
|
267
|
+
# otherwise, have a 'fast ams benchmarking' module that extends benchmarkings to add the 'ams'
|
268
|
+
# method but doesn't depend on benchmark-ips
|
269
|
+
options = {
|
270
|
+
commit_hash: ref,
|
271
|
+
base: base,
|
272
|
+
rubyopt: Shellwords.shellescape("-Ilib:#{source_stasher.gem_require_paths.join(':')}")
|
273
|
+
}
|
274
|
+
BenchmarkDriver.parse_argv_and_run(ARGV.dup, options)
|
275
|
+
end
|
276
|
+
end
|
277
|
+
|
278
|
+
if $PROGRAM_NAME == __FILE__
|
279
|
+
benchmarking = BenchRegression.new
|
280
|
+
|
281
|
+
case ARGV[0]
|
282
|
+
when 'current'
|
283
|
+
# Run current branch only
|
284
|
+
|
285
|
+
# super simple command line parsing
|
286
|
+
args = ARGV.dup
|
287
|
+
_ = args.shift # remove 'current' from args
|
288
|
+
cmd = args
|
289
|
+
benchmarking.run_benchmark(cmd)
|
290
|
+
when 'revisions'
|
291
|
+
# Runs on every revision
|
292
|
+
|
293
|
+
# super simple command line parsing
|
294
|
+
args = ARGV.dup
|
295
|
+
_ = args.shift
|
296
|
+
ref1 = args.shift # remove 'revisions' from args
|
297
|
+
ref2 = args.shift
|
298
|
+
cmd = args
|
299
|
+
benchmarking.benchmark_revisions(ref1: ref1, ref2: ref2, cmd: cmd)
|
300
|
+
when 'vendor'
|
301
|
+
# Just prevents vendored files from being cleaned up
|
302
|
+
# at exit. (They are vendored at initialize.)
|
303
|
+
benchmarking.source_stasher.vendor = true
|
304
|
+
else
|
305
|
+
# Default: Compare current_branch to master
|
306
|
+
# Optionally: pass in two refs as args to `bin/bench_regression`
|
307
|
+
# TODO: Consider checking across more revisions, to automatically find problems.
|
308
|
+
|
309
|
+
# super simple command line parsing
|
310
|
+
args = ARGV.dup
|
311
|
+
ref1 = args.shift
|
312
|
+
ref2 = args.shift
|
313
|
+
cmd = args
|
314
|
+
benchmarking.benchmark_refs(ref1: ref1, ref2: ref2, cmd: cmd)
|
315
|
+
end
|
316
|
+
end
|