salt: use resources

1 files changed, 101 insertions, 87 deletions

diff --git a/Library/Formula/salt.rb b/Library/Formula/salt.rb
index 5c3b1aaab..bd85021b8 100644
--- a/Library/Formula/salt.rb
+++ b/Library/Formula/salt.rb
@@ -1,73 +1,5 @@
 require 'formula'
 
-class SaltSALT2 < Formula
-  url 'http://supernovae.in2p3.fr/~guy/salt-dev/download/salt2_model_data-2-0.tar.gz'
-  sha1 '271e67d764c98b423dfaa264b9baf759a46acff1'
-end
-class Salt04D3gx < Formula
-  url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-04D3gx.tar.gz"
-  sha1 '6267be3319f4c777d8f67642bb0e9bfde298ffff'
-  version '2.2.2b'
-end
-class Salt4SHOOTER2 < Formula
-  url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-4Shooter2.tar.gz"
-  sha1 '6929813baaf5368979325d79ca1ea8068f410a1d'
-  version '2.2.2b'
-end
-class SaltSWOPE < Formula
-  url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-CSP-Swope.tar.gz"
-  sha1 '3ec88a86d77693d8f99c95b76a0a6208208ccfcd'
-  version '2.2.2b'
-end
-class SaltACSWF < Formula
-  url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-HST-ACSWF.tar.gz"
-  sha1 '1d3c49efe65964c69d932314c0e137fa746b7b71'
-  version '2.2.2b'
-end
-class SaltNICMOS2 < Formula
-  url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-HST-NICMOS2.tar.gz"
-  sha1 '52bce4a15bf3a6e2c6fe93c9077cc85865cf58db'
-  version '2.2.2b'
-end
-class SaltKEPLERCAM < Formula
-  url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-Keplercam.tar.gz"
-  sha1 'de1e79204c05457c86ea07918cb3a1c2bdde9d21'
-  version '2.2.2b'
-end
-class SaltSTANDARD < Formula
-  url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-Landolt-model.tar.gz"
-  sha1 'd2421fb470f678ee94619622433fb975339fe7ac'
-  version '2.2.2b'
-end
-class SaltMEGACAM < Formula
-  url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-Megacam-model.tar.gz"
-  sha1 '8b112a69881bb6a9967576b5e18c8d62b93f009b'
-  version '2.2.2b'
-end
-class SaltSDSS < Formula
-  url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-SDSS-model-Doi2010.tar.gz"
-  sha1 '8858167928151bc07e790c30abf609614ad817d2'
-  version '2.2.2b'
-end
-class SaltSDSS_AB_off < Formula
-  url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-SDSS-magsys.tar.gz"
-  sha1 'd1e4a4c5fe7f56c2502ba42f0b3e28f5168928be'
-  version '2.2.2b'
-  def linkto () return 'MagSys/SDSS-AB-off.dat' end
-end
-class SaltVEGAHST < Formula
-  url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-Vega-magsys.tar.gz"
-  sha1 'add0b1df6353a34912311c1a1973b03147862539'
-  version '2.2.2b'
-  def linkto () return 'MagSys/Vega0.dat' end
-end
-class SaltVEGA < Formula
-  url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-magsys-1.tar.gz"
-  sha1 '4f3f05d1d08c6840f13b0ec6101826159a450eff'
-  version '2.2.2b'
-  def linkto () return 'MagSys/BD17-snls3.dat' end
-end
-
 class Salt < Formula
   homepage 'http://supernovae.in2p3.fr/~guy/salt/'
   url 'http://supernovae.in2p3.fr/~guy/salt/download/snfit-2.2.2b.tar.gz'
@@ -75,20 +7,101 @@ class Salt < Formula
 
   depends_on :fortran
 
-  def install_subbrew(subbrew, installdir)
-    s = subbrew.new
-    s.brew do
+  resource 'SALT2' do
+    url 'http://supernovae.in2p3.fr/~guy/salt-dev/download/salt2_model_data-2-0.tar.gz'
+    sha1 '271e67d764c98b423dfaa264b9baf759a46acff1'
+  end
+
+  resource '04D3gx' do
+    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-04D3gx.tar.gz"
+    sha1 '6267be3319f4c777d8f67642bb0e9bfde298ffff'
+    version '2.2.2b'
+  end
+
+  resource '4SHOOTER2' do
+    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-4Shooter2.tar.gz"
+    sha1 '6929813baaf5368979325d79ca1ea8068f410a1d'
+    version '2.2.2b'
+  end
+
+  resource 'SWOPE' do
+    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-CSP-Swope.tar.gz"
+    sha1 '3ec88a86d77693d8f99c95b76a0a6208208ccfcd'
+    version '2.2.2b'
+  end
+
+  resource 'ACSWF' do
+    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-HST-ACSWF.tar.gz"
+    sha1 '1d3c49efe65964c69d932314c0e137fa746b7b71'
+    version '2.2.2b'
+  end
+
+  resource 'NICMOS2' do
+    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-HST-NICMOS2.tar.gz"
+    sha1 '52bce4a15bf3a6e2c6fe93c9077cc85865cf58db'
+    version '2.2.2b'
+  end
+
+  resource 'KEPLERCAM' do
+    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-Keplercam.tar.gz"
+    sha1 'de1e79204c05457c86ea07918cb3a1c2bdde9d21'
+    version '2.2.2b'
+  end
+
+  resource 'STANDARD' do
+    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-Landolt-model.tar.gz"
+    sha1 'd2421fb470f678ee94619622433fb975339fe7ac'
+    version '2.2.2b'
+  end
+
+  resource 'MEGACAM' do
+    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-Megacam-model.tar.gz"
+    sha1 '8b112a69881bb6a9967576b5e18c8d62b93f009b'
+    version '2.2.2b'
+  end
+
+  resource 'SDSS' do
+    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-SDSS-model-Doi2010.tar.gz"
+    sha1 '8858167928151bc07e790c30abf609614ad817d2'
+    version '2.2.2b'
+  end
+
+  resource 'SDSS-AB-off' do
+    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-SDSS-magsys.tar.gz"
+    sha1 'd1e4a4c5fe7f56c2502ba42f0b3e28f5168928be'
+    version '2.2.2b'
+  end
+
+  resource 'VEGAHST' do
+    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-Vega-magsys.tar.gz"
+    sha1 'add0b1df6353a34912311c1a1973b03147862539'
+    version '2.2.2b'
+  end
+
+  resource 'VEGA' do
+    url "http://supernovae.in2p3.fr/~guy/salt-dev/download/SNLS3-magsys-1.tar.gz"
+    sha1 '4f3f05d1d08c6840f13b0ec6101826159a450eff'
+    version '2.2.2b'
+  end
+
+
+  def install_resource(name, dir)
+    resource(name).stage do
       d = File.basename Dir.pwd
-      (installdir + d).install Dir['*']
+      (dir/d).install Dir['*']
+
       # the fitmodel file will link by default to the first dir
       # on the path right after #{prefix}/data/
-      if s.respond_to? 'linkto'
-        linkto = s.linkto
-      else
-        base = File.basename installdir
-        linkto = base == 'data' ? d : File.join(base, d)
+      linkto = {
+        'SDSS-AB-off' => 'MagSys/SDSS-AB-off.dat',
+        'VEGAHST'     => 'MagSys/Vega0.dat',
+        'VEGA'        => 'MagSys/BD17-snls3.dat',
+      }.fetch(name) do
+        base = File.basename(dir)
+        base == 'data' ? d : File.join(base, d)
       end
-      return "@#{subbrew.name.sub('Salt', '').gsub('_','-')} #{linkto}\n"
+
+      "@#{name} #{linkto}\n"
     end
   end
 
@@ -103,23 +116,24 @@ class Salt < Formula
 
     # install all the model data
     # http://supernovae.in2p3.fr/~guy/salt/download/snls3-intallation.sh
-    data = prefix/'data'
-    data.mkpath
-    File.open(data/'fitmodel.card', 'w') do |fitmodel|
+    (data = prefix/'data').mkpath
+    (data/'fitmodel.card').open('w') do |f|
       # salt2 model + magsys
-      [SaltSALT2, SaltVEGA, SaltSDSS_AB_off, SaltVEGAHST].each do |cls|
-        fitmodel.write(install_subbrew(cls, data))
+      %w{SALT2 VEGA SDSS-AB-off VEGAHST}.each do |name|
+        f.write(install_resource(name, data))
       end
       # instruments
       inst = data + 'Instruments'
-      [SaltSTANDARD, SaltMEGACAM, SaltKEPLERCAM, Salt4SHOOTER2, SaltSDSS,
-       SaltSWOPE, SaltACSWF, SaltNICMOS2].each do |cls|
-        fitmodel.write(install_subbrew(cls, inst))
+      %w{
+        STANDARD MEGACAM KEPLERCAM 4SHOOTER2
+        SDSS SWOPE ACSWF NICMOS2
+      }.each do |name|
+        f.write(install_resource(name, inst))
       end
     end
 
     # for testing
-    Salt04D3gx.new.brew { (prefix + '04D3gx').install Dir['*'] }
+    (prefix/'04D3gx').install resource('04D3gx')
   end
 
   test do