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
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion bin/fig-debug
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
File renamed without changes.
File renamed without changes.
2 changes: 1 addition & 1 deletion lib/fig/backtrace.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'fig/repositoryerror'
require 'fig/repository_error'

module Fig; end

Expand Down
12 changes: 6 additions & 6 deletions lib/fig/command.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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.
Expand All @@ -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

Expand Down
File renamed without changes.
4 changes: 2 additions & 2 deletions lib/fig/command/listing.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'fig/userinputerror'
require 'fig/user_input_error'

module Fig; end
class Fig::Command; end
Expand Down
4 changes: 2 additions & 2 deletions lib/fig/command/options.rb
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
require 'fig/package'
require 'fig/packagedescriptor'
require 'fig/package_descriptor'
require 'fig/parser'

module Fig; end
Expand Down
Original file line number Diff line number Diff line change
@@ -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,
Expand Down
4 changes: 2 additions & 2 deletions lib/fig/environment.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'fig/environmentvariables'
require 'fig/environment_variables'

module Fig; end;
module EnvironmentVariables; end
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'fig/environmentvariables'
require 'fig/environment_variables'

module Fig; end;
module EnvironmentVariables; end
Expand Down
6 changes: 3 additions & 3 deletions lib/fig/figrc.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/fig/grammar.treetop
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
2 changes: 1 addition & 1 deletion lib/fig/log4r/outputter.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'fig/userinputerror'
require 'fig/user_input_error'

module Fig
# A problem with configuring Log4r.
Expand Down
4 changes: 2 additions & 2 deletions lib/fig/logging.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion lib/fig/networkerror.rb → lib/fig/network_error.rb
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'fig/userinputerror'
require 'fig/user_input_error'

module Fig
# A problem with file transfer over the network.
Expand Down
Original file line number Diff line number Diff line change
@@ -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.
Expand Down
File renamed without changes.
10 changes: 5 additions & 5 deletions lib/fig/operatingsystem.rb → lib/fig/operating_system.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
4 changes: 2 additions & 2 deletions lib/fig/package.rb
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'fig/packagedescriptorparseerror'
require 'fig/package_descriptor_parse_error'

module Fig; end

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'fig/userinputerror'
require 'fig/user_input_error'

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

module Fig
# An issue with parsing a .fig file.
Expand Down
8 changes: 4 additions & 4 deletions lib/fig/parser.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'fig/packageparseerror'
require 'fig/package_parse_error'
require 'fig/statement'

module Fig; end
Expand Down
12 changes: 6 additions & 6 deletions lib/fig/repository.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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

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

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

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

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

module Fig
# Configuration attempted to specify a URL outside of the whitelist.
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
Expand Up @@ -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

Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
require 'fig/applicationconfiguration'
require 'fig/application_configuration'

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

Expand Down
2 changes: 1 addition & 1 deletion spec/command/publishing_retrieval_spec.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion spec/command/publishing_spec.rb
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
4 changes: 2 additions & 2 deletions spec/environment_spec.rb
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
4 changes: 2 additions & 2 deletions spec/environment_variables_spec.rb
Original file line number Diff line number Diff line change
@@ -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|
Expand Down
2 changes: 1 addition & 1 deletion spec/figrc_spec.rb
Original file line number Diff line number Diff line change
Expand Up @@ -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')
Expand Down
6 changes: 3 additions & 3 deletions spec/parser_spec.rb
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions spec/repository_spec.rb
Original file line number Diff line number Diff line change
@@ -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'
Expand Down
Loading

0 comments on commit 719bb66

Please sign in to comment.