passenger 5.0.0.beta3 → 5.0.0.rc1
Sign up to get free protection for your applications and to get access to all the features.
Potentially problematic release.
This version of passenger might be problematic. Click here for more details.
- checksums.yaml +8 -8
- checksums.yaml.gz.asc +7 -7
- data.tar.gz.asc +7 -7
- data/.editorconfig +11 -5
- data/CHANGELOG +38 -0
- data/CONTRIBUTING.md +1 -4
- data/Gemfile +0 -1
- data/Gemfile.lock +0 -2
- data/Rakefile +33 -33
- data/bin/passenger +1 -1
- data/bin/passenger-config +1 -1
- data/bin/passenger-install-apache2-module +800 -800
- data/bin/passenger-install-nginx-module +592 -592
- data/bin/passenger-memory-stats +127 -127
- data/bin/passenger-status +216 -216
- data/build/agents.rb +127 -127
- data/build/apache2.rb +87 -87
- data/build/basics.rb +60 -60
- data/build/common_library.rb +165 -165
- data/build/cplusplus_support.rb +51 -51
- data/build/cxx_tests.rb +268 -268
- data/build/debian.rb +143 -143
- data/build/documentation.rb +58 -58
- data/build/integration_tests.rb +81 -81
- data/build/misc.rb +132 -132
- data/build/nginx.rb +20 -20
- data/build/node_tests.rb +7 -7
- data/build/oxt_tests.rb +14 -14
- data/build/packaging.rb +570 -570
- data/build/preprocessor.rb +260 -260
- data/build/rake_extensions.rb +71 -71
- data/build/ruby_extension.rb +29 -29
- data/build/ruby_tests.rb +6 -6
- data/build/test_basics.rb +37 -37
- data/debian.template/control.template +3 -5
- data/dev/copy_boost_headers +134 -134
- data/dev/install_scripts_bootstrap_code.rb +25 -25
- data/dev/list_tests +20 -20
- data/dev/ruby_server.rb +223 -223
- data/dev/runner +18 -18
- data/doc/ServerOptimizationGuide.txt.md +55 -2
- data/doc/Users guide Nginx.txt +0 -26
- data/doc/Users guide Standalone.txt +5 -1
- data/doc/users_guide_snippets/tips.txt +9 -0
- data/ext/common/ApplicationPool2/Group.h +23 -11
- data/ext/common/ApplicationPool2/Implementation.cpp +32 -7
- data/ext/common/ApplicationPool2/Pool.h +22 -17
- data/ext/common/ApplicationPool2/SmartSpawner.h +4 -1
- data/ext/common/ApplicationPool2/Spawner.h +1 -1
- data/ext/common/Constants.h +1 -1
- data/ext/common/agents/Base.cpp +35 -20
- data/ext/common/agents/HelperAgent/Main.cpp +8 -1
- data/ext/common/agents/HelperAgent/OptionParser.h +18 -4
- data/ext/common/agents/HelperAgent/RequestHandler.h +2 -83
- data/ext/common/agents/HelperAgent/RequestHandler/ForwardResponse.cpp +54 -1
- data/ext/common/agents/HelperAgent/RequestHandler/InitRequest.cpp +7 -4
- data/ext/common/agents/Main.cpp +1 -1
- data/ext/common/agents/Watchdog/Main.cpp +54 -19
- data/ext/nginx/Configuration.c +7 -0
- data/ext/nginx/ContentHandler.c +9 -1
- data/helper-scripts/backtrace-sanitizer.rb +106 -87
- data/helper-scripts/crash-watch.rb +32 -0
- data/helper-scripts/download_binaries/extconf.rb +38 -38
- data/helper-scripts/meteor-loader.rb +107 -107
- data/helper-scripts/prespawn +101 -101
- data/helper-scripts/rack-loader.rb +96 -96
- data/helper-scripts/rack-preloader.rb +137 -137
- data/lib/phusion_passenger.rb +292 -292
- data/lib/phusion_passenger/abstract_installer.rb +438 -438
- data/lib/phusion_passenger/active_support3_extensions/init.rb +168 -170
- data/lib/phusion_passenger/admin_tools.rb +20 -20
- data/lib/phusion_passenger/admin_tools/instance.rb +178 -178
- data/lib/phusion_passenger/admin_tools/instance_registry.rb +61 -61
- data/lib/phusion_passenger/admin_tools/memory_stats.rb +267 -267
- data/lib/phusion_passenger/apache2/config_options.rb +182 -182
- data/lib/phusion_passenger/common_library.rb +479 -485
- data/lib/phusion_passenger/config/about_command.rb +161 -161
- data/lib/phusion_passenger/config/admin_command_command.rb +129 -129
- data/lib/phusion_passenger/config/agent_compiler.rb +121 -121
- data/lib/phusion_passenger/config/build_native_support_command.rb +43 -43
- data/lib/phusion_passenger/config/command.rb +25 -25
- data/lib/phusion_passenger/config/compile_agent_command.rb +62 -62
- data/lib/phusion_passenger/config/compile_nginx_engine_command.rb +88 -73
- data/lib/phusion_passenger/config/detach_process_command.rb +72 -72
- data/lib/phusion_passenger/config/download_agent_command.rb +246 -227
- data/lib/phusion_passenger/config/download_nginx_engine_command.rb +245 -224
- data/lib/phusion_passenger/config/install_agent_command.rb +144 -132
- data/lib/phusion_passenger/config/install_standalone_runtime_command.rb +205 -185
- data/lib/phusion_passenger/config/installation_utils.rb +204 -204
- data/lib/phusion_passenger/config/list_instances_command.rb +64 -64
- data/lib/phusion_passenger/config/main.rb +152 -152
- data/lib/phusion_passenger/config/nginx_engine_compiler.rb +319 -300
- data/lib/phusion_passenger/config/reopen_logs_command.rb +67 -67
- data/lib/phusion_passenger/config/restart_app_command.rb +155 -155
- data/lib/phusion_passenger/config/system_metrics_command.rb +13 -13
- data/lib/phusion_passenger/config/utils.rb +95 -95
- data/lib/phusion_passenger/config/validate_install_command.rb +198 -198
- data/lib/phusion_passenger/console_text_template.rb +25 -25
- data/lib/phusion_passenger/constants.rb +90 -90
- data/lib/phusion_passenger/debug_logging.rb +106 -106
- data/lib/phusion_passenger/loader_shared_helpers.rb +447 -432
- data/lib/phusion_passenger/message_channel.rb +312 -312
- data/lib/phusion_passenger/message_client.rb +176 -176
- data/lib/phusion_passenger/native_support.rb +369 -369
- data/lib/phusion_passenger/nginx/config_options.rb +297 -297
- data/lib/phusion_passenger/packaging.rb +131 -131
- data/lib/phusion_passenger/platform_info.rb +360 -360
- data/lib/phusion_passenger/platform_info/apache.rb +767 -767
- data/lib/phusion_passenger/platform_info/apache_detector.rb +199 -199
- data/lib/phusion_passenger/platform_info/binary_compatibility.rb +107 -107
- data/lib/phusion_passenger/platform_info/compiler.rb +570 -570
- data/lib/phusion_passenger/platform_info/curl.rb +32 -32
- data/lib/phusion_passenger/platform_info/cxx_portability.rb +188 -188
- data/lib/phusion_passenger/platform_info/depcheck.rb +372 -372
- data/lib/phusion_passenger/platform_info/depcheck_specs/apache2.rb +109 -109
- data/lib/phusion_passenger/platform_info/depcheck_specs/compiler_toolchain.rb +4 -4
- data/lib/phusion_passenger/platform_info/depcheck_specs/gems.rb +10 -34
- data/lib/phusion_passenger/platform_info/depcheck_specs/libs.rb +101 -101
- data/lib/phusion_passenger/platform_info/depcheck_specs/ruby.rb +5 -5
- data/lib/phusion_passenger/platform_info/depcheck_specs/utilities.rb +13 -13
- data/lib/phusion_passenger/platform_info/linux.rb +55 -55
- data/lib/phusion_passenger/platform_info/operating_system.rb +149 -149
- data/lib/phusion_passenger/platform_info/ruby.rb +468 -448
- data/lib/phusion_passenger/platform_info/zlib.rb +9 -9
- data/lib/phusion_passenger/plugin.rb +66 -66
- data/lib/phusion_passenger/preloader_shared_helpers.rb +126 -126
- data/lib/phusion_passenger/public_api.rb +191 -191
- data/lib/phusion_passenger/rack/out_of_band_gc.rb +93 -94
- data/lib/phusion_passenger/rack/thread_handler_extension.rb +231 -227
- data/lib/phusion_passenger/request_handler.rb +567 -577
- data/lib/phusion_passenger/request_handler/thread_handler.rb +379 -381
- data/lib/phusion_passenger/ruby_core_enhancements.rb +86 -86
- data/lib/phusion_passenger/ruby_core_io_enhancements.rb +74 -74
- data/lib/phusion_passenger/simple_benchmarking.rb +25 -25
- data/lib/phusion_passenger/standalone/app_finder.rb +153 -150
- data/lib/phusion_passenger/standalone/command.rb +44 -40
- data/lib/phusion_passenger/standalone/config_utils.rb +53 -53
- data/lib/phusion_passenger/standalone/control_utils.rb +38 -59
- data/lib/phusion_passenger/standalone/main.rb +73 -73
- data/lib/phusion_passenger/standalone/start_command.rb +697 -685
- data/lib/phusion_passenger/standalone/start_command/builtin_engine.rb +193 -155
- data/lib/phusion_passenger/standalone/start_command/nginx_engine.rb +162 -133
- data/lib/phusion_passenger/standalone/status_command.rb +64 -64
- data/lib/phusion_passenger/standalone/stop_command.rb +72 -72
- data/lib/phusion_passenger/standalone/version_command.rb +9 -9
- data/lib/phusion_passenger/union_station/connection.rb +32 -32
- data/lib/phusion_passenger/union_station/core.rb +251 -251
- data/lib/phusion_passenger/union_station/transaction.rb +126 -126
- data/lib/phusion_passenger/utils.rb +199 -167
- data/lib/phusion_passenger/utils/ansi_colors.rb +128 -128
- data/lib/phusion_passenger/utils/download.rb +196 -196
- data/lib/phusion_passenger/utils/file_system_watcher.rb +158 -158
- data/lib/phusion_passenger/utils/hosts_file_parser.rb +101 -101
- data/lib/phusion_passenger/utils/lock.rb +31 -31
- data/lib/phusion_passenger/utils/native_support_utils.rb +31 -31
- data/lib/phusion_passenger/utils/progress_bar.rb +26 -26
- data/lib/phusion_passenger/utils/shellwords.rb +20 -20
- data/lib/phusion_passenger/utils/terminal_choice_menu.rb +206 -206
- data/lib/phusion_passenger/utils/unseekable_socket.rb +272 -272
- data/lib/phusion_passenger/vendor/crash_watch/app.rb +129 -0
- data/lib/phusion_passenger/vendor/crash_watch/gdb_controller.rb +341 -0
- data/lib/phusion_passenger/vendor/crash_watch/version.rb +24 -0
- data/lib/phusion_passenger/vendor/daemon_controller.rb +877 -0
- data/lib/phusion_passenger/vendor/daemon_controller/lock_file.rb +127 -0
- data/lib/phusion_passenger/vendor/daemon_controller/spawn.rb +26 -0
- data/lib/phusion_passenger/vendor/daemon_controller/version.rb +29 -0
- data/packaging/rpm/passenger_spec/passenger.spec.template +0 -1
- data/passenger.gemspec +0 -1
- data/resources/templates/config/nginx_engine_compiler/possible_solutions_for_download_and_extraction_problems.txt.erb +27 -0
- data/resources/templates/standalone/config.erb +19 -15
- data/test/integration_tests/apache2_tests.rb +566 -566
- data/test/integration_tests/downloaded_binaries_tests.rb +126 -125
- data/test/integration_tests/native_packaging_spec.rb +296 -296
- data/test/integration_tests/nginx_tests.rb +393 -393
- data/test/integration_tests/shared/example_webapp_tests.rb +282 -280
- data/test/integration_tests/source_packaging_test.rb +138 -138
- data/test/integration_tests/spec_helper.rb +5 -5
- data/test/integration_tests/standalone_tests.rb +367 -367
- data/test/ruby/debug_logging_spec.rb +133 -133
- data/test/ruby/message_channel_spec.rb +186 -186
- data/test/ruby/rack/loader_spec.rb +28 -28
- data/test/ruby/rack/preloader_spec.rb +34 -34
- data/test/ruby/rails3.0/loader_spec.rb +12 -12
- data/test/ruby/rails3.0/preloader_spec.rb +18 -18
- data/test/ruby/rails3.1/loader_spec.rb +12 -12
- data/test/ruby/rails3.1/preloader_spec.rb +18 -18
- data/test/ruby/rails3.2/loader_spec.rb +12 -12
- data/test/ruby/rails3.2/preloader_spec.rb +18 -18
- data/test/ruby/rails4.0/loader_spec.rb +12 -12
- data/test/ruby/rails4.0/preloader_spec.rb +18 -18
- data/test/ruby/rails4.1/loader_spec.rb +12 -12
- data/test/ruby/rails4.1/preloader_spec.rb +18 -18
- data/test/ruby/request_handler_spec.rb +730 -730
- data/test/ruby/shared/loader_sharedspec.rb +224 -224
- data/test/ruby/shared/rails/union_station_extensions_sharedspec.rb +327 -327
- data/test/ruby/shared/ruby_loader_sharedspec.rb +47 -47
- data/test/ruby/spec_helper.rb +65 -65
- data/test/ruby/standalone/runtime_installer_spec.rb +384 -384
- data/test/ruby/union_station_spec.rb +276 -276
- data/test/ruby/utils/file_system_watcher_spec.rb +220 -220
- data/test/ruby/utils/hosts_file_parser.rb +248 -248
- data/test/ruby/utils/tee_input_spec.rb +215 -215
- data/test/ruby/utils/unseekable_socket_spec.rb +57 -57
- data/test/ruby/utils_spec.rb +21 -21
- data/test/stub/rack/config.ru +87 -87
- data/test/stub/rack/library.rb +8 -8
- data/test/stub/rack/start.rb +30 -30
- data/test/support/apache2_controller.rb +191 -191
- data/test/support/nginx_controller.rb +90 -99
- data/test/support/placebo-preloader.rb +57 -57
- data/test/support/test_helper.rb +435 -435
- metadata +11 -21
- metadata.gz.asc +7 -7
- data/lib/phusion_passenger/standalone/command2.rb +0 -292
- data/lib/phusion_passenger/standalone/start2_command.rb +0 -799
- data/resources/templates/standalone/download_tool_missing.txt.erb +0 -18
- data/resources/templates/standalone/possible_solutions_for_download_and_extraction_problems.txt.erb +0 -17
- data/resources/templates/standalone/run_installer_as_root.txt.erb +0 -8
data/build/preprocessor.rb
CHANGED
@@ -55,287 +55,287 @@
|
|
55
55
|
# * Text inside #if/#elif/#else are automatically unindented.
|
56
56
|
# * ERB compatible.
|
57
57
|
class Preprocessor
|
58
|
-
|
59
|
-
|
60
|
-
|
61
|
-
|
62
|
-
|
58
|
+
def initialize
|
59
|
+
require 'erb' if !defined?(ERB)
|
60
|
+
@indentation_size = 4
|
61
|
+
@debug = boolean_option('DEBUG')
|
62
|
+
end
|
63
63
|
|
64
|
-
|
65
|
-
|
66
|
-
|
67
|
-
|
68
|
-
|
69
|
-
|
70
|
-
|
71
|
-
|
72
|
-
|
73
|
-
|
74
|
-
|
75
|
-
|
64
|
+
def start(filename, output_filename, variables = {})
|
65
|
+
if output_filename
|
66
|
+
temp_output_filename = "#{output_filename}._new"
|
67
|
+
output = File.open(temp_output_filename, 'w')
|
68
|
+
else
|
69
|
+
output = STDOUT
|
70
|
+
end
|
71
|
+
the_binding = create_binding(variables)
|
72
|
+
context = []
|
73
|
+
@filename = filename
|
74
|
+
@lineno = 1
|
75
|
+
@indentation = 0
|
76
76
|
|
77
|
-
|
78
|
-
|
77
|
+
each_line(filename, the_binding) do |line|
|
78
|
+
debug("context=#{context.inspect}, line=#{line.inspect}")
|
79
79
|
|
80
|
-
|
81
|
-
|
82
|
-
|
83
|
-
|
84
|
-
|
85
|
-
|
86
|
-
|
87
|
-
|
88
|
-
|
89
|
-
|
90
|
-
|
91
|
-
|
92
|
-
|
93
|
-
|
94
|
-
|
95
|
-
|
96
|
-
|
97
|
-
|
98
|
-
|
99
|
-
|
100
|
-
|
101
|
-
|
102
|
-
|
103
|
-
|
104
|
-
|
105
|
-
|
106
|
-
|
107
|
-
|
108
|
-
|
109
|
-
|
110
|
-
|
111
|
-
|
112
|
-
|
113
|
-
|
114
|
-
|
115
|
-
|
116
|
-
|
117
|
-
|
118
|
-
|
119
|
-
|
120
|
-
|
121
|
-
|
122
|
-
|
123
|
-
|
124
|
-
|
125
|
-
|
126
|
-
|
127
|
-
|
128
|
-
|
129
|
-
|
130
|
-
|
131
|
-
|
132
|
-
|
133
|
-
|
134
|
-
|
135
|
-
|
136
|
-
|
137
|
-
|
138
|
-
|
139
|
-
|
140
|
-
|
141
|
-
|
142
|
-
|
143
|
-
|
144
|
-
|
145
|
-
|
146
|
-
|
147
|
-
|
148
|
-
|
149
|
-
|
150
|
-
|
151
|
-
|
152
|
-
|
153
|
-
|
154
|
-
|
155
|
-
|
156
|
-
|
157
|
-
|
158
|
-
|
159
|
-
|
160
|
-
|
161
|
-
|
80
|
+
name, args_string, cmd_indentation = recognize_command(line)
|
81
|
+
case name
|
82
|
+
when "if"
|
83
|
+
case context.last
|
84
|
+
when nil, :if_true, :else_true
|
85
|
+
check_indentation(cmd_indentation)
|
86
|
+
result = the_binding.eval(args_string, filename, @lineno)
|
87
|
+
context.push(result ? :if_true : :if_false)
|
88
|
+
inc_indentation
|
89
|
+
when :if_false, :else_false, :if_ignore
|
90
|
+
check_indentation(cmd_indentation)
|
91
|
+
inc_indentation
|
92
|
+
context.push(:if_ignore)
|
93
|
+
else
|
94
|
+
terminate "#if is not allowed in this context"
|
95
|
+
end
|
96
|
+
when "elif"
|
97
|
+
case context.last
|
98
|
+
when :if_true
|
99
|
+
dec_indentation
|
100
|
+
check_indentation(cmd_indentation)
|
101
|
+
inc_indentation
|
102
|
+
context[-1] = :if_false
|
103
|
+
when :if_false
|
104
|
+
dec_indentation
|
105
|
+
check_indentation(cmd_indentation)
|
106
|
+
inc_indentation
|
107
|
+
result = the_binding.eval(args_string, filename, @lineno)
|
108
|
+
context[-1] = result ? :if_true : :if_false
|
109
|
+
when :else_true, :else_false
|
110
|
+
terminate "#elif is not allowed after #else"
|
111
|
+
when :if_ignore
|
112
|
+
dec_indentation
|
113
|
+
check_indentation(cmd_indentation)
|
114
|
+
inc_indentation
|
115
|
+
else
|
116
|
+
terminate "#elif is not allowed outside #if block"
|
117
|
+
end
|
118
|
+
when "else"
|
119
|
+
case context.last
|
120
|
+
when :if_true
|
121
|
+
dec_indentation
|
122
|
+
check_indentation(cmd_indentation)
|
123
|
+
inc_indentation
|
124
|
+
context[-1] = :else_false
|
125
|
+
when :if_false
|
126
|
+
dec_indentation
|
127
|
+
check_indentation(cmd_indentation)
|
128
|
+
inc_indentation
|
129
|
+
context[-1] = :else_true
|
130
|
+
when :else_true, :else_false
|
131
|
+
terminate "it is not allowed to have multiple #else clauses in one #if block"
|
132
|
+
when :if_ignore
|
133
|
+
dec_indentation
|
134
|
+
check_indentation(cmd_indentation)
|
135
|
+
inc_indentation
|
136
|
+
else
|
137
|
+
terminate "#else is not allowed outside #if block"
|
138
|
+
end
|
139
|
+
when "endif"
|
140
|
+
case context.last
|
141
|
+
when :if_true, :if_false, :else_true, :else_false, :if_ignore
|
142
|
+
dec_indentation
|
143
|
+
check_indentation(cmd_indentation)
|
144
|
+
context.pop
|
145
|
+
else
|
146
|
+
terminate "#endif is not allowed outside #if block"
|
147
|
+
end
|
148
|
+
when "DEBHELPER"
|
149
|
+
output.puts(line)
|
150
|
+
when "", nil
|
151
|
+
# Either a comment or not a preprocessor command.
|
152
|
+
case context.last
|
153
|
+
when nil, :if_true, :else_true
|
154
|
+
output.puts(unindent(line))
|
155
|
+
else
|
156
|
+
# Check indentation but do not output.
|
157
|
+
unindent(line)
|
158
|
+
end
|
159
|
+
else
|
160
|
+
terminate "Unrecognized preprocessor command ##{name.inspect}"
|
161
|
+
end
|
162
162
|
|
163
|
-
|
164
|
-
|
165
|
-
|
166
|
-
|
167
|
-
|
168
|
-
|
169
|
-
|
170
|
-
|
171
|
-
|
172
|
-
|
173
|
-
|
163
|
+
@lineno += 1
|
164
|
+
end
|
165
|
+
ensure
|
166
|
+
if output_filename && output
|
167
|
+
output.close
|
168
|
+
stat = File.stat(filename)
|
169
|
+
File.chmod(stat.mode, temp_output_filename)
|
170
|
+
File.chown(stat.uid, stat.gid, temp_output_filename) rescue nil
|
171
|
+
File.rename(temp_output_filename, output_filename)
|
172
|
+
end
|
173
|
+
end
|
174
174
|
|
175
175
|
private
|
176
|
-
|
177
|
-
|
178
|
-
|
179
|
-
|
180
|
-
|
181
|
-
|
182
|
-
|
183
|
-
|
184
|
-
|
185
|
-
|
186
|
-
|
187
|
-
|
188
|
-
|
189
|
-
|
190
|
-
|
191
|
-
|
192
|
-
|
193
|
-
|
194
|
-
|
195
|
-
|
196
|
-
|
197
|
-
|
198
|
-
|
199
|
-
|
176
|
+
UBUNTU_DISTRIBUTIONS = {
|
177
|
+
"lucid" => "10.04",
|
178
|
+
"maverick" => "10.10",
|
179
|
+
"natty" => "11.04",
|
180
|
+
"oneiric" => "11.10",
|
181
|
+
"precise" => "12.04",
|
182
|
+
"quantal" => "12.10",
|
183
|
+
"raring" => "13.04",
|
184
|
+
"saucy" => "13.10",
|
185
|
+
"trusty" => "14.04",
|
186
|
+
"utopic" => "14.10",
|
187
|
+
"vivid" => "15.05"
|
188
|
+
}
|
189
|
+
DEBIAN_DISTRIBUTIONS = {
|
190
|
+
"squeeze" => "20110206",
|
191
|
+
"wheezy" => "20130504",
|
192
|
+
"jessie" => "20140000"
|
193
|
+
}
|
194
|
+
REDHAT_ENTERPRISE_DISTRIBUTIONS = {
|
195
|
+
"el6" => "el6.0"
|
196
|
+
}
|
197
|
+
AMAZON_DISTRIBUTIONS = {
|
198
|
+
"amazon" => "amazon"
|
199
|
+
}
|
200
200
|
|
201
|
-
|
202
|
-
|
203
|
-
|
204
|
-
|
205
|
-
|
206
|
-
|
207
|
-
|
208
|
-
|
209
|
-
|
210
|
-
|
211
|
-
|
212
|
-
|
213
|
-
|
201
|
+
# Provides the DSL that's accessible within.
|
202
|
+
class Evaluator
|
203
|
+
def _infer_distro_table(name)
|
204
|
+
if UBUNTU_DISTRIBUTIONS.has_key?(name)
|
205
|
+
return UBUNTU_DISTRIBUTIONS
|
206
|
+
elsif DEBIAN_DISTRIBUTIONS.has_key?(name)
|
207
|
+
return DEBIAN_DISTRIBUTIONS
|
208
|
+
elsif REDHAT_ENTERPRISE_DISTRIBUTIONS.has_key?(name)
|
209
|
+
return REDHAT_ENTERPRISE_DISTRIBUTIONS
|
210
|
+
elsif AMAZON_DISTRIBUTIONS.has_key?(name)
|
211
|
+
return AMAZON_DISTRIBUTIONS
|
212
|
+
end
|
213
|
+
end
|
214
214
|
|
215
|
-
|
216
|
-
|
217
|
-
|
218
|
-
|
219
|
-
|
220
|
-
|
221
|
-
|
222
|
-
|
223
|
-
|
224
|
-
|
215
|
+
def is_distribution?(expr)
|
216
|
+
if @distribution.nil?
|
217
|
+
raise "The :distribution variable must be set"
|
218
|
+
else
|
219
|
+
if expr =~ /^(>=|>|<=|<|==|\!=)[\s]*(.+)/
|
220
|
+
comparator = $1
|
221
|
+
name = $2
|
222
|
+
else
|
223
|
+
raise "Invalid expression #{expr.inspect}"
|
224
|
+
end
|
225
225
|
|
226
|
-
|
227
|
-
|
228
|
-
|
229
|
-
|
230
|
-
|
231
|
-
|
232
|
-
|
226
|
+
table1 = _infer_distro_table(@distribution)
|
227
|
+
table2 = _infer_distro_table(name)
|
228
|
+
raise "Distribution name #{@distribution.inspect} not recognized" if !table1
|
229
|
+
raise "Distribution name #{name.inspect} not recognized" if !table2
|
230
|
+
return false if table1 != table2
|
231
|
+
v1 = table1[@distribution]
|
232
|
+
v2 = table2[name]
|
233
233
|
|
234
|
-
|
235
|
-
|
236
|
-
|
237
|
-
|
238
|
-
|
239
|
-
|
240
|
-
|
241
|
-
|
242
|
-
|
243
|
-
|
244
|
-
|
245
|
-
|
246
|
-
|
247
|
-
|
248
|
-
|
249
|
-
|
250
|
-
|
251
|
-
|
252
|
-
|
234
|
+
case comparator
|
235
|
+
when ">"
|
236
|
+
return v1 > v2
|
237
|
+
when ">="
|
238
|
+
return v1 >= v2
|
239
|
+
when "<"
|
240
|
+
return v1 < v2
|
241
|
+
when "<="
|
242
|
+
return v1 <= v2
|
243
|
+
when "=="
|
244
|
+
return v1 == v2
|
245
|
+
when "!="
|
246
|
+
return v1 != v2
|
247
|
+
else
|
248
|
+
raise "BUG"
|
249
|
+
end
|
250
|
+
end
|
251
|
+
end
|
252
|
+
end
|
253
253
|
|
254
|
-
|
255
|
-
|
256
|
-
|
257
|
-
|
258
|
-
|
259
|
-
|
260
|
-
|
261
|
-
|
262
|
-
|
263
|
-
|
254
|
+
def each_line(filename, the_binding)
|
255
|
+
data = File.open(filename, 'r') do |f|
|
256
|
+
erb = ERB.new(f.read, nil, "-")
|
257
|
+
erb.filename = filename
|
258
|
+
erb.result(the_binding)
|
259
|
+
end
|
260
|
+
data.each_line do |line|
|
261
|
+
yield line.chomp
|
262
|
+
end
|
263
|
+
end
|
264
264
|
|
265
|
-
|
266
|
-
|
267
|
-
|
268
|
-
|
265
|
+
def recognize_command(line)
|
266
|
+
if line =~ /^([\s\t]*)#(.+)/
|
267
|
+
indentation_str = $1
|
268
|
+
command = $2
|
269
269
|
|
270
|
-
|
271
|
-
|
272
|
-
|
270
|
+
# Declare tabs as equivalent to 4 spaces. This is necessary for
|
271
|
+
# Makefiles in which the use of tabs is required.
|
272
|
+
indentation_str.gsub!("\t", " ")
|
273
273
|
|
274
|
-
|
275
|
-
|
276
|
-
|
274
|
+
name = command.scan(/^\w+/).first
|
275
|
+
# Ignore shebangs and comments.
|
276
|
+
return if name.nil?
|
277
277
|
|
278
|
-
|
279
|
-
|
280
|
-
|
281
|
-
|
282
|
-
|
283
|
-
|
278
|
+
args_string = command.sub(/^#{Regexp.escape(name)}[\s\t]*/, '')
|
279
|
+
return [name, args_string, indentation_str.to_s.size]
|
280
|
+
else
|
281
|
+
return nil
|
282
|
+
end
|
283
|
+
end
|
284
284
|
|
285
|
-
|
286
|
-
|
287
|
-
|
288
|
-
|
289
|
-
|
290
|
-
|
291
|
-
|
292
|
-
|
293
|
-
|
285
|
+
def create_binding(variables)
|
286
|
+
object = Evaluator.new
|
287
|
+
variables.each_pair do |key, val|
|
288
|
+
object.send(:instance_variable_set, "@#{key}", val)
|
289
|
+
end
|
290
|
+
return object.instance_eval do
|
291
|
+
binding
|
292
|
+
end
|
293
|
+
end
|
294
294
|
|
295
|
-
|
296
|
-
|
297
|
-
|
295
|
+
def inc_indentation
|
296
|
+
@indentation += @indentation_size
|
297
|
+
end
|
298
298
|
|
299
|
-
|
300
|
-
|
301
|
-
|
299
|
+
def dec_indentation
|
300
|
+
@indentation -= @indentation_size
|
301
|
+
end
|
302
302
|
|
303
|
-
|
304
|
-
|
305
|
-
|
306
|
-
|
307
|
-
|
303
|
+
def check_indentation(expected)
|
304
|
+
if expected != @indentation
|
305
|
+
terminate "wrong indentation: found #{expected} characters, should be #{@indentation}"
|
306
|
+
end
|
307
|
+
end
|
308
308
|
|
309
|
-
|
310
|
-
|
311
|
-
|
312
|
-
|
313
|
-
|
309
|
+
def unindent(line)
|
310
|
+
line =~ /^([\s\t]*)/
|
311
|
+
# Declare tabs as equivalent to 4 spaces. This is necessary for
|
312
|
+
# Makefiles in which the use of tabs is required.
|
313
|
+
found = $1.to_s.gsub("\t", " ").size
|
314
314
|
|
315
|
-
|
316
|
-
|
317
|
-
|
318
|
-
|
319
|
-
|
320
|
-
|
321
|
-
|
322
|
-
|
323
|
-
|
324
|
-
|
325
|
-
|
326
|
-
|
327
|
-
|
328
|
-
|
329
|
-
|
330
|
-
|
331
|
-
|
332
|
-
|
315
|
+
if found >= @indentation
|
316
|
+
# Tab-friendly way to remove indentation.
|
317
|
+
remaining = @indentation
|
318
|
+
line = line.dup
|
319
|
+
while remaining > 0
|
320
|
+
if line[0..0] == " "
|
321
|
+
remaining -= 1
|
322
|
+
else
|
323
|
+
# This is a tab.
|
324
|
+
remaining -= 4
|
325
|
+
end
|
326
|
+
line.slice!(0, 1)
|
327
|
+
end
|
328
|
+
return line
|
329
|
+
else
|
330
|
+
terminate "wrong indentation: found #{found} characters, should be at least #{@indentation}"
|
331
|
+
end
|
332
|
+
end
|
333
333
|
|
334
|
-
|
335
|
-
|
336
|
-
|
334
|
+
def debug(message)
|
335
|
+
puts "DEBUG:#{@lineno}: #{message}" if @debug
|
336
|
+
end
|
337
337
|
|
338
|
-
|
339
|
-
|
340
|
-
|
338
|
+
def terminate(message)
|
339
|
+
abort "*** ERROR: #{@filename} line #{@lineno}: #{message}"
|
340
|
+
end
|
341
341
|
end
|