homebrew_automation 0.0.9 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bdaeff9e52d6b0ddeefead7ebced2d97dcde3ae8e6535648c5758ad218b8d42b
-  data.tar.gz: bdf140bc9b706c81ee09344bcb6c36bd8d7679f84fb0757db01fb7df78b0a019
+  metadata.gz: 240ff77ce84a9af442b04b396ddba4f32014d95d02ebf7fda5ff5904e71aa8bf
+  data.tar.gz: 898384c47dbfee5484b26d4faa5ee2352398c8b8fa2f26b500adcff9e1c1182d
 SHA512:
-  metadata.gz: 77b8a3c5fbf0bf8488ebd6a39b2d493beb99b1ac2d2a6bfc64336cdacac2ae352dac3cd30ce62130c2de0bd898f8f9b9dcffce97bb69f6017f7110b2db5374cb
-  data.tar.gz: bb9add2b195407088552da55a35df30a0170fec173c437d97ef15db3cdb1237a4fb4b31b1d37f37edfaa9d124abe13beadab0ac6639048f0fdad4fffff9cb1f8
+  metadata.gz: ffc1fbb67e9b31b5aeca7b0b11c2f5c6ef6c694e4e4af9bcb1ffbc4a27e20f2be1bbcb1416f4735176543d0ab929519c01e15c51a096fa0400195e796bee97af
+  data.tar.gz: f6c5a599c570f9183201101fb9197fbf063bffb845bdf343ddf00e91687c41d565f482d2290c46002f0ddb7c2ff24feb6b74a1df6a77e73a8731ae3141665199

data/bin/homebrew_automation.rb

@@ -1,99 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'thor'
-
-require_relative '../lib/homebrew_automation.rb'
-
-class FormulaCommands < Thor
-
-  desc 'put-sdist', 'Update the URL and sha256 checksum of the source tarball'
-  option :url, :required => true
-  option :sha256, :required => true
-  def put_sdist
-    before = HomebrewAutomation::Formula.parse_string($stdin.read)
-    after = before.put_sdist options[:url], options[:sha256]
-    $stdout.write after
-  end
-
-  desc 'put-bottle', 'Insert or update a bottle reference for a given OS'
-  option :os, :required => true
-  option :sha256, :required => true
-  def put_bottle
-    before = HomebrewAutomation::Formula.parse_string($stdin.read)
-    after = before.put_bottle(options[:os], options[:sha256])
-    $stdout.write after
-  end
-
-end
-
-class WorkflowCommands < Thor
-  class_option :tap_user, :required => true
-  class_option :tap_repo, :required => true
-  class_option :tap_token, :required => true
-  class_option :bintray_user, :required => true
-  class_option :bintray_token, :required => true
-
-  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`.
-
-    `formula_name` defaults to the same as `source_repo`.
-    `formula_version` defaults to `source_tag` with a leading `v` stripped off.
-  HERE_HERE
-  option :source_user, :required => true
-  option :source_repo, :required => true
-  option :source_tag, :required => true
-  option :formula_name
-  option :formula_version
-  def build_and_upload
-    workflow.build_and_upload_bottle(
-      HomebrewAutomation::SourceDist.new(
-        options[:source_user],
-        options[:source_repo],
-        options[:source_tag]),
-      formula_name: options[:formula_name],
-      version_name: options[:formula_version])
-  end
-
-  desc 'gather-and-publish', 'Make the Tap aware of new Bottles'
-  long_desc <<-HERE_HERE
-    See what bottles have been built and uploaded to Bintray, then publish them into the Tap.
-
-    Since we're publishing updates to the Formula in our Tap, we need Git push access to the
-    Tap repo on Github via a Github OAuth token via `tap_token`.
-
-    `formula-name` should be both the formula name as appears in the Tap and also the Bintray package name.
-    `formula-version` should be the Bintray "Version" name.
-  HERE_HERE
-  option :formula_name, :required => true
-  option :formula_version, :required => true
-  def gather_and_publish
-    workflow.gather_and_publish_bottles(
-      options[:formula_name],
-      options[:formula_version])
-  end
-
-  private
-
-  def workflow
-    HomebrewAutomation::Workflow.new(
-      HomebrewAutomation::Tap.new(options[:tap_user], options[:tap_repo], options[:tap_token]),
-      HomebrewAutomation::Bintray.new(options[:bintray_user], options[:bintray_token]))
-  end
-
-end
-
-class MyCliApp < Thor
-
-  desc 'formula (...)', 'Modify Formula DSL source (read stdin, write stdout)'
-  subcommand "formula", FormulaCommands
-
-  desc 'bottle (...)', 'Workflows for dealing with binary artifacts'
-  subcommand "bottle", WorkflowCommands
-
-end
-
-
-MyCliApp.start(ARGV)
-
+require_relative '../lib/homebrew_automation/cli.rb'
 
+HomebrewAutomation::CLI::MyCliApp.start(ARGV)

data/lib/homebrew_automation.rb

@@ -1,13 +1,10 @@
 
 # Help you manipulate Homebrew Formula files, Bottles etc.
-module HomebrewAutomation
-end
 
 require_relative 'homebrew_automation/bintray.rb'
 require_relative 'homebrew_automation/bottle.rb'
-require_relative 'homebrew_automation/bottle_gatherer.rb'
 require_relative 'homebrew_automation/formula.rb'
-require_relative 'homebrew_automation/mac-os.rb'
+require_relative 'homebrew_automation/mac_os.rb'
 require_relative 'homebrew_automation/source_dist.rb'
 require_relative 'homebrew_automation/tap.rb'
 require_relative 'homebrew_automation/version.rb'

data/lib/homebrew_automation/bintray.rb

@@ -1,122 +1,3 @@
 
-require 'json'
-require 'base64'
-require 'uri'
-require 'rest-client'
-
-module HomebrewAutomation
-
-  # A bare-bones Bintray API client that implements only the methods needed for
-  # Homebrew things.
-  class Bintray
-
-    # @param username [String] Bintray username; for me this was not my email address
-    # @param api_key [String] Bearer-token-like key; generated in the Bintray web UI
-    # @param http [RestClient.Class] The +RestClient+ class itself
-    # @param base_url [String] Include the +https://+; exclude the trailing slash.
-    def initialize(
-        username,
-        api_key,
-        http: RestClient,
-        base_url: "https://bintray.com/api/v1"
-    )
-      @username = username
-      @api_key = api_key
-      @base_url = base_url
-      @http = http  # allow injecting mocks for testing
-    end
-
-    # <tt>POST /packages/:subject/:repo/:package/versions</tt>
-    #
-    # Redundant: Bintray seems to create nonexistant versions for you if you
-    # just try to upload files into it.
-    #
-    # @param repo_name [String]
-    # @param package_name [String]
-    # @param version_name [String]
-    # @return [RestClient::Response]
-    def create_version(repo_name, package_name, version_name)
-      safe_repo = URI.escape(repo_name)
-      safe_pkg = URI.escape(package_name)
-      @http.post(
-        rel("/packages/#{safe_username}/#{safe_repo}/#{safe_pkg}/versions"),
-        { name: version_name }.to_json,
-        api_headers
-      )
-    end
-
-    # <tt>PUT /content/:subject/:repo/:package/:version/:file_path[?publish=0/1][?override=0/1][?explode=0/1]</tt>
-    #
-    # Bintray seems to expect the byte sequence of the file to be written straight out into the
-    # HTTP request body, optionally via <tt>Transfer-Encoding: chunked</tt>. So we pass the +content+ String
-    # straight through to RestClient
-    #
-    # @param repo_name [String]
-    # @param package_name [String]
-    # @param version_name [String]
-    # @param filename [String] The filename within one Bintray repository, e.g. +hack-assembler-0.1.1.17.high_sierra.bottle.tar.gz+
-    # @param content [String] The bytes for the file, e.g. from a +File.read+
-    # @return [RestClient::Response]
-    def upload_file(repo_name, package_name, version_name, filename, content, publish: 1)
-      safe_repo = URI.escape(repo_name)
-      safe_pkg = URI.escape(package_name)
-      safe_ver = URI.escape(version_name)
-      safe_filename = URI.escape(filename)
-      safe_publish = URI.escape(publish.to_s)
-      @http.put(
-        rel("/content/#{safe_username}/#{safe_repo}/#{safe_pkg}/#{safe_ver}/#{safe_filename}?publish=#{safe_publish}"),
-        content,
-        auth_headers
-      )
-    end
-
-    # <tt>GET /packages/:subject/:repo/:package/versions/:version/files[?include_unpublished=0/1]</tt>
-    #
-    # Useful when seeing what bottles have already been built.
-    #
-    # @param repo_name [String]
-    # @param package_name [String]
-    # @param version_name [String]
-    # @return [RestClient::Response]
-    def get_all_files_in_version(repo_name, package_name, version_name)
-      safe_repo = URI.escape(repo_name)
-      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"),
-        auth_headers)
-    end
-
-    # Bintray username, URI-escaped.
-    #
-    # @return [String]
-    def safe_username
-      URI.escape(@username)
-    end
-
-    # Resolve a relative path into a URL using the current base_url
-    #
-    # @param slash_subpath [String]
-    # @return [String]
-    def rel(slash_subpath)
-      @base_url + slash_subpath
-    end
-
-    # @return [Hash]
-    def api_headers
-      { "Content-Type" => "application/json" }.update auth_headers
-    end
-
-    # Implement HTTP Basich Auth, as per RFC 7617.
-    #
-    # Let's not bring in a library just for these two lines.
-    #
-    # @return [Hash]
-    def auth_headers
-      cred = Base64.strict_encode64("#{@username}:#{@api_key}")
-      { Authorization: "Basic #{cred}" }
-    end
-
-  end
-
-end
+require_relative 'bintray/client.rb'
+require_relative 'bintray/version.rb'

data/lib/homebrew_automation/bintray/client.rb

@@ -0,0 +1,125 @@
+
+require 'json'
+require 'base64'
+require 'uri'
+require 'rest-client'
+
+module HomebrewAutomation
+end
+
+module HomebrewAutomation::Bintray
+
+  # A bare-bones Bintray API client that implements only the methods needed for
+  # Homebrew things.
+  class Client
+
+    # @param username [String] Bintray username; for me this was not my email address
+    # @param api_key [String] Bearer-token-like key; generated in the Bintray web UI
+    # @param http [RestClient.Class] The +RestClient+ class itself
+    # @param base_url [String] Include the +https://+; exclude the trailing slash.
+    def initialize(
+        username,
+        api_key,
+        http: RestClient,
+        base_url: "https://bintray.com/api/v1"
+    )
+      @username = username
+      @api_key = api_key
+      @base_url = base_url
+      @http = http  # allow injecting mocks for testing
+    end
+
+    # <tt>POST /packages/:subject/:repo/:package/versions</tt>
+    #
+    # Redundant: Bintray seems to create nonexistant versions for you if you
+    # just try to upload files into it.
+    #
+    # @param repo_name [String]
+    # @param package_name [String]
+    # @param version_name [String]
+    # @return [RestClient::Response]
+    def create_version(repo_name, package_name, version_name)
+      safe_repo = URI.escape(repo_name)
+      safe_pkg = URI.escape(package_name)
+      @http.post(
+        rel("/packages/#{safe_username}/#{safe_repo}/#{safe_pkg}/versions"),
+        { name: version_name }.to_json,
+        api_headers
+      )
+    end
+
+    # <tt>PUT /content/:subject/:repo/:package/:version/:file_path[?publish=0/1][?override=0/1][?explode=0/1]</tt>
+    #
+    # Bintray seems to expect the byte sequence of the file to be written straight out into the
+    # HTTP request body, optionally via <tt>Transfer-Encoding: chunked</tt>. So we pass the +content+ String
+    # straight through to RestClient
+    #
+    # @param repo_name [String]
+    # @param package_name [String]
+    # @param version_name [String]
+    # @param filename [String] The filename within one Bintray repository, e.g. +hack-assembler-0.1.1.17.high_sierra.bottle.tar.gz+
+    # @param content [String] The bytes for the file, e.g. from a +File.read+
+    # @return [RestClient::Response]
+    def upload_file(repo_name, package_name, version_name, filename, content, publish: 1)
+      safe_repo = URI.escape(repo_name)
+      safe_pkg = URI.escape(package_name)
+      safe_ver = URI.escape(version_name)
+      safe_filename = URI.escape(filename)
+      safe_publish = URI.escape(publish.to_s)
+      @http.put(
+        rel("/content/#{safe_username}/#{safe_repo}/#{safe_pkg}/#{safe_ver}/#{safe_filename}?publish=#{safe_publish}"),
+        content,
+        auth_headers
+      )
+    end
+
+    # <tt>GET /packages/:subject/:repo/:package/versions/:version/files[?include_unpublished=0/1]</tt>
+    #
+    # Useful when seeing what bottles have already been built.
+    #
+    # @param repo_name [String]
+    # @param package_name [String]
+    # @param version_name [String]
+    # @return [RestClient::Response]
+    def get_all_files_in_version(repo_name, package_name, version_name)
+      safe_repo = URI.escape(repo_name)
+      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"),
+        auth_headers)
+    end
+
+    # Bintray username, URI-escaped.
+    #
+    # @return [String]
+    def safe_username
+      URI.escape(@username)
+    end
+
+    # Resolve a relative path into a URL using the current base_url
+    #
+    # @param slash_subpath [String]
+    # @return [String]
+    def rel(slash_subpath)
+      @base_url + slash_subpath
+    end
+
+    # @return [Hash]
+    def api_headers
+      { "Content-Type" => "application/json" }.update auth_headers
+    end
+
+    # Implement HTTP Basich Auth, as per RFC 7617.
+    #
+    # Let's not bring in a library just for these two lines.
+    #
+    # @return [Hash]
+    def auth_headers
+      cred = Base64.strict_encode64("#{@username}:#{@api_key}")
+      { Authorization: "Basic #{cred}" }
+    end
+
+  end
+
+end

data/lib/homebrew_automation/bintray/version.rb

@@ -0,0 +1,83 @@
+
+require 'json'
+
+module HomebrewAutomation
+end
+
+module HomebrewAutomation::Bintray
+
+  # A representation of a Bintray +Version+
+  #
+  # As per Bintray, a +Version+ is part of a +Package+ is part of a +Repository+.
+  class Version
+
+    # @param client [Client] Connection to Bintray servers
+    # @param repo_name [String]
+    # @param package_name [String]
+    # @param version_name [String]
+    def initialize(client, repo_name, package_name, version_name)
+      @client = client
+      @repo_name = repo_name
+      @package_name = package_name
+      @version_name = version_name
+    end
+
+    attr_reader :repo_name, :package_name, :version_name
+
+    # Create this +Version+
+    #
+    # This assumes the +Package+ and +Repository+ already exists. If they do
+    # not, consider creating them manually via the Bintray web UI.
+    def create!
+      @client.create_version(@repo_name, @package_name, @version_name)
+    end
+
+    # Upload a file to be part of this +Version+
+    #
+    # This is probably your Homebrew Bottle binary tarball.
+    #
+    # @param filename [String]
+    # @param content [String] the bytes in the file
+    def upload_file!(filename, content)
+      @client.upload_file(
+        @repo_name,
+        @package_name,
+        @version_name,
+        filename,
+        content)
+    end
+
+    # Download metadata about files that exist on Bintray for this +Version+
+    #
+    # @return [Hash] mapping from OS (as appears in part of the filenames) to sha256 checksum
+    def gather_bottles
+      resp = @client.get_all_files_in_version(@repo_name, @package_name, @version_name)
+      _assert_match((200..207), resp.code)
+      json = JSON.parse(resp.body)
+      _assert_match(Array, json)
+      pairs = json.map do |f|
+        os = _parse_for_os(f['name'])
+        checksum = f['sha256']
+        [os, checksum]
+      end
+      Hash[pairs]
+    end
+
+    def _assert_match(cond, x)
+      unless cond === x
+        p x
+        raise StandardError.new(x)
+      end
+    end
+
+    # @param bottle_filename [String] filename
+    # @return [String] OS name
+    def _parse_for_os(bottle_filename)
+      File.extname(
+        File.basename(bottle_filename, '.bottle.tar.gz')).
+      sub(/^\./, '')
+    end
+
+  end
+
+end

data/lib/homebrew_automation/bottle.rb

@@ -1,4 +1,5 @@
 
+require 'json'
 
 module HomebrewAutomation
 

data/lib/homebrew_automation/cli.rb

@@ -0,0 +1,2 @@
+
+require_relative 'cli/cli.rb'

data/lib/homebrew_automation/cli/cli.rb

@@ -0,0 +1,22 @@
+
+require 'thor'
+
+require_relative 'formula_commands.rb'
+require_relative 'workflow_commands.rb'
+
+module HomebrewAutomation
+  module CLI
+
+    class MyCliApp < Thor
+
+      desc 'formula (...)', 'Modify Formula DSL source (read stdin, write stdout)'
+      subcommand "formula", FormulaCommands
+
+      desc 'bottle (...)', 'Workflows for dealing with binary artifacts'
+      subcommand "bottle", WorkflowCommands
+
+    end
+
+  end
+end
+

data/lib/homebrew_automation/cli/formula_commands.rb

@@ -0,0 +1,31 @@
+
+require 'thor'
+
+require_relative '../../homebrew_automation/formula.rb'
+
+module HomebrewAutomation
+  module CLI
+  end
+end
+
+class HomebrewAutomation::CLI::FormulaCommands < Thor
+
+  desc 'put-sdist', 'Update the URL and sha256 checksum of the source tarball'
+  option :url, :required => true
+  option :sha256, :required => true
+  def put_sdist
+    before = HomebrewAutomation::Formula.parse_string($stdin.read)
+    after = before.put_sdist options[:url], options[:sha256]
+    $stdout.write after
+  end
+
+  desc 'put-bottle', 'Insert or update a bottle reference for a given OS'
+  option :os, :required => true
+  option :sha256, :required => true
+  def put_bottle
+    before = HomebrewAutomation::Formula.parse_string($stdin.read)
+    after = before.put_bottle(options[:os], options[:sha256])
+    $stdout.write after
+  end
+
+end

data/lib/homebrew_automation/cli/workflow_commands.rb

@@ -0,0 +1,84 @@
+
+require 'thor'
+
+require_relative '../../homebrew_automation.rb'
+
+module HomebrewAutomation
+  module CLI
+  end
+end
+
+class HomebrewAutomation::CLI::WorkflowCommands < Thor
+  class_option :source_user, :required => true
+  class_option :source_repo, :required => true
+  class_option :source_tag, :required => true
+  class_option :tap_user, :required => true
+  class_option :tap_repo, :required => true
+  class_option :tap_token, :required => true
+  class_option :formula_name
+  class_option :bintray_user, :required => true
+  class_option :bintray_token, :required => true
+  class_option :bintray_repo
+  class_option :bintray_package
+  class_option :bintray_version
+
+  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
+  def build_and_upload
+    workflow.build_and_upload_bottle(sdist, tap, formula_name, bintray_version)
+  end
+
+  desc 'gather-and-publish', 'Make the Tap aware of new Bottles'
+  long_desc <<-HERE_HERE
+    See what bottles have been built and uploaded to Bintray, then publish them into the Tap.
+
+    Since we're publishing updates to the Formula in our Tap, we need Git push access to the
+    Tap repo on Github via a Github OAuth token via `tap_token`.
+  HERE_HERE
+  def gather_and_publish
+    workflow.gather_and_publish_bottles(sdist, tap, formula_name, bintray_version)
+  end
+
+  private
+
+  def sdist
+    HomebrewAutomation::SourceDist.new(
+      options[:source_user],
+      options[:source_repo],
+      options[:source_tag])
+  end
+
+  def tap
+    HomebrewAutomation::Tap.new(
+      options[:tap_user],
+      options[:tap_repo],
+      options[:tap_token])
+  end
+
+  # DOC: default values here
+  def formula_name
+    options[:formula_name] || sdist.repo
+  end
+
+  def bintray_client
+    HomebrewAutomation::Bintray::Client.new(
+      options[:bintray_user],
+      options[:bintray_token])
+  end
+
+  # DOC: default values here
+  def bintray_version
+    HomebrewAutomation::Bintray::Version.new(
+      bintray_client,
+      options[:bintray_repo] || "homebrew-bottles",
+      options[:bintray_package] || sdist.repo,
+      options[:bintray_version] || sdist.tag.sub(/^v/, ''))
+  end
+
+  def workflow
+    HomebrewAutomation::Workflow.new
+  end
+
+end

data/lib/homebrew_automation/formula.rb

@@ -82,6 +82,20 @@ module HomebrewAutomation
         put_bottle_version(os, sha256))
     end
 
+    # Remove sha256 references to all bottles
+    #
+    # This may leave the Formula in a non-standard state. Please add at lease
+    # one bottle referene back, otherwise why are you even declaring a bottles block
+    # at all.
+    #
+    # @return [Formula] a new instance of Formula with the changes applied
+    def rm_all_bottles
+      Formula.new update(
+        @ast,
+        bot_begin_path,
+        rm_all_bottle_sha256s)
+    end
+
     # Both formulae are +==+, as per +Parser::AST::Node#==+.
     #
     # In practice, I think this means both formulae are equivalent in terms of
@@ -137,6 +151,18 @@ module HomebrewAutomation
       }
     end
 
+    # Drop all bottles
+    # rm_all_bottle_sha256s :: Proc (Node -> Node)
+    def rm_all_bottle_sha256s
+      -> (bot_begin) {
+        bot_begin.updated(
+          nil,  # keep the node type unchanged
+          bot_begin.children.reject(
+            # Get ride of all bottles condtionlessly
+            &by_msg('sha256')))
+      }
+    end
+
     # Build a new AST Node
     # String -> String -> Node
     def new_sha256 sha256, os

data/lib/homebrew_automation/{mac-os.rb → mac_os.rb}

@@ -11,7 +11,12 @@ module HomebrewAutomation
     #
     # @return [String]
     def self.identify_version
-      version = `sw_vers -productVersion`
+      version =
+        begin
+          `sw_vers -productVersion`
+        rescue Errno::ENOENT    # if we're not on a Mac
+          nil
+        end
       mac_to_homebrew.
         select { |pattern, _| pattern === version }.
         map { |_, description| description }.

data/lib/homebrew_automation/source_dist.rb

@@ -7,10 +7,11 @@ module HomebrewAutomation
   class SourceDist
 
     # Assign args to attributes {#user}, {#repo}, {#tag}
-    def initialize user, repo, tag
+    def initialize user, repo, tag, http: RestClient
       @user = user
       @repo = repo
       @tag = tag
+      @http = http
     end
 
     # Github username, as appears in Github URLs
@@ -41,12 +42,11 @@ module HomebrewAutomation
     #
     # Lazy and memoized.
     #
-    # @param fake [String] inject fake file contents (for testing)
     # @return [String] contents of the file
-    def contents fake: nil
-      @contents = @contents || fake ||
+    def contents
+      @contents = @contents ||
         begin
-          resp = RestClient.get url
+          resp = @http.get url
           case resp.code
           when 200
             resp.body.to_s

data/lib/homebrew_automation/tap.rb

@@ -18,15 +18,15 @@ module HomebrewAutomation
       @keep_submodule = keep_submodule
     end
 
-    # Github username, as appears in Github URLs
+    # Github repo name, as appears in Github URLs
     #
     # @return [String]
-    attr_reader :user
+    attr_reader :repo
 
-    # Github repo name, as appears in Github URLs
+    # Repo URL, as expected by Git
     #
     # @return [String]
-    attr_reader :repo
+    attr_reader :url
 
     # Github OAuth token
     #
@@ -63,9 +63,9 @@ module HomebrewAutomation
     # @return [Formula] as returned from the block,
     #     assuming it obediantly returns a {Formula}.
     def on_formula(formula, &block)
-      name = "#{formula}.rb"
+      name = "#{formula}.rb"  # DOC
       block ||= ->(n) { n }
-      Dir.chdir 'Formula' do
+      Dir.chdir 'Formula' do  # DOC
         File.open name, 'r' do |old_file|
           File.open "#{name}.new", 'w' do |new_file|
             new_file.write(

data/lib/homebrew_automation/version.rb

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

data/lib/homebrew_automation/workflow.rb

@@ -1,6 +1,7 @@
 
-require_relative './mac-os.rb'
-require_relative './bottle_gatherer.rb'
+require_relative './mac_os.rb'
+require_relative './bintray.rb'
+require_relative './source_dist.rb'
 
 module HomebrewAutomation
 
@@ -9,71 +10,31 @@ module HomebrewAutomation
   # Each method in this class probably makes sense to be exposed as a CLI command.
   class Workflow
 
-    # Assign params to attributes.
-    #
-    # See {#tap} and {#bintray}.
-    #
-    # @param tap [Tap]
-    # @param bintray [Bintray]
-    # @param bintray_bottle_repo [String] Really should be somehow a part of the +bintray+ param
-    def initialize(
-        tap,
-        bintray,
-        bintray_bottle_repo: 'homebrew-bottles')
-      @tap = tap
-      @bintray = bintray
-      @bintray_bottle_repo = bintray_bottle_repo
-    end
-
-    # The Tap holding the Formulae for which we might want to build or publish bottles.
-    #
-    # @return [Tap]
-    attr_reader :tap
-
-    # An API client
-    #
-    # @return [Bintray]
-    attr_reader :bintray
-
     # Build and upload a bottle.
     #
-    # The Formula source comes from +source_dist+, and the Bottle tarball that
-    # is built goes to {#bintray}.
+    # The built Bottle tarball gets uploaded to Bintray.
     #
-    # +source_dist+ not only specifies the source tarball, but it also implies:
-    # - the formula name, as appears in the {#tap}, via {SourceDist#repo};
-    # - the Bintray package version, as to be uploaded, via {SourceDist#tag}, with any leading +v+ stripped off.
-    #
-    # The optional params overwrite the above implication.
-    #
-    # @param source_dist [HomebrewAutomation::SourceDist] Source tarball
-    # @param formula_name [String] Formula name as appears in the Tap, which should be the same as the Bintray "Package" name
-    # @param version_name [String] Bintray package "Version" name; defaults to stripping leading `v` from the Git tag.
+    # @param sdist [SourceDist]
+    # @param tap [Tap]
+    # @param formula_name [String] the name of the formula in the Tap
+    # @param bversion [Bintray::Version]
     # @return [Bottle]
-    def build_and_upload_bottle(source_dist, formula_name: nil, version_name: nil)
-      formula_name ||= source_dist.repo
-      version_name ||= source_dist.tag.sub(/^v/, '')
+    def build_and_upload_bottle(sdist, tap, formula_name, bversion)
       os_name = MacOS.identify_version
-      @tap.with_git_clone do
-        @tap.on_formula(formula_name) do |formula|
-          formula.put_sdist(source_dist.url, source_dist.sha256)
+      tap.with_git_clone do
+        tap.on_formula(formula_name) do |formula|
+          formula.put_sdist(sdist.url, sdist.sha256)
         end
-        @tap.git_commit_am "Throwaway commit; just for building bottles"
+        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.build
 
-        @bintray.create_version(
-          @bintray_bottle_repo,
-          formula_name,
-          version_name)
-        @bintray.upload_file(
-          @bintray_bottle_repo,
-          formula_name,
-          version_name,
-          bottle.filename,
-          bottle.content)
+        # Bintray auto-creates Versions on file-upload.
+        # Re-creating an existing Version results in a 409.
+        #bversion.create!
+        bversion.upload_file!(bottle.filename, bottle.content)
 
         bottle
       end
@@ -86,34 +47,29 @@ module HomebrewAutomation
     # the {#tap} repository to make an existing Formula aware of the Bottles
     # we're gathered (as such "publishing" the bottles).
     #
-    # @param formula_name [String] Both the Formula name in the Tap repo, and the Package name in the Bintray repo.
-    # @param version_name [String] Bintray "Version" name; not a Git tag.
+    # @param sdist [SourceDist]
+    # @param tap [Tap]
+    # @param formula_name [String] the name of the formula in the Tap
+    # @param bversion [Bintray::Version]
     # @return [Formula]
-    def gather_and_publish_bottles(formula_name, version_name)
-      @tap.with_git_clone do
-        resp = @bintray.get_all_files_in_version(
-          @bintray_bottle_repo,
-          formula_name,
-          version_name)
-        unless (200..207) === resp.code
-          puts resp
-          raise StandardError.new(resp)
+    def gather_and_publish_bottles(sdist, tap, formula_name, bversion)
+      tap.with_git_clone do
+        tap.on_formula(formula_name) do |formula|
+          bottles = bversion.gather_bottles
+          bottles.reduce(
+            formula.
+            put_sdist(sdist.url, sdist.sha256).
+            rm_all_bottles
+          ) do |f, (os, checksum)|
+            f.put_bottle(os, checksum)
+          end
         end
-
-        json = JSON.parse(resp.body)
-        gatherer = BottleGatherer.new(json)
-
-        @tap.on_formula(formula_name) do |formula|
-          gatherer.put_bottles_into(formula)
-        end
-
-        @tap.git_config
-        @tap.git_commit_am "Add bottles for #{formula_name}@#{version_name}"
-        @tap.git_push
+        tap.git_config
+        tap.git_commit_am "Add bottles for #{formula_name}@#{bversion.version_name}"
+        tap.git_push
       end
     end
 
-
   end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: homebrew_automation
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.0
 platform: ruby
 authors:
 - easoncxz
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-03-03 00:00:00.000000000 Z
+date: 2019-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -66,6 +66,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ripper-tags
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
@@ -132,10 +146,15 @@ files:
 - bin/homebrew_automation.rb
 - lib/homebrew_automation.rb
 - lib/homebrew_automation/bintray.rb
+- lib/homebrew_automation/bintray/client.rb
+- lib/homebrew_automation/bintray/version.rb
 - lib/homebrew_automation/bottle.rb
-- lib/homebrew_automation/bottle_gatherer.rb
+- lib/homebrew_automation/cli.rb
+- lib/homebrew_automation/cli/cli.rb
+- lib/homebrew_automation/cli/formula_commands.rb
+- lib/homebrew_automation/cli/workflow_commands.rb
 - lib/homebrew_automation/formula.rb
-- lib/homebrew_automation/mac-os.rb
+- lib/homebrew_automation/mac_os.rb
 - lib/homebrew_automation/source_dist.rb
 - lib/homebrew_automation/tap.rb
 - lib/homebrew_automation/version.rb
@@ -160,7 +179,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.2
+rubyforge_project: 
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Build bottles and update Formulae

data/lib/homebrew_automation/bottle_gatherer.rb

@@ -1,49 +0,0 @@
-
-require_relative './mac-os.rb'
-require_relative './formula.rb'
-
-module HomebrewAutomation
-
-  # See what Bottles have already been built and uploaded to Bintray
-  class BottleGatherer
-
-    # @param json [Array<Hash>] JSON from a +RestClient::Response+ containing the list of files from Bintray
-    def initialize(json)
-      @json = json
-      @bottles = nil
-    end
-
-    # The bottles gathered.
-    #
-    # @return [Hash<String, String>] with keys being OS names (in Homebrew-form) and values being SHA256 checksums
-    def bottles
-      return @bottles if @bottles
-      pairs = @json.map do |f|
-        os = _parse_for_os(f['name'])
-        checksum = f['sha256']
-        [os, checksum]
-      end
-      @bottles = Hash[pairs]
-    end
-
-    # Put all bottles gathered here into the given formula, then return the result
-    #
-    # @param formula [HomebrewAutomation::Formula]
-    # @return [HomebrewAutomation::Formula]
-    def put_bottles_into(formula)
-      bottles.reduce(formula) do |formula, (os, checksum)|
-        formula.put_bottle(os, checksum)
-      end
-    end
-
-    # @param bottle_filename [String] filename
-    # @return [String] OS name
-    def _parse_for_os(bottle_filename)
-      File.extname(
-        File.basename(bottle_filename, '.bottle.tar.gz')).
-      sub(/^\./, '')
-    end
-
-  end
-
-end