cloudstrap 0.46.7.pre → 0.47.0.pre

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 101f28a731cd71c9cc10bd3c3cfa5db26754a8d3
-  data.tar.gz: 05ddb68c380b9cf71fac0835b1cae6895a469ce9
+  metadata.gz: bd656a1fb5421724af841dca0ff457b082811bab
+  data.tar.gz: 5b961f7ca2cd65e7d732500fd750578f5e91ab74
 SHA512:
-  metadata.gz: cf8a664968511adde35cda725be13ea0da10bb11710a5277d9a45d9f923b8b9c059c94ac030973f9df8b8615276b64f9d1e9e0e280db213e1d51a5533b694c26
-  data.tar.gz: 41ae9981f9aea5d220205e5cc90f1ec77264317d9cd2b37216ad8dd553939bd5bac85beec4d85e5af5a713100ff32675d42b856fd08c297edf0e02bacf31ae2f
+  metadata.gz: 100e5c75a79d96f8a4ed7e1132f6df54fc063dab809c76a2ec242be892362015662b203b0205bee559af075f65ccce2d8f37f8d49fe4bb0c7878a933dda83544
+  data.tar.gz: c1009f7862b4a7c7220887eaefa6736a98f09face46d97d9ee7de30e1b2b61193e67fc3c07abb401adfa58eac5fce8426524e094c8067367c8fd39598a8aa4fc

data/lib/cloudstrap/agent.rb

@@ -6,6 +6,7 @@ require_relative 'amazon'
 require_relative 'config'
 require_relative 'errors'
 require_relative 'hcp/bootstrap_properties'
+require_relative 'hooks'
 require_relative 'network'
 require_relative 'ssh'
 
@@ -13,6 +14,7 @@ module Cloudstrap
   class Agent
     include ::Contracts::Core
     include ::Contracts::Builtin
+    include Hooks
 
     Contract None => Agent
     def initialize
@@ -435,20 +437,22 @@ module Cloudstrap
       properties = bootstrap_properties.file
       package = config.hcp_package_url
 
-      ssh.to(jumpbox_ip) do
-        '/home/ubuntu/.ssh/id_rsa'.tap do |target|
-          execute :rm, '-f', target
-          upload! private_key, target
-          execute :chmod, '-w', target
-        end
+      hooking(:setup) do
+        ssh.to(jumpbox_ip) do
+          '/home/ubuntu/.ssh/id_rsa'.tap do |target|
+            execute :rm, '-f', target
+            upload! private_key, target
+            execute :chmod, '-w', target
+          end
 
-        upload! properties, '/home/ubuntu/bootstrap.properties'
+          upload! properties, '/home/ubuntu/bootstrap.properties'
 
-        as :root do
-          execute :apt, *%w(install --assume-yes genisoimage aria2)
-          execute :rm, '-f', '/opt/bootstrap.deb'
-          execute :aria2c, '--continue=true', '--dir=/opt', '--out=bootstrap.deb', package
-          execute :dpkg, *%w(--install /opt/bootstrap.deb)
+          as :root do
+            execute :apt, *%w(install --assume-yes genisoimage aria2)
+            execute :rm, '-f', '/opt/bootstrap.deb'
+            execute :aria2c, '--continue=true', '--dir=/opt', '--out=bootstrap.deb', package
+            execute :dpkg, *%w(--install /opt/bootstrap.deb)
+          end
         end
       end
     end

data/lib/cloudstrap/cache.rb

@@ -0,0 +1,47 @@
+require 'contracts'
+require 'moneta'
+
+require_relative 'config'
+
+module Cloudstrap
+  class Cache
+    include ::Contracts::Core
+    include ::Contracts::Builtin
+
+    Contract RespondTo[:to_s], Maybe[RespondTo[:call]] => Maybe[Any]
+    def get(key)
+      persistence.fetch(key.to_s) do
+        # TODO: Remove symbol fallback for 1.0
+        persistence.fetch(key.to_s.to_sym) do
+          yield if block_given?
+        end
+      end
+    end
+
+    Contract RespondTo[:to_s], Any => Any
+    def set(key, value)
+      persistence.store key.to_s, value
+    end
+
+    Contract RespondTo[:to_s] => Maybe[Any]
+    def delete(key)
+      #TODO: Remove symbol fallback for 1.0
+      persistence.delete(key.to_s) || persistence.delete(key.to_s.to_sym)
+    end
+
+    Contract RespondTo[:to_s], Maybe[RespondTo[:call]] => Maybe[Any]
+    def call(key)
+      get(key) { set key, yield if block_given? }
+    end
+
+    Contract None => ::Moneta::Proxy
+    def persistence
+      @persistence ||= ::Moneta.new :File, dir: config.cache_path
+    end
+
+    Contract None => Config
+    def config
+      @config ||= Config.new
+    end
+  end
+end

data/lib/cloudstrap/config.rb

@@ -232,6 +232,16 @@ module Cloudstrap
       required :domain_name
     end
 
+    Contract None => String
+    def hooks_dir
+      lookup(:hooks_dir) { [workdir, 'hooks'].join('/') }
+    end
+
+    Contract None => String
+    def remote_hooks_dir
+      lookup(:remote_hooks_dir) { '.cloudstrap/hooks' }
+    end
+
     private
 
     Contract None => ::Pastel::Delegator

data/lib/cloudstrap/hook.rb

@@ -0,0 +1,80 @@
+require_relative 'cache'
+require_relative 'config'
+require_relative 'ssh/client'
+
+module Cloudstrap
+  class Hook
+    def initialize(name, **options)
+      @name = name
+      @options = options
+      self
+    end
+
+    attr_reader :name
+
+    alias to_s name
+    alias to_str to_s
+
+    def local
+      "#{config.hooks_dir}/#{name}"
+    end
+
+    def remote
+      "#{config.remote_hooks_dir}/#{name}"
+    end
+
+    def exists?
+      File.exist? local
+    end
+
+    def enabled?
+      File.executable? local
+    end
+
+    def disabled?
+      !enabled?
+    end
+
+    def upload!
+      return false unless exists?
+
+      [local, remote].tap do |local_file, remote_file|
+        ssh.to(host) {
+          execute :mkdir, '-p', File.dirname(remote_file)
+          upload! local_file, remote_file }
+      end
+    end
+
+    def execute!
+      return true unless enabled?
+
+      remote.tap { |hook| ssh.to(host) { execute hook } }
+    end
+
+    def call
+      upload! && execute!
+    end
+
+    private
+
+    def ssh
+      @ssh ||= SSH::Client.new key
+    end
+
+    def key
+      @options.fetch(:key)
+    end
+
+    def host
+      @options.fetch(:host)
+    end
+
+    def cache
+      @cache ||= Cache.new
+    end
+
+    def config
+      @config ||= Config.new
+    end
+  end
+end

data/lib/cloudstrap/hooks.rb

@@ -0,0 +1,26 @@
+require_relative 'hook'
+
+module Cloudstrap
+  module Hooks
+    def hooks
+      return [] unless Dir.exist? config.hooks_dir
+
+      Dir
+        .entries(config.hooks_dir)
+        .reject { |entry| %w(. ..).include? entry }
+        .map { |entry| Hook.new entry, host: jumpbox_ip, key: ssh_key.private_file }
+    end
+
+    def hook(name)
+      hook = hooks.find { |h| h.name == name }
+      return unless hook
+      hook.call
+    end
+
+    def hooking(event)
+      return unless block_given?
+      hook "pre-#{event}"
+      yield.tap { hook "post-#{event}" }
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstrap
 version: !ruby/object:Gem::Version
-  version: 0.46.7.pre
+  version: 0.47.0.pre
 platform: ruby
 authors:
 - Chris Olstrom
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-09 00:00:00.000000000 Z
+date: 2017-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -362,10 +362,13 @@ files:
 - lib/cloudstrap/amazon/service.rb
 - lib/cloudstrap/amazon/support/rate_limit_handler.rb
 - lib/cloudstrap/bootstrap_agent.rb
+- lib/cloudstrap/cache.rb
 - lib/cloudstrap/component_versions.rb
 - lib/cloudstrap/config.rb
 - lib/cloudstrap/errors.rb
 - lib/cloudstrap/hcp/bootstrap_properties.rb
+- lib/cloudstrap/hook.rb
+- lib/cloudstrap/hooks.rb
 - lib/cloudstrap/network.rb
 - lib/cloudstrap/seed_properties.rb
 - lib/cloudstrap/ssh.rb