421 Commits

Author SHA1 Message Date
Jack Nagel
5b75c73df6 Do this in a saner way 2013-06-29 21:36:04 -05:00
Adam Vandenberg
099a62c95b Move Formula.factory into new Formulary module 2013-06-29 16:44:44 -07:00
Adam Vandenberg
3654822f77 Add TODO to canonical_name 2013-06-29 09:40:54 -07:00
Adam Vandenberg
a6777838d4 Pass strings to factory 2013-06-29 09:38:57 -07:00
Jack Nagel
0d35455820 Formula.each: note why import failed
Refs Homebrew/homebrew#20819.
2013-06-26 13:02:48 -05:00
Adam Vandenberg
1a72c85a05 Use 'path or URL' as tap for non-tap, non-core formulae 2013-06-24 07:33:37 -07:00
Adam Vandenberg
b9b1dfb9a6 Show tap/path for non-core formulae on build failure
Closes Homebrew/homebrew#16373.
Closes Homebrew/homebrew#20725.
2013-06-24 07:33:29 -07:00
Adam Vandenberg
9903e7cd92 Remove unused guard in canonical_name
Closes Homebrew/homebrew#20718.
2013-06-23 18:44:10 -07:00
Adam Vandenberg
66fc5fa48a document canonical name and move vars down to usage
Closes Homebrew/homebrew#20719.
2013-06-23 18:42:18 -07:00
Jack Nagel
3ab28ff9ad Remove unused accessor 2013-06-20 16:37:34 -05:00
Jack Nagel
d8756075f4 Use a Set for skip_clean_paths 2013-06-20 16:25:59 -05:00
Jack Nagel
7cdf400762 Splatted parameter is always an array 2013-06-20 16:22:55 -05:00
Mike McQuaid
a783946b6d Formula: improve local bottle failure messaging. 2013-06-20 13:07:43 +01:00
Jack Nagel
a1e30cdd3a Update Formula#to_hash for tweaked conflicts implementation 2013-06-09 15:20:36 -05:00
Jack Nagel
8b9a3a560f Separate formula conflicts from requirements
Closes Homebrew/homebrew#20357.
2013-06-09 13:45:25 -05:00
Jack Nagel
bae36f0830 Make Test::Unit assertions available in formula tests
Closes Homebrew/homebrew#18753.
Closes Homebrew/homebrew#20358.
2013-06-08 21:31:44 -05:00
Adam Vandenberg
fb83fc7bc4 Add class name to method_added error 2013-06-06 16:41:26 -07:00
Jack Nagel
856cebd9b4 Use ivar accessors 2013-06-06 12:10:41 -05:00
Samuel John
1c95045033 Hotfix: Revert Python module 2013-06-06 13:18:32 +02:00
Samuel John
4e8aa8637f PythonInstalled: Don't require superenv
* The python do ... end block does no longer
  require 'superenv' but saves and restores
  the ENV by using ENV.to_hash and `ensure`.
  This should resolve some build problems
  with formulae using `env :std`!
* `python_helper` is now in a module `Python`.
* Imporoved some comments in python_dependency.rb
2013-06-06 12:33:28 +02:00
Adam Vandenberg
3e5ac7e55c Consolidate formula visibility blocks
Closes Homebrew/homebrew#20261.
2013-06-05 09:48:12 -07:00
Jack Nagel
b97b013fce Extract attr_rw from Formula for reuse
Closes Homebrew/homebrew#20239.
2013-06-04 11:06:18 -05:00
Jack Nagel
ef0920e01d Remove unnecessary use of instance_eval 2013-06-03 17:03:09 -05:00
Samuel John
c524895666 Python 2.x and 3.x support
New `depends_on :python` Dependency.
New `depends_on :python3` Dependency.

To avoid having multiple formulae with endings -py2 and -py3,
we will handle support for different pythons (2.x vs. 3.x)
in the same formula.
Further brewed vs. external python will be transparently supported.

The formula also gets a new object `python`, which is false if
no Python is available or the user has disabled it. Otherwise
it is defined and provides several support methods:

python.site_packages # the site-packages in the formula's Cellar
python.global_site_packages
python.binary # the full path to the python binary
python.prefix
python.version
python.version.major
python.version.minor
python.xy # => e.g. "python2.7"
python.incdir # includes of python
python.libdir # the python dylib library
python.pkg_config_path # used internally by brew
python.from_osx?
python.framework?
python.universal?
python.pypy?
python.standard_caveats # Text to set PYTHONPATH for python.from_osx?
python.if3then3 # => "" for 2.x and to "3" for 3.x.

Further, to avoid code duplication, `python` takes an optional
block that is run twice if the formula defines depends_on
:python AND :python3.

python do
  system python, 'setup.py', "--prefix=#{prefix}"
end

Read more in the Homebrew wiki.
2013-06-03 17:29:43 +02:00
Jack Nagel
95ab813b35 Fix Formula#installed_prefix logic
Due to the precedence of "and" relative to "||", this was not working as
intended; but because #version influences #prefix, the outcome was still
correct. So we can simplify this method quite a bit, and take the
opportunity to share code with #prefix.
2013-05-25 19:24:08 -05:00
Mike McQuaid
a75aff246e Remove cat_without_underscores bottle methods. 2013-05-25 16:02:18 +01:00
Jack Nagel
0e81c4de9c Formula: move pin methods somewhere less intrusive 2013-05-21 22:41:21 -05:00
Jack Nagel
a3312d24a3 Use subdirs to avoid checking for .DS_Store 2013-05-16 17:48:12 -05:00
Jack Nagel
460e805592 Formula: remove specs accessor
This information is only used by the downloader, no need to expose it.
2013-05-16 15:33:31 -05:00
Jack Nagel
2d8496129c Formula#fetch: always return the cached path
This allows us to remove some type checks that were protecting against
potential nils.
2013-05-16 14:06:26 -05:00
Jack Nagel
daef74aa27 Adjust semantics of Formula#fetch
It doesn't really make logical sense that this method returns both the
fetched path (or sometimes nil!) and the downloader, so just return the
path (again, or nil!) and callers that want the downloader can ask for
it separately.
2013-05-16 14:06:26 -05:00
Jack Nagel
7629d4485e Use Enumerable#grep 2013-05-10 23:45:06 -05:00
Misty De Meo
9ec3102e57 Formula: fix to_hash output for bottles 2013-05-05 10:58:12 -05:00
Adam Vandenberg
1c12c8b7a2 Add frameworks helper to formula 2013-05-03 11:41:55 -07:00
Jack Nagel
9b5cb6cfb6 Allow brew versions to work with underspecified formulae 2013-04-27 14:44:48 -05:00
Simon Sigurdhsson
4f45077fde Remove global methods from formulae
Removes any global methods from formulae, and moves #kext_prefix (which
seems to be at least somewhat abstractable) into the Formula class. The
only formula with global methods is now aspell; it (and its generating
script in contrib) has been changed to prefix that method with
`aspell_`, to minimize the risk of name collisions.

Closes Homebrew/homebrew#19331.
Closes Homebrew/homebrew#19343.

Signed-off-by: Jack Nagel <jacknagel@gmail.com>
2013-04-21 23:48:50 -05:00
Jack Nagel
3a0726406b Add tests for FormulaPin and simplify implementation 2013-04-16 01:58:11 -05:00
Jack Nagel
49682e854d Avoid expensive Pathname concatenation 2013-04-15 15:00:57 -05:00
Jack Nagel
33e00b7f7c Style nit 2013-04-14 23:29:15 -05:00
Jack Nagel
b258bee44e Don't use Pathname#/ in performance-critical code
This method (well, really, #join) is *twice* as slow as simple
concatenation, and shouldn't really be used at all in non-Formula code.
2013-04-14 20:09:20 -05:00
Jack Nagel
a05bb48807 Raise a useful exception for incomplete formulae 2013-04-13 17:40:14 -05:00
Jack Nagel
4bd34c9624 Allow "devel-only" formulae
It seems only natural that this should be possible, or at the very
least, it should not result in calling methods on nil.
2013-04-13 17:40:13 -05:00
Jack Nagel
2e26afe556 Improved formula attribute validation
The initializer for Formula does a number of validations, but it does
them in a weird order, and some attributes aren't validated under
certain circumstances. This became even more of a mess when most
software package attributes were moved into the SoftwareSpec class.

This commit removes the last vestiges of storing these attributes as
instance variables. In particular, it eliminates #set_instance_variable
and #validate_variable, replacing them with methods that operate on
SoftwareSpec instances, and generate more useful errors.

Doing these validations unconditionally in the initializer means we bail
out much earlier if the formula has invalid attributes or is not fully
specified, and no longer need to validate in #prefix.

Technically we don't need to validate in #brew either, but we continue
to do so anyway as a safety measure, and because we cannot enforce calls
to super in subclasses.
2013-04-13 17:40:12 -05:00
Jack Nagel
bd4aaac96b Check existence rather than rescue exceptions 2013-04-09 19:40:08 -05:00
Jack Nagel
9db0e68eb6 Unify indentation of access modifiers
These are class method calls, not some special keyword, and should be
indented as such (also all standard Ruby indenters do this).
2013-04-07 20:59:49 -05:00
Jack Nagel
62d25f9c8b Remove obsolete comment about download_strategy
The canonical way to select a custom download strategy is to pass

  :using => StrategyClass

as an argument to the url DSL method.
2013-04-05 14:41:14 -05:00
Mike McQuaid
462a418878 Add optional post_install method to Formula.
Sometimes we may want to run commands after bottle installation (such as
creating directories outside the Cellar) so this method allows us to do
so.

Closes Homebrew/homebrew#18382.
2013-04-01 22:12:43 +01:00
Simon Sigurdhsson
f8a88b5f28 brew-pin: prevent selected formulae from upgrade.
* Added `pin` et. al. to manpage.
* Added `brew pin` to `brew.1` * Added `brew unpin` to `brew.1`
* Added `brew list --pinned` to `brew.1`
* Added information about frozen formulae to `brew upgrade` in `brew.1`
* Added `pin` et.al. to completion scripts.
* Unpin formulae when uninstalling them
* Unpin and re-pin formulae when upgrading (avoids stale symlink)

References Homebrew/homebrew#18386.
Closes Homebrew/homebrew#18515.

Signed-off-by: Mike McQuaid <mike@mikemcquaid.com>
2013-03-30 19:50:47 +00:00
Jack Nagel
593289a018 Make clear that this method discards arguments 2013-03-28 17:37:28 -05:00
Jack Nagel
8d000110cc Move this method somewhere more appropriate 2013-03-20 22:32:56 -05:00