cult 0.1.3.pre → 0.1.4.pre

data/lib/cult/role.rb

@@ -72,12 +72,12 @@ module Cult
 
 
     def build_tasks
-      tasks.select(&:build_task?)
+      tasks.select { |t| t.is_a?(Cult::BuildTask) }
     end
 
 
     def event_tasks
-      tasks.select(&:event_task?)
+      tasks.select { |t| t.is_a?(Cult::EventTask) }
     end
 
 
@@ -93,7 +93,8 @@ module Cult
 
 
     def definition_path
-      File.join(path, "role")
+      [ File.join(path, "extra.json"),
+        File.join(path, "role.json") ]
     end
 
 
@@ -108,7 +109,7 @@ module Cult
 
 
     def includes
-      definition.direct('includes') || ['all']
+      definition.direct('includes') || ['base']
     end
 
 
@@ -154,11 +155,10 @@ module Cult
 
 
     def self.all(project)
+      fail if block_given?
       all_files(project).map do |filename|
-        new(project, filename).tap do |new_role|
-          yield new_role if block_given?
-        end
-      end.to_named_array
+        new(project, filename)
+      end.select(&:exist?).to_named_array
     end
 
 
@@ -185,6 +185,10 @@ module Cult
       build_order.map(&:name)
     end
 
+    def query_for_role
+      build_order
+    end
+
     def names_for_task
       tasks.map(&:name)
     end

data/lib/cult/task.rb

@@ -3,36 +3,74 @@ module Cult
     include Transferable
     include SingletonInstances
 
-    attr_reader :path
     attr_reader :role
-    attr_reader :serial
+    attr_reader :path
     attr_reader :name
-    attr_reader :type
-
-    LEADING_ZEROS = 3
-    BASENAME_RE = /\A(\d{#{LEADING_ZEROS},})-([\w-]+)(\..+)?\z/i
-    EVENTS = [:sync]
-
 
     def initialize(role, path)
       @role = role
       @path = path
-      @basename = File.basename(path)
+      @name = File.basename(path)
+    end
+
+
+    def self.collection_name
+      "tasks"
+    end
+
+
+    def relative_path
+      File.basename(path)
+    end
+
+
+    # Task files are executable by anyone: this makes re-exec'ing
+    # tasks as another user trivial.
+    def file_mode
+      super | 0111
+    end
+
 
-      unless self.class.valid_task_name?(@basename)
-        fail ArgumentError, "invalid task name: #{path}"
+    def self.spawn(role, path)
+      [BuildTask, EventTask].each do |task_cls|
+        if task_cls.valid_name?(File.basename(path))
+          return task_cls.new(role, path)
+        end
       end
+      nil
+    end
+
+
+    def self.all_for_role(project, role)
+      fail ArgumentError if block_given?
+
+      Dir.glob(File.join(role.path, "tasks", "*")).sort.map do |path|
+        spawn(role, path)
+      end.compact.to_named_array
+    end
+  end
+
+
+  class BuildTask < Task
+    LEADING_ZEROS = 3
+    BASENAME_RE = /\A(\d{#{LEADING_ZEROS},})-([\w-]+)(\..+)?\z/i
+
+
+    def self.valid_name?(basename)
+      !! basename.match(BASENAME_RE)
+    end
+
+
+    attr_reader :serial
+
+    def initialize(role, path)
+      super
 
-      if (m = @basename.match(BASENAME_RE))
-        @type = :build
+      if (m = BASENAME_RE.match(name))
         @serial = m[1].to_i
         @name = m[2]
-      elsif EVENTS.map(&:to_s).include?(@basename)
-        @type = :event
-        @serial = nil
-        @name = @basename
       else
-        fail "WTF"
+        fail ArgumentError
       end
     end
 
@@ -41,46 +79,36 @@ module Cult
       basename = sprintf("%0#{LEADING_ZEROS}d-%s", serial, name)
       new(role, File.join(role.path, collection_name, basename))
     end
+  end
 
 
-    def relative_path
-      File.basename(path)
-    end
-
-
-    def build_task?
-      type == :build
-    end
+  class EventTask < Task
+    EVENT_TYPES = [:sync]
+    EVENT_RE = /^(#{EVENT_TYPES.join('|')})(?:\-P(\d+))?\-?/
 
+    attr_reader :event
+    attr_reader :pass
 
-    def event_task?
-      type != :build
+    def self.valid_name?(basename)
+      !! basename.match(EVENT_RE)
     end
 
 
-    def inspect
-      "\#<#{self.class.name} type: #{type} role:#{role&.name.inspect} " +
-          "serial:#{serial} name:#{name.inspect}>"
+    def initialize(role, path)
+      super
+      @event = event_name(name)
+      @pass = pass_name(name)
     end
-    alias_method :to_s, :inspect
 
 
-    def file_mode
-      super | 0100
+    private
+    def event_name(basename)
+      basename.match(EVENT_RE)[1].to_sym
     end
 
-    def self.valid_task_name?(basename)
-      EVENTS.map(&:to_s).include?(basename) || basename.match(BASENAME_RE)
+    def pass_name(basename)
+      basename.match(EVENT_RE)[2].to_i
     end
 
-
-    def self.all_for_role(project, role)
-      Dir.glob(File.join(role.path, "tasks", "*")).map do |filename|
-        next unless valid_task_name?(File.basename(filename))
-        new(role, filename).tap do |new_task|
-          yield new_task if block_given?
-        end
-      end.compact.to_named_array
-    end
   end
 end

data/lib/cult/template.rb

@@ -1,5 +1,4 @@
-require 'erb'
-require 'json'
+require 'erubis'
 require 'cult/user_refinements'
 
 module Cult
@@ -12,9 +11,9 @@ module Cult
         super(project, **kw)
       end
 
-      def _process(template, filename: nil)
+      def _process(input, filename: nil)
         Dir.chdir(@pwd || Dir.pwd) do
-          erb = ::ERB.new(template)
+          erb = Erubis::Eruby.new(input)
           erb.filename = filename
           erb.result(binding)
         end

data/lib/cult/transaction.rb

@@ -9,11 +9,17 @@ module Cult
 
       def unwind
         begin
-          while (step = steps.pop)
+          # We stop rolling back when we read entries created in our parent
+          # process
+          while !steps.empty?
+            pid, step = steps.last
+            break if pid != Process.pid
+            steps.pop
             step.call
           end
         rescue Exception => e
-          puts "Error raised while rolling back: #{e.inspect}\n#{e.backtrace}"
+          $stderr.puts "Execption raised while rolling back: #{e.inspect}\n" +
+                       e.backtrace
           retry
         end
       end
@@ -21,15 +27,15 @@ module Cult
       def protect(&block)
         begin
           yield
-        rescue Exception
-          $stderr.puts "Rolling back actions"
+        rescue Exception => e
+          $stderr.puts "Rolling back actions due to: #{e.inspect}"
           unwind
           raise
         end
       end
 
       def rollback(&block)
-        steps.push(block)
+        steps.push([Process.pid, block])
       end
     end
 

data/lib/cult/user_refinements.rb

@@ -27,7 +27,7 @@ module Cult
 
     refine String do
       def dquote
-        Util.squote(self)
+        Util.dquote(self)
       end
       alias_method :dq, :dquote
       alias_method :q, :dquote

data/lib/cult/version.rb

@@ -1,3 +1,3 @@
 module Cult
-  VERSION = '0.1.3.pre'
+  VERSION = '0.1.4.pre'
 end

data/lib/cult.rb

@@ -1,12 +1,14 @@
 require 'cult/artifact'
 require 'cult/bundle'
+require 'cult/commander_sync'
 require 'cult/commander'
 require 'cult/definition'
 require 'cult/driver'
 require 'cult/named_array'
 require 'cult/node'
-require 'cult/project'
+require 'cult/paramap'
 require 'cult/project_context'
+require 'cult/project'
 require 'cult/provider'
 require 'cult/role'
 require 'cult/singleton_instances'
@@ -17,14 +19,41 @@ require 'cult/transaction'
 require 'cult/transferable'
 require 'cult/version'
 
-
 module Cult
   class << self
     attr_accessor :project
 
     attr_writer :singletons
     def singletons?
-      @singletons
+      defined?(@singletons) ? @singletons : env_flag('CULT_SINGLETONS', true)
+    end
+
+
+    def concurrency=(v)
+      unless v == :max || (v.is_a?(Integer) && v >= 0)
+        fail CLI::CLIError, "concurrency must be a positive integer or :max"
+      end
+      v = 1 if v == 0
+      @concurrency = v
+    end
+
+
+    def concurrency
+      defined?(@concurrency) ? @concurrency : :max
+    end
+
+
+    def env_flag(s, default = false)
+      case (v = ENV[s])
+        when /^0|false|no|n$/i
+          false
+        when /^1|true|yes|y$/i
+          true
+        when nil
+          default
+        else
+          fail CLI::CLIError, "Invalid value for boolean #{s}: #{v}"
+      end
     end
   end
 end

data/skel/roles/{all/tasks/sync → base/tasks/sync-host-map}

@@ -2,16 +2,16 @@
 set -e
 
 # This file generates a map of all hosts on each node, in an /etc/hosts like
-# format.  Because it's included in all, it'll be executed before your custom
-# roles' sync task.  That means you can parse the cultmap instead of using
-# custom Ruby templating, if that's not your thing.
+# format.  Because it's included in `base`, it'll be executed before your
+# custom roles' sync task.  That means you can parse the cultmap instead of
+# using custom Ruby templating, if that's not your thing.
 #
 # Keep in mind that this file is evaluated on the local machine, and its result
 # is sent to the remote host.
 #
 # The output format is:
 #
-# 192.168.1.1 node-name # all role1 role2 role3
+# 192.168.1.1 node-name # base role1 role2 role3
 #
 
 CULTMAP="$HOME/cult/hosts"
@@ -20,5 +20,5 @@ sudo rm -f "$CULTMAP"
 
 <% nodes.each do |n| %>
   <% roles = n.build_order.map(&:name).join " " %>
-  echo "<%= n.ipv4_private %> <%= n.name %> # <%= roles %>" | sudo tee -a "$CULTMAP"
+  echo "<%= n.addr_from(node) %> <%= n.name %> # <%= roles %>" | sudo tee -a "$CULTMAP"
 <% end %>

data/skel/roles/base/tasks/sync-leader-of

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+set -e
+LEADER_FILE=~cult/cult/leader-of
+
+<% leader_of = roles.select {|r| node.zone_leader?(r) }.map(&:name) %>
+
+<% if leader_of.empty? %>
+  rm -f "$LEADER_FILE"
+<% else %>
+  echo <%= leader_of.join(" ").sq %> | tee "$LEADER_FILE"
+<% end %>

data/skel/roles/bootstrap/files/cult-motd

@@ -2,8 +2,16 @@
 set -e
 
 NODE=<%= node.name.sq %>
-ROLES=<%= node.roles.map(&:name).sq %>
-SPAWN=<%= Time.now.to_s.sq %>
+PROVIDER=<%= node.provider.name.sq %>
+ZONE=<%= node.zone.sq %>
+ROLES=<%= node.build_order.map(&:name).join(' ').sq %>
+CREATED_AT=<%= Time.now.to_s.sq %>
+SIZE=<%= node.size.sq %>
+IMAGE=<%= node.image.sq %>
+IPV4_PUBLIC=<%= node.ipv4_public.sq %>
+IPV4_PRIVATE=<%= node.ipv4_private.sq %>
+
+LEADER_FILE=~cult/cult/leader-of
 
 colorize() {
   i=124
@@ -38,8 +46,12 @@ cat <<EOD | colorize
                      ::: :::  ::::: ::   :: ::::     ::
                      :: :: :   : :  :   : :: : :     :
 
+
 EOD
 
-inf "node: $NODE, since $SPAWN"
+inf "node: $NODE@$PROVIDER/$ZONE:$SIZE/$IMAGE"
+inf "addr: $IPV4_PUBLIC, $IPV4_PRIVATE"
+inf "created: $CREATED_AT"
 inf "roles: $ROLES"
+[ -f "$LEADER_FILE" ] && inf "leader: $(cat "$LEADER_FILE")"
 echo

data/skel/roles/bootstrap/tasks/{00000-set-hostname → 000-set-hostname}

@@ -13,7 +13,7 @@ HOSTS=$(cat /etc/hosts | sed -e 's/#.*//g' | sed -e 's/\t/ /g' | tr -s ' ' | \
         grep -v '^\s*$' | cut -d' ' -f2-)
 
 # See if we're in hosts
-if ! echo "$HOSTS" | grep -q "$NODE_NAME" ; then
+if ! echo "$HOSTS" | grep -E -q "\b$NODE_NAME\b" ; then
   echo "127.0.1.1 $NODE_NAME" >> /etc/hosts
   echo "::1 $NODE_NAME" >> /etc/hosts
 fi

data/skel/roles/bootstrap/tasks/{00001-add-cult-user → 001-add-cult-user}

@@ -13,9 +13,3 @@ chmod -R 0700 /home/cult/.ssh
 chmod -R 0600 /home/cult/.ssh/*
 
 echo 'cult ALL=(ALL) NOPASSWD:ALL' > /etc/sudoers.d/cult-nopasswd
-
-# disable root account
-passwd -l root
-sed -i.bak -e 's/^PermitRootLogin.*/PermitRootLogin no/' /etc/ssh/sshd_config
-
-systemctl reload sshd

data/skel/roles/bootstrap/tasks/002-disable-root-user

@@ -0,0 +1,7 @@
+#!/bin/sh
+set -e
+
+passwd -l root
+sed -i.bak -e 's/^PermitRootLogin.*/PermitRootLogin no/' /etc/ssh/sshd_config
+
+systemctl reload sshd

data/skel/roles/bootstrap/tasks/{00002-install-cult-motd → 002-install-cult-motd}

@@ -1,4 +1,4 @@
-#!/usr/bin/env bash
+#!/bin/bash
 set -e
 
 if [ -d "/etc/update-motd.d" ]; then

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cult
 version: !ruby/object:Gem::Version
-  version: 0.1.3.pre
+  version: 0.1.4.pre
 platform: ruby
 authors:
 - Mike Owens
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-09-11 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cri
@@ -66,6 +66,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: erubis
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.7.0
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -117,7 +131,6 @@ files:
 - lib/cult/cli/common.rb
 - lib/cult/cli/console_cmd.rb
 - lib/cult/cli/cri_extensions.rb
-- lib/cult/cli/fleet_cmd.rb
 - lib/cult/cli/init_cmd.rb
 - lib/cult/cli/load.rb
 - lib/cult/cli/node_cmd.rb
@@ -125,15 +138,18 @@ files:
 - lib/cult/cli/role_cmd.rb
 - lib/cult/cli/task_cmd.rb
 - lib/cult/commander.rb
+- lib/cult/commander_sync.rb
 - lib/cult/definition.rb
 - lib/cult/driver.rb
 - lib/cult/drivers/common.rb
 - lib/cult/drivers/digital_ocean_driver.rb
 - lib/cult/drivers/linode_driver.rb
 - lib/cult/drivers/load.rb
+- lib/cult/drivers/virtual_box_driver.rb
 - lib/cult/drivers/vultr_driver.rb
 - lib/cult/named_array.rb
 - lib/cult/node.rb
+- lib/cult/paramap.rb
 - lib/cult/project.rb
 - lib/cult/project_context.rb
 - lib/cult/provider.rb
@@ -151,14 +167,16 @@ files:
 - skel/README.md.erb
 - skel/nodes/.keep
 - skel/providers/.keep
-- skel/roles/all/role.json
-- skel/roles/all/tasks/00000-do-something-cool
-- skel/roles/all/tasks/sync
+- skel/roles/base/role.json
+- skel/roles/base/tasks/000-do-something-cool
+- skel/roles/base/tasks/sync-host-map
+- skel/roles/base/tasks/sync-leader-of
 - skel/roles/bootstrap/files/cult-motd
 - skel/roles/bootstrap/role.json
-- skel/roles/bootstrap/tasks/00000-set-hostname
-- skel/roles/bootstrap/tasks/00001-add-cult-user
-- skel/roles/bootstrap/tasks/00002-install-cult-motd
+- skel/roles/bootstrap/tasks/000-set-hostname
+- skel/roles/bootstrap/tasks/001-add-cult-user
+- skel/roles/bootstrap/tasks/002-disable-root-user
+- skel/roles/bootstrap/tasks/002-install-cult-motd
 homepage: https://github.com/metermd/cult
 licenses:
 - MIT
@@ -170,9 +188,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - "~>"
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '2.3'
+      version: '2.2'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"

data/lib/cult/cli/fleet_cmd.rb

@@ -1,37 +0,0 @@
-module Cult
-  module CLI
-    module_function
-    def fleet_cmd
-      fleet = Cri::Command.define do
-        name 'fleet'
-        summary 'Fleet commands'
-
-        run(arguments: 0) do |opts, args, cmd|
-          puts cmd.help
-        end
-      end
-
-      fleet_sync = Cri::Command.define do
-        name    'sync'
-        summary 'Synchronize host information across fleet'
-        description <<~EOD.format_description
-          Processes generates and executes tasks/sync on every node with a
-          current network setup.
-        EOD
-
-        run(arguments: 0..-1) do |opts, args, cmd|
-          nodes = args.empty? ? Cult.project.nodes
-                              : CLI.fetch_items(args, from: Node)
-          nodes.each do |node|
-            c = Commander.new(project: Cult.project, node: node)
-            c.sync!
-            puts "SYNCING #{node}"
-          end
-        end
-      end
-      fleet.add_command(fleet_sync)
-
-      fleet
-    end
-  end
-end