You can not select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.

Frank Schroeder 1c75cf1af5 pkg refactor ... command/agent/* -> agent/* command/consul/* -> agent/consul/* command/agent/command{,_test}.go -> command/agent{,_test}.go command/base/command.go -> command/base.go command/base/* -> command/* commands.go -> command/commands.go The script which did the refactor is: ( cd $GOPATH/src/github.com/hashicorp/consul git mv command/agent/command.go command/agent.go git mv command/agent/command_test.go command/agent_test.go git mv command/agent/flag_slice_value{,_test}.go command/ git mv command/agent . git mv command/base/command.go command/base.go git mv command/base/config_util{,_test}.go command/ git mv commands.go command/ git mv consul agent rmdir command/base/ gsed -i -e 's|package agent|package command|' command/agent{,_test}.go gsed -i -e 's|package agent|package command|' command/flag_slice_value{,_test}.go gsed -i -e 's|package base|package command|' command/base.go command/config_util{,_test}.go gsed -i -e 's|package main|package command|' command/commands.go gsed -i -e 's|base.Command|BaseCommand|' command/commands.go gsed -i -e 's|agent.Command|AgentCommand|' command/commands.go gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/commands.go gsed -i -e 's|base\.||' command/commands.go gsed -i -e 's|command\.||' command/commands.go gsed -i -e 's|command|c|' main.go gsed -i -e 's|range Commands|range command.Commands|' main.go gsed -i -e 's|Commands: Commands|Commands: command.Commands|' main.go gsed -i -e 's|base\.BoolValue|BoolValue|' command/operator_autopilot_set.go gsed -i -e 's|base\.DurationValue|DurationValue|' command/operator_autopilot_set.go gsed -i -e 's|base\.StringValue|StringValue|' command/operator_autopilot_set.go gsed -i -e 's|base\.UintValue|UintValue|' command/operator_autopilot_set.go gsed -i -e 's|\bCommand\b|BaseCommand|' command/base.go gsed -i -e 's|BaseCommand Options|Command Options|' command/base.go gsed -i -e 's|base.Command|BaseCommand|' command/*.go gsed -i -e 's|c\.Command|c.BaseCommand|g' command/*.go gsed -i -e 's|\tCommand:|\tBaseCommand:|' command/*_test.go gsed -i -e 's|base\.||' command/*_test.go gsed -i -e 's|\bCommand\b|AgentCommand|' command/agent{,_test}.go gsed -i -e 's|cmd.AgentCommand|cmd.BaseCommand|' command/agent.go gsed -i -e 's|cli.AgentCommand = new(Command)|cli.Command = new(AgentCommand)|' command/agent_test.go gsed -i -e 's|exec.AgentCommand|exec.Command|' command/agent_test.go gsed -i -e 's|exec.BaseCommand|exec.Command|' command/agent_test.go gsed -i -e 's|NewTestAgent|agent.NewTestAgent|' command/agent_test.go gsed -i -e 's|= TestConfig|= agent.TestConfig|' command/agent_test.go gsed -i -e 's|: RetryJoin|: agent.RetryJoin|' command/agent_test.go gsed -i -e 's|\.\./\.\./|../|' command/config_util_test.go gsed -i -e 's|\bverifyUniqueListeners|VerifyUniqueListeners|' agent/config{,_test}.go command/agent.go gsed -i -e 's|\bserfLANKeyring\b|SerfLANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go gsed -i -e 's|\bserfWANKeyring\b|SerfWANKeyring|g' agent/{agent,keyring,testagent}.go command/agent.go gsed -i -e 's|\bNewAgent\b|agent.New|g' command/agent{,_test}.go gsed -i -e 's|\bNewAgent|New|' agent/{acl_test,agent,testagent}.go gsed -i -e 's|\bAgent\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bBool\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bDefaultConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bDevConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bMergeConfig\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bReadConfigPaths\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bParseMetaPair\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bSerfLANKeyring\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|\bSerfWANKeyring\b|agent.&|g' command/agent{,_test}.go gsed -i -e 's|circonus\.agent|circonus|g' command/agent{,_test}.go gsed -i -e 's|logger\.agent|logger|g' command/agent{,_test}.go gsed -i -e 's|metrics\.agent|metrics|g' command/agent{,_test}.go gsed -i -e 's|// agent.Agent|// agent|' command/agent{,_test}.go gsed -i -e 's|a\.agent\.Config|a.Config|' command/agent{,_test}.go gsed -i -e 's|agent\.AppendSliceValue|AppendSliceValue|' command/{configtest,validate}.go gsed -i -e 's|consul/consul|agent/consul|' GNUmakefile gsed -i -e 's|\.\./test|../../test|' agent/consul/server_test.go # fix imports f=$(grep -rl 'github.com/hashicorp/consul/command/agent' * | grep '\.go') gsed -i -e 's|github.com/hashicorp/consul/command/agent|github.com/hashicorp/consul/agent|' $f goimports -w $f f=$(grep -rl 'github.com/hashicorp/consul/consul' * | grep '\.go') gsed -i -e 's|github.com/hashicorp/consul/consul|github.com/hashicorp/consul/agent/consul|' $f goimports -w $f goimports -w command/*.go main.go )		8 years ago
..
agent.go	pkg refactor	8 years ago
agent_test.go	pkg refactor	8 years ago
base.go	pkg refactor	8 years ago
commands.go	pkg refactor	8 years ago
config_util.go	pkg refactor	8 years ago
config_util_test.go	pkg refactor	8 years ago
configtest.go	pkg refactor	8 years ago
configtest_test.go	pkg refactor	8 years ago
event.go	pkg refactor	8 years ago
event_test.go	pkg refactor	8 years ago
exec.go	pkg refactor	8 years ago
exec_test.go	pkg refactor	8 years ago
flag_slice_value.go	pkg refactor	8 years ago
flag_slice_value_test.go	pkg refactor	8 years ago
force_leave.go	pkg refactor	8 years ago
force_leave_test.go	pkg refactor	8 years ago
info.go	pkg refactor	8 years ago
info_test.go	pkg refactor	8 years ago
join.go	pkg refactor	8 years ago
join_test.go	pkg refactor	8 years ago
keygen.go	pkg refactor	8 years ago
keygen_test.go	pkg refactor	8 years ago
keyring.go	pkg refactor	8 years ago
keyring_test.go	pkg refactor	8 years ago
kv_command.go	pkg refactor	8 years ago
kv_command_test.go	test: run command tests in parallel	8 years ago
kv_delete.go	pkg refactor	8 years ago
kv_delete_test.go	pkg refactor	8 years ago
kv_export.go	pkg refactor	8 years ago
kv_export_test.go	pkg refactor	8 years ago
kv_get.go	pkg refactor	8 years ago
kv_get_test.go	pkg refactor	8 years ago
kv_import.go	pkg refactor	8 years ago
kv_import_test.go	pkg refactor	8 years ago
kv_put.go	pkg refactor	8 years ago
kv_put_test.go	pkg refactor	8 years ago
leave.go	pkg refactor	8 years ago
leave_test.go	pkg refactor	8 years ago
lock.go	pkg refactor	8 years ago
lock_test.go	pkg refactor	8 years ago
maint.go	pkg refactor	8 years ago
maint_test.go	pkg refactor	8 years ago
members.go	pkg refactor	8 years ago
members_test.go	pkg refactor	8 years ago
monitor.go	pkg refactor	8 years ago
operator.go	pkg refactor	8 years ago
operator_autopilot.go	pkg refactor	8 years ago
operator_autopilot_get.go	pkg refactor	8 years ago
operator_autopilot_get_test.go	pkg refactor	8 years ago
operator_autopilot_set.go	pkg refactor	8 years ago
operator_autopilot_set_test.go	pkg refactor	8 years ago
operator_autopilot_test.go	test: run command tests in parallel	8 years ago
operator_raft.go	pkg refactor	8 years ago
operator_raft_list.go	pkg refactor	8 years ago
operator_raft_list_test.go	pkg refactor	8 years ago
operator_raft_remove.go	pkg refactor	8 years ago
operator_raft_remove_test.go	pkg refactor	8 years ago
operator_raft_test.go	pkg refactor	8 years ago
operator_test.go	test: run command tests in parallel	8 years ago
reload.go	pkg refactor	8 years ago
reload_test.go	pkg refactor	8 years ago
rtt.go	pkg refactor	8 years ago
rtt_test.go	pkg refactor	8 years ago
snapshot_command.go	…
snapshot_command_test.go	test: run command tests in parallel	8 years ago
snapshot_inspect.go	pkg refactor	8 years ago
snapshot_inspect_test.go	pkg refactor	8 years ago
snapshot_restore.go	pkg refactor	8 years ago
snapshot_restore_test.go	pkg refactor	8 years ago
snapshot_save.go	pkg refactor	8 years ago
snapshot_save_test.go	pkg refactor	8 years ago
util_test.go	…
util_unix.go	…
util_windows.go	…
validate.go	pkg refactor	8 years ago
validate_test.go	pkg refactor	8 years ago
version.go	pkg refactor	8 years ago
version_test.go	test: run command tests in parallel	8 years ago
watch.go	pkg refactor	8 years ago
watch_test.go	pkg refactor	8 years ago