heroku-platform-helper 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9998684f8dfcc820a08844df7247679237cfd3ce
-  data.tar.gz: 70a92edbd2b05be2b47312e5d1ab311aebe820b6
+  metadata.gz: 83e32fac0eb8a96b0ad8acbcf4b9581df7db222e
+  data.tar.gz: ab01b84a9ace7218870af8f766cf75bc2c98f34a
 SHA512:
-  metadata.gz: 41c2b6de7a1a06a0eb2f3219a0a89eb291d480453333638ab446219d03e75325636815e1f0235a7a8705e387314bac3cd9e1af88e2b64b87ef8ec521a00244ae
-  data.tar.gz: a155379dc080d5d8b0795a0d21fa23f892b71beb4a10bb6e4312dfcf6af6f33bec7d4712ee430c09778e9ef22c2872791172ef6fb854de08fc3ef25c9b5621a5
+  metadata.gz: 869ae7db97425435211e818df97de7ce7576bc5a55dd8cb3c8d0fc035234c200dcd0ffe711308fa453c32de39935402447a0a51232e34f7b916facb8c29fcbf9
+  data.tar.gz: e24bb9446d8842e4a49c3029d7ef60f399796212ac1a69d24810f7c2a8e004e175c2d9c855166a91c86e4b370bd9bd5622449c883b0c2ec95b30019855bb2279

data/README.md

@@ -1,6 +1,8 @@
 # HerokuHelper
 
 [![Gem Version](https://badge.fury.io/rb/heroku-platform-helper.svg)](https://badge.fury.io/rb/heroku-platform-helper)
+[![Code Climate](https://codeclimate.com/github/perobertson/heroku-platform-helper/badges/gpa.svg)](https://codeclimate.com/github/perobertson/heroku-platform-helper)
+[![Test Coverage](https://codeclimate.com/github/perobertson/heroku-platform-helper/badges/coverage.svg)](https://codeclimate.com/github/perobertson/heroku-platform-helper/coverage)
 
 Welcome to your new gem! In this directory, you'll find the files you need to be able to package up your Ruby library into a gem. Put your Ruby code in the file `lib/heroku_helper`. To experiment with that code, run `bin/console` for an interactive prompt.
 
@@ -24,6 +26,11 @@ Or install it yourself as:
 
 ## Usage
 
+Log output can be customized by setting the logger:
+```ruby
+HerokuHelper.logger = Logger.new(STDOUT)
+```
+
 TODO: Write usage instructions here
 
 ## Development

data/bin/console

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "heroku/helper"
+require "heroku_helper"
 
 # You can add fixtures and/or initialization code here to make experimenting
 # with your gem easier. You can also use a different console, if you like.

data/heroku-platform-helper.gemspec

@@ -21,8 +21,10 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'bundler', '~> 1.10'
   spec.add_development_dependency 'rake', '~> 10.0'
   spec.add_development_dependency 'rspec'
+  spec.add_development_dependency 'codeclimate-test-reporter'
+  spec.add_development_dependency 'byebug'
 
   spec.add_dependency 'platform-api', '~> 0.3'
   spec.add_dependency 'rendezvous', '~> 0.1'
-  spec.add_dependency 'colorize'
+  spec.add_dependency 'git', '>= 1.2.6'
 end

data/lib/heroku_helper/app.rb

@@ -1,9 +1,36 @@
+require 'logger'
+require 'git'
 require 'platform-api'
 require 'rendezvous'
-require 'colorize'
 
 module HerokuHelper
+  class << self
+    attr_writer :logger
+
+    def logger
+      @logger ||= Logger.new(STDOUT).tap do |log|
+        log.progname = self.name
+        case ENV['LOG_LEVEL']
+        when 'unknown'
+          log.level = Logger::UNKNOWN
+        when 'fatal'
+          log.level = Logger::FATAL
+        when 'error'
+          log.level = Logger::ERROR
+        when 'warn'
+          log.level = Logger::WARN
+        when 'info'
+          log.level = Logger::INFO
+        else
+          log.level = Logger::DEBUG
+        end
+      end
+    end
+  end
+
   class App
+    attr_reader :app_name
+
     def initialize(api_key, app_name)
       @api_key = api_key
       @app_name = app_name
@@ -14,35 +41,50 @@ module HerokuHelper
       heroku = PlatformAPI.connect_oauth @api_key
 
       git_url = heroku.app.info(@app_name)['git_url']
-      fail 'Cannot determine git url' if git_url.blank?
-
-      # Fetch whats currently deployed
-      system "[ \"$(git remote | grep -e ^#{remote})\" != '' ] && git remote rm #{remote}"
-      unless system "git remote add #{remote} #{git_url}"
-        fail "Could not add #{remote} remote #{git_url}"
+      if git_url
+        HerokuHelper.logger.info "Heroku repo: #{git_url}"
+      else
+        HerokuHelper.logger.error 'Cannot determine git url'
+        return false
       end
-      unless system "git fetch #{remote} master"
-        fail "Could not fetch master from #{remote}"
+
+      # Set up git to deploy
+      begin
+        git = Git.open('.', log: HerokuHelper.logger)
+        git.config('url.ssh://git@heroku.com/.insteadOf', 'https://git.heroku.com/')
+
+        remotes = git.remotes.map &:name
+        if remotes.include? remote
+          HerokuHelper.logger.info "Resetting remote: #{remote}"
+          git.remove_remote remote
+        end
+
+        git.add_remote remote, git_url, fetch: true, track: 'master'
+      rescue => e
+        HerokuHelper.logger.error "Could not set up git correctly. Error: #{e}"
+        return false
       end
 
       scale worker: 0, clock: 0
       maintenance(true) if enable_maintenance
 
-      unless system "git push #{remote} #{branch}:master"
-        fail "Failed to push branch(#{branch}) to remote(#{remote})"
-      end
+      git.push remote, "#{branch}:master"
 
       migrate
       maintenance(false) if enable_maintenance
       scale worker: worker, clock: clock
+      HerokuHelper.logger.info "Deployed #{@app_name}"
+      true
+    rescue => e
+      HerokuHelper.logger.error "FAILED TO DEPLOY! Your app is in a bad state and needs to be fixed manually. Error: #{e}"
     end
 
     def maintenance(enabled)
       heroku = PlatformAPI.connect_oauth @api_key
       if enabled
-        puts "Enabling maintenance for #{@app_name}".cyan
+        HerokuHelper.logger.info "Enabling maintenance for #{@app_name}"
       else
-        puts "Disabling maintenance for #{@app_name}".cyan
+        HerokuHelper.logger.info "Disabling maintenance for #{@app_name}"
       end
       heroku.app.update(@app_name, maintenance: enabled)
     end
@@ -56,11 +98,11 @@ module HerokuHelper
       response = heroku.dyno.create(@app_name, payload)
 
       begin
-        puts 'Running migrations'.cyan
+        HerokuHelper.logger.info 'Running migrations'
         # set an activity timeout so it doesn't block forever
         Rendezvous.start(url: response['attach_url'], activity_timeout: 600)
       rescue => e
-        log.error("Error capturing output for dyno\n#{e.message}")
+        HerokuHelper.logger.error("Error capturing output for dyno\n#{e.message}")
       end
     end
 
@@ -71,7 +113,9 @@ module HerokuHelper
         updates: []
       }
 
-      formations = heroku.formation.list(@app_name)
+      heroku_formation = heroku.formation
+
+      formations = heroku_formation.list(@app_name)
       formations.each do |formation|
         size = formation['size']
         if !worker.nil? && formation['type'] == 'worker'
@@ -81,9 +125,9 @@ module HerokuHelper
               quantity: worker,
               size: size
             }
-            puts "Scaling worker to #{worker}".cyan
+            HerokuHelper.logger.info "Scaling worker to #{worker}"
           else
-            puts "Worker is already scaled to #{worker}".yellow
+            HerokuHelper.logger.warn "Worker is already scaled to #{worker}"
           end
         elsif !clock.nil? && formation['type'] == 'clock'
           if formation['quantity'] != clock
@@ -92,26 +136,26 @@ module HerokuHelper
               quantity: clock,
               size: size
             }
-            puts "Scaling clock to #{clock}".cyan
+            HerokuHelper.logger.info "Scaling clock to #{clock}"
           else
-            puts "Clock is already scaled to #{clock}".yellow
+            HerokuHelper.logger.warn "Clock is already scaled to #{clock}"
           end
         end
       end
 
       if payload[:updates].empty?
-        puts 'Warning: nothing to scale. Please check your configurations'.yellow
+        HerokuHelper.logger.warn 'Nothing to scale. Please check your configurations'
       else
         if payload[:updates].map { |u| u[:size] }.uniq.include? 'Free'
-          puts 'Warning: you can only run 2 dynos on the free tier'.yellow
+          HerokuHelper.logger.warn 'You can only run 2 dynos on the free tier'
           updates = payload[:updates].sort { |a, b| a[:quantity] <=> b[:quantity] }
           updates.each do |update|
             type = update[:process]
             quantity = update[:quantity]
-            heroku.formation.update(@app_name, type, quantity: quantity)
+            heroku_formation.update(@app_name, type, quantity: quantity)
           end
         else
-          heroku.formation.batch_update(@app_name, payload)
+          heroku_formation.batch_update(@app_name, payload)
         end
       end
     end
@@ -119,12 +163,15 @@ module HerokuHelper
     def restart
       heroku = PlatformAPI.connect_oauth @api_key
       heroku.dyno.restart_all @app_name
+      HerokuHelper.logger.info "#{app_name} restarted"
     end
 
     def version
       heroku = PlatformAPI.connect_oauth @api_key
       build = heroku.build.list(@app_name).last
-      build['source_blob']['version']
+      build['source_blob']['version'].tap do |version|
+        HerokuHelper.logger.info "#{@app_name}::version #{version}"
+      end
     end
   end
 end

data/lib/heroku_helper/version.rb

@@ -1,3 +1,3 @@
 module HerokuHelper
-  VERSION = '0.1.0'
+  VERSION = '0.2.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: heroku-platform-helper
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Paul Robertson
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-01-13 00:00:00.000000000 Z
+date: 2016-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -52,6 +52,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: codeclimate-test-reporter
+  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: byebug
+  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: platform-api
   requirement: !ruby/object:Gem::Requirement
@@ -81,19 +109,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0.1'
 - !ruby/object:Gem::Dependency
-  name: colorize
+  name: git
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.2.6
 description: 
 email:
 - t.paulrobertson@gmail.com