Commit 476918d5 authored by matt.downey's avatar matt.downey

change method names to conform to ruby style guidelines

parent 8df14b7d
...@@ -45,7 +45,7 @@ abort "Chromebrew should not be run as root." if Process.uid == 0 && @command != ...@@ -45,7 +45,7 @@ abort "Chromebrew should not be run as root." if Process.uid == 0 && @command !=
@device[key] = @device[key].to_sym rescue @device[key] @device[key] = @device[key].to_sym rescue @device[key]
end end
def setPkg (pkgName, silent = false) def set_package (pkgName, silent = false)
require CREW_LIB_PATH + 'packages/' + pkgName require CREW_LIB_PATH + 'packages/' + pkgName
@pkg = Object.const_get(pkgName.capitalize) @pkg = Object.const_get(pkgName.capitalize)
@pkg.name = pkgName @pkg.name = pkgName
...@@ -64,7 +64,7 @@ end ...@@ -64,7 +64,7 @@ end
def search (pkgName, silent = false) def search (pkgName, silent = false)
Find.find (CREW_LIB_PATH + 'packages') do |filename| Find.find (CREW_LIB_PATH + 'packages') do |filename|
return setPkg(pkgName, silent) if filename == CREW_LIB_PATH + 'packages/' + pkgName + '.rb' return set_package(pkgName, silent) if filename == CREW_LIB_PATH + 'packages/' + pkgName + '.rb'
end end
abort "package #{pkgName} not found :(" abort "package #{pkgName} not found :("
end end
...@@ -140,7 +140,7 @@ def upgrade ...@@ -140,7 +140,7 @@ def upgrade
if currentVersion != @pkg.version if currentVersion != @pkg.version
puts "Updating #{@pkg.name}..." puts "Updating #{@pkg.name}..."
@pkg.in_upgrade = true @pkg.in_upgrade = true
resolveDependenciesAndInstall resolve_dependencies_and_install
@pkg.in_upgrade = false @pkg.in_upgrade = false
else else
puts "#{@pkg.name} is already up to date." puts "#{@pkg.name} is already up to date."
...@@ -159,7 +159,7 @@ def upgrade ...@@ -159,7 +159,7 @@ def upgrade
toBeUpdated.each do |package| toBeUpdated.each do |package|
search package search package
@pkg.in_upgrade = true @pkg.in_upgrade = true
resolveDependenciesAndInstall resolve_dependencies_and_install
@pkg.in_upgrade = false @pkg.in_upgrade = false
end end
puts "Packages have been updated." puts "Packages have been updated."
...@@ -269,7 +269,7 @@ def install_package (pkgdir) ...@@ -269,7 +269,7 @@ def install_package (pkgdir)
end end
end end
def resolveDependenciesAndInstall def resolve_dependencies_and_install
begin begin
origin = @pkg.name origin = @pkg.name
...@@ -296,7 +296,7 @@ def resolveDependencies ...@@ -296,7 +296,7 @@ def resolveDependencies
# check source packages existance # check source packages existance
@source_package = 0 @source_package = 0
def pushDeps def push_dependencies
if @pkg.binary_url && @pkg.binary_url.has_key?(@device[:architecture]) if @pkg.binary_url && @pkg.binary_url.has_key?(@device[:architecture])
@check_deps = @pkg.dependencies @check_deps = @pkg.dependencies
else else
...@@ -309,12 +309,12 @@ def resolveDependencies ...@@ -309,12 +309,12 @@ def resolveDependencies
@pkg.dependencies.each do |dep| @pkg.dependencies.each do |dep|
search dep, true search dep, true
pushDeps push_dependencies
end end
end end
end end
pushDeps push_dependencies
# Add buildessential and solve its dependencies if any of dependent # Add buildessential and solve its dependencies if any of dependent
# packages are made from source # packages are made from source
...@@ -322,7 +322,7 @@ def resolveDependencies ...@@ -322,7 +322,7 @@ def resolveDependencies
@dependencies.unshift 'buildessential' @dependencies.unshift 'buildessential'
search 'buildessential', true search 'buildessential', true
end end
pushDeps push_dependencies
return if @dependencies.empty? return if @dependencies.empty?
...@@ -535,7 +535,7 @@ when "upgrade" ...@@ -535,7 +535,7 @@ when "upgrade"
upgrade upgrade
when "install" when "install"
search @pkgName search @pkgName
resolveDependenciesAndInstall resolve_dependencies_and_install
when "build" when "build"
search @pkgName search @pkgName
resolve_dependencies_and_build resolve_dependencies_and_build
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment