Better version extraction and more flexible funcs

1 files changed, 12 insertions, 9 deletions

diff --git a/bin/brew b/bin/brew
index 23c38a599..73d8faf2f 100755
--- a/bin/brew
+++ b/bin/brew
@@ -235,19 +235,20 @@ begin
       shift_formulae_from_ARGV.each {|name| rm name}
     when 'mk'
       require 'brewkit'
-      class Template <Formula
-        @url=ARGV.shift
-      end
+      url=ARGV.shift
+      version=extract_version File.basename(url, Pathname.new(url).extname)
+
+      /(.*?)[-_.]?#{version}/.match File.basename(url)
+      raise "Couldn't parse name from #{url}" if $1.nil?
 
-      t=Template.new
-      /(.*)[-_.]#{t.version}/.match File.basename(t.url)
-      t.name = $1
+      path=$formula+($1+'.rb')
+      raise "#{path} already exists!" if File.exist? path
 
-      f=File.new $formula+(t.name+'.rb'), 'w'
+      f=File.new path, 'w'
       f.puts "require 'brewkit'"
       f.puts
-      f.puts "class #{__class t.name} <Formula"
-      f.puts "  @url=#{t.url}"
+      f.puts "class #{__class $1} <Formula"
+      f.puts "  @url='#{url}'"
       f.puts "  @md5=''"
       f.puts "  @homepage=''"
       f.puts
@@ -257,6 +258,8 @@ begin
       f.puts "  end"
       f.puts "end"
       f.close
+
+      puts path
     when 'info'
       o=__obj shift_formulae_from_ARGV[0]
       puts "#{o.name} #{o.version}"