Move bottle.rb logic from test-bot to brew bottle.

3 files changed, 11 insertions, 14 deletions

diff --git a/Library/Contributions/cmd/brew-test-bot.rb b/Library/Contributions/cmd/brew-test-bot.rb
index cbec69ad5..fb21b5ece 100755
--- a/Library/Contributions/cmd/brew-test-bot.rb
+++ b/Library/Contributions/cmd/brew-test-bot.rb
@@ -53,7 +53,7 @@ class Step
   end
 
   def command_short
-    @command.gsub(/(brew|--force|--verbose|--build-bottle) /, '').strip.squeeze ' '
+    @command.gsub(/(brew|--force|--verbose|--build-bottle|--rb) /, '').strip.squeeze ' '
   end
 
   def passed?
@@ -276,16 +276,11 @@ class Test
     test "brew audit #{formula}"
     return unless install_passed
     unless ARGV.include? '--no-bottle'
-      test "brew bottle #{formula}", :puts_output_on_success => true
+      test "brew bottle --rb #{formula}", :puts_output_on_success => true
       bottle_step = steps.last
       if bottle_step.passed? and bottle_step.has_output?
-        bottle_revision = bottle_new_revision(formula_object)
-        bottle_filename = bottle_filename(formula_object, bottle_revision)
-        bottle_base = bottle_filename.gsub(bottle_suffix(bottle_revision), '')
-        bottle_output = bottle_step.output.gsub /.*(bottle do.*end)/m, '\1'
-        File.open "#{bottle_base}.bottle.rb", 'w' do |file|
-          file.write bottle_output
-        end
+        bottle_filename =
+          bottle_step.output.gsub(/.*(\.\/\S+#{bottle_native_regex}).*/m, '\1')
         test "brew uninstall --force #{formula}"
         test "brew install #{bottle_filename}"
       end
diff --git a/Library/Homebrew/bottles.rb b/Library/Homebrew/bottles.rb
index 5736aeea3..ff12cc689 100644
--- a/Library/Homebrew/bottles.rb
+++ b/Library/Homebrew/bottles.rb
@@ -50,11 +50,6 @@ def bottle_file_outdated? f, file
   bottle_ext && bottle_url_ext && bottle_ext != bottle_url_ext
 end
 
-def bottle_new_revision f
-  return 0 unless bottle_current? f
-  f.bottle.revision + 1
-end
-
 def bottle_native_suffix revision=nil
   ".#{bottle_tag}#{bottle_suffix(revision)}"
 end
diff --git a/Library/Homebrew/cmd/bottle.rb b/Library/Homebrew/cmd/bottle.rb
index 9c7157d8e..c6d074750 100644
--- a/Library/Homebrew/cmd/bottle.rb
+++ b/Library/Homebrew/cmd/bottle.rb
@@ -114,6 +114,13 @@ module Homebrew extend self
       output = bottle_output bottle
       puts output
     end
+
+    if ARGV.include? '--rb'
+      bottle_base = filename.gsub(bottle_suffix(bottle_revision), '')
+      File.open "#{bottle_base}.bottle.rb", 'w' do |file|
+        file.write output
+      end
+    end
   end
 
   def merge