Permalink
Browse files

Don't use deprecated form of attr

The form "attr :name, true" is deprecated and causes Ruby to emit a
warning in verbose mode. Using attr_{reader,writer,accessor} is more
clear anyway, so do so.
  • Loading branch information...
1 parent ee25d02 commit 5a34e80675c6406d66569affc4732e2dc5f3b605 @jacknagel jacknagel committed Feb 18, 2013
View
4 Library/Homebrew/cmd/audit.rb
@@ -73,9 +73,7 @@ def has_trailing_newline?
end
class FormulaAuditor
- attr :f
- attr :text
- attr :problems, true
+ attr_reader :f, :text, :problems
BUILD_TIME_DEPS = %W[
autoconf
View
8 Library/Homebrew/cmd/create.rb
@@ -71,12 +71,8 @@ def __gets
end
class FormulaCreator
- attr :url
- attr :sha1
- attr :name, true
- attr :version, true
- attr :path, true
- attr :mode, true
+ attr_reader :url, :sha1
+ attr_accessor :name, :version, :path, :mode
def url= url
@url = url
View
22 Library/Homebrew/exceptions.rb
@@ -3,7 +3,7 @@ class FormulaUnspecifiedError < UsageError; end
class KegUnspecifiedError < UsageError; end
class MultipleVersionsInstalledError < RuntimeError
- attr :name
+ attr_reader :name
def initialize name
@name = name
@@ -14,7 +14,7 @@ def initialize name
class NotAKegError < RuntimeError; end
class NoSuchKegError < RuntimeError
- attr :name
+ attr_reader :name
def initialize name
@name = name
@@ -23,8 +23,8 @@ def initialize name
end
class FormulaUnavailableError < RuntimeError
- attr :name
- attr :dependent, true
+ attr_reader :name
+ attr_accessor :dependent
def dependent_s
"(dependency of #{dependent})" if dependent and dependent != name
@@ -59,7 +59,7 @@ def initialize name
module Homebrew
class InstallationError < RuntimeError
- attr :formula
+ attr_reader :formula
def initialize formula, message=""
super message
@@ -87,7 +87,7 @@ def initialize(f, dep)
end
class UnsatisfiedRequirements < Homebrew::InstallationError
- attr :reqs
+ attr_reader :reqs
def initialize formula, reqs
@reqs = reqs
@@ -99,9 +99,7 @@ def initialize formula, reqs
end
class BuildError < Homebrew::InstallationError
- attr :exit_status
- attr :command
- attr :env
+ attr_reader :exit_status, :command, :env
def initialize formula, cmd, args, es
@command = cmd
@@ -159,10 +157,8 @@ class ChecksumMissingError < ArgumentError
# raised by Pathname#verify_checksum when verification fails
class ChecksumMismatchError < RuntimeError
- attr :advice, true
- attr :expected
- attr :actual
- attr :hash_type
+ attr_accessor :advice
+ attr_reader :expected, :actual, :hash_type
def initialize expected, actual
@expected = expected
View
9 Library/Homebrew/formula_installer.rb
@@ -6,12 +6,9 @@
require 'caveats'
class FormulaInstaller
- attr :f
- attr :tab, true
- attr :options, true
- attr :show_summary_heading, true
- attr :ignore_deps, true
- attr :show_header, true
+ attr_reader :f
+ attr_accessor :tab, :options, :ignore_deps
+ attr_accessor :show_summary_heading, :show_header
def initialize ff
@f = ff

0 comments on commit 5a34e80

Please sign in to comment.