bb_deploy 0.0.1.1 → 0.0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4265cc5173996544b0df461c34d76fa8dc525d39
-  data.tar.gz: be98bb1650d4a2c678a9e09d72ea22ae7a41a2eb
+  metadata.gz: c0d49f7d13e54ae2d7327460b9c20a4ed73d0aa6
+  data.tar.gz: 7b4626caef82427c994a8fd883046175911bbaf1
 SHA512:
-  metadata.gz: f4cd670da569b6c8954023da9fd7d374a4cc56cd903ed82167422a8bc6d3021c9b26da8302a0dcb00b11094405dc25a39c5863bfbb3f1b017edf745a3acd9141
-  data.tar.gz: e25c4afd11033f7f7c6002497a14ffd76c6260b0e1021f98e49cb5b27fbe57975108a0ebbed5d5b30e365206461ec99688116bcb0ae3a16147435cda9c515b8e
+  metadata.gz: b7d64c2882f5d840da266b15e523807e365a14b86a458f203792bcfbdd2918177b367b9020f1a2795e6f57302fad5076ea7acd65e6f8a114186f9cb2412bb774
+  data.tar.gz: 3297ebab2f7eee11c49ff83c45f09457d06c8b4e56ac6e8cb5d743d8b304374dd42b553cf0663a0399ceda0b650d43ffb49ecd0ba2ac90f94bc3c898c08333a9

data/lib/bb_deploy/config.rb

@@ -1,3 +1,5 @@
+require_relative './heroku'
+
 module BbDeploy
   class Config
     attr_accessor :application_name,
@@ -16,6 +18,22 @@ module BbDeploy
         yield(configuration)
       end
 
+      def configure_from_yaml(filepath)
+        options = YAML.load_file(filepath)
+        configure do |config|
+          %i(application_name application_urls deployment_channel engineering_channel).each do |key|
+            config.send("#{key}=", options[key])
+          end
+        end
+      end
+
+      def set_heroku_fields!(phase:)
+        configure do |config|
+          config.logentries_token  = BbDeploy::Heroku.get_variable(phase, 'DEPLOY_LOG_TOKEN').freeze
+          config.slack_webhook_key = BbDeploy::Heroku.get_variable(phase, 'SLACK_WEBHOOK').freeze
+        end
+      end
+
       def method_missing(method, *args)
         configuration.send(method, *args)
       end

data/lib/bb_deploy/deployer.rb

@@ -11,7 +11,8 @@ class BbDeploy::Deployer
   attr_reader :phase
 
   def initialize(phase:)
-    BbDeploy::Config.set_dynamic_fields!(phase: phase)
+    BbDeploy::Config.configure_from_yaml('config/deploy.yml')
+    BbDeploy::Config.set_heroku_fields!(phase: phase)
     @phase = phase
   end
 

data/lib/bb_deploy/heroku.rb

@@ -1,10 +1,16 @@
+require_relative './task'
+
 module BbDeploy::Heroku
   class << self
-    def set_dynamic_fields!(phase:)
-      BbDeploy::Config.configure do |config|
-        config.logentries_token  = get_heroku_variable(phase, 'DEPLOY_LOG_TOKEN').freeze
-        config.slack_webhook_key = get_heroku_variable(phase, 'SLACK_WEBHOOK').freeze
+    def get_variable(phase, var_name)
+      @heroku_env_vars ||= {}
+      return @heroku_env_vars[var_name] if @heroku_env_vars[var_name]
+      if token = heroku_run("heroku config:get #{var_name} --remote #{phase}").chomp.presence
+        @heroku_env_vars[var_name] = token.split.last
+      else
+        raise "Ack! Thbbft!!! Can't find #{var_name} on heroku #{phase}."
       end
+      @heroku_env_vars[var_name]
     end
 
     def last_release_sha(phase)
@@ -29,7 +35,8 @@ module BbDeploy::Heroku
     def heroku_run(*cmds)
       # Heroku Toolbelt uses Ruby 1.9, which requires clearing the RUBYOPT var ...
       puts "Running\n#{cmds}"
-      run(*cmds.map { |cmd| cmd =~ /heroku/ ? "export RUBYOPT='' && #{cmd}" : cmd })
+      puts *cmds.map { |cmd| cmd =~ /heroku/ ? "export RUBYOPT='' && #{cmd}" : cmd }
+      # BbDeploy::Task.run(*cmds.map { |cmd| cmd =~ /heroku/ ? "export RUBYOPT='' && #{cmd}" : cmd })
     end
   end
 end

data/lib/bb_deploy/logger.rb

@@ -60,10 +60,11 @@ module BbDeploy::Logger
       }
     ]
 
-    slack.ping("*Deploying to #{phase}*", attachments: attachment, channel: BbDeploy::Config.deployment_channel)
-    slack.ping("*Deploying to #{phase}*", attachments: attachment, channel: BbDeploy::Config.engineering_channel) if notify_eng_hub
-    @consolidated_logger ||= ConsolidatedLogger::Logentries.new(phase)
-    @consolidated_logger.logger.info("DEPLOY--#{msg}")
+    puts "[ *Deploying to #{phase}* ]"
+    # slack.ping("*Deploying to #{phase}*", attachments: attachment, channel: BbDeploy::Config.deployment_channel)
+    # slack.ping("*Deploying to #{phase}*", attachments: attachment, channel: BbDeploy::Config.engineering_channel) if notify_eng_hub
+    # @consolidated_logger ||= ConsolidatedLogger::Logentries.new(phase)
+    # @consolidated_logger.logger.info("DEPLOY--#{msg}")
   end
 
   def slack

data/lib/bb_deploy/task.rb

@@ -1,5 +1,3 @@
-require 'highline'
-
 module BbDeploy::Task
   class << self
     def run(*cmds)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bb_deploy
 version: !ruby/object:Gem::Version
-  version: 0.0.1.1
+  version: 0.0.1.2
 platform: ruby
 authors:
 - Peter van Wesep
@@ -24,7 +24,6 @@ files:
 - lib/bb_deploy/heroku.rb
 - lib/bb_deploy/logger.rb
 - lib/bb_deploy/task.rb
-- lib/tasks/deploy.rake
 homepage: 
 licenses:
 - MIT

data/lib/tasks/deploy.rake

@@ -1,15 +0,0 @@
-namespace :heroku do
-  namespace :deploy do
-    task qa: :environment do
-      BbDeploy::Deployer.new(phase: 'qa').deploy!
-    end
-
-    task staging: :environment do
-      BbDeploy::Deployer.new(phase: 'staging').deploy!
-    end
-
-    task production: :environment do
-      BbDeploy::Deployer.new(phase: 'production').deploy!
-    end
-  end
-end