escobar 0.3.4 → 0.3.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d510a52fd6a330d51dcdd7868cf6ea151a04248a
-  data.tar.gz: 85dadfb5890e87875c9ce572ee61ef9d9c7e0f78
+  metadata.gz: 057a7451fec509ee272972a0f81078d0dac7e41f
+  data.tar.gz: fc19310666d77b537f139e99581e133fb8b2a3ce
 SHA512:
-  metadata.gz: 0adce59eb6c5920aaf8056fb5884b807cc4e92f1f0f9001dd525984ec8ae32978347eb4be58dae992db17afacf9901e9d73502b79195f22b8399e9b5fe18ef70
-  data.tar.gz: f68558eeaf871b358542ff50202fadc3dd2a4505a0889a8e70bc8a96ebcd8b40fbdc68982074d599c38f366dde9e55884343007b9af6ac13497921a40cf96e42
+  metadata.gz: 11917124e4d40f75eeaf5a98b196df275d18f77961ea32228d8356f814f32294c57fbbbb75eb83d320b8140f375cca09d52be3cc297eedc3c86bc4d37a6db7de
+  data.tar.gz: d08521ed38d5f06fee160b1c10cec67ad5251f1026520af313b4e0f456d205ef758913d5fbd6f9ebe6bdf8ada6f3b0a7720d6ca8b5c8b90e0cc519a4cf561a73

data/.rubocop.yml

@@ -113,3 +113,6 @@ Rails:
   Enabled: true
 Rails/Delegate:
   Enabled: false # delegate isn't available outside of rails?
+BlockLength:
+  Exclude:
+    - 'spec/**/*'

data/lib/escobar.rb

@@ -54,3 +54,4 @@ require_relative "./escobar/heroku/build_request"
 require_relative "./escobar/heroku/client"
 require_relative "./escobar/heroku/coupling"
 require_relative "./escobar/heroku/pipeline"
+require_relative "./escobar/heroku/release"

data/lib/escobar/heroku/app.rb

@@ -20,6 +20,10 @@ module Escobar
         "https://dashboard.heroku.com/apps/#{name}"
       end
 
+      def cache_key
+        "escobar-app-#{id}"
+      end
+
       # Accepts either google authenticator or yubikey second_factor formatting
       def preauth(second_factor)
         !client.heroku.put("/apps/#{id}/pre-authorizations", second_factor).any?
@@ -31,7 +35,7 @@ module Escobar
       end
 
       def build_request_for(pipeline)
-        Escobar::Heroku::BuildRequest.new(pipeline, self)
+        Escobar::Heroku::BuildRequest.new(pipeline, id)
       end
     end
   end

data/lib/escobar/heroku/build.rb

@@ -2,17 +2,16 @@ module Escobar
   module Heroku
     # Class representing a heroku build
     class Build
-      attr_reader :app_id, :app_name, :client, :id
+      attr_reader :app_id, :client, :id
 
       attr_accessor :command_id
       attr_accessor :github_url
       attr_accessor :pipeline_name
       attr_accessor :sha
 
-      def initialize(client, app, id)
+      def initialize(client, app_id, id)
         @id            = id
-        @app_id        = app.id
-        @app_name      = app.name
+        @app_id        = app_id
         @client        = client
       end
 
@@ -20,8 +19,24 @@ module Escobar
         @info ||= client.heroku.get("/apps/#{app_id}/builds/#{id}")
       end
 
+      def status
+        info["status"]
+      end
+
+      def releasing?
+        status == "succeeded" && !release_id.nil?
+      end
+
+      def release_id
+        info["release"]["id"]
+      end
+
+      def app
+        @app ||= Escobar::Heroku::App.new(client, app_id)
+      end
+
       def dashboard_build_output_url
-        "https://dashboard.heroku.com/apps/#{app_name}/activity/builds/#{id}"
+        "https://dashboard.heroku.com/apps/#{app.name}/activity/builds/#{id}"
       end
 
       def repository_regex
@@ -29,16 +44,16 @@ module Escobar
       end
 
       def repository
-        github_url.match(repository_regex)[1]
+        github_url && github_url.match(repository_regex)[1]
       end
 
       def to_job_json
         {
           sha: sha,
-          name: pipeline_name,
+          pipeline_name: pipeline_name,
           repo: repository,
           app_id: app_id,
-          app_name: app_name,
+          app_name: app.name,
           build_id: id,
           command_id: command_id,
           target_url: dashboard_build_output_url,

data/lib/escobar/heroku/build_request.rb

@@ -17,21 +17,25 @@ module Escobar
         end
       end
 
-      attr_reader :app, :github_deployment_url, :pipeline, :sha
+      attr_reader :app_id, :github_deployment_url, :pipeline, :sha
 
       attr_accessor :environment, :ref, :forced, :custom_payload
 
-      def initialize(pipeline, app)
-        @app      = app
+      def initialize(pipeline, app_id)
+        @app_id   = app_id
         @pipeline = pipeline
       end
 
+      def app
+        @app ||= Escobar::Heroku::App.new(pipeline.client, app_id)
+      end
+
       def error_for(message)
         Error.new_from_build_request(self, message)
       end
 
       def cache_key
-        "escobar-build-request-#{app.name}"
+        app.cache_key
       end
 
       def create(task, environment, ref, forced, custom_payload)
@@ -62,7 +66,7 @@ module Escobar
 
       def process_heroku_build(build)
         heroku_build = Escobar::Heroku::Build.new(
-          app.client, app, build["id"]
+          pipeline.client, app_id, build["id"]
         )
 
         create_github_pending_deployment_status(heroku_build)

data/lib/escobar/heroku/pipeline.rb

@@ -84,15 +84,25 @@ module Escobar
       end
 
       def reap_build(app_id, build_id)
-        info = client.heroku.get("/apps/#{app_id}/builds/#{build_id}")
-        case info["status"]
+        build = Escobar::Heroku::Build.new(client, app_id, build_id)
+        case build.status
         when "succeeded", "failed"
-          info
+          build
+        end
+      end
+
+      def reap_release(app_id, build_id, release_id)
+        release = Escobar::Heroku::Release.new(
+          client, app_id, build_id, release_id
+        )
+        case release.status
+        when "succeeded", "failed"
+          release
         end
       end
 
       def default_heroku_application(environment)
-        app = environments[environment] && environments[environment].last
+        app = environments[environment] && environments[environment].first
         unless app
           raise ArgumentError, "No '#{environment}' environment for #{name}."
         end

data/lib/escobar/heroku/release.rb

@@ -0,0 +1,63 @@
+module Escobar
+  module Heroku
+    # Class representing a heroku release
+    class Release
+      attr_reader :app_id, :app_name, :build_id, :client, :id
+
+      attr_accessor :command_id
+      attr_accessor :github_url
+      attr_accessor :pipeline_name
+      attr_accessor :sha
+
+      def initialize(client, app_id, build_id, id)
+        @id       = id
+        @app_id   = app_id
+        @build_id = build_id
+        @client   = client
+      end
+
+      def info
+        @info ||= client.heroku.get("/apps/#{app_id}/releases/#{id}")
+      end
+
+      def app
+        @app ||= Escobar::Heroku::App.new(client, app_id)
+      end
+
+      def build
+        @build ||= Escobar::Heroku::Build.new(client, app.id, build_id)
+      end
+
+      def dashboard_build_output_url
+        "https://dashboard.heroku.com/apps/#{app.name}/activity/builds/#{id}"
+      end
+
+      def repository
+        github_url && github_url.match(repository_regex)[1]
+      end
+
+      def repository_regex
+        %r{https:\/\/api\.github\.com\/repos\/([-_\.0-9a-z]+\/[-_\.0-9a-z]+)}
+      end
+
+      def status
+        info["status"]
+      end
+
+      def to_job_json
+        {
+          sha: sha,
+          name: pipeline_name,
+          repo: repository,
+          app_id: app_id,
+          app_name: app_name,
+          build_id: build_id,
+          release_id: id,
+          command_id: command_id,
+          target_url: dashboard_build_output_url,
+          deployment_url: github_url
+        }
+      end
+    end
+  end
+end

data/lib/escobar/version.rb

@@ -1,3 +1,3 @@
 module Escobar
-  VERSION = "0.3.4".freeze
+  VERSION = "0.3.6".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: escobar
 version: !ruby/object:Gem::Version
-  version: 0.3.4
+  version: 0.3.6
 platform: ruby
 authors:
 - Corey Donohoe
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-01-13 00:00:00.000000000 Z
+date: 2017-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -182,6 +182,7 @@ files:
 - lib/escobar/heroku/client.rb
 - lib/escobar/heroku/coupling.rb
 - lib/escobar/heroku/pipeline.rb
+- lib/escobar/heroku/release.rb
 - lib/escobar/version.rb
 homepage: https://github.com/atmos/escobar
 licenses: