homebrew_automation 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 240ff77ce84a9af442b04b396ddba4f32014d95d02ebf7fda5ff5904e71aa8bf
-  data.tar.gz: 898384c47dbfee5484b26d4faa5ee2352398c8b8fa2f26b500adcff9e1c1182d
+  metadata.gz: 49d776c65c9e87632521fa074eae30c674f541dc8fd5f4ffbe5b1ec522196e62
+  data.tar.gz: 42501be3a1f1503901489d1207ab572a1264785a8aebcbba9824ee59513fb09c
 SHA512:
-  metadata.gz: ffc1fbb67e9b31b5aeca7b0b11c2f5c6ef6c694e4e4af9bcb1ffbc4a27e20f2be1bbcb1416f4735176543d0ab929519c01e15c51a096fa0400195e796bee97af
-  data.tar.gz: f6c5a599c570f9183201101fb9197fbf063bffb845bdf343ddf00e91687c41d565f482d2290c46002f0ddb7c2ff24feb6b74a1df6a77e73a8731ae3141665199
+  metadata.gz: e3f99f2156856a7489a874953873569c88d42c360334829d33233a7231e7057c1309ad2cf8ad1715e34154444bbb9650ef69acf7472dc8338ba604eee0beab96
+  data.tar.gz: a7d2d286cdc1561dfbd80b6cac9e9e246422b162e3f306eb338a2fb82f070fc64100e79deb505bb4430157eed1c0f0cdeeacd8c88ee684e2069d4e2f6d122d00

data/lib/homebrew_automation/bottle.rb

@@ -11,18 +11,21 @@ module HomebrewAutomation
     # @param os_name [String] As known by Homebrew, e.g. +el_capitan+
     # @param filename [String] ???
     # @param content [String] ???
+    # @param keep_tmp [Boolean] pass +--keep-tmp+ to +brew+
     def initialize(
         tap_url,
         formula_name,
         os_name,
         filename: nil,
-        content: nil)
+        content: nil,
+        keep_tmp: false)
       @tap_url = tap_url
       @formula_name = formula_name
       @os_name = os_name
       @filename = filename
       @minus_minus = nil  # https://github.com/Homebrew/brew/pull/4612
       @content = content
+      @keep_tmp = keep_tmp
     end
 
     # Takes ages to run, just like if done manually
@@ -30,9 +33,10 @@ module HomebrewAutomation
     # @raise [StandardError]
     # @return [nil]
     def build
-      die unless system 'brew', 'tap', local_tap_name, @tap_url
-      die unless system 'brew', 'install', '--verbose', '--build-bottle', @formula_name
-      die unless system 'brew', 'bottle', '--verbose', '--json', @formula_name
+      die unless system 'brew', 'tap', tmp_tap_name, @tap_url
+      maybe_keep_tmp = @keep_tmp ? '--keep-tmp' : ''
+      die unless system 'brew', 'install', '--verbose', maybe_keep_tmp, '--build-bottle', fully_qualified_formula_name
+      die unless system 'brew', 'bottle', '--verbose', '--json', '--no-rebuild', fully_qualified_formula_name
     end
 
     # Read and analyse metadata JSON file
@@ -82,8 +86,12 @@ module HomebrewAutomation
     private
 
     # A name for the temporary tap; doesn't really matter what this is.
-    def local_tap_name
-      'easoncxz/local-tap'
+    def tmp_tap_name
+      'easoncxz/tmp-tap'
+    end
+
+    def fully_qualified_formula_name
+      tmp_tap_name + '/' + @formula_name
     end
 
     def die

data/lib/homebrew_automation/cli/cli.rb

@@ -9,6 +9,11 @@ module HomebrewAutomation
 
     class MyCliApp < Thor
 
+      desc 'version', 'version of homebrew_automation'
+      def version
+        puts HomebrewAutomation::VERSION
+      end
+
       desc 'formula (...)', 'Modify Formula DSL source (read stdin, write stdout)'
       subcommand "formula", FormulaCommands
 

data/lib/homebrew_automation/cli/workflow_commands.rb

@@ -21,13 +21,15 @@ class HomebrewAutomation::CLI::WorkflowCommands < Thor
   class_option :bintray_repo
   class_option :bintray_package
   class_option :bintray_version
+  class_option :keep_tap_repo, :type => :boolean
 
   desc 'build-and-upload', 'Build binary tarball from source tarball, then upload to Bintray'
   long_desc <<-HERE_HERE
     Since we're uploading to Bintray, we need a Bintray API KEY at `bintray_token`.
   HERE_HERE
+  option :keep_brew_tmp, :type => :boolean
   def build_and_upload
-    workflow.build_and_upload_bottle(sdist, tap, formula_name, bintray_version)
+    workflow.build_and_upload_bottle(sdist, tap, formula_name, bintray_version, keep_homebrew_tmp: option[:keep_brew_tmp])
   end
 
   desc 'gather-and-publish', 'Make the Tap aware of new Bottles'
@@ -50,11 +52,16 @@ class HomebrewAutomation::CLI::WorkflowCommands < Thor
       options[:source_tag])
   end
 
+  def keep_tap_repo?
+    options[:keep_tap_repo]
+  end
+
   def tap
     HomebrewAutomation::Tap.new(
       options[:tap_user],
       options[:tap_repo],
-      options[:tap_token])
+      options[:tap_token],
+      keep_submodule: keep_tap_repo?)
   end
 
   # DOC: default values here

data/lib/homebrew_automation/version.rb

@@ -2,6 +2,6 @@
 module HomebrewAutomation
 
   # Yep.
-  VERSION = '0.1.0'
+  VERSION = '0.1.2'
 
 end

data/lib/homebrew_automation/workflow.rb

@@ -19,7 +19,7 @@ module HomebrewAutomation
     # @param formula_name [String] the name of the formula in the Tap
     # @param bversion [Bintray::Version]
     # @return [Bottle]
-    def build_and_upload_bottle(sdist, tap, formula_name, bversion)
+    def build_and_upload_bottle(sdist, tap, formula_name, bversion, keep_homebrew_tmp: false)
       os_name = MacOS.identify_version
       tap.with_git_clone do
         tap.on_formula(formula_name) do |formula|
@@ -28,7 +28,7 @@ module HomebrewAutomation
         tap.git_commit_am "Throwaway commit; just for building bottles"
 
         local_tap_url = File.realpath('.')
-        bottle = Bottle.new(local_tap_url, formula_name, os_name)
+        bottle = Bottle.new(local_tap_url, formula_name, os_name, keep_tmp: keep_homebrew_tmp)
         bottle.build
 
         # Bintray auto-creates Versions on file-upload.

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: homebrew_automation
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - easoncxz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-14 00:00:00.000000000 Z
+date: 2019-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec