Skip to content

Commit

Permalink
Death to the Ruby file naming convention.
Browse files Browse the repository at this point in the history
File names now have underscores.
  • Loading branch information
clonezone committed May 23, 2012
1 parent 245eeeb commit 719bb66
Show file tree
Hide file tree
Showing 50 changed files with 73 additions and 73 deletions.
2 changes: 1 addition & 1 deletion bin/fig
Expand Up @@ -3,7 +3,7 @@
if ENV['FIG_COVERAGE'] if ENV['FIG_COVERAGE']
require File.expand_path( require File.expand_path(
File.join( File.join(
File.dirname(__FILE__), %w< .. lib fig command coveragesupport.rb > File.dirname(__FILE__), %w< .. lib fig command coverage_support.rb >
) )
) )
end end
Expand Down
2 changes: 1 addition & 1 deletion bin/fig-debug
Expand Up @@ -3,7 +3,7 @@
if ENV['FIG_COVERAGE'] if ENV['FIG_COVERAGE']
require File.expand_path( require File.expand_path(
File.join( File.join(
File.dirname(__FILE__), %w< .. lib fig command coveragesupport.rb > File.dirname(__FILE__), %w< .. lib fig command coverage_support.rb >
) )
) )
end end
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/fig/backtrace.rb
@@ -1,4 +1,4 @@
require 'fig/repositoryerror' require 'fig/repository_error'


module Fig; end module Fig; end


Expand Down
12 changes: 6 additions & 6 deletions lib/fig/command.rb
Expand Up @@ -2,19 +2,19 @@
require 'net/ftp' require 'net/ftp'
require 'set' require 'set'


require 'fig/atexit' require 'fig/at_exit'
require 'fig/command/options' require 'fig/command/options'
require 'fig/environment' require 'fig/environment'
require 'fig/figrc' require 'fig/figrc'
require 'fig/logging' require 'fig/logging'
require 'fig/operatingsystem' require 'fig/operating_system'
require 'fig/package' require 'fig/package'
require 'fig/parser' require 'fig/parser'
require 'fig/repository' require 'fig/repository'
require 'fig/repositoryerror' require 'fig/repository_error'
require 'fig/statement/configuration' require 'fig/statement/configuration'
require 'fig/userinputerror' require 'fig/user_input_error'
require 'fig/workingdirectorymaintainer' require 'fig/working_directory_maintainer'


# The following are a break out of parts of this class simply to keep the file # The following are a break out of parts of this class simply to keep the file
# size down. # size down.
Expand All @@ -24,7 +24,7 @@


# You will need to look in this file for any stuff related to loading the # You will need to look in this file for any stuff related to loading the
# base Package object. # base Package object.
require 'fig/command/packageload' require 'fig/command/package_load'


module Fig; end module Fig; end


Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions lib/fig/command/listing.rb
Expand Up @@ -2,8 +2,8 @@


require 'fig/backtrace' require 'fig/backtrace'
require 'fig/package' require 'fig/package'
require 'fig/packagedescriptor' require 'fig/package_descriptor'
require 'fig/userinputerror' require 'fig/user_input_error'


module Fig; end module Fig; end
class Fig::Command; end class Fig::Command; end
Expand Down
@@ -1,4 +1,4 @@
require 'fig/userinputerror' require 'fig/user_input_error'


module Fig; end module Fig; end
class Fig::Command; end class Fig::Command; end
Expand Down
4 changes: 2 additions & 2 deletions lib/fig/command/options.rb
@@ -1,8 +1,8 @@
require 'optparse' require 'optparse'


require 'fig/command/optionerror' require 'fig/command/option_error'
require 'fig/package' require 'fig/package'
require 'fig/packagedescriptor' require 'fig/package_descriptor'
require 'fig/statement/archive' require 'fig/statement/archive'
require 'fig/statement/include' require 'fig/statement/include'
require 'fig/statement/path' require 'fig/statement/path'
Expand Down
@@ -1,5 +1,5 @@
require 'fig/package' require 'fig/package'
require 'fig/packagedescriptor' require 'fig/package_descriptor'
require 'fig/parser' require 'fig/parser'


module Fig; end module Fig; end
Expand Down
@@ -1,4 +1,4 @@
require 'fig/userinputerror' require 'fig/user_input_error'


module Fig module Fig
# Could not determine some kind of information from a configuration file, # Could not determine some kind of information from a configuration file,
Expand Down
4 changes: 2 additions & 2 deletions lib/fig/environment.rb
Expand Up @@ -3,12 +3,12 @@
require 'fig/backtrace' require 'fig/backtrace'
require 'fig/logging' require 'fig/logging'
require 'fig/package' require 'fig/package'
require 'fig/repositoryerror' require 'fig/repository_error'
require 'fig/statement/command' require 'fig/statement/command'
require 'fig/statement/include' require 'fig/statement/include'
require 'fig/statement/path' require 'fig/statement/path'
require 'fig/statement/set' require 'fig/statement/set'
require 'fig/userinputerror' require 'fig/user_input_error'


module Fig; end module Fig; end


Expand Down
File renamed without changes.
@@ -1,4 +1,4 @@
require 'fig/environmentvariables' require 'fig/environment_variables'


module Fig; end; module Fig; end;
module EnvironmentVariables; end module EnvironmentVariables; end
Expand Down
@@ -1,4 +1,4 @@
require 'fig/environmentvariables' require 'fig/environment_variables'


module Fig; end; module Fig; end;
module EnvironmentVariables; end module EnvironmentVariables; end
Expand Down
6 changes: 3 additions & 3 deletions lib/fig/figrc.rb
@@ -1,8 +1,8 @@
require 'json' require 'json'


require 'fig/applicationconfiguration' require 'fig/application_configuration'
require 'fig/configfileerror' require 'fig/config_file_error'
require 'fig/operatingsystem' require 'fig/operating_system'
require 'fig/repository' require 'fig/repository'


module Fig; end module Fig; end
Expand Down
2 changes: 1 addition & 1 deletion lib/fig/grammar.treetop
@@ -1,7 +1,7 @@
# Treetop (http://treetop.rubyforge.org/) grammar for package definitions. # Treetop (http://treetop.rubyforge.org/) grammar for package definitions.


require 'fig/package' require 'fig/package'
require 'fig/packagedescriptor' require 'fig/package_descriptor'
require 'fig/parser' require 'fig/parser'
require 'fig/statement/archive' require 'fig/statement/archive'
require 'fig/statement/command' require 'fig/statement/command'
Expand Down
2 changes: 1 addition & 1 deletion lib/fig/log4r/outputter.rb
Expand Up @@ -3,7 +3,7 @@
require 'log4r/outputter/iooutputter' require 'log4r/outputter/iooutputter'


require 'fig/logging/colorizable' require 'fig/logging/colorizable'
require 'fig/operatingsystem' require 'fig/operating_system'


module Fig; end module Fig; end
module Fig::Log4r; end module Fig::Log4r; end
Expand Down
@@ -1,4 +1,4 @@
require 'fig/userinputerror' require 'fig/user_input_error'


module Fig module Fig
# A problem with configuring Log4r. # A problem with configuring Log4r.
Expand Down
4 changes: 2 additions & 2 deletions lib/fig/logging.rb
Expand Up @@ -2,8 +2,8 @@
require 'log4r/configurator' require 'log4r/configurator'
require 'log4r/yamlconfigurator' require 'log4r/yamlconfigurator'


require 'fig/configfileerror' require 'fig/config_file_error'
require 'fig/log4rconfigerror' require 'fig/log4r_config_error'
require 'fig/log4r/outputter' require 'fig/log4r/outputter'


module Fig; end module Fig; end
Expand Down
2 changes: 1 addition & 1 deletion lib/fig/networkerror.rb → lib/fig/network_error.rb
@@ -1,4 +1,4 @@
require 'fig/userinputerror' require 'fig/user_input_error'


module Fig module Fig
# A problem with file transfer over the network. # A problem with file transfer over the network.
Expand Down
@@ -1,5 +1,5 @@
require 'fig/packagedescriptor' require 'fig/package_descriptor'
require 'fig/userinputerror' require 'fig/user_input_error'


module Fig module Fig
# User specified a configuration for a Package that does not exist. # User specified a configuration for a Package that does not exist.
Expand Down
File renamed without changes.
10 changes: 5 additions & 5 deletions lib/fig/operatingsystem.rb → lib/fig/operating_system.rb
Expand Up @@ -13,12 +13,12 @@


require 'highline/import' require 'highline/import'


require 'fig/atexit' require 'fig/at_exit'
require 'fig/environmentvariables/caseinsensitive' require 'fig/environment_variables/case_insensitive'
require 'fig/environmentvariables/casesensitive' require 'fig/environment_variables/case_sensitive'
require 'fig/logging' require 'fig/logging'
require 'fig/networkerror' require 'fig/network_error'
require 'fig/notfounderror' require 'fig/not_found_error'


module Fig; end module Fig; end


Expand Down
4 changes: 2 additions & 2 deletions lib/fig/package.rb
@@ -1,6 +1,6 @@
require 'fig/logging' require 'fig/logging'
require 'fig/nosuchpackageconfigerror' require 'fig/no_such_package_config_error'
require 'fig/packagedescriptor' require 'fig/package_descriptor'
require 'fig/statement/archive' require 'fig/statement/archive'
require 'fig/statement/configuration' require 'fig/statement/configuration'
require 'fig/statement/resource' require 'fig/statement/resource'
Expand Down
File renamed without changes.
@@ -1,4 +1,4 @@
require 'fig/packagedescriptorparseerror' require 'fig/package_descriptor_parse_error'


module Fig; end module Fig; end


Expand Down
@@ -1,4 +1,4 @@
require 'fig/userinputerror' require 'fig/user_input_error'


module Fig module Fig
# Could not turn a string into a PackageDescriptor. # Could not turn a string into a PackageDescriptor.
Expand Down
@@ -1,4 +1,4 @@
require 'fig/userinputerror' require 'fig/user_input_error'


module Fig module Fig
# An issue with parsing a .fig file. # An issue with parsing a .fig file.
Expand Down
8 changes: 4 additions & 4 deletions lib/fig/parser.rb
Expand Up @@ -2,12 +2,12 @@


require 'fig/grammar' # this is grammar.treetop, not grammar.rb. require 'fig/grammar' # this is grammar.treetop, not grammar.rb.
require 'fig/logging' require 'fig/logging'
require 'fig/packageparseerror' require 'fig/package_parse_error'
require 'fig/parserpackagebuildstate' require 'fig/parser_package_build_state'
require 'fig/repository' require 'fig/repository'
require 'fig/statement' require 'fig/statement'
require 'fig/urlaccesserror' require 'fig/url_access_error'
require 'fig/userinputerror' require 'fig/user_input_error'


module Fig; end module Fig; end


Expand Down
@@ -1,4 +1,4 @@
require 'fig/packageparseerror' require 'fig/package_parse_error'
require 'fig/statement' require 'fig/statement'


module Fig; end module Fig; end
Expand Down
12 changes: 6 additions & 6 deletions lib/fig/repository.rb
Expand Up @@ -3,17 +3,17 @@
require 'sys/admin' require 'sys/admin'
require 'tmpdir' require 'tmpdir'


require 'fig/atexit' require 'fig/at_exit'
require 'fig/command' require 'fig/command'
require 'fig/logging' require 'fig/logging'
require 'fig/notfounderror' require 'fig/not_found_error'
require 'fig/packagecache' require 'fig/package_cache'
require 'fig/packagedescriptor' require 'fig/package_descriptor'
require 'fig/parser' require 'fig/parser'
require 'fig/repositoryerror' require 'fig/repository_error'
require 'fig/statement/archive' require 'fig/statement/archive'
require 'fig/statement/resource' require 'fig/statement/resource'
require 'fig/urlaccesserror' require 'fig/url_access_error'


module Fig; end module Fig; end


Expand Down
2 changes: 1 addition & 1 deletion lib/fig/repositoryerror.rb → lib/fig/repository_error.rb
@@ -1,4 +1,4 @@
require 'fig/userinputerror' require 'fig/user_input_error'


module Fig module Fig
# A problem within/related to a repository. # A problem within/related to a repository.
Expand Down
2 changes: 1 addition & 1 deletion lib/fig/statement/include.rb
@@ -1,4 +1,4 @@
require 'fig/packagedescriptor' require 'fig/package_descriptor'
require 'fig/statement' require 'fig/statement'


module Fig; end module Fig; end
Expand Down
2 changes: 1 addition & 1 deletion lib/fig/statement/override.rb
@@ -1,4 +1,4 @@
require 'fig/packagedescriptor' require 'fig/package_descriptor'
require 'fig/statement' require 'fig/statement'


module Fig; end module Fig; end
Expand Down
2 changes: 1 addition & 1 deletion lib/fig/urlaccesserror.rb → lib/fig/url_access_error.rb
@@ -1,4 +1,4 @@
require 'fig/userinputerror' require 'fig/user_input_error'


module Fig module Fig
# Configuration attempted to specify a URL outside of the whitelist. # Configuration attempted to specify a URL outside of the whitelist.
Expand Down
File renamed without changes.
Expand Up @@ -2,8 +2,8 @@


require 'fig/logging' require 'fig/logging'
require 'fig/logging/colorizable' require 'fig/logging/colorizable'
require 'fig/packagedescriptor' require 'fig/package_descriptor'
require 'fig/workingdirectorymetadata' require 'fig/working_directory_metadata'


module Fig; end module Fig; end


Expand Down
File renamed without changes.
@@ -1,4 +1,4 @@
require 'fig/applicationconfiguration' require 'fig/application_configuration'


require File.expand_path(File.dirname(__FILE__) + '/spec_helper') require File.expand_path(File.dirname(__FILE__) + '/spec_helper')


Expand Down
2 changes: 1 addition & 1 deletion spec/command/publishing_retrieval_spec.rb
@@ -1,6 +1,6 @@
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')


require 'fig/operatingsystem' require 'fig/operating_system'


describe 'Fig' do describe 'Fig' do
describe 'publishing/retrieval' do describe 'publishing/retrieval' do
Expand Down
2 changes: 1 addition & 1 deletion spec/command/publishing_spec.rb
@@ -1,6 +1,6 @@
require File.expand_path(File.dirname(__FILE__) + '/../spec_helper') require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')


require 'fig/operatingsystem' require 'fig/operating_system'
require 'fig/repository' require 'fig/repository'


ECHO_COMMAND = Fig::OperatingSystem.windows? ? '@echo' : 'echo' ECHO_COMMAND = Fig::OperatingSystem.windows? ? '@echo' : 'echo'
Expand Down
@@ -1,6 +1,6 @@
require File.expand_path(File.dirname(__FILE__) + '/spec_helper') require File.expand_path(File.dirname(__FILE__) + '/spec_helper')


require 'fig/command/optionerror' require 'fig/command/option_error'
require 'fig/command/options' require 'fig/command/options'


def check_environment_variable_option(option_name) def check_environment_variable_option(option_name)
Expand Down
4 changes: 2 additions & 2 deletions spec/environment_spec.rb
@@ -1,9 +1,9 @@
require File.expand_path(File.dirname(__FILE__) + '/spec_helper') require File.expand_path(File.dirname(__FILE__) + '/spec_helper')


require 'fig/environment' require 'fig/environment'
require 'fig/environmentvariables/casesensitive' require 'fig/environment_variables/case_sensitive'
require 'fig/package' require 'fig/package'
require 'fig/packagedescriptor' require 'fig/package_descriptor'
require 'fig/statement/configuration' require 'fig/statement/configuration'
require 'fig/statement/retrieve' require 'fig/statement/retrieve'
require 'fig/statement/set' require 'fig/statement/set'
Expand Down
4 changes: 2 additions & 2 deletions spec/environment_variables_spec.rb
@@ -1,7 +1,7 @@
require File.expand_path(File.dirname(__FILE__) + '/spec_helper') require File.expand_path(File.dirname(__FILE__) + '/spec_helper')


require 'fig/environmentvariables/caseinsensitive' require 'fig/environment_variables/case_insensitive'
require 'fig/environmentvariables/casesensitive' require 'fig/environment_variables/case_sensitive'


def find_diffs(primary_hash, secondary_hash, diff_hash) def find_diffs(primary_hash, secondary_hash, diff_hash)
primary_hash.each do |key, value| primary_hash.each do |key, value|
Expand Down
2 changes: 1 addition & 1 deletion spec/figrc_spec.rb
Expand Up @@ -5,7 +5,7 @@


require 'fig/figrc' require 'fig/figrc'
require 'fig/repository' require 'fig/repository'
require 'fig/workingdirectorymaintainer' require 'fig/working_directory_maintainer'


def create_override_file(foo, bar = nil) def create_override_file(foo, bar = nil)
tempfile = Tempfile.new('some_json_tempfile') tempfile = Tempfile.new('some_json_tempfile')
Expand Down
6 changes: 3 additions & 3 deletions spec/parser_spec.rb
@@ -1,8 +1,8 @@
require File.expand_path(File.dirname(__FILE__) + '/spec_helper') require File.expand_path(File.dirname(__FILE__) + '/spec_helper')


require 'fig/applicationconfiguration' require 'fig/application_configuration'
require 'fig/packagedescriptor' require 'fig/package_descriptor'
require 'fig/packageparseerror' require 'fig/package_parse_error'
require 'fig/parser' require 'fig/parser'


describe 'Parser' do describe 'Parser' do
Expand Down
4 changes: 2 additions & 2 deletions spec/repository_spec.rb
@@ -1,7 +1,7 @@
require File.expand_path(File.dirname(__FILE__) + '/spec_helper') require File.expand_path(File.dirname(__FILE__) + '/spec_helper')


require 'fig/applicationconfiguration' require 'fig/application_configuration'
require 'fig/packagedescriptor' require 'fig/package_descriptor'
require 'fig/repository' require 'fig/repository'
require 'fig/statement/configuration' require 'fig/statement/configuration'
require 'fig/statement/path' require 'fig/statement/path'
Expand Down

0 comments on commit 719bb66

Please sign in to comment.