From 719bb668c287ced989cb3e4ffc373e761ed02601 Mon Sep 17 00:00:00 2001 From: Elliot Shank Date: Wed, 23 May 2012 11:40:49 -0500 Subject: [PATCH] Death to the Ruby file naming convention. File names now have underscores. --- bin/fig | 2 +- bin/fig-debug | 2 +- ...configuration.rb => application_configuration.rb} | 0 lib/fig/{atexit.rb => at_exit.rb} | 0 lib/fig/backtrace.rb | 2 +- lib/fig/command.rb | 12 ++++++------ .../{coveragesupport.rb => coverage_support.rb} | 0 lib/fig/command/listing.rb | 4 ++-- lib/fig/command/{optionerror.rb => option_error.rb} | 2 +- lib/fig/command/options.rb | 4 ++-- lib/fig/command/{packageload.rb => package_load.rb} | 2 +- lib/fig/{configfileerror.rb => config_file_error.rb} | 2 +- lib/fig/environment.rb | 4 ++-- ...ironmentvariables.rb => environment_variables.rb} | 0 .../case_insensitive.rb} | 2 +- .../case_sensitive.rb} | 2 +- lib/fig/figrc.rb | 6 +++--- lib/fig/grammar.treetop | 2 +- lib/fig/log4r/outputter.rb | 2 +- .../{log4rconfigerror.rb => log4r_config_error.rb} | 2 +- lib/fig/logging.rb | 4 ++-- lib/fig/{networkerror.rb => network_error.rb} | 2 +- ...onfigerror.rb => no_such_package_config_error.rb} | 4 ++-- lib/fig/{notfounderror.rb => not_found_error.rb} | 0 lib/fig/{operatingsystem.rb => operating_system.rb} | 10 +++++----- lib/fig/package.rb | 4 ++-- lib/fig/{packagecache.rb => package_cache.rb} | 0 .../{packagedescriptor.rb => package_descriptor.rb} | 2 +- ...rseerror.rb => package_descriptor_parse_error.rb} | 2 +- .../{packageparseerror.rb => package_parse_error.rb} | 2 +- lib/fig/parser.rb | 8 ++++---- ...gebuildstate.rb => parser_package_build_state.rb} | 2 +- lib/fig/repository.rb | 12 ++++++------ lib/fig/{repositoryerror.rb => repository_error.rb} | 2 +- lib/fig/statement/include.rb | 2 +- lib/fig/statement/override.rb | 2 +- lib/fig/{urlaccesserror.rb => url_access_error.rb} | 2 +- lib/fig/{userinputerror.rb => user_input_error.rb} | 0 ...maintainer.rb => working_directory_maintainer.rb} | 4 ++-- ...torymetadata.rb => working_directory_metadata.rb} | 0 ...ion_spec.rb => application_configuration_spec.rb} | 2 +- spec/command/publishing_retrieval_spec.rb | 2 +- spec/command/publishing_spec.rb | 2 +- ...ommandoptions_spec.rb => command_options_spec.rb} | 2 +- spec/environment_spec.rb | 4 ++-- spec/environment_variables_spec.rb | 4 ++-- spec/figrc_spec.rb | 2 +- spec/parser_spec.rb | 6 +++--- spec/repository_spec.rb | 4 ++-- ..._spec.rb => working_directory_maintainer_spec.rb} | 2 +- 50 files changed, 73 insertions(+), 73 deletions(-) rename lib/fig/{applicationconfiguration.rb => application_configuration.rb} (100%) rename lib/fig/{atexit.rb => at_exit.rb} (100%) rename lib/fig/command/{coveragesupport.rb => coverage_support.rb} (100%) rename lib/fig/command/{optionerror.rb => option_error.rb} (80%) rename lib/fig/command/{packageload.rb => package_load.rb} (99%) rename lib/fig/{configfileerror.rb => config_file_error.rb} (90%) rename lib/fig/{environmentvariables.rb => environment_variables.rb} (100%) rename lib/fig/{environmentvariables/caseinsensitive.rb => environment_variables/case_insensitive.rb} (96%) rename lib/fig/{environmentvariables/casesensitive.rb => environment_variables/case_sensitive.rb} (94%) rename lib/fig/{log4rconfigerror.rb => log4r_config_error.rb} (92%) rename lib/fig/{networkerror.rb => network_error.rb} (78%) rename lib/fig/{nosuchpackageconfigerror.rb => no_such_package_config_error.rb} (81%) rename lib/fig/{notfounderror.rb => not_found_error.rb} (100%) rename lib/fig/{operatingsystem.rb => operating_system.rb} (98%) rename lib/fig/{packagecache.rb => package_cache.rb} (100%) rename lib/fig/{packagedescriptor.rb => package_descriptor.rb} (99%) rename lib/fig/{packagedescriptorparseerror.rb => package_descriptor_parse_error.rb} (90%) rename lib/fig/{packageparseerror.rb => package_parse_error.rb} (77%) rename lib/fig/{parserpackagebuildstate.rb => parser_package_build_state.rb} (97%) rename lib/fig/{repositoryerror.rb => repository_error.rb} (77%) rename lib/fig/{urlaccesserror.rb => url_access_error.rb} (89%) rename lib/fig/{userinputerror.rb => user_input_error.rb} (100%) rename lib/fig/{workingdirectorymaintainer.rb => working_directory_maintainer.rb} (98%) rename lib/fig/{workingdirectorymetadata.rb => working_directory_metadata.rb} (100%) rename spec/{applicationconfiguration_spec.rb => application_configuration_spec.rb} (98%) rename spec/{commandoptions_spec.rb => command_options_spec.rb} (98%) rename spec/{workingdirectorymaintainer_spec.rb => working_directory_maintainer_spec.rb} (98%) diff --git a/bin/fig b/bin/fig index f1fa9e5..6e43abb 100755 --- a/bin/fig +++ b/bin/fig @@ -3,7 +3,7 @@ if ENV['FIG_COVERAGE'] require File.expand_path( File.join( - File.dirname(__FILE__), %w< .. lib fig command coveragesupport.rb > + File.dirname(__FILE__), %w< .. lib fig command coverage_support.rb > ) ) end diff --git a/bin/fig-debug b/bin/fig-debug index 3011e40..1e8ac3e 100755 --- a/bin/fig-debug +++ b/bin/fig-debug @@ -3,7 +3,7 @@ if ENV['FIG_COVERAGE'] require File.expand_path( File.join( - File.dirname(__FILE__), %w< .. lib fig command coveragesupport.rb > + File.dirname(__FILE__), %w< .. lib fig command coverage_support.rb > ) ) end diff --git a/lib/fig/applicationconfiguration.rb b/lib/fig/application_configuration.rb similarity index 100% rename from lib/fig/applicationconfiguration.rb rename to lib/fig/application_configuration.rb diff --git a/lib/fig/atexit.rb b/lib/fig/at_exit.rb similarity index 100% rename from lib/fig/atexit.rb rename to lib/fig/at_exit.rb diff --git a/lib/fig/backtrace.rb b/lib/fig/backtrace.rb index 7bb4f71..03ad200 100644 --- a/lib/fig/backtrace.rb +++ b/lib/fig/backtrace.rb @@ -1,4 +1,4 @@ -require 'fig/repositoryerror' +require 'fig/repository_error' module Fig; end diff --git a/lib/fig/command.rb b/lib/fig/command.rb index 3051d20..bf23d33 100644 --- a/lib/fig/command.rb +++ b/lib/fig/command.rb @@ -2,19 +2,19 @@ require 'net/ftp' require 'set' -require 'fig/atexit' +require 'fig/at_exit' require 'fig/command/options' require 'fig/environment' require 'fig/figrc' require 'fig/logging' -require 'fig/operatingsystem' +require 'fig/operating_system' require 'fig/package' require 'fig/parser' require 'fig/repository' -require 'fig/repositoryerror' +require 'fig/repository_error' require 'fig/statement/configuration' -require 'fig/userinputerror' -require 'fig/workingdirectorymaintainer' +require 'fig/user_input_error' +require 'fig/working_directory_maintainer' # The following are a break out of parts of this class simply to keep the file # size down. @@ -24,7 +24,7 @@ # You will need to look in this file for any stuff related to loading the # base Package object. -require 'fig/command/packageload' +require 'fig/command/package_load' module Fig; end diff --git a/lib/fig/command/coveragesupport.rb b/lib/fig/command/coverage_support.rb similarity index 100% rename from lib/fig/command/coveragesupport.rb rename to lib/fig/command/coverage_support.rb diff --git a/lib/fig/command/listing.rb b/lib/fig/command/listing.rb index b5f4098..df0749b 100644 --- a/lib/fig/command/listing.rb +++ b/lib/fig/command/listing.rb @@ -2,8 +2,8 @@ require 'fig/backtrace' require 'fig/package' -require 'fig/packagedescriptor' -require 'fig/userinputerror' +require 'fig/package_descriptor' +require 'fig/user_input_error' module Fig; end class Fig::Command; end diff --git a/lib/fig/command/optionerror.rb b/lib/fig/command/option_error.rb similarity index 80% rename from lib/fig/command/optionerror.rb rename to lib/fig/command/option_error.rb index 61ae161..63be32e 100644 --- a/lib/fig/command/optionerror.rb +++ b/lib/fig/command/option_error.rb @@ -1,4 +1,4 @@ -require 'fig/userinputerror' +require 'fig/user_input_error' module Fig; end class Fig::Command; end diff --git a/lib/fig/command/options.rb b/lib/fig/command/options.rb index 21ca752..fff0e90 100644 --- a/lib/fig/command/options.rb +++ b/lib/fig/command/options.rb @@ -1,8 +1,8 @@ require 'optparse' -require 'fig/command/optionerror' +require 'fig/command/option_error' require 'fig/package' -require 'fig/packagedescriptor' +require 'fig/package_descriptor' require 'fig/statement/archive' require 'fig/statement/include' require 'fig/statement/path' diff --git a/lib/fig/command/packageload.rb b/lib/fig/command/package_load.rb similarity index 99% rename from lib/fig/command/packageload.rb rename to lib/fig/command/package_load.rb index 1c7ff2c..876880d 100644 --- a/lib/fig/command/packageload.rb +++ b/lib/fig/command/package_load.rb @@ -1,5 +1,5 @@ require 'fig/package' -require 'fig/packagedescriptor' +require 'fig/package_descriptor' require 'fig/parser' module Fig; end diff --git a/lib/fig/configfileerror.rb b/lib/fig/config_file_error.rb similarity index 90% rename from lib/fig/configfileerror.rb rename to lib/fig/config_file_error.rb index 9dfcf5e..421dda8 100644 --- a/lib/fig/configfileerror.rb +++ b/lib/fig/config_file_error.rb @@ -1,4 +1,4 @@ -require 'fig/userinputerror' +require 'fig/user_input_error' module Fig # Could not determine some kind of information from a configuration file, diff --git a/lib/fig/environment.rb b/lib/fig/environment.rb index 4dfc799..40771ee 100644 --- a/lib/fig/environment.rb +++ b/lib/fig/environment.rb @@ -3,12 +3,12 @@ require 'fig/backtrace' require 'fig/logging' require 'fig/package' -require 'fig/repositoryerror' +require 'fig/repository_error' require 'fig/statement/command' require 'fig/statement/include' require 'fig/statement/path' require 'fig/statement/set' -require 'fig/userinputerror' +require 'fig/user_input_error' module Fig; end diff --git a/lib/fig/environmentvariables.rb b/lib/fig/environment_variables.rb similarity index 100% rename from lib/fig/environmentvariables.rb rename to lib/fig/environment_variables.rb diff --git a/lib/fig/environmentvariables/caseinsensitive.rb b/lib/fig/environment_variables/case_insensitive.rb similarity index 96% rename from lib/fig/environmentvariables/caseinsensitive.rb rename to lib/fig/environment_variables/case_insensitive.rb index 78a6600..cc30cb2 100644 --- a/lib/fig/environmentvariables/caseinsensitive.rb +++ b/lib/fig/environment_variables/case_insensitive.rb @@ -1,4 +1,4 @@ -require 'fig/environmentvariables' +require 'fig/environment_variables' module Fig; end; module EnvironmentVariables; end diff --git a/lib/fig/environmentvariables/casesensitive.rb b/lib/fig/environment_variables/case_sensitive.rb similarity index 94% rename from lib/fig/environmentvariables/casesensitive.rb rename to lib/fig/environment_variables/case_sensitive.rb index 53b91f5..7c74b6c 100644 --- a/lib/fig/environmentvariables/casesensitive.rb +++ b/lib/fig/environment_variables/case_sensitive.rb @@ -1,4 +1,4 @@ -require 'fig/environmentvariables' +require 'fig/environment_variables' module Fig; end; module EnvironmentVariables; end diff --git a/lib/fig/figrc.rb b/lib/fig/figrc.rb index d9a163a..d0df268 100644 --- a/lib/fig/figrc.rb +++ b/lib/fig/figrc.rb @@ -1,8 +1,8 @@ require 'json' -require 'fig/applicationconfiguration' -require 'fig/configfileerror' -require 'fig/operatingsystem' +require 'fig/application_configuration' +require 'fig/config_file_error' +require 'fig/operating_system' require 'fig/repository' module Fig; end diff --git a/lib/fig/grammar.treetop b/lib/fig/grammar.treetop index 359b52d..4952d60 100644 --- a/lib/fig/grammar.treetop +++ b/lib/fig/grammar.treetop @@ -1,7 +1,7 @@ # Treetop (http://treetop.rubyforge.org/) grammar for package definitions. require 'fig/package' -require 'fig/packagedescriptor' +require 'fig/package_descriptor' require 'fig/parser' require 'fig/statement/archive' require 'fig/statement/command' diff --git a/lib/fig/log4r/outputter.rb b/lib/fig/log4r/outputter.rb index b023421..b663023 100644 --- a/lib/fig/log4r/outputter.rb +++ b/lib/fig/log4r/outputter.rb @@ -3,7 +3,7 @@ require 'log4r/outputter/iooutputter' require 'fig/logging/colorizable' -require 'fig/operatingsystem' +require 'fig/operating_system' module Fig; end module Fig::Log4r; end diff --git a/lib/fig/log4rconfigerror.rb b/lib/fig/log4r_config_error.rb similarity index 92% rename from lib/fig/log4rconfigerror.rb rename to lib/fig/log4r_config_error.rb index 7b50ffd..b46ec86 100644 --- a/lib/fig/log4rconfigerror.rb +++ b/lib/fig/log4r_config_error.rb @@ -1,4 +1,4 @@ -require 'fig/userinputerror' +require 'fig/user_input_error' module Fig # A problem with configuring Log4r. diff --git a/lib/fig/logging.rb b/lib/fig/logging.rb index bd70ff7..3eeee7b 100644 --- a/lib/fig/logging.rb +++ b/lib/fig/logging.rb @@ -2,8 +2,8 @@ require 'log4r/configurator' require 'log4r/yamlconfigurator' -require 'fig/configfileerror' -require 'fig/log4rconfigerror' +require 'fig/config_file_error' +require 'fig/log4r_config_error' require 'fig/log4r/outputter' module Fig; end diff --git a/lib/fig/networkerror.rb b/lib/fig/network_error.rb similarity index 78% rename from lib/fig/networkerror.rb rename to lib/fig/network_error.rb index 5d42769..3c92f20 100644 --- a/lib/fig/networkerror.rb +++ b/lib/fig/network_error.rb @@ -1,4 +1,4 @@ -require 'fig/userinputerror' +require 'fig/user_input_error' module Fig # A problem with file transfer over the network. diff --git a/lib/fig/nosuchpackageconfigerror.rb b/lib/fig/no_such_package_config_error.rb similarity index 81% rename from lib/fig/nosuchpackageconfigerror.rb rename to lib/fig/no_such_package_config_error.rb index 86eb6c3..b201b0b 100644 --- a/lib/fig/nosuchpackageconfigerror.rb +++ b/lib/fig/no_such_package_config_error.rb @@ -1,5 +1,5 @@ -require 'fig/packagedescriptor' -require 'fig/userinputerror' +require 'fig/package_descriptor' +require 'fig/user_input_error' module Fig # User specified a configuration for a Package that does not exist. diff --git a/lib/fig/notfounderror.rb b/lib/fig/not_found_error.rb similarity index 100% rename from lib/fig/notfounderror.rb rename to lib/fig/not_found_error.rb diff --git a/lib/fig/operatingsystem.rb b/lib/fig/operating_system.rb similarity index 98% rename from lib/fig/operatingsystem.rb rename to lib/fig/operating_system.rb index 7cc8c5f..3d3191b 100644 --- a/lib/fig/operatingsystem.rb +++ b/lib/fig/operating_system.rb @@ -13,12 +13,12 @@ require 'highline/import' -require 'fig/atexit' -require 'fig/environmentvariables/caseinsensitive' -require 'fig/environmentvariables/casesensitive' +require 'fig/at_exit' +require 'fig/environment_variables/case_insensitive' +require 'fig/environment_variables/case_sensitive' require 'fig/logging' -require 'fig/networkerror' -require 'fig/notfounderror' +require 'fig/network_error' +require 'fig/not_found_error' module Fig; end diff --git a/lib/fig/package.rb b/lib/fig/package.rb index 0055be8..c289667 100644 --- a/lib/fig/package.rb +++ b/lib/fig/package.rb @@ -1,6 +1,6 @@ require 'fig/logging' -require 'fig/nosuchpackageconfigerror' -require 'fig/packagedescriptor' +require 'fig/no_such_package_config_error' +require 'fig/package_descriptor' require 'fig/statement/archive' require 'fig/statement/configuration' require 'fig/statement/resource' diff --git a/lib/fig/packagecache.rb b/lib/fig/package_cache.rb similarity index 100% rename from lib/fig/packagecache.rb rename to lib/fig/package_cache.rb diff --git a/lib/fig/packagedescriptor.rb b/lib/fig/package_descriptor.rb similarity index 99% rename from lib/fig/packagedescriptor.rb rename to lib/fig/package_descriptor.rb index f1b9046..d56364b 100644 --- a/lib/fig/packagedescriptor.rb +++ b/lib/fig/package_descriptor.rb @@ -1,4 +1,4 @@ -require 'fig/packagedescriptorparseerror' +require 'fig/package_descriptor_parse_error' module Fig; end diff --git a/lib/fig/packagedescriptorparseerror.rb b/lib/fig/package_descriptor_parse_error.rb similarity index 90% rename from lib/fig/packagedescriptorparseerror.rb rename to lib/fig/package_descriptor_parse_error.rb index f115064..d7fd538 100644 --- a/lib/fig/packagedescriptorparseerror.rb +++ b/lib/fig/package_descriptor_parse_error.rb @@ -1,4 +1,4 @@ -require 'fig/userinputerror' +require 'fig/user_input_error' module Fig # Could not turn a string into a PackageDescriptor. diff --git a/lib/fig/packageparseerror.rb b/lib/fig/package_parse_error.rb similarity index 77% rename from lib/fig/packageparseerror.rb rename to lib/fig/package_parse_error.rb index e444b71..6e2fa57 100644 --- a/lib/fig/packageparseerror.rb +++ b/lib/fig/package_parse_error.rb @@ -1,4 +1,4 @@ -require 'fig/userinputerror' +require 'fig/user_input_error' module Fig # An issue with parsing a .fig file. diff --git a/lib/fig/parser.rb b/lib/fig/parser.rb index ebd4556..4a2dd68 100644 --- a/lib/fig/parser.rb +++ b/lib/fig/parser.rb @@ -2,12 +2,12 @@ require 'fig/grammar' # this is grammar.treetop, not grammar.rb. require 'fig/logging' -require 'fig/packageparseerror' -require 'fig/parserpackagebuildstate' +require 'fig/package_parse_error' +require 'fig/parser_package_build_state' require 'fig/repository' require 'fig/statement' -require 'fig/urlaccesserror' -require 'fig/userinputerror' +require 'fig/url_access_error' +require 'fig/user_input_error' module Fig; end diff --git a/lib/fig/parserpackagebuildstate.rb b/lib/fig/parser_package_build_state.rb similarity index 97% rename from lib/fig/parserpackagebuildstate.rb rename to lib/fig/parser_package_build_state.rb index 197a157..7c82654 100644 --- a/lib/fig/parserpackagebuildstate.rb +++ b/lib/fig/parser_package_build_state.rb @@ -1,4 +1,4 @@ -require 'fig/packageparseerror' +require 'fig/package_parse_error' require 'fig/statement' module Fig; end diff --git a/lib/fig/repository.rb b/lib/fig/repository.rb index 4cf91e7..6302eb6 100644 --- a/lib/fig/repository.rb +++ b/lib/fig/repository.rb @@ -3,17 +3,17 @@ require 'sys/admin' require 'tmpdir' -require 'fig/atexit' +require 'fig/at_exit' require 'fig/command' require 'fig/logging' -require 'fig/notfounderror' -require 'fig/packagecache' -require 'fig/packagedescriptor' +require 'fig/not_found_error' +require 'fig/package_cache' +require 'fig/package_descriptor' require 'fig/parser' -require 'fig/repositoryerror' +require 'fig/repository_error' require 'fig/statement/archive' require 'fig/statement/resource' -require 'fig/urlaccesserror' +require 'fig/url_access_error' module Fig; end diff --git a/lib/fig/repositoryerror.rb b/lib/fig/repository_error.rb similarity index 77% rename from lib/fig/repositoryerror.rb rename to lib/fig/repository_error.rb index e0920d2..65a5d29 100644 --- a/lib/fig/repositoryerror.rb +++ b/lib/fig/repository_error.rb @@ -1,4 +1,4 @@ -require 'fig/userinputerror' +require 'fig/user_input_error' module Fig # A problem within/related to a repository. diff --git a/lib/fig/statement/include.rb b/lib/fig/statement/include.rb index dbb8c81..5a9ec34 100644 --- a/lib/fig/statement/include.rb +++ b/lib/fig/statement/include.rb @@ -1,4 +1,4 @@ -require 'fig/packagedescriptor' +require 'fig/package_descriptor' require 'fig/statement' module Fig; end diff --git a/lib/fig/statement/override.rb b/lib/fig/statement/override.rb index b48795f..b7c8377 100644 --- a/lib/fig/statement/override.rb +++ b/lib/fig/statement/override.rb @@ -1,4 +1,4 @@ -require 'fig/packagedescriptor' +require 'fig/package_descriptor' require 'fig/statement' module Fig; end diff --git a/lib/fig/urlaccesserror.rb b/lib/fig/url_access_error.rb similarity index 89% rename from lib/fig/urlaccesserror.rb rename to lib/fig/url_access_error.rb index ba880fd..ae71bf9 100644 --- a/lib/fig/urlaccesserror.rb +++ b/lib/fig/url_access_error.rb @@ -1,4 +1,4 @@ -require 'fig/userinputerror' +require 'fig/user_input_error' module Fig # Configuration attempted to specify a URL outside of the whitelist. diff --git a/lib/fig/userinputerror.rb b/lib/fig/user_input_error.rb similarity index 100% rename from lib/fig/userinputerror.rb rename to lib/fig/user_input_error.rb diff --git a/lib/fig/workingdirectorymaintainer.rb b/lib/fig/working_directory_maintainer.rb similarity index 98% rename from lib/fig/workingdirectorymaintainer.rb rename to lib/fig/working_directory_maintainer.rb index 212b3c8..44dff98 100644 --- a/lib/fig/workingdirectorymaintainer.rb +++ b/lib/fig/working_directory_maintainer.rb @@ -2,8 +2,8 @@ require 'fig/logging' require 'fig/logging/colorizable' -require 'fig/packagedescriptor' -require 'fig/workingdirectorymetadata' +require 'fig/package_descriptor' +require 'fig/working_directory_metadata' module Fig; end diff --git a/lib/fig/workingdirectorymetadata.rb b/lib/fig/working_directory_metadata.rb similarity index 100% rename from lib/fig/workingdirectorymetadata.rb rename to lib/fig/working_directory_metadata.rb diff --git a/spec/applicationconfiguration_spec.rb b/spec/application_configuration_spec.rb similarity index 98% rename from spec/applicationconfiguration_spec.rb rename to spec/application_configuration_spec.rb index 6571eea..84644ab 100644 --- a/spec/applicationconfiguration_spec.rb +++ b/spec/application_configuration_spec.rb @@ -1,4 +1,4 @@ -require 'fig/applicationconfiguration' +require 'fig/application_configuration' require File.expand_path(File.dirname(__FILE__) + '/spec_helper') diff --git a/spec/command/publishing_retrieval_spec.rb b/spec/command/publishing_retrieval_spec.rb index 93b9a76..bd4a134 100644 --- a/spec/command/publishing_retrieval_spec.rb +++ b/spec/command/publishing_retrieval_spec.rb @@ -1,6 +1,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') -require 'fig/operatingsystem' +require 'fig/operating_system' describe 'Fig' do describe 'publishing/retrieval' do diff --git a/spec/command/publishing_spec.rb b/spec/command/publishing_spec.rb index dcea8f6..afc91bc 100644 --- a/spec/command/publishing_spec.rb +++ b/spec/command/publishing_spec.rb @@ -1,6 +1,6 @@ require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') -require 'fig/operatingsystem' +require 'fig/operating_system' require 'fig/repository' ECHO_COMMAND = Fig::OperatingSystem.windows? ? '@echo' : 'echo' diff --git a/spec/commandoptions_spec.rb b/spec/command_options_spec.rb similarity index 98% rename from spec/commandoptions_spec.rb rename to spec/command_options_spec.rb index dd52a30..dd9b05d 100644 --- a/spec/commandoptions_spec.rb +++ b/spec/command_options_spec.rb @@ -1,6 +1,6 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper') -require 'fig/command/optionerror' +require 'fig/command/option_error' require 'fig/command/options' def check_environment_variable_option(option_name) diff --git a/spec/environment_spec.rb b/spec/environment_spec.rb index 56e3135..988aa3c 100644 --- a/spec/environment_spec.rb +++ b/spec/environment_spec.rb @@ -1,9 +1,9 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper') require 'fig/environment' -require 'fig/environmentvariables/casesensitive' +require 'fig/environment_variables/case_sensitive' require 'fig/package' -require 'fig/packagedescriptor' +require 'fig/package_descriptor' require 'fig/statement/configuration' require 'fig/statement/retrieve' require 'fig/statement/set' diff --git a/spec/environment_variables_spec.rb b/spec/environment_variables_spec.rb index 7f81a7d..a5fabcc 100644 --- a/spec/environment_variables_spec.rb +++ b/spec/environment_variables_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper') -require 'fig/environmentvariables/caseinsensitive' -require 'fig/environmentvariables/casesensitive' +require 'fig/environment_variables/case_insensitive' +require 'fig/environment_variables/case_sensitive' def find_diffs(primary_hash, secondary_hash, diff_hash) primary_hash.each do |key, value| diff --git a/spec/figrc_spec.rb b/spec/figrc_spec.rb index 081d1cb..41a3eba 100644 --- a/spec/figrc_spec.rb +++ b/spec/figrc_spec.rb @@ -5,7 +5,7 @@ require 'fig/figrc' require 'fig/repository' -require 'fig/workingdirectorymaintainer' +require 'fig/working_directory_maintainer' def create_override_file(foo, bar = nil) tempfile = Tempfile.new('some_json_tempfile') diff --git a/spec/parser_spec.rb b/spec/parser_spec.rb index 6a52bc5..34c5329 100644 --- a/spec/parser_spec.rb +++ b/spec/parser_spec.rb @@ -1,8 +1,8 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper') -require 'fig/applicationconfiguration' -require 'fig/packagedescriptor' -require 'fig/packageparseerror' +require 'fig/application_configuration' +require 'fig/package_descriptor' +require 'fig/package_parse_error' require 'fig/parser' describe 'Parser' do diff --git a/spec/repository_spec.rb b/spec/repository_spec.rb index 990529f..ae982a4 100644 --- a/spec/repository_spec.rb +++ b/spec/repository_spec.rb @@ -1,7 +1,7 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper') -require 'fig/applicationconfiguration' -require 'fig/packagedescriptor' +require 'fig/application_configuration' +require 'fig/package_descriptor' require 'fig/repository' require 'fig/statement/configuration' require 'fig/statement/path' diff --git a/spec/workingdirectorymaintainer_spec.rb b/spec/working_directory_maintainer_spec.rb similarity index 98% rename from spec/workingdirectorymaintainer_spec.rb rename to spec/working_directory_maintainer_spec.rb index 3552d2d..0d26d53 100644 --- a/spec/workingdirectorymaintainer_spec.rb +++ b/spec/working_directory_maintainer_spec.rb @@ -1,6 +1,6 @@ require File.expand_path(File.dirname(__FILE__) + '/spec_helper') -require 'fig/workingdirectorymaintainer' +require 'fig/working_directory_maintainer' describe 'WorkingDirectoryMaintainer' do let(:base_directory) { "#{FIG_SPEC_BASE_DIRECTORY}/retrieve-test" }