fairchild-poolparty 1.1.4 → 1.1.5
Sign up to get free protection for your applications and to get access to all the features.
- data/README.txt +0 -12
- data/Rakefile +17 -1
- data/VERSION.yml +1 -1
- data/bin/cloud +20 -1
- data/bin/cloud-bootstrap +14 -4
- data/bin/cloud-configure +26 -9
- data/bin/cloud-contract +7 -7
- data/bin/cloud-describe +28 -0
- data/bin/cloud-expand +13 -6
- data/bin/cloud-list +3 -5
- data/bin/cloud-osxcopy +1 -1
- data/bin/cloud-provision +1 -1
- data/bin/cloud-show +6 -5
- data/bin/cloud-ssh +1 -3
- data/bin/cloud-start +8 -6
- data/bin/cloud-terminate +9 -7
- data/bin/server-cloud-elections +29 -18
- data/bin/server-ensure-provisioning +24 -29
- data/bin/server-list-active +10 -5
- data/bin/server-monitor.ru +18 -1
- data/bin/server-update-hosts +3 -3
- data/bin/server-write-new-nodes +1 -1
- data/config/jeweler.rb +12 -3
- data/lib/poolparty/aska/aska.rb +1 -12
- data/lib/poolparty/base_packages/haproxy.rb +26 -18
- data/lib/poolparty/base_packages/poolparty.rb +1 -1
- data/lib/poolparty/capistrano.rb +1 -1
- data/lib/poolparty/core/array.rb +12 -0
- data/lib/poolparty/core/hash.rb +12 -5
- data/lib/poolparty/core/nil.rb +8 -0
- data/lib/poolparty/core/object.rb +15 -5
- data/lib/poolparty/core/string.rb +28 -2
- data/lib/poolparty/dependency_resolver/chef_resolver.rb +106 -79
- data/lib/poolparty/dependency_resolver/dependency_resolver.rb +1 -1
- data/lib/poolparty/dependency_resolver/dependency_resolver_cloud_extensions.rb +5 -4
- data/lib/poolparty/dependency_resolver/puppet_resolver.rb +44 -17
- data/lib/poolparty/helpers/console.rb +1 -1
- data/lib/poolparty/helpers/optioner.rb +9 -2
- data/lib/poolparty/lite.rb +12 -2
- data/lib/poolparty/modules/callbacks.rb +44 -0
- data/lib/poolparty/modules/cloud_dsl.rb +17 -11
- data/lib/poolparty/modules/cloud_resourcer.rb +29 -21
- data/lib/poolparty/modules/definable_resource.rb +1 -1
- data/lib/poolparty/modules/pinger.rb +28 -0
- data/lib/poolparty/modules/resourcing_dsl.rb +7 -3
- data/lib/poolparty/modules/thread_pool.rb +107 -106
- data/lib/poolparty/modules/user_helpers.rb +20 -0
- data/lib/poolparty/monitors/base_monitor.rb +32 -81
- data/lib/poolparty/monitors/monitor_rack.rb +60 -69
- data/lib/poolparty/monitors/monitors/favicon_monitor.rb +12 -0
- data/lib/poolparty/monitors/monitors/load_monitor.rb +9 -15
- data/lib/poolparty/monitors/monitors/memory_monitor.rb +48 -48
- data/lib/poolparty/monitors/monitors/neighborhood_monitor.rb +77 -0
- data/lib/poolparty/monitors/{stats_monitor.rb → monitors/stats_monitor.rb} +29 -24
- data/lib/poolparty/monitors/monitors/time_monitor.rb +15 -0
- data/lib/poolparty/net/messenger.rb +2 -0
- data/lib/poolparty/net/remoter/cloud_control.rb +177 -227
- data/lib/poolparty/net/remoter/connections.rb +10 -18
- data/lib/poolparty/net/remoter/interactive.rb +24 -90
- data/lib/poolparty/net/remoter_base.rb +98 -25
- data/lib/poolparty/net/remoter_bases/ec2/ec2.rb +83 -66
- data/lib/poolparty/net/remoter_bases/vmrun/utilities/vm_disk.rb +12 -0
- data/lib/poolparty/net/remoter_bases/vmrun/utilities/vmx.rb +33 -0
- data/lib/poolparty/net/remoter_bases/vmrun/utilities/vmx_file.rb +117 -0
- data/lib/poolparty/net/remoter_bases/vmrun/vmrun.rb +165 -0
- data/lib/poolparty/net/remoter_bases/vmrun/vmrun_instance.rb +71 -0
- data/lib/poolparty/{base_packages → plugins}/bind.rb +1 -1
- data/lib/poolparty/plugins/chef.rb +71 -71
- data/lib/poolparty/plugins/chef_deploy.rb +58 -0
- data/lib/poolparty/plugins/{deploydirectory.rb → deploy_directory.rb} +12 -3
- data/lib/poolparty/plugins/dynomite.rb +14 -0
- data/lib/poolparty/plugins/gem_package.rb +37 -0
- data/lib/poolparty/plugins/line_in_file.rb +1 -0
- data/lib/poolparty/plugins/nanite.rb +41 -0
- data/lib/poolparty/{base_packages → plugins}/tokyo_tyrant.rb +1 -1
- data/lib/poolparty/poolparty/cloud.rb +36 -35
- data/lib/poolparty/poolparty/default.rb +2 -11
- data/lib/poolparty/poolparty/key.rb +15 -12
- data/lib/poolparty/poolparty/neighborhoods.rb +54 -21
- data/lib/poolparty/poolparty/plugin.rb +6 -9
- data/lib/poolparty/poolparty/plugin_model.rb +5 -5
- data/lib/poolparty/poolparty/pool.rb +8 -4
- data/lib/poolparty/poolparty/poolparty_base_class.rb +20 -11
- data/lib/poolparty/poolparty/resource.rb +9 -5
- data/lib/poolparty/poolparty/service.rb +3 -1
- data/lib/poolparty/provision/boot_strapper.rb +47 -24
- data/lib/poolparty/provision/configurations/chef.rb +7 -4
- data/lib/poolparty/provision/dr_configure.rb +80 -25
- data/lib/poolparty/resources/cron.rb +8 -0
- data/lib/poolparty/resources/directory.rb +1 -1
- data/lib/poolparty/resources/file.rb +16 -0
- data/lib/poolparty/resources/package.rb +7 -2
- data/lib/poolparty/resources/service.rb +4 -3
- data/lib/poolparty/resources/symlink.rb +0 -8
- data/lib/poolparty/schema.rb +35 -20
- data/lib/poolparty/templates/haproxy.conf +27 -25
- data/lib/poolparty/templates/monitor.ru +3 -3
- data/lib/poolparty/verification/verifier_base.rb +17 -0
- data/lib/poolparty/verification/verifiers/ping.rb +17 -0
- data/lib/poolparty/verification/verify.rb +74 -0
- data/lib/poolparty.rb +8 -9
- data/lib/poolpartycl.rb +14 -0
- data/spec/bin/server-list-active_spec.rb +2 -0
- data/spec/poolparty/base_packages/haproxy_spec.rb +1 -1
- data/spec/poolparty/core/array_spec.rb +3 -1
- data/spec/poolparty/core/ordered_hash_spec.rb +2 -2
- data/spec/poolparty/dependency_resolver/chef_resolver_spec.rb +9 -15
- data/spec/poolparty/dependency_resolver/dependency_resolver_cloud_extensions_spec.rb +6 -6
- data/spec/poolparty/dependency_resolver/puppet_resolver_spec.rb +121 -124
- data/spec/poolparty/net/remote_spec.rb +287 -286
- data/spec/poolparty/net/remoter_bases/ec2_mocks_and_stubs.rb +1 -1
- data/spec/poolparty/net/remoter_bases/ec2_remote_instance_spec.rb +7 -8
- data/spec/poolparty/net/remoter_bases/ec2_spec.rb +22 -7
- data/spec/poolparty/net/remoter_spec.rb +48 -45
- data/spec/poolparty/poolparty/cloud_spec.rb +15 -22
- data/spec/poolparty/poolparty/key_spec.rb +4 -4
- data/spec/poolparty/poolparty/neighborhoods_spec.rb +1 -2
- data/spec/poolparty/poolparty/plugin_spec.rb +2 -2
- data/spec/poolparty/poolparty/resource_spec.rb +4 -5
- data/spec/poolparty/poolparty_base_class_spec.rb +82 -78
- data/spec/poolparty/resources/package_spec.rb +0 -3
- data/spec/poolparty/spec_helper.rb +4 -4
- data/tasks/development.rake +9 -0
- data/test/poolparty/core/array_test.rb +21 -0
- data/test/poolparty/core/hash_test.rb +14 -1
- data/test/poolparty/core/string_test.rb +29 -0
- data/test/poolparty/dependency_resolver/puppet_resolver_test.rb +106 -0
- data/test/poolparty/modules/callbacks_test.rb +40 -0
- data/test/poolparty/modules/cloud_dsl_test.rb +25 -0
- data/test/poolparty/net/remoter_bases/vmrun/vmrun_test.rb +50 -0
- data/test/poolparty/net/remoter_test.rb +14 -0
- data/test/poolparty/poolparty/neighborhood_test.rb +23 -0
- data/test/poolparty/poolparty/poolparty_base_class_test.rb +84 -0
- data/test/poolparty/verification/verify_test.rb +49 -0
- data/test/test_helper.rb +4 -1
- data/test/test_poolparty.rb +6 -5
- data/vendor/chef/apache2/attributes/apache.rb +1 -1
- data/vendor/chef/apache2/templates/default/default-site.erb +1 -1
- data/vendor/chef/chef-deploy/LICENSE +201 -0
- data/vendor/chef/chef-deploy/README.rdoc +24 -0
- data/vendor/chef/chef-deploy/Rakefile +57 -0
- data/vendor/chef/chef-deploy/TODO +4 -0
- data/vendor/chef/chef-deploy/lib/chef-deploy/cached_deploy.rb +230 -0
- data/vendor/chef/chef-deploy/lib/chef-deploy/git.rb +132 -0
- data/vendor/chef/chef-deploy/lib/chef-deploy/subversion.rb +98 -0
- data/vendor/chef/chef-deploy/lib/chef-deploy.rb +183 -0
- metadata +57 -252
- data/bin/cloud-run +0 -18
- data/bin/cloud-stats +0 -17
- data/bin/ec2-list-active +0 -24
- data/bin/pool +0 -31
- data/bin/pool-describe +0 -8
- data/bin/pool-generate +0 -18
- data/bin/pool-init +0 -28
- data/bin/pool-list +0 -30
- data/bin/pool-start +0 -26
- data/bin/server-list-instances +0 -15
- data/lib/erlang/messenger/Emakefile +0 -1
- data/lib/erlang/messenger/Makefile +0 -15
- data/lib/erlang/messenger/README +0 -5
- data/lib/erlang/messenger/Rakefile +0 -72
- data/lib/erlang/messenger/control +0 -11
- data/lib/erlang/messenger/ebin/client.app +0 -19
- data/lib/erlang/messenger/ebin/master.app +0 -19
- data/lib/erlang/messenger/ebin/node.app +0 -19
- data/lib/erlang/messenger/ebin/packager.app +0 -19
- data/lib/erlang/messenger/ebin/pm_client_rel-0.1.rel +0 -1
- data/lib/erlang/messenger/ebin/pm_master_rel-0.1.rel +0 -1
- data/lib/erlang/messenger/ebin/pm_node_rel-0.1.rel +0 -1
- data/lib/erlang/messenger/include/defines.hrl +0 -27
- data/lib/erlang/messenger/lib/eunit/AUTHORS +0 -2
- data/lib/erlang/messenger/lib/eunit/CHANGELOG +0 -14
- data/lib/erlang/messenger/lib/eunit/COPYING +0 -504
- data/lib/erlang/messenger/lib/eunit/Makefile +0 -28
- data/lib/erlang/messenger/lib/eunit/NOTES +0 -276
- data/lib/erlang/messenger/lib/eunit/README +0 -3
- data/lib/erlang/messenger/lib/eunit/doc/edoc-info +0 -3
- data/lib/erlang/messenger/lib/eunit/doc/erlang.png +0 -0
- data/lib/erlang/messenger/lib/eunit/doc/eunit.html +0 -172
- data/lib/erlang/messenger/lib/eunit/doc/index.html +0 -17
- data/lib/erlang/messenger/lib/eunit/doc/modules-frame.html +0 -12
- data/lib/erlang/messenger/lib/eunit/doc/overview-summary.html +0 -984
- data/lib/erlang/messenger/lib/eunit/doc/overview.edoc +0 -980
- data/lib/erlang/messenger/lib/eunit/doc/packages-frame.html +0 -11
- data/lib/erlang/messenger/lib/eunit/doc/stylesheet.css +0 -55
- data/lib/erlang/messenger/lib/eunit/ebin/autoload.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/code_monitor.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit.app +0 -21
- data/lib/erlang/messenger/lib/eunit/ebin/eunit.appup +0 -1
- data/lib/erlang/messenger/lib/eunit/ebin/eunit.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_autoexport.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_data.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_lib.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_proc.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_serial.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_server.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_striptests.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_test.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_tests.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/eunit_tty.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/ebin/file_monitor.beam +0 -0
- data/lib/erlang/messenger/lib/eunit/examples/eunit_examples.erl +0 -339
- data/lib/erlang/messenger/lib/eunit/examples/fib.erl +0 -19
- data/lib/erlang/messenger/lib/eunit/examples/tests.txt +0 -1
- data/lib/erlang/messenger/lib/eunit/include/eunit.hrl +0 -313
- data/lib/erlang/messenger/lib/eunit/src/Makefile +0 -46
- data/lib/erlang/messenger/lib/eunit/src/autoload.erl +0 -388
- data/lib/erlang/messenger/lib/eunit/src/code_monitor.erl +0 -243
- data/lib/erlang/messenger/lib/eunit/src/eunit.app.src +0 -21
- data/lib/erlang/messenger/lib/eunit/src/eunit.appup.src +0 -1
- data/lib/erlang/messenger/lib/eunit/src/eunit.erl +0 -196
- data/lib/erlang/messenger/lib/eunit/src/eunit_autoexport.erl +0 -102
- data/lib/erlang/messenger/lib/eunit/src/eunit_data.erl +0 -798
- data/lib/erlang/messenger/lib/eunit/src/eunit_internal.hrl +0 -48
- data/lib/erlang/messenger/lib/eunit/src/eunit_lib.erl +0 -682
- data/lib/erlang/messenger/lib/eunit/src/eunit_proc.erl +0 -552
- data/lib/erlang/messenger/lib/eunit/src/eunit_serial.erl +0 -157
- data/lib/erlang/messenger/lib/eunit/src/eunit_server.erl +0 -340
- data/lib/erlang/messenger/lib/eunit/src/eunit_striptests.erl +0 -64
- data/lib/erlang/messenger/lib/eunit/src/eunit_test.erl +0 -334
- data/lib/erlang/messenger/lib/eunit/src/eunit_tests.erl +0 -45
- data/lib/erlang/messenger/lib/eunit/src/eunit_tty.erl +0 -272
- data/lib/erlang/messenger/lib/eunit/src/file_monitor.erl +0 -409
- data/lib/erlang/messenger/lib/eunit/sys.config +0 -9
- data/lib/erlang/messenger/lib/eunit/vsn.mk +0 -1
- data/lib/erlang/messenger/pm_client_rel-0.1.boot +0 -0
- data/lib/erlang/messenger/pm_client_rel-0.1.script +0 -238
- data/lib/erlang/messenger/pm_master_rel-0.1.boot +0 -0
- data/lib/erlang/messenger/pm_master_rel-0.1.script +0 -239
- data/lib/erlang/messenger/pm_node_rel-0.1.boot +0 -0
- data/lib/erlang/messenger/pm_node_rel-0.1.script +0 -237
- data/lib/erlang/messenger/src/client_app.erl +0 -39
- data/lib/erlang/messenger/src/client_server.erl +0 -60
- data/lib/erlang/messenger/src/master_app.erl +0 -39
- data/lib/erlang/messenger/src/node_app.erl +0 -39
- data/lib/erlang/messenger/src/pm_client.erl +0 -49
- data/lib/erlang/messenger/src/pm_client_supervisor.erl +0 -38
- data/lib/erlang/messenger/src/pm_cluster.erl +0 -61
- data/lib/erlang/messenger/src/pm_event_manager.erl +0 -27
- data/lib/erlang/messenger/src/pm_master.erl +0 -215
- data/lib/erlang/messenger/src/pm_master_event_handler.erl +0 -72
- data/lib/erlang/messenger/src/pm_master_supervisor.erl +0 -39
- data/lib/erlang/messenger/src/pm_node.erl +0 -200
- data/lib/erlang/messenger/src/pm_node_supervisor.erl +0 -38
- data/lib/erlang/messenger/src/pm_packager.erl +0 -76
- data/lib/erlang/messenger/src/pm_spawner.erl +0 -213
- data/lib/erlang/messenger/src/pm_strings.erl +0 -11
- data/lib/erlang/messenger/src/utils.erl +0 -72
- data/lib/erlang/messenger/useful_snippets +0 -17
- data/lib/poolparty/monitors/monitors/server_monitor.rb +0 -7
- data/lib/poolparty/monitors/monitors/web_monitor.rb +0 -18
- data/lib/poolparty/monitors/neighborhood_monitor.rb +0 -24
- data/lib/poolparty/monitors.rb +0 -6
- data/lib/poolparty/net/remoter/lists.rb +0 -12
- data/lib/poolparty/poolparty/custom_resource.rb +0 -45
- data/lib/poolparty/resources/custom_service.rb +0 -30
- data/lib/poolparty/services/gem_package.rb +0 -52
- data/lib/poolparty/version.rb +0 -15
- data/spec/poolparty/plugins/svn_spec.rb +0 -16
- data/spec/poolparty/poolparty/custom_resource_spec.rb +0 -79
- data/vendor/gems/butterfly/History.txt +0 -4
- data/vendor/gems/butterfly/PostInstall.txt +0 -2
- data/vendor/gems/butterfly/README.rdoc +0 -48
- data/vendor/gems/butterfly/Rakefile +0 -62
- data/vendor/gems/butterfly/VERSION.yml +0 -4
- data/vendor/gems/butterfly/bin/flutter +0 -4
- data/vendor/gems/butterfly/butterfly.gemspec +0 -37
- data/vendor/gems/butterfly/examples/config.ru +0 -15
- data/vendor/gems/butterfly/examples/my_app.rb +0 -12
- data/vendor/gems/butterfly/lib/butterfly.rb +0 -14
- data/vendor/gems/butterfly/lib/handler.rb +0 -48
- data/vendor/gems/butterfly/lib/request.rb +0 -29
- data/vendor/gems/butterfly/lib/response.rb +0 -49
- data/vendor/gems/butterfly/script/console +0 -10
- data/vendor/gems/butterfly/script/destroy +0 -14
- data/vendor/gems/butterfly/script/generate +0 -14
- data/vendor/gems/butterfly/test/test_adapter_base.rb +0 -23
- data/vendor/gems/butterfly/test/test_butterfly_request.rb +0 -46
- data/vendor/gems/butterfly/test/test_butterfly_response.rb +0 -43
- data/vendor/gems/butterfly/test/test_butterfly_server.rb +0 -16
- data/vendor/gems/butterfly/test/test_default.rb +0 -12
- data/vendor/gems/butterfly/test/test_helper.rb +0 -6
- data/vendor/gems/dslify/History.txt +0 -4
- data/vendor/gems/dslify/Manifest.txt +0 -25
- data/vendor/gems/dslify/PostInstall.txt +0 -5
- data/vendor/gems/dslify/README.txt +0 -60
- data/vendor/gems/dslify/Rakefile +0 -56
- data/vendor/gems/dslify/config/hoe.rb +0 -73
- data/vendor/gems/dslify/config/requirements.rb +0 -15
- data/vendor/gems/dslify/dslify.gemspec +0 -40
- data/vendor/gems/dslify/lib/dslify/dslify.rb +0 -69
- data/vendor/gems/dslify/lib/dslify/version.rb +0 -10
- data/vendor/gems/dslify/lib/dslify.rb +0 -7
- data/vendor/gems/dslify/script/console +0 -10
- data/vendor/gems/dslify/script/destroy +0 -14
- data/vendor/gems/dslify/script/generate +0 -14
- data/vendor/gems/dslify/script/txt2html +0 -82
- data/vendor/gems/dslify/setup.rb +0 -1585
- data/vendor/gems/dslify/tasks/deployment.rake +0 -34
- data/vendor/gems/dslify/tasks/environment.rake +0 -7
- data/vendor/gems/dslify/tasks/website.rake +0 -17
- data/vendor/gems/dslify/test/test_dslify.rb +0 -114
- data/vendor/gems/dslify/website/index.html +0 -86
- data/vendor/gems/dslify/website/index.txt +0 -83
- data/vendor/gems/dslify/website/javascripts/rounded_corners_lite.inc.js +0 -285
- data/vendor/gems/dslify/website/stylesheets/screen.css +0 -138
- data/vendor/gems/dslify/website/template.html.erb +0 -48
- data/vendor/gems/parenting/History.txt +0 -4
- data/vendor/gems/parenting/Manifest.txt +0 -13
- data/vendor/gems/parenting/PostInstall.txt +0 -2
- data/vendor/gems/parenting/README.rdoc +0 -47
- data/vendor/gems/parenting/Rakefile +0 -28
- data/vendor/gems/parenting/lib/parenting/base.rb +0 -65
- data/vendor/gems/parenting/lib/parenting.rb +0 -10
- data/vendor/gems/parenting/parenting.gemspec +0 -39
- data/vendor/gems/parenting/script/console +0 -10
- data/vendor/gems/parenting/script/destroy +0 -14
- data/vendor/gems/parenting/script/generate +0 -14
- data/vendor/gems/parenting/test/file_to_eval.rb +0 -9
- data/vendor/gems/parenting/test/test_helper.rb +0 -5
- data/vendor/gems/parenting/test/test_parenting.rb +0 -89
- data/vendor/gems/suitcase/LICENSE +0 -20
- data/vendor/gems/suitcase/README.rdoc +0 -31
- data/vendor/gems/suitcase/Rakefile +0 -57
- data/vendor/gems/suitcase/VERSION.yml +0 -4
- data/vendor/gems/suitcase/lib/suitcase/unzipper.rb +0 -15
- data/vendor/gems/suitcase/lib/suitcase/zipper.rb +0 -119
- data/vendor/gems/suitcase/lib/suitcase.rb +0 -5
- data/vendor/gems/suitcase/suitcase.gemspec +0 -32
- data/vendor/gems/suitcase/test/suitcase_test.rb +0 -102
- data/vendor/gems/suitcase/test/test_dir/box.rb +0 -1
- data/vendor/gems/suitcase/test/test_dir/test.txt +0 -1
- data/vendor/gems/suitcase/test/test_helper.rb +0 -12
@@ -1,313 +0,0 @@
|
|
1
|
-
%% This library is free software; you can redistribute it and/or modify
|
2
|
-
%% it under the terms of the GNU Lesser General Public License as
|
3
|
-
%% published by the Free Software Foundation; either version 2 of the
|
4
|
-
%% License, or (at your option) any later version.
|
5
|
-
%%
|
6
|
-
%% This library is distributed in the hope that it will be useful, but
|
7
|
-
%% WITHOUT ANY WARRANTY; without even the implied warranty of
|
8
|
-
%% MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
9
|
-
%% Lesser General Public License for more details.
|
10
|
-
%%
|
11
|
-
%% You should have received a copy of the GNU Lesser General Public
|
12
|
-
%% License along with this library; if not, write to the Free Software
|
13
|
-
%% Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
|
14
|
-
%% USA
|
15
|
-
%%
|
16
|
-
%% $Id: eunit.hrl 261 2008-10-12 11:33:16Z rcarlsson $
|
17
|
-
%%
|
18
|
-
%% Copyright (C) 2004-2006 Micka�l R�mond, Richard Carlsson
|
19
|
-
|
20
|
-
%% Including this file turns on testing and defines TEST, unless NOTEST
|
21
|
-
%% is defined before the file is included. If both NOTEST and TEST are
|
22
|
-
%% already defined, then TEST takes precedence, and NOTEST will become
|
23
|
-
%% undefined.
|
24
|
-
%%
|
25
|
-
%% If including this file causes TEST to be defined, then NOASSERT will
|
26
|
-
%% be undefined, even if it was previously defined. If both ASSERT and
|
27
|
-
%% NOASSERT are defined before the file is included, then ASSERT takes
|
28
|
-
%% precedence, and NOASSERT will become undefined regardless of TEST.
|
29
|
-
%%
|
30
|
-
%% After including this file, EUNIT will be defined if and only if TEST
|
31
|
-
%% is defined.
|
32
|
-
|
33
|
-
-ifndef(EUNIT_HRL).
|
34
|
-
-define(EUNIT_HRL, true).
|
35
|
-
|
36
|
-
%% allow defining TEST to override NOTEST
|
37
|
-
-ifdef(TEST).
|
38
|
-
-undef(NOTEST).
|
39
|
-
-endif.
|
40
|
-
|
41
|
-
%% allow NODEBUG to imply NOASSERT, unless overridden below
|
42
|
-
-ifdef(NODEBUG).
|
43
|
-
-ifndef(NOASSERT).
|
44
|
-
-define(NOASSERT, true).
|
45
|
-
-endif.
|
46
|
-
-endif.
|
47
|
-
|
48
|
-
%% note that the main switch used within this file is NOTEST; however,
|
49
|
-
%% both TEST and EUNIT may be used to check whether testing is enabled
|
50
|
-
-ifndef(NOTEST).
|
51
|
-
-undef(NOASSERT). % testing requires that assertions are enabled
|
52
|
-
-ifndef(TEST).
|
53
|
-
-define(TEST, true).
|
54
|
-
-endif.
|
55
|
-
-ifndef(EUNIT).
|
56
|
-
-define(EUNIT, true).
|
57
|
-
-endif.
|
58
|
-
-else.
|
59
|
-
-undef(EUNIT).
|
60
|
-
-endif.
|
61
|
-
|
62
|
-
%% allow ASSERT to override NOASSERT (regardless of TEST/NOTEST)
|
63
|
-
-ifdef(ASSERT).
|
64
|
-
-undef(NOASSERT).
|
65
|
-
-endif.
|
66
|
-
|
67
|
-
%% Parse transforms for automatic exporting/stripping of test functions.
|
68
|
-
%% (Note that although automatic stripping is convenient, it will make
|
69
|
-
%% the code dependent on this header file and the eunit_striptests
|
70
|
-
%% module for compilation, even when testing is switched off! Using
|
71
|
-
%% -ifdef(EUNIT) around all test code makes the program more portable.)
|
72
|
-
|
73
|
-
-ifndef(EUNIT_NOAUTO).
|
74
|
-
-ifndef(NOTEST).
|
75
|
-
-compile({parse_transform, eunit_autoexport}).
|
76
|
-
-else.
|
77
|
-
-compile({parse_transform, eunit_striptests}).
|
78
|
-
-endif.
|
79
|
-
-endif.
|
80
|
-
|
81
|
-
%% All macros should be available even if testing is turned off, and
|
82
|
-
%% should preferably not require EUnit to be present at runtime.
|
83
|
-
%%
|
84
|
-
%% We must use fun-call wrappers ((fun () -> ... end)()) to avoid
|
85
|
-
%% exporting local variables, and furthermore we only use variable names
|
86
|
-
%% prefixed with "__", that hopefully will not be bound outside the fun.
|
87
|
-
|
88
|
-
%% A generic let-macro is particularly useful when writing test cases.
|
89
|
-
%% It is more compact than 'begin X = Y, Z end', and guarantees that
|
90
|
-
%% X gets a new, local binding.
|
91
|
-
%% (Note that lowercase 'let' is a reserved word.)
|
92
|
-
-ifndef(LET).
|
93
|
-
-define(LET(X,Y,Z), ((fun(X)->(Z)end)(Y))).
|
94
|
-
-endif.
|
95
|
-
|
96
|
-
%% It is important that testing code is short and readable.
|
97
|
-
%% An if-then-else macro can make some code much more compact.
|
98
|
-
%% Compare: case f(X) of true->g(X); false->h(X) end
|
99
|
-
%% and: ?IF(f(X), g(Y), h(Z))
|
100
|
-
-ifndef(IF).
|
101
|
-
-define(IF(B,T,F), (case (B) of true->(T); false->(F) end)).
|
102
|
-
-endif.
|
103
|
-
|
104
|
-
-ifdef(NOASSERT).
|
105
|
-
%% The plain assert macro should be defined to do nothing if this file
|
106
|
-
%% is included when debugging/testing is turned off.
|
107
|
-
-ifndef(assert).
|
108
|
-
-define(assert(BoolExpr),ok).
|
109
|
-
-endif.
|
110
|
-
-else.
|
111
|
-
%% The assert macro is written the way it is so as not to cause warnings
|
112
|
-
%% for clauses that cannot match, even if the expression is a constant.
|
113
|
-
-undef(assert).
|
114
|
-
-define(assert(BoolExpr),
|
115
|
-
((fun () ->
|
116
|
-
case (BoolExpr) of
|
117
|
-
true -> ok;
|
118
|
-
__V -> .erlang:error({assertion_failed,
|
119
|
-
[{module, ?MODULE},
|
120
|
-
{line, ?LINE},
|
121
|
-
{expression, (??BoolExpr)},
|
122
|
-
{expected, true},
|
123
|
-
{value, case __V of false -> __V;
|
124
|
-
_ -> {not_a_boolean,__V}
|
125
|
-
end}]})
|
126
|
-
end
|
127
|
-
end)())).
|
128
|
-
-endif.
|
129
|
-
-define(assertNot(BoolExpr), ?assert(not (BoolExpr))).
|
130
|
-
|
131
|
-
-define(_test(Expr), {?LINE, fun () -> (Expr) end}).
|
132
|
-
|
133
|
-
-define(_assert(BoolExpr), ?_test(?assert(BoolExpr))).
|
134
|
-
|
135
|
-
-define(_assertNot(BoolExpr), ?_assert(not (BoolExpr))).
|
136
|
-
|
137
|
-
%% This is mostly a convenience which gives more detailed reports.
|
138
|
-
%% Note: Guard is a guarded pattern, and can not be used for value.
|
139
|
-
-ifdef(NOASSERT).
|
140
|
-
-define(assertMatch(Guard,Expr),ok).
|
141
|
-
-else.
|
142
|
-
-define(assertMatch(Guard, Expr),
|
143
|
-
((fun () ->
|
144
|
-
case (Expr) of
|
145
|
-
Guard -> ok;
|
146
|
-
__V -> .erlang:error({assertMatch_failed,
|
147
|
-
[{module, ?MODULE},
|
148
|
-
{line, ?LINE},
|
149
|
-
{expression, (??Expr)},
|
150
|
-
{expected, (??Guard)},
|
151
|
-
{value, __V}]})
|
152
|
-
end
|
153
|
-
end)())).
|
154
|
-
-endif.
|
155
|
-
-define(_assertMatch(Guard, Expr), ?_test(?assertMatch(Guard, Expr))).
|
156
|
-
|
157
|
-
%% This is a convenience macro which gives more detailed reports when
|
158
|
-
%% the expected LHS value is not a pattern, but a computed value
|
159
|
-
-ifdef(NOASSERT).
|
160
|
-
-define(assertEqual(Expect,Expr),ok).
|
161
|
-
-else.
|
162
|
-
-define(assertEqual(Expect, Expr),
|
163
|
-
((fun (__X) ->
|
164
|
-
case (Expr) of
|
165
|
-
__X -> ok;
|
166
|
-
__V -> .erlang:error({assertEqual_failed,
|
167
|
-
[{module, ?MODULE},
|
168
|
-
{line, ?LINE},
|
169
|
-
{expression, (??Expr)},
|
170
|
-
{expected, __X},
|
171
|
-
{value, __V}]})
|
172
|
-
end
|
173
|
-
end)(Expect))).
|
174
|
-
-endif.
|
175
|
-
-define(_assertEqual(Expect, Expr), ?_test(?assertEqual(Expect, Expr))).
|
176
|
-
|
177
|
-
%% Note: Class and Term are patterns, and can not be used for value.
|
178
|
-
-ifdef(NOASSERT).
|
179
|
-
-define(assertException(Class, Term, Expr),ok).
|
180
|
-
-else.
|
181
|
-
-define(assertException(Class, Term, Expr),
|
182
|
-
((fun () ->
|
183
|
-
try (Expr) of
|
184
|
-
__V -> .erlang:error({assertException_failed,
|
185
|
-
[{module, ?MODULE},
|
186
|
-
{line, ?LINE},
|
187
|
-
{expression, (??Expr)},
|
188
|
-
{expected,
|
189
|
-
"{ "++(??Class)++" , "++(??Term)
|
190
|
-
++" , [...] }"},
|
191
|
-
{unexpected_success, __V}]})
|
192
|
-
catch
|
193
|
-
Class:Term -> ok;
|
194
|
-
__C:__T ->
|
195
|
-
.erlang:error({assertException_failed,
|
196
|
-
[{module, ?MODULE},
|
197
|
-
{line, ?LINE},
|
198
|
-
{expression, (??Expr)},
|
199
|
-
{expected,
|
200
|
-
"{ "++(??Class)++" , "++(??Term)
|
201
|
-
++" , [...] }"},
|
202
|
-
{unexpected_exception,
|
203
|
-
{__C, __T, erlang:get_stacktrace()}}]})
|
204
|
-
end
|
205
|
-
end)())).
|
206
|
-
-endif.
|
207
|
-
|
208
|
-
-define(assertError(Term, Expr), ?assertException(error, Term, Expr)).
|
209
|
-
-define(assertExit(Term, Expr), ?assertException(exit, Term, Expr)).
|
210
|
-
-define(assertThrow(Term, Expr), ?assertException(throw, Term, Expr)).
|
211
|
-
|
212
|
-
-define(_assertException(Class, Term, Expr),
|
213
|
-
?_test(?assertException(Class, Term, Expr))).
|
214
|
-
-define(_assertError(Term, Expr), ?_assertException(error, Term, Expr)).
|
215
|
-
-define(_assertExit(Term, Expr), ?_assertException(exit, Term, Expr)).
|
216
|
-
-define(_assertThrow(Term, Expr), ?_assertException(throw, Term, Expr)).
|
217
|
-
|
218
|
-
%% Macros for running operating system commands. (Note that these
|
219
|
-
%% require EUnit to be present at runtime, or at least eunit_lib.)
|
220
|
-
|
221
|
-
%% these can be used for simply running commands in a controlled way
|
222
|
-
-define(_cmd_(Cmd), (.eunit_lib:command(Cmd))).
|
223
|
-
-define(cmdStatus(N, Cmd),
|
224
|
-
((fun () ->
|
225
|
-
case ?_cmd_(Cmd) of
|
226
|
-
{(N), __Out} -> __Out;
|
227
|
-
{__N, _} -> .erlang:error({command_failed,
|
228
|
-
[{module, ?MODULE},
|
229
|
-
{line, ?LINE},
|
230
|
-
{command, (Cmd)},
|
231
|
-
{expected_status,(N)},
|
232
|
-
{status,__N}]})
|
233
|
-
end
|
234
|
-
end)())).
|
235
|
-
-define(_cmdStatus(N, Cmd), ?_test(?cmdStatus(N, Cmd))).
|
236
|
-
-define(cmd(Cmd), ?cmdStatus(0, Cmd)).
|
237
|
-
-define(_cmd(Cmd), ?_test(?cmd(Cmd))).
|
238
|
-
|
239
|
-
%% these are only used for testing; they always return 'ok' on success,
|
240
|
-
%% and have no effect if debugging/testing is turned off
|
241
|
-
-ifdef(NOASSERT).
|
242
|
-
-define(assertCmdStatus(N, Cmd),ok).
|
243
|
-
-else.
|
244
|
-
-define(assertCmdStatus(N, Cmd),
|
245
|
-
((fun () ->
|
246
|
-
case ?_cmd_(Cmd) of
|
247
|
-
{(N), _} -> ok;
|
248
|
-
{__N, _} -> .erlang:error({assertCmd_failed,
|
249
|
-
[{module, ?MODULE},
|
250
|
-
{line, ?LINE},
|
251
|
-
{command, (Cmd)},
|
252
|
-
{expected_status,(N)},
|
253
|
-
{status,__N}]})
|
254
|
-
end
|
255
|
-
end)())).
|
256
|
-
-endif.
|
257
|
-
-define(assertCmd(Cmd), ?assertCmdStatus(0, Cmd)).
|
258
|
-
|
259
|
-
-ifdef(NOASSERT).
|
260
|
-
-define(assertCmdOutput(T, Cmd),ok).
|
261
|
-
-else.
|
262
|
-
-define(assertCmdOutput(T, Cmd),
|
263
|
-
((fun () ->
|
264
|
-
case ?_cmd_(Cmd) of
|
265
|
-
{_, (T)} -> ok;
|
266
|
-
{_, __T} -> .erlang:error({assertCmdOutput_failed,
|
267
|
-
[{module, ?MODULE},
|
268
|
-
{line, ?LINE},
|
269
|
-
{command,(Cmd)},
|
270
|
-
{expected_output,(T)},
|
271
|
-
{output,__T}]})
|
272
|
-
end
|
273
|
-
end)())).
|
274
|
-
-endif.
|
275
|
-
|
276
|
-
-define(_assertCmdStatus(N, Cmd), ?_test(?assertCmdStatus(N, Cmd))).
|
277
|
-
-define(_assertCmd(Cmd), ?_test(?assertCmd(Cmd))).
|
278
|
-
-define(_assertCmdOutput(T, Cmd), ?_test(?assertCmdOutput(T, Cmd))).
|
279
|
-
|
280
|
-
%% Macros to simplify debugging (in particular, they work even when the
|
281
|
-
%% standard output is being redirected by EUnit while running tests)
|
282
|
-
|
283
|
-
-ifdef(NODEBUG).
|
284
|
-
-define(debugMsg(S), ok).
|
285
|
-
-define(debugHere, ok).
|
286
|
-
-define(debugFmt(S, As), ok).
|
287
|
-
-define(debugVal(E), (E)).
|
288
|
-
-define(debugTime(S,E), (E)).
|
289
|
-
-else.
|
290
|
-
-define(debugMsg(S),
|
291
|
-
(begin
|
292
|
-
io:fwrite(user, <<"~s:~w: ~s\n">>,
|
293
|
-
[?FILE, ?LINE, S]),
|
294
|
-
ok
|
295
|
-
end)).
|
296
|
-
-define(debugHere, (?debugMsg("<-"))).
|
297
|
-
-define(debugFmt(S, As), (?debugMsg(io_lib:format((S), (As))))).
|
298
|
-
-define(debugVal(E),
|
299
|
-
((fun (__V) ->
|
300
|
-
?debugFmt(<<"~s = ~P">>, [(??E), __V, 15]),
|
301
|
-
__V
|
302
|
-
end)(E))).
|
303
|
-
-define(debugTime(S,E),
|
304
|
-
((fun () ->
|
305
|
-
{__T0, _} = statistics(wall_clock),
|
306
|
-
__V = (E),
|
307
|
-
{__T1, _} = statistics(wall_clock),
|
308
|
-
?debugFmt(<<"~s: ~.3f s">>, [(S), (__T1-__T0)/1000]),
|
309
|
-
__V
|
310
|
-
end)())).
|
311
|
-
-endif.
|
312
|
-
|
313
|
-
-endif. % EUNIT_HRL
|
@@ -1,46 +0,0 @@
|
|
1
|
-
|
2
|
-
include ../vsn.mk
|
3
|
-
|
4
|
-
EMULATOR=beam
|
5
|
-
EBIN=../ebin
|
6
|
-
INCLUDE=../include
|
7
|
-
|
8
|
-
APP_TARGET=$(EBIN)/eunit.app
|
9
|
-
APPUP_TARGET=$(EBIN)/eunit.appup
|
10
|
-
|
11
|
-
ERL_COMPILE_FLAGS += -I$(INCLUDE) +warn_unused_vars +nowarn_shadow_vars +warn_unused_import
|
12
|
-
|
13
|
-
SOURCES= \
|
14
|
-
eunit_autoexport.erl \
|
15
|
-
eunit_striptests.erl \
|
16
|
-
eunit.erl \
|
17
|
-
eunit_tests.erl \
|
18
|
-
eunit_server.erl \
|
19
|
-
eunit_proc.erl \
|
20
|
-
eunit_serial.erl \
|
21
|
-
eunit_test.erl \
|
22
|
-
eunit_lib.erl \
|
23
|
-
eunit_data.erl \
|
24
|
-
eunit_tty.erl \
|
25
|
-
code_monitor.erl \
|
26
|
-
file_monitor.erl \
|
27
|
-
autoload.erl
|
28
|
-
|
29
|
-
OBJECTS=$(SOURCES:%.erl=$(EBIN)/%.$(EMULATOR)) $(APP_TARGET) $(APPUP_TARGET)
|
30
|
-
|
31
|
-
all: $(OBJECTS)
|
32
|
-
|
33
|
-
$(OBJECTS): eunit_internal.hrl \
|
34
|
-
$(INCLUDE)/eunit.hrl
|
35
|
-
|
36
|
-
clean:
|
37
|
-
rm -f $(OBJECTS)
|
38
|
-
|
39
|
-
$(EBIN)/%.$(EMULATOR):%.erl
|
40
|
-
erlc -pa $(EBIN) -W $(ERL_COMPILE_FLAGS) -o$(EBIN) $<
|
41
|
-
|
42
|
-
$(APP_TARGET): eunit.app.src ../vsn.mk
|
43
|
-
sed -e 's;%VSN%;$(EUNIT_VSN);' $< > $@
|
44
|
-
|
45
|
-
$(APPUP_TARGET): eunit.appup.src ../vsn.mk
|
46
|
-
sed -e 's;%VSN%;$(EUNIT_VSN);' $< > $@
|