aboutsummaryrefslogtreecommitdiffstats
path: root/Library/Homebrew/language
diff options
context:
space:
mode:
authorBrewTestBot2015-08-03 13:09:07 +0100
committerMike McQuaid2015-08-03 13:22:35 +0100
commit13d544e11e92ba8ea3788723432046f8dfe4adf9 (patch)
treee6da18436d9ce956e6fbe80e3185c67cf3b58808 /Library/Homebrew/language
parent3b68215be793774fafd9ce124a2065f5968f50e5 (diff)
downloadbrew-13d544e11e92ba8ea3788723432046f8dfe4adf9.tar.bz2
Core files style updates.
Closes Homebrew/homebrew#42354. Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
Diffstat (limited to 'Library/Homebrew/language')
-rw-r--r--Library/Homebrew/language/go.rb2
-rw-r--r--Library/Homebrew/language/haskell.rb10
-rw-r--r--Library/Homebrew/language/java.rb6
-rw-r--r--Library/Homebrew/language/python.rb20
4 files changed, 19 insertions, 19 deletions
diff --git a/Library/Homebrew/language/go.rb b/Library/Homebrew/language/go.rb
index 80c243832..c051aacc9 100644
--- a/Library/Homebrew/language/go.rb
+++ b/Library/Homebrew/language/go.rb
@@ -6,7 +6,7 @@ module Language
# building go software.
# The resource names should be the import name of the package,
# e.g. `resource "github.com/foo/bar"`
- def self.stage_deps resources, target
+ def self.stage_deps(resources, target)
resources.grep(Resource::Go) { |resource| resource.stage(target) }
end
end
diff --git a/Library/Homebrew/language/haskell.rb b/Library/Homebrew/language/haskell.rb
index 6dc8df9ca..e7163a231 100644
--- a/Library/Homebrew/language/haskell.rb
+++ b/Library/Homebrew/language/haskell.rb
@@ -9,7 +9,7 @@ module Language
end
end
- def self.included base
+ def self.included(base)
base.extend ClassMethods
end
@@ -23,7 +23,7 @@ module Language
ENV["HOME"] = pwd
# use cabal's sandbox feature if available
- cabal_version = `cabal --version`[/[0-9.]+/].split('.').collect(&:to_i)
+ cabal_version = `cabal --version`[/[0-9.]+/].split(".").collect(&:to_i)
if (cabal_version <=> [1, 20]) > -1
system "cabal", "sandbox", "init"
cabal_sandbox_bin = pwd/".cabal-sandbox/bin"
@@ -34,7 +34,7 @@ module Language
# cabal may build useful tools that should be found in the PATH
mkdir_p cabal_sandbox_bin
path = ENV["PATH"]
- ENV.prepend_path 'PATH', cabal_sandbox_bin
+ ENV.prepend_path "PATH", cabal_sandbox_bin
# update cabal package database
system "cabal", "update"
yield
@@ -55,7 +55,7 @@ module Language
# package. The tools are installed sequentially in order to make possible
# to install several tools that depends on each other
def cabal_install_tools(*opts)
- opts.each {|t| cabal_install t}
+ opts.each { |t| cabal_install t }
rm_rf Dir[".cabal*/*packages.conf.d/"]
end
@@ -66,7 +66,7 @@ module Language
rm_rf lib
end
- def install_cabal_package args=[]
+ def install_cabal_package(args = [])
cabal_sandbox do
# the dependencies are built first and installed locally, and only the
# current package is actually installed in the destination dir
diff --git a/Library/Homebrew/language/java.rb b/Library/Homebrew/language/java.rb
index 69cc87f50..5bdc3e7cf 100644
--- a/Library/Homebrew/language/java.rb
+++ b/Library/Homebrew/language/java.rb
@@ -1,15 +1,15 @@
module Language
module Java
- def self.java_home_cmd(version=nil)
+ def self.java_home_cmd(version = nil)
version_flag = " --version #{version}" if version
"/usr/libexec/java_home#{version_flag}"
end
- def self.java_home_env(version=nil)
+ def self.java_home_env(version = nil)
{ :JAVA_HOME => "$(#{java_home_cmd(version)})" }
end
- def self.overridable_java_home_env(version=nil)
+ def self.overridable_java_home_env(version = nil)
{ :JAVA_HOME => "${JAVA_HOME:-$(#{java_home_cmd(version)})}" }
end
end
diff --git a/Library/Homebrew/language/python.rb b/Library/Homebrew/language/python.rb
index 4089316bb..c396230c0 100644
--- a/Library/Homebrew/language/python.rb
+++ b/Library/Homebrew/language/python.rb
@@ -2,21 +2,21 @@ require "utils.rb"
module Language
module Python
- def self.major_minor_version python
+ def self.major_minor_version(python)
version = /\d\.\d/.match `#{python} --version 2>&1`
return unless version
Version.new(version.to_s)
end
- def self.homebrew_site_packages(version="2.7")
+ def self.homebrew_site_packages(version = "2.7")
HOMEBREW_PREFIX/"lib/python#{version}/site-packages"
end
- def self.each_python build, &block
+ def self.each_python(build, &block)
original_pythonpath = ENV["PYTHONPATH"]
["python", "python3"].each do |python|
next if build.without? python
- version = self.major_minor_version python
+ version = major_minor_version python
ENV["PYTHONPATH"] = if Formulary.factory(python).installed?
nil
else
@@ -27,7 +27,7 @@ module Language
ENV["PYTHONPATH"] = original_pythonpath
end
- def self.reads_brewed_pth_files? python
+ def self.reads_brewed_pth_files?(python)
version = major_minor_version python
return unless homebrew_site_packages(version).directory?
return unless homebrew_site_packages(version).writable_real?
@@ -40,11 +40,11 @@ module Language
end
end
- def self.user_site_packages python
+ def self.user_site_packages(python)
Pathname.new(`#{python} -c "import site; print(site.getusersitepackages())"`.chomp)
end
- def self.in_sys_path? python, path
+ def self.in_sys_path?(python, path)
script = <<-EOS.undent
import os, sys
[os.path.realpath(p) for p in sys.path].index(os.path.realpath("#{path}"))
@@ -53,7 +53,7 @@ module Language
end
# deprecated; use system "python", *setup_install_args(prefix) instead
- def self.setup_install python, prefix, *args
+ def self.setup_install(python, prefix, *args)
opoo <<-EOS.undent
Language::Python.setup_install is deprecated.
If you are a formula author, please use
@@ -75,7 +75,7 @@ module Language
system python, "-c", shim, "install", *args
end
- def self.setup_install_args prefix
+ def self.setup_install_args(prefix)
shim = <<-EOS.undent
import setuptools, tokenize
__file__ = 'setup.py'
@@ -93,7 +93,7 @@ module Language
]
end
- def self.package_available? python, module_name
+ def self.package_available?(python, module_name)
quiet_system python, "-c", "import #{module_name}"
end
end