diff options
| author | Vlad Shablinsky | 2016-07-11 16:09:35 +0300 |
|---|---|---|
| committer | Xu Cheng | 2016-07-16 20:39:13 +0800 |
| commit | 3fb5d70a729472a7d7f2a5d0d7b84248921fb583 (patch) | |
| tree | b23f70013abe231fe997f2601ae89814b1f338db /Library/Homebrew/requirements | |
| parent | 454003c4c1ea43f4fd84db96017636fc4c50b318 (diff) | |
| download | brew-3fb5d70a729472a7d7f2a5d0d7b84248921fb583.tar.bz2 | |
Unify Version.create usage
Substitue each Version.new and HeadVersion.new with Version.create
to unify Version and HeadVersion instantiation among core code.
Note that this does not relate to Mac::OS::Version class.
Diffstat (limited to 'Library/Homebrew/requirements')
5 files changed, 9 insertions, 9 deletions
diff --git a/Library/Homebrew/requirements/emacs_requirement.rb b/Library/Homebrew/requirements/emacs_requirement.rb index 4f7c36a85..591b7babb 100644 --- a/Library/Homebrew/requirements/emacs_requirement.rb +++ b/Library/Homebrew/requirements/emacs_requirement.rb @@ -11,7 +11,7 @@ class EmacsRequirement < Requirement next false unless which "emacs" next true unless @version emacs_version = Utils.popen_read("emacs", "--batch", "--eval", "(princ emacs-version)") - Version.new(emacs_version) >= Version.new(@version) + Version.create(emacs_version) >= Version.create(@version) end env do diff --git a/Library/Homebrew/requirements/perl_requirement.rb b/Library/Homebrew/requirements/perl_requirement.rb index 79d5e8e92..0aac21610 100644 --- a/Library/Homebrew/requirements/perl_requirement.rb +++ b/Library/Homebrew/requirements/perl_requirement.rb @@ -12,7 +12,7 @@ class PerlRequirement < Requirement which_all("perl").detect do |perl| perl_version = Utils.popen_read(perl, "--version")[/\(v(\d+\.\d+)(?:\.\d+)?\)/, 1] next unless perl_version - Version.new(perl_version.to_s) >= Version.new(@version) + Version.create(perl_version.to_s) >= Version.create(@version) end end diff --git a/Library/Homebrew/requirements/python_requirement.rb b/Library/Homebrew/requirements/python_requirement.rb index 4faf78dfa..2800f52b0 100644 --- a/Library/Homebrew/requirements/python_requirement.rb +++ b/Library/Homebrew/requirements/python_requirement.rb @@ -11,16 +11,16 @@ class PythonRequirement < Requirement version = python_short_version next unless version # Always use Python 2.7 for consistency on older versions of OSX. - version == Version.new("2.7") + version == Version.create("2.7") end env do short_version = python_short_version - if !system_python? && short_version == Version.new("2.7") + if !system_python? && short_version == Version.create("2.7") ENV.prepend_path "PATH", which_python.dirname # Homebrew Python should take precedence over older Pythons in the PATH - elsif short_version != Version.new("2.7") + elsif short_version != Version.create("2.7") ENV.prepend_path "PATH", Formula["python"].opt_bin end diff --git a/Library/Homebrew/requirements/ruby_requirement.rb b/Library/Homebrew/requirements/ruby_requirement.rb index 87db39777..c445bd408 100644 --- a/Library/Homebrew/requirements/ruby_requirement.rb +++ b/Library/Homebrew/requirements/ruby_requirement.rb @@ -12,7 +12,7 @@ class RubyRequirement < Requirement which_all("ruby").detect do |ruby| version = /\d\.\d/.match Utils.popen_read(ruby, "--version") next unless version - Version.new(version.to_s) >= Version.new(@version) + Version.create(version.to_s) >= Version.create(@version) end end diff --git a/Library/Homebrew/requirements/x11_requirement.rb b/Library/Homebrew/requirements/x11_requirement.rb index ce921cffa..d91f9d3d4 100644 --- a/Library/Homebrew/requirements/x11_requirement.rb +++ b/Library/Homebrew/requirements/x11_requirement.rb @@ -13,17 +13,17 @@ class X11Requirement < Requirement def initialize(name = "x11", tags = []) @name = name if /(\d\.)+\d/ === tags.first - @min_version = Version.new(tags.shift) + @min_version = Version.create(tags.shift) @min_version_string = " #{@min_version}" else - @min_version = Version.new("0.0.0") + @min_version = Version.create("0.0.0") @min_version_string = "" end super(tags) end satisfy :build_env => false do - MacOS::XQuartz.installed? && min_version <= Version.new(MacOS::XQuartz.version) + MacOS::XQuartz.installed? && min_version <= Version.create(MacOS::XQuartz.version) end def message |
