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,340 +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_server.erl 238 2007-11-15 10:23:54Z mremond $
|
17
|
-
%%
|
18
|
-
%% @author Richard Carlsson <richardc@it.uu.se>
|
19
|
-
%% @copyright 2006 Richard Carlsson
|
20
|
-
%% @private
|
21
|
-
%% @see eunit
|
22
|
-
%% @doc EUnit server process
|
23
|
-
|
24
|
-
-module(eunit_server).
|
25
|
-
|
26
|
-
-export([start/1, stop/1, start_test/4, watch/3, watch_path/3,
|
27
|
-
watch_regexp/3]).
|
28
|
-
|
29
|
-
-export([main/1]). % private
|
30
|
-
|
31
|
-
-include("eunit.hrl").
|
32
|
-
-include("eunit_internal.hrl").
|
33
|
-
|
34
|
-
|
35
|
-
-define(AUTO_TIMEOUT, 60000). %% auto test time limit
|
36
|
-
|
37
|
-
%% TODO: pass options to server, such as default timeout?
|
38
|
-
|
39
|
-
start(Server) when is_atom(Server) ->
|
40
|
-
ensure_started(Server).
|
41
|
-
|
42
|
-
stop(Server) ->
|
43
|
-
command(Server, stop).
|
44
|
-
|
45
|
-
|
46
|
-
-record(job, {super, test, options}).
|
47
|
-
|
48
|
-
%% The `Super' process will receive a stream of status messages; see
|
49
|
-
%% eunit_proc:status_message/3 for details.
|
50
|
-
|
51
|
-
start_test(Server, Super, T, Options) ->
|
52
|
-
command(Server, {start, #job{super = Super,
|
53
|
-
test = T,
|
54
|
-
options = Options}}).
|
55
|
-
|
56
|
-
watch(Server, Module, Opts) when is_atom(Module) ->
|
57
|
-
command(Server, {watch, {module, Module}, Opts}).
|
58
|
-
|
59
|
-
watch_path(Server, Path, Opts) ->
|
60
|
-
command(Server, {watch, {path, filename:flatten(Path)}, Opts}).
|
61
|
-
|
62
|
-
watch_regexp(Server, Regex, Opts) ->
|
63
|
-
case regexp:parse(Regex) of
|
64
|
-
{ok, R} ->
|
65
|
-
command(Server, {watch, {regexp, R}, Opts});
|
66
|
-
{error, _}=Error ->
|
67
|
-
Error
|
68
|
-
end.
|
69
|
-
|
70
|
-
%% This makes sure the server is started before sending the command, and
|
71
|
-
%% returns {ok, Result} if the server accepted the command or {error,
|
72
|
-
%% server_down} if the server process crashes. If the server does not
|
73
|
-
%% reply, this function will wait until the server is killed.
|
74
|
-
|
75
|
-
command(Server, Cmd) ->
|
76
|
-
if is_atom(Server), Cmd /= stop -> ensure_started(Server);
|
77
|
-
true -> ok
|
78
|
-
end,
|
79
|
-
if is_pid(Server) -> command_1(Server, Cmd);
|
80
|
-
true ->
|
81
|
-
case whereis(Server) of
|
82
|
-
undefined -> {error, server_down};
|
83
|
-
Pid -> command_1(Pid, Cmd)
|
84
|
-
end
|
85
|
-
end.
|
86
|
-
|
87
|
-
command_1(Pid, Cmd) when is_pid(Pid) ->
|
88
|
-
Pid ! {command, self(), Cmd},
|
89
|
-
command_wait(Pid, 1000, undefined).
|
90
|
-
|
91
|
-
command_wait(Pid, Timeout, Monitor) ->
|
92
|
-
receive
|
93
|
-
{Pid, Result} -> Result;
|
94
|
-
{'DOWN', Monitor, process, Pid, _R} -> {error, server_down}
|
95
|
-
after Timeout ->
|
96
|
-
%% avoid creating a monitor unless some time has passed
|
97
|
-
command_wait(Pid, infinity, erlang:monitor(process, Pid))
|
98
|
-
end.
|
99
|
-
|
100
|
-
%% Starting the server
|
101
|
-
|
102
|
-
ensure_started(Name) ->
|
103
|
-
ensure_started(Name, 5).
|
104
|
-
|
105
|
-
ensure_started(Name, N) when N > 0 ->
|
106
|
-
case whereis(Name) of
|
107
|
-
undefined ->
|
108
|
-
Parent = self(),
|
109
|
-
Pid = spawn(fun () -> server_start(Name, Parent) end),
|
110
|
-
receive
|
111
|
-
{Pid, ok} ->
|
112
|
-
Pid;
|
113
|
-
{Pid, error} ->
|
114
|
-
receive after 200 -> ensure_started(N - 1) end
|
115
|
-
end;
|
116
|
-
Pid ->
|
117
|
-
Pid
|
118
|
-
end;
|
119
|
-
ensure_started(_, _) ->
|
120
|
-
throw(no_server).
|
121
|
-
|
122
|
-
server_start(undefined = Name, Parent) ->
|
123
|
-
%% anonymous server
|
124
|
-
server_start_1(Name, Parent);
|
125
|
-
server_start(Name, Parent) ->
|
126
|
-
try register(Name, self()) of
|
127
|
-
true -> server_start_1(Name, Parent)
|
128
|
-
catch
|
129
|
-
_:_ ->
|
130
|
-
Parent ! {self(), error},
|
131
|
-
exit(error)
|
132
|
-
end.
|
133
|
-
|
134
|
-
server_start_1(Name, Parent) ->
|
135
|
-
Parent ! {self(), ok},
|
136
|
-
server_init(Name).
|
137
|
-
|
138
|
-
-record(state, {name,
|
139
|
-
stopped,
|
140
|
-
jobs,
|
141
|
-
queue,
|
142
|
-
auto_test,
|
143
|
-
modules,
|
144
|
-
paths,
|
145
|
-
regexps}).
|
146
|
-
|
147
|
-
server_init(Name) ->
|
148
|
-
server(#state{name = Name,
|
149
|
-
stopped = false,
|
150
|
-
jobs = dict:new(),
|
151
|
-
queue = queue:new(),
|
152
|
-
auto_test = queue:new(),
|
153
|
-
modules = sets:new(),
|
154
|
-
paths = sets:new(),
|
155
|
-
regexps = sets:new()}).
|
156
|
-
|
157
|
-
server(St) ->
|
158
|
-
server_check_exit(St),
|
159
|
-
?MODULE:main(St).
|
160
|
-
|
161
|
-
%% @private
|
162
|
-
main(St) ->
|
163
|
-
receive
|
164
|
-
{done, auto_test, _Pid} ->
|
165
|
-
server(auto_test_done(St));
|
166
|
-
{done, Reference, _Pid} ->
|
167
|
-
server(handle_done(Reference, St));
|
168
|
-
{command, From, _Cmd} when St#state.stopped ->
|
169
|
-
From ! {self(), stopped};
|
170
|
-
{command, From, Cmd} ->
|
171
|
-
server_command(From, Cmd, St);
|
172
|
-
{code_monitor, {loaded, M, _Time}} ->
|
173
|
-
case is_watched(M, St) of
|
174
|
-
true ->
|
175
|
-
server(new_auto_test(self(), M, St));
|
176
|
-
false ->
|
177
|
-
server(St)
|
178
|
-
end
|
179
|
-
end.
|
180
|
-
|
181
|
-
server_check_exit(St) ->
|
182
|
-
case dict:size(St#state.jobs) of
|
183
|
-
0 when St#state.stopped -> exit(normal);
|
184
|
-
_ -> ok
|
185
|
-
end.
|
186
|
-
|
187
|
-
server_command(From, {start, Job}, St) ->
|
188
|
-
Reference = make_ref(),
|
189
|
-
St1 = case proplists:get_bool(enqueue, Job#job.options) of
|
190
|
-
true ->
|
191
|
-
enqueue(Job, From, Reference, St);
|
192
|
-
false ->
|
193
|
-
start_job(Job, From, Reference, St)
|
194
|
-
end,
|
195
|
-
server_command_reply(From, {ok, Reference}),
|
196
|
-
server(St1);
|
197
|
-
server_command(From, stop, St) ->
|
198
|
-
%% unregister the server name and let remaining jobs finish
|
199
|
-
server_command_reply(From, {error, stopped}),
|
200
|
-
catch unregister(St#state.name),
|
201
|
-
server(St#state{stopped = true});
|
202
|
-
server_command(From, {watch, Target, _Opts}, St) ->
|
203
|
-
%% the code watcher is only started on demand
|
204
|
-
code_monitor:monitor(self()),
|
205
|
-
%% TODO: propagate options to testing stage
|
206
|
-
St1 = add_watch(Target, St),
|
207
|
-
server_command_reply(From, ok),
|
208
|
-
server(St1);
|
209
|
-
server_command(From, {forget, Target}, St) ->
|
210
|
-
St1 = delete_watch(Target, St),
|
211
|
-
server_command_reply(From, ok),
|
212
|
-
server(St1);
|
213
|
-
server_command(From, Cmd, St) ->
|
214
|
-
server_command_reply(From, {error, {unknown_command, Cmd}}),
|
215
|
-
server(St).
|
216
|
-
|
217
|
-
server_command_reply(From, Result) ->
|
218
|
-
From ! {self(), Result}.
|
219
|
-
|
220
|
-
enqueue(Job, From, Reference, St) ->
|
221
|
-
case dict:size(St#state.jobs) of
|
222
|
-
0 ->
|
223
|
-
start_job(Job, From, Reference, St);
|
224
|
-
_ ->
|
225
|
-
St#state{queue = queue:in({Job, From, Reference},
|
226
|
-
St#state.queue)}
|
227
|
-
end.
|
228
|
-
|
229
|
-
dequeue(St) ->
|
230
|
-
case queue:out(St#state.queue) of
|
231
|
-
{empty, _} ->
|
232
|
-
St;
|
233
|
-
{{value, {Job, From, Reference}}, Queue} ->
|
234
|
-
start_job(Job, From, Reference, St#state{queue = Queue})
|
235
|
-
end.
|
236
|
-
|
237
|
-
start_job(Job, From, Reference, St) ->
|
238
|
-
From ! {start, Reference},
|
239
|
-
%% The default is to run tests in order unless otherwise specified
|
240
|
-
Order = proplists:get_value(order, Job#job.options, inorder),
|
241
|
-
eunit_proc:start(Job#job.test, Order, Job#job.super, Reference),
|
242
|
-
St#state{jobs = dict:store(Reference, From, St#state.jobs)}.
|
243
|
-
|
244
|
-
handle_done(Reference, St) ->
|
245
|
-
case dict:find(Reference, St#state.jobs) of
|
246
|
-
{ok, From} ->
|
247
|
-
From ! {done, Reference},
|
248
|
-
dequeue(St#state{jobs = dict:erase(Reference,
|
249
|
-
St#state.jobs)});
|
250
|
-
error ->
|
251
|
-
St
|
252
|
-
end.
|
253
|
-
|
254
|
-
%% Adding and removing watched modules or paths
|
255
|
-
|
256
|
-
add_watch({module, M}, St) ->
|
257
|
-
St#state{modules = sets:add_element(M, St#state.modules)};
|
258
|
-
add_watch({path, P}, St) ->
|
259
|
-
St#state{paths = sets:add_element(P, St#state.paths)};
|
260
|
-
add_watch({regexp, R}, St) ->
|
261
|
-
St#state{regexps = sets:add_element(R, St#state.regexps)}.
|
262
|
-
|
263
|
-
delete_watch({module, M}, St) ->
|
264
|
-
St#state{modules = sets:del_element(M, St#state.modules)};
|
265
|
-
delete_watch({path, P}, St) ->
|
266
|
-
St#state{paths = sets:del_element(P, St#state.paths)};
|
267
|
-
delete_watch({regexp, R}, St) ->
|
268
|
-
St#state{regexps = sets:del_element(R, St#state.regexps)}.
|
269
|
-
|
270
|
-
%% Checking if a module is being watched
|
271
|
-
|
272
|
-
is_watched(M, St) when is_atom(M) ->
|
273
|
-
sets:is_element(M, St#state.modules) orelse
|
274
|
-
is_watched(code:which(M), St);
|
275
|
-
is_watched(Path, St) ->
|
276
|
-
sets:is_element(filename:dirname(Path), St#state.paths) orelse
|
277
|
-
match_any(sets:to_list(St#state.regexps), Path).
|
278
|
-
|
279
|
-
match_any([R | Rs], Str) ->
|
280
|
-
case regexp:first_match(Str, R) of
|
281
|
-
{match, _, _} -> true;
|
282
|
-
_ -> match_any(Rs, Str)
|
283
|
-
end;
|
284
|
-
match_any([], _Str) -> false.
|
285
|
-
|
286
|
-
%% Running automatic tests when a watched module is loaded.
|
287
|
-
%% Uses a queue in order to avoid overlapping output when several
|
288
|
-
%% watched modules are loaded simultaneously. (The currently running
|
289
|
-
%% automatic test is kept in the queue until it is done. An empty queue
|
290
|
-
%% means that no automatic test is running.)
|
291
|
-
|
292
|
-
new_auto_test(Server, M, St) ->
|
293
|
-
case queue:is_empty(St#state.auto_test) of
|
294
|
-
true ->
|
295
|
-
start_auto_test(Server, M);
|
296
|
-
false ->
|
297
|
-
ok
|
298
|
-
end,
|
299
|
-
St#state{auto_test = queue:in({Server, M}, St#state.auto_test)}.
|
300
|
-
|
301
|
-
auto_test_done(St) ->
|
302
|
-
%% remove finished test from queue before checking for more
|
303
|
-
{_, Queue} = queue:out(St#state.auto_test),
|
304
|
-
case queue:out(Queue) of
|
305
|
-
{{value, {Server, M}}, _} ->
|
306
|
-
%% this is just lookahead - the item is not removed
|
307
|
-
start_auto_test(Server, M);
|
308
|
-
{empty, _} ->
|
309
|
-
ok
|
310
|
-
end,
|
311
|
-
St#state{auto_test = Queue}.
|
312
|
-
|
313
|
-
start_auto_test(Server, M) ->
|
314
|
-
spawn(fun () -> auto_super(Server, M) end).
|
315
|
-
|
316
|
-
auto_super(Server, M) ->
|
317
|
-
process_flag(trap_exit, true),
|
318
|
-
%% Give the user a short delay before any output is produced
|
319
|
-
receive after 333 -> ok end,
|
320
|
-
%% Make sure output is sent to console on server node
|
321
|
-
group_leader(whereis(user), self()),
|
322
|
-
Pid = spawn_link(fun () -> auto_proc(Server, M) end),
|
323
|
-
receive
|
324
|
-
{'EXIT', Pid, _} ->
|
325
|
-
ok
|
326
|
-
after ?AUTO_TIMEOUT ->
|
327
|
-
exit(Pid, kill),
|
328
|
-
io:put_chars("\n== EUnit: automatic test was aborted ==\n"),
|
329
|
-
io:put_chars("\n> ")
|
330
|
-
end,
|
331
|
-
Server ! {done, auto_test, self()}.
|
332
|
-
|
333
|
-
auto_proc(Server, M) ->
|
334
|
-
%% Make the output start on a new line instead of on the same line
|
335
|
-
%% as the current shell prompt.
|
336
|
-
io:fwrite("\n== EUnit: testing module ~w ==\n", [M]),
|
337
|
-
eunit:test(Server, M, [enqueue]),
|
338
|
-
%% Make sure to print a dummy prompt at the end of the output, most
|
339
|
-
%% of all so that the Emacs mode realizes that input is active.
|
340
|
-
io:put_chars("\n-> ").
|
@@ -1,64 +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_striptests.erl 238 2007-11-15 10:23:54Z mremond $
|
17
|
-
%%
|
18
|
-
%% @author Richard Carlsson <richardc@it.uu.se>
|
19
|
-
%% @author Eric Merritt <cyberlync@gmail.com>
|
20
|
-
%% @copyright 2006 Richard Carlsson, Eric Merritt
|
21
|
-
%% @private
|
22
|
-
%% @see eunit
|
23
|
-
%% @doc Parse transform for stripping EUnit test functions.
|
24
|
-
|
25
|
-
-module(eunit_striptests).
|
26
|
-
|
27
|
-
-include("eunit_internal.hrl").
|
28
|
-
|
29
|
-
-export([parse_transform/2]).
|
30
|
-
|
31
|
-
parse_transform(Forms, Options) ->
|
32
|
-
TestSuffix = proplists:get_value(eunit_test_suffix, Options,
|
33
|
-
?DEFAULT_TEST_SUFFIX),
|
34
|
-
GeneratorSuffix = proplists:get_value(eunit_generator_suffix,
|
35
|
-
Options,
|
36
|
-
?DEFAULT_GENERATOR_SUFFIX),
|
37
|
-
ExportSuffix = proplists:get_value(eunit_export_suffix, Options,
|
38
|
-
?DEFAULT_EXPORT_SUFFIX),
|
39
|
-
Exports = lists:foldl(fun ({attribute,_,export,Es}, S) ->
|
40
|
-
sets:union(sets:from_list(Es), S);
|
41
|
-
(_F, S) -> S
|
42
|
-
end,
|
43
|
-
sets:new(), Forms),
|
44
|
-
F = fun (Form, Acc) ->
|
45
|
-
form(Form, Acc, Exports, TestSuffix, GeneratorSuffix,
|
46
|
-
ExportSuffix)
|
47
|
-
end,
|
48
|
-
lists:reverse(lists:foldl(F, [], Forms)).
|
49
|
-
|
50
|
-
form({function, _L, Name, 0, _Cs}=Form, Acc, Exports, TestSuffix,
|
51
|
-
GeneratorSuffix, ExportSuffix) ->
|
52
|
-
N = atom_to_list(Name),
|
53
|
-
case not sets:is_element({Name, 0}, Exports)
|
54
|
-
andalso (lists:suffix(TestSuffix, N)
|
55
|
-
orelse lists:suffix(GeneratorSuffix, N)
|
56
|
-
orelse lists:suffix(ExportSuffix, N))
|
57
|
-
of
|
58
|
-
true ->
|
59
|
-
Acc;
|
60
|
-
false ->
|
61
|
-
[Form | Acc]
|
62
|
-
end;
|
63
|
-
form(Form, Acc, _, _, _, _) ->
|
64
|
-
[Form | Acc].
|