apperol 0.0.7 → 0.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e9e981c70db00587f3b2340a9d452ce9176edd0
-  data.tar.gz: f898bafdb9d0d814335b91de19e9c33c4e727f35
+  metadata.gz: 5ac9811222d781a47081d4c75503a5c4a0d1fdd6
+  data.tar.gz: 42f10ad07bf9cf917604fd01425fa35538bd95ff
 SHA512:
-  metadata.gz: acb1d55c64aa1d3fc98f247c44d7bf6ec686a61db8898e4b88cb9790bfe4bbcb30a9647280692ebce533eefebd13030ca2024bbd4dff1290d62b60758ce218b0
-  data.tar.gz: 7dfb3ecb7b81c2f6110c069f5bf5b64d0f82fbb4f905bdca8db2ead39aab7ebb93ba4ae539046bafe19de251b44fac989e76ed9021423740cd9c7d31ef8f86a1
+  metadata.gz: 96ec2f030b2e8f6fc5e4a628cb8377e9bc41141fe48397742c592d73448e5b78b219f45c3a42ebbd9bab24196220f36d7f534b72a4a31e35588cf32b84feba61
+  data.tar.gz: b46aa47a94c0dd798cf9812b8e486d690c45cf92c659929718018c49aabd2a347180390c6e98458c4a9b8f0bf2b8b05bbdc4dd40be3668e7623ab35d190ec078

data/.gitignore

@@ -11,4 +11,5 @@
 *.so
 *.o
 *.a
+*.gem
 mkmf.log

data/apperol.gemspec

@@ -7,7 +7,7 @@ Gem::Specification.new do |spec|
   spec.name          = "apperol"
   spec.version       = Apperol::VERSION
   spec.authors       = ["Yannick"]
-  spec.email         = ["yannick@heroku.com"]
+  spec.email         = ["yannick@heroku.com", "opensource@heroku.com"]
   spec.summary       = %q{Create heroku app from heroku repository}
   spec.description   = %q{Create heroku app from heroku repository with app.json}
   spec.homepage      = "https://github.com/ys/apperol"

data/lib/apperol/cli.rb

@@ -7,6 +7,9 @@ require "netrc"
 require "spinning_cursor"
 
 require_relative "app_json"
+require_relative "creds"
+require_relative "heroku_client"
+require_relative "github_client"
 
 module Apperol
   class CLI
@@ -48,66 +51,91 @@ module Apperol
       @app_extension = args.shift
 
       unless @app_extension
-        $stderr.puts("usage: apperol [options] [app_extension]")
+        $stderr.puts(parser.help)
         exit EX_USAGE
       end
     end
 
     def call
-      heroku_app_setup
+      launch_app_setup do |response|
+        build_id = response["id"]
+        output_stream_url = get_output_stream_url(build_id)
+        stream_build(output_stream_url)
+        finalizing_setup(build_id)
+      end
     end
 
-    def heroku_app_setup
-      req = Net::HTTP::Post.new(app_setup_url, initheader = heroku_headers)
-      req.basic_auth *heroku_creds
-      req.body = app_setup_payload
+    private
+
+    def launch_app_setup
       $stdout.puts("Setting up heroku app #{heroku_app_name}-#{@app_extension}")
-      res = heroku_http.request(req)
-      if res.code != "202"
-        $stderr.puts JSON.parse(res.body)["message"]
+      response = heroku_client.post(app_setup_url, app_setup_payload)
+      if response.status != 202
+        $stderr.puts response.body["message"]
         exit 1
       else
-        poll_app_status(JSON.parse(res.body))
+        yield response.body
       end
     end
 
-    def poll_app_status(response)
-      req = Net::HTTP::Get.new(app_setup_url(response["id"]), initheader = heroku_headers)
-      req.basic_auth *heroku_creds
-      res = {}
-      spin_wait("Setting up your app", "App setup done") do
-        loop do
-          res = JSON.parse(heroku_http.request(req).body)
-          break unless res["status"] == "pending"
-        end
+    def get_output_stream_url(build_id)
+      response = loop_on_build_until(build_id) do |response|
+        !response.body["build"]["output_stream_url"].nil? || response.body["status"] != "pending"
       end
-      if res["status"] == "succeeded"
-        unless res["postdeploy"].empty?
-          $stdout.puts(res["postdeploy"]["output"])
-        end
-        $stdout.puts("Application #{res["app"]["name"]}.herokuapp.com has been successfully created.")
+      response.body["build"]["output_stream_url"]
+    end
+
+    def stream_build(url)
+      heroku_client.stream_build(url) do |chunk|
+        puts chunk
+      end
+    end
+
+    def finalizing_setup(build_id)
+      response = loop_on_build_until(build_id) do |response|
+        response.body["status"] != "pending"
+      end
+      if response.body["status"] == "succeeded"
+        $stdout.puts("Application #{response.body["app"]["name"]}.herokuapp.com has been successfully created.")
         exit 0
       else
-        $stderr.puts("error: #{res["failure_message"]}")
-        unless res["manifest_errors"].empty?
-          $stderr.puts("       #{res["manifest_errors"]}")
+        $stderr.puts("error: #{response.body["failure_message"]}")
+        unless response.body["manifest_errors"].empty?
+          $stderr.puts("       #{response.body["manifest_errors"]}")
         end
-        unless res["postdeploy"].empty?
-          $stderr.puts(res["postdeploy"]["output"])
+        unless response.body["postdeploy"].empty?
+          $stderr.puts(response.body["postdeploy"]["output"])
         end
         exit 1
       end
     end
 
+    def loop_on_build_until(build_id)
+      response = nil
+      spin_wait("Setting up your app", "App setup done") do
+        loop do
+          response = heroku_client.get(app_setup_url(build_id))
+          break if yield(response)
+        end
+      end
+      response
+    end
+
+    def heroku_client
+      @heroku_client ||= Apperol::HerokuClient.new
+    end
+
+    def github_client
+      @github_client ||= Apperol::GithubClient.new
+    end
+
     def spin_wait(banner_txt, message_txt)
       SpinningCursor.run do
         banner banner_txt
         type :dots
         message message_txt
       end
-
       yield
-
       SpinningCursor.stop
     end
 
@@ -115,19 +143,6 @@ module Apperol
       URI("https://api.heroku.com/app-setups/#{id}")
     end
 
-    def heroku_headers
-      {
-        "Content-Type" => "application/json",
-        "Accept" => "application/vnd.heroku+json; version=3"
-      }
-    end
-
-    def heroku_http
-      @heroku_http ||= Net::HTTP.new(app_setup_url.hostname, app_setup_url.port).tap do |http|
-        http.use_ssl = true
-      end
-    end
-
     def app_setup_payload
       payload = {
         app: {
@@ -155,27 +170,13 @@ module Apperol
     end
 
     def github_tarball_location
-      $stdout.puts("Getting tarball location for empirical branch #{github_branch}")
-      res = github_get(tarball_path)
-      if res["Location"]
-        res["Location"]
-      else
-        $stderr.puts("error: No tarball found for #{github_url + tarball_path} : #{JSON.parse(res.body)["message"]}")
+      $stdout.puts("Getting tarball location for #{repo}  on branch #{branch}")
+      location = github_client.tarball(repo, branch)
+      unless location
+        $stderr.puts("error: No tarball found for #{repo}")
         exit 1
       end
-    end
-
-    def github_get(path)
-      puts github_url + path
-      req = Net::HTTP::Get.new(github_url + path)
-      req.basic_auth *github_creds
-      github_http.request(req)
-    end
-
-    def github_http
-      @github_http ||= Net::HTTP.new(github_url.hostname, github_url.port).tap do |http|
-        http.use_ssl = true
-      end
+      location
     end
 
     def personal_app?
@@ -196,19 +197,12 @@ module Apperol
 
     def user
       @user ||= @options.fetch(:user) {
-        res = github_get("/user")
-        JSON.parse(res.body)["login"]
-      }
-    end
-
-    def rollbar_token
-      @options.fetch(:rollbar_token) {
-        $stdout.puts("Missing rollbar_token option, its not required but you won't have exception tracking")
-        ""
+        res = github_client.get("/user")
+        res.body["login"]
       }
     end
 
-    def github_branch
+    def branch
       @options.fetch(:branch, "master")
     end
 
@@ -222,26 +216,6 @@ module Apperol
       }
     end
 
-    def github_url
-      URI("https://api.github.com")
-    end
-
-    def tarball_path
-      "/repos/#{repo}/tarball/#{github_branch}"
-    end
-
-    def github_creds
-      netrc["api.github.com"]
-    end
-
-    def heroku_creds
-      netrc["api.heroku.com"]
-    end
-
-    def netrc
-      @netrc ||= Netrc.read
-    end
-
     def heroku_app_name
       Dir.pwd.split("/").last
     end

data/lib/apperol/creds.rb

@@ -0,0 +1,29 @@
+module Apperol
+  class Creds
+    class << self
+      def heroku
+        instance.heroku
+      end
+
+      def github
+        instance.github
+      end
+
+      def instance
+        @instance ||= new
+      end
+    end
+
+    def heroku
+      netrc["api.heroku.com"]
+    end
+
+    def github
+      netrc["api.github.com"]
+    end
+
+    def netrc
+      @netrc ||= Netrc.read
+    end
+  end
+end

data/lib/apperol/github_client.rb

@@ -0,0 +1,29 @@
+require_relative "response"
+
+module Apperol
+  class GithubClient
+
+    def tarball(repository, branch = "master")
+      tarball_path = "/repos/#{repository}/tarball/#{branch}"
+      res = get(tarball_path)
+      res.header("Location")
+    end
+
+    def get(path)
+      req = Net::HTTP::Get.new(url + path)
+      req.basic_auth *Apperol::Creds.github
+      res = client.request(req)
+      Apperol::Response.new(res.code, res.body, headers: res.to_hash)
+    end
+
+    def client
+      @client ||= Net::HTTP.new(url.hostname, url.port).tap do |http|
+        http.use_ssl = true
+      end
+    end
+
+    def url
+      URI("https://api.github.com")
+    end
+  end
+end

data/lib/apperol/heroku_client.rb

@@ -0,0 +1,54 @@
+require_relative "response"
+
+module Apperol
+  class HerokuClient
+
+    def get(url)
+      request = Net::HTTP::Get.new(url, initheader = default_headers)
+      request.basic_auth *Apperol::Creds.heroku
+      res = client.request(request)
+      Apperol::Response.new(res.code, res.body)
+    end
+
+    def post(url, body)
+      request = Net::HTTP::Post.new(url, initheader = default_headers)
+      request.basic_auth *Apperol::Creds.heroku
+      request.body = body
+      res = client.request(request)
+      Apperol::Response.new(res.code, res.body)
+    end
+
+    def stream_build(url)
+      req = Net::HTTP::Get.new(url, initheader = default_headers)
+      req.basic_auth *Apperol::Creds.heroku
+      builds_client.request req do |response|
+        response.read_body do |chunk|
+          yield chunk
+        end
+      end
+    end
+
+    def builds_client
+      @builds_client ||= Net::HTTP.new(builds_url.hostname, 443).tap do |http|
+        http.use_ssl = true
+      end
+    end
+
+    def builds_url
+      URI("https://build-output.heroku.com")
+    end
+
+    def default_headers
+      {
+        "Content-Type" => "application/json",
+        "Accept" => "application/vnd.heroku+json; version=edge"
+      }
+    end
+
+    def client
+      @client ||= Net::HTTP.new("api.heroku.com", 443).tap do |http|
+        http.use_ssl = true
+      end
+    end
+  end
+end

data/lib/apperol/response.rb

@@ -0,0 +1,24 @@
+module Apperol
+  class Response
+    attr_accessor :status, :original_body, :headers
+
+    def initialize(status, body, options = {})
+      @status = status.to_i
+      @original_body = body
+      @headers = options[:headers]
+    end
+
+    def body
+      @body ||= JSON.parse(original_body)
+    end
+
+    def header(key)
+      @headers[key.downcase].first
+    end
+
+    def [](key)
+      puts @headers
+      @headers[key.downcase].first
+    end
+  end
+end

data/lib/apperol/version.rb

@@ -1,3 +1,3 @@
 module Apperol
-  VERSION = "0.0.7"
+  VERSION = "0.0.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: apperol
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.8
 platform: ruby
 authors:
 - Yannick
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-23 00:00:00.000000000 Z
+date: 2014-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -69,6 +69,7 @@ dependencies:
 description: Create heroku app from heroku repository with app.json
 email:
 - yannick@heroku.com
+- opensource@heroku.com
 executables:
 - apperol
 extensions: []
@@ -84,6 +85,10 @@ files:
 - lib/apperol.rb
 - lib/apperol/app_json.rb
 - lib/apperol/cli.rb
+- lib/apperol/creds.rb
+- lib/apperol/github_client.rb
+- lib/apperol/heroku_client.rb
+- lib/apperol/response.rb
 - lib/apperol/version.rb
 homepage: https://github.com/ys/apperol
 licenses: