bub_bot 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 56a3e504964a815eb7f1424fd0dc0d2c7c4193f4
-  data.tar.gz: cf11d85e4fd9a2f81728ceee6067a4a6e039e286
+  metadata.gz: f624985c964068cf82f1766cb94e27e0ee895ab4
+  data.tar.gz: 112176a7a01c8bdd9f40434ee8f37eee12e355bc
 SHA512:
-  metadata.gz: 53d5b06e8a41488bc2bbed625f235ca8484bf6dd4c413bd7bff89f12a31aba23dcd82e2af0f7222c6244887205b2e6b5b8a4a1ed54b4ed33e845bcf92994dfeb
-  data.tar.gz: 93a21d75d1586ec8ab08ffc4b95a116ae2f81568652b6b41566461d146ded203ba48cc02ea3654a90fdce1c26984ff77fd17580df7cef3dc2111866fb49f611e
+  metadata.gz: 45a161978eaae8e736497d6fa2f5d2eeea829424236d50b47d2c20533fb4644ac980f6d8f1dbb0161317389e10ed9e2bdf0661ded67b8cc4cc997de814776147
+  data.tar.gz: 88adca1eb0da42fc256a4989a3b347872370c962473e3f104f6d0cf541df49edea24d46c0d6f814c774762e7a03135f6a2701f18558dc559c95b96d73306bd53

data/.gitignore

@@ -9,3 +9,4 @@
 /tmp/
 test_config.yml
 deploy_web.sh
+.env

data/bub_bot.gemspec

@@ -34,4 +34,5 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "rspec-mocks", "~> 3.5"
   spec.add_development_dependency "pry-byebug"
+  spec.add_development_dependency "dotenv"
 end

data/lib/bub_bot.rb

@@ -8,6 +8,7 @@ require 'active_support/core_ext'
 
 if ENV['RACK_ENV'] == 'development'
   require 'pry-byebug'
+  require 'dotenv/load'
 end
 
 module BubBot

data/lib/bub_bot/configuration.rb

@@ -17,7 +17,7 @@ class BubBot::Configuration
 
   OPTIONS = RACK_OPTIONS + BUB_BOT_OPTIONS
 
-  attr_accessor *OPTIONS
+  attr_writer *OPTIONS
 
   def rack_options_hash
     RACK_OPTIONS.each_with_object({}) do |option_name, options_hash|
@@ -31,4 +31,43 @@ class BubBot::Configuration
     true
   end
 
+  # Each config option will, when requested (eg BubBot.configuration.bot_name), be
+  # run through ERB.  You can provide optional additional context for the erb call.
+  # This is is a good way to provide variable that you want to access in the yaml.
+  # Eg if the bot_name is "friendly_bot_<%= phase_of_moon %>" in the yaml, you could
+  # call `BubBot.configuration.bot_name(phase_of_moon: 'waxing')`.
+  OPTIONS.each do |option|
+    define_method(option) do |extra_context = {}|
+      option_data = instance_variable_get("@#{option}".to_sym)
+      interpolate(option_data, extra_context)
+    end
+  end
+
+  private
+
+  def interpolate(data, extra_context)
+    if data.is_a?(String)
+      ERB.new(data).result(get_binding(extra_context))
+    elsif data.is_a?(Array)
+      data.map { |element| interpolate(element, extra_context) }
+    elsif data.is_a?(Hash)
+      data.each_with_object({}) do |(key, value), new_hash|
+        new_hash[key] = interpolate(value, extra_context)
+      end
+    else
+      data
+    end
+  end
+
+  # Gets a binding object with the given variables defined in it.  You'd *think*
+  # there'd be a simpler way.  Well, ok, there is, but there's no simpler way that
+  # doesn't *also* polute the binding with variables from the outer scope.
+  def get_binding(variables)
+    obj = Class.new {
+      attr_accessor *variables.keys
+      def get_binding(); binding end
+    }.new
+    variables.each { |name, value| obj.public_send(:"#{name}=", value) }
+    obj.get_binding
+  end
 end

data/lib/bub_bot/deploy_manager.rb

@@ -10,7 +10,7 @@ class BubBot::DeployManager
 
     begin
       DeployState[server, target_name].set(true)
-      target_config = target(target_name)
+      target_config = target(target_name, server)
 
       unless deploy_config = target_config['deploy']
         raise "Missing deploy config for #{target_name}"
@@ -24,7 +24,6 @@ class BubBot::DeployManager
       # TODO: maybe handle multiple deploys for each target?  Right now the
       # workaround to do that is to just have a script-type deploy that does that.
       if deploy_git_remote = deploy_config['git']
-        deploy_git_remote = ERB.new(deploy_git_remote).result(get_binding(locals))
         repo(target_name, server).push(branch, deploy_git_remote)
       elsif deploy_script = deploy_config['script']
         puts "xdeploying web script #{deploy_script}"
@@ -42,11 +41,8 @@ class BubBot::DeployManager
       elsif deploy_url = deploy_config['http']
         raise RespondableError.new('Sorry, deploys by http request are not supported yet')
       end
-
-      DeployState[server, target_name].set(false)
-    rescue
+    ensure
       DeployState[server, target_name].set(false)
-      raise
     end
   end
 
@@ -62,17 +58,17 @@ class BubBot::DeployManager
 
   def repo(target_name, server)
     @repos ||= {}
-    target = target(target_name)
+    target = target(target_name, server)
     @repos[target_name + '__' + server] ||= Repo.new(target_name, target['git'], server)
   end
 
   # Returns a hash of config data for the target with this name
-  def target(target_name)
-    targets.find { |name, _| name == target_name }.last
+  def target(target_name, server = nil)
+    targets(server).find { |name, _| name == target_name }.last
   end
 
-  def targets
-    BubBot.configuration.deploy_targets
+  def targets(server = nil)
+    BubBot.configuration.deploy_targets(server: server)
   end
 
   # Gets a binding object with the given variables defined in it.  You'd *think*

data/lib/bub_bot/version.rb

@@ -1,3 +1,3 @@
 module BubBot
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: bub_bot
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Kevin Kuchta
@@ -192,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: dotenv
+  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'
 description: 
 email:
 - kevin@kevinkuchta.com