homebrew_automation 0.1.10 → 0.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0a7e329d80eca725cc1e67b8b6adc44be6abcc8188a1667bf68d03221f7132d3
-  data.tar.gz: be1c89833487aea65a54fc4b87c5dfd2299469fd9cecc2739c5d44c4e0513c9f
+  metadata.gz: 631a391dc1b239b9195b9dd9ae7dfe554a9d622afd3437b672716e27d599b70a
+  data.tar.gz: 0c40e8267deb8365212d2b60d976fadbf52c81c685fdba2d1404f473b8564405
 SHA512:
-  metadata.gz: 30421bf2d3dfd26da1cbdbaedae7b37793533a587677aea855e6c7c01c5d3d0a522cd86703dc2d1abe02d02b14ff3213e7e01887ea6ee20f849d9f34be11768c
-  data.tar.gz: 4eb44efc9e0bcc0bb16bdc6c1c44a9804602a376e533e49bd2060aa75ba236142a00b726fa2c519f6a04d1d9d714da02e943fae618f541441da49da1f7e800bd
+  metadata.gz: 302c739c1028ac4255fb2bd9e15e9f2979cc0df5dd67704795d6fcb3a58f391c790763813b83bc2242a40e9fb5eedf2f5bb8e3fab60a73523ab895130117a10c
+  data.tar.gz: f9f41c0cee062f606391ac04e28739754c027c6b6cb6eb9643dca876b7b1dc26c2fb9a593debaebb54215bc3b1c855414cecaeff07148b884a81dc89a70809c9

data/lib/homebrew_automation/bintray/client.rb

@@ -86,7 +86,7 @@ module HomebrewAutomation::Bintray
       safe_pkg = URI.escape(package_name)
       safe_ver = URI.escape(version_name)
       @http.get(
-        rel("/packages/#{safe_username}/#{safe_repo}/#{safe_pkg}/versions/#{safe_ver}/files"),
+        rel("/packages/#{safe_username}/#{safe_repo}/#{safe_pkg}/versions/#{safe_ver}/files?include_unpublished=1"),
         auth_headers)
     end
 

data/lib/homebrew_automation/bintray/version.rb

@@ -16,11 +16,13 @@ module HomebrewAutomation::Bintray
     end
 
     # @param client [Client] Connection to Bintray servers
+    # @param logger [HomebrewAutomation::Logger]
     # @param repo_name [String]
     # @param package_name [String]
     # @param version_name [String]
-    def initialize(client, repo_name, package_name, version_name)
+    def initialize(client, logger, repo_name, package_name, version_name)
       @client = client
+      @logger = logger
       @repo_name = repo_name
       @package_name = package_name
       @version_name = version_name
@@ -67,12 +69,13 @@ module HomebrewAutomation::Bintray
       resp = @client.get_all_files_in_version(@repo_name, @package_name, @version_name)
       _assert_match((200..207), resp.code)
       json = JSON.parse(resp.body)
+      @logger.info!("All files in Bintray Version: #{json}")
       _assert_match(Array, json)
       pairs = json.map do |f|
         os = _parse_for_os(f['name'])
         checksum = f['sha256']
         [os, checksum]
-      end
+      end.select { |o, _| not o.empty? }
       Hash[pairs]
     end
 

data/lib/homebrew_automation/bottle.rb

@@ -81,7 +81,9 @@ module HomebrewAutomation
       begin
         @brew.tap!(@tap_name, @tap_url)
         tapped = true
+        # TODO: @brew.list! may print a worrying "Error" message if Formula wasn't installed:
         if @brew.list!([], fully_qualified_formula_name)
+          # TODO: This doesn't seem to work. Carefully test.
           # passing `--force` to uninstall all versions
           @brew.uninstall!(['--force'], fully_qualified_formula_name)
         end

data/lib/homebrew_automation/cli/workflow_commands.rb

@@ -52,7 +52,9 @@ class HomebrewAutomation::CLI::WorkflowCommands < Thor
       sdist,
       tap,
       formula_name,
-      bintray_version)
+      bintray_version,
+      git,
+      logger)
   end
 
   private
@@ -90,6 +92,7 @@ class HomebrewAutomation::CLI::WorkflowCommands < Thor
   def bintray_version
     HomebrewAutomation::Bintray::Version.new(
       bintray_client,
+      logger,
       options[:bintray_repo] || "homebrew-bottles",
       options[:bintray_package] || sdist.repo,
       options[:bintray_version] || sdist.tag.sub(/^v/, ''))

data/lib/homebrew_automation/git.rb

@@ -49,7 +49,7 @@ module HomebrewAutomation
     # @param keep_dir [Boolean]
     # @yieldparam dir [String] name of freshly cloned dir
     # @yieldreturn [a] anything
-    # @return [a]
+    # @return [NilClass]
     def with_clone!(url, dir, keep_dir: false, &block)
       begin
         clone! url, dir: dir

data/lib/homebrew_automation/mac_os.rb

@@ -31,7 +31,9 @@ module HomebrewAutomation
         /^10.10/ => 'yosemite',
         /^10.11/ => 'el_capitan',
         /^10.12/ => 'sierra',
-        /^10.13/ => 'high_sierra'
+        /^10.13/ => 'high_sierra',
+        /^10.14/ => 'mojave',
+        /^10.15/ => 'catalina'
       }
     end
 

data/lib/homebrew_automation/source_dist.rb

@@ -6,6 +6,9 @@ module HomebrewAutomation
   # A representation of a source distribution tarball file
   class SourceDist
 
+    class Error < StandardError
+    end
+
     # Assign args to attributes {#user}, {#repo}, {#tag}
     def initialize user, repo, tag, http: RestClient
       @user = user
@@ -38,6 +41,9 @@ module HomebrewAutomation
       @sha256 ||= Digest::SHA256.hexdigest contents
     end
 
+    class SdistDoesNotExist < StandardError
+    end
+
     # Download and return the file contents.
     #
     # Lazy and memoized.
@@ -51,9 +57,10 @@ module HomebrewAutomation
           when 200
             resp.body.to_s
           else
-            puts resp
-            raise StandardError.new resp.code
+            raise Error.new "Other error: HTTP #{resp.code}"
           end
+        rescue RestClient::NotFound
+          raise SdistDoesNotExist.new
         end
     end
 

data/lib/homebrew_automation/version.rb

@@ -2,6 +2,6 @@
 module HomebrewAutomation
 
   # Yep.
-  VERSION = '0.1.10'
+  VERSION = '0.1.17'
 
 end

data/lib/homebrew_automation/workflow.rb

@@ -1,6 +1,9 @@
 
 require_relative './mac_os.rb'
 require_relative './bottle.rb'
+require_relative './brew.rb'
+require_relative './git.rb'
+require_relative './source_dist.rb'
 
 module HomebrewAutomation
 
@@ -40,6 +43,7 @@ module HomebrewAutomation
         "bottles to Bintray.")
       os_name = mac_os.identify_version!
       logger.info!("First let's clone your Tap repo to see the Formula.")
+      # TODO: What if repo already exists?
       git.with_clone!(tap.url, tap.repo, keep_dir: keep_tap_repo) do |cloned_dir|
         tap.on_formula! formula_name do |formula|
           formula.put_sdist(sdist.url, sdist.sha256)
@@ -77,6 +81,7 @@ module HomebrewAutomation
         "Backtrace:",
         e.backtrace.join("\n")
       ].join("\n"))
+      raise
     rescue HomebrewAutomation::Brew::OlderVersionAlreadyInstalled => e
       logger.error!([
         "An older version of the Formula is already installed on your system. " \
@@ -85,16 +90,23 @@ module HomebrewAutomation
         "Caused by: #{e.cause}",
         (e.cause ? e.cause.backtrace.join("\n") : '')
       ].join("\n"))
+      raise
     rescue HomebrewAutomation::Brew::UninstallFailed => e
       logger.error!("brew uninstall failed:\n" + e.backtrace.join("\n"))
+      raise
     rescue HomebrewAutomation::Brew::Error => e
       logger.error!(
         "Something went wrong in this Homebrew command: " +
         e.message + "\n" + e.backtrace.join("\n"))
+      raise
     rescue HomebrewAutomation::Git::Error => e
       logger.error!(
         "Something went wrong in this Git command: " +
         e.message + "\n" + e.backtrace.join("\n"))
+      raise
+    rescue HomebrewAutomation::SourceDist::SdistDoesNotExist => e
+      logger.error!("The tar file from Github you named doesn't exist. Is it because you haven't pushed that tag to Github yet?")
+      raise
     end
 
     # Gather and publish bottles.
@@ -108,9 +120,10 @@ module HomebrewAutomation
     # @param tap [Tap]
     # @param formula_name [String] the name of the formula in the Tap
     # @param bversion [Bintray::Version]
+    # @param git [HomebrewAutomation::Git]
     # @param logger [HomebrewAutomation::Logger]
     # @return [NilClass]
-    def gather_and_publish_bottles!(sdist, tap, formula_name, bversion, logger)
+    def gather_and_publish_bottles!(sdist, tap, formula_name, bversion, git, logger)
       logger.info!(
         "Hello, this is HomebrewAutomation! I will browse through your Bintray to " \
         "see if there may be Bottles built earlier for your Formula, and update your " \
@@ -122,6 +135,7 @@ module HomebrewAutomation
         tap.on_formula! formula_name do |formula|
           logger.info!("Let's see if any files on your Bintray look like Bottles.")
           bottles = bversion.gather_bottles
+          logger.info!("Found bottles: #{bottles}")
           bottles.reduce(
             formula.
             put_sdist(sdist.url, sdist.sha256).

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: homebrew_automation
 version: !ruby/object:Gem::Version
-  version: 0.1.10
+  version: 0.1.17
 platform: ruby
 authors:
 - easoncxz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-04-06 00:00:00.000000000 Z
+date: 2020-04-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec