baptize 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6a940dc1a55b7aa62c6b41fe6134e36024d4e713
-  data.tar.gz: 2ef97b29ab2151e6d59b7a31ed2c2648189a594d
+  metadata.gz: 11dedf7433eb9c33188a68b80a8d1b79b1a9bf1f
+  data.tar.gz: 5af048e9e82eeafa942d46194b2cc77c72ccf089
 SHA512:
-  metadata.gz: 4ffae4ac6b4ccd2101d465e0aef62134768a05c3ce1e64227871d636ac53c471154d2f374c254f7d50c75acc5e4d3e18302109149e341166fa3fc3af5187c33d
-  data.tar.gz: 28b85c6a1f3a1038d0b462084544d7a564be7b99f968ebbb853dea98a361cdb0264a4bf0f4f2fa792914974113a98b306b40099ddbb239185dc211f497761c12
+  metadata.gz: 2da09b4fb58133cfa2756fbd78aaf06c67bb99f4aa6fa426f38f938dc8ec5c1eb6e8ac0bd133ef41bccc518195aaf80bd3a2f2de43544248f8fec0a62fca5998
+  data.tar.gz: 1c4a577daa8bf401a315587cc610e08957dffad5903ed520596879e7063d7adf32a9d9e1a323bea4985f107085b35e0b6798b1876cea3e098fbcc453b28c99ca

data/README.markdown

@@ -3,129 +3,4 @@ Baptize
 
 Baptize is an extension for Capistrano, that allows for server provisioning. The API resembles [Sprinkle](https://github.com/sprinkle-tool/sprinkle), but the underlying implementation is quite different. Where Sprinkle tries to compile a static payload of commands and push to the server, Baptize is executed in runtime. It also reuses much more of Capistrano, than Sprinkle does. Basically, each Baptize package is a capistrano task - Baptize just adds some helpers and fancy dsl on top, to make it look declarative.
 
-Be warned that Baptize is less than a week old at the time of this writing, and it has no test coverage - so it's probably riddled with bugs. That said, I do eat my own dog food, so it's at least somewhat functional.
-
-Setup
----
-
-At some point, I'll probably wrap this procedure in a generator, but for now you'll have to do so manually.
-
-To get started, create a `Gemfile`:
-
-```ruby
-source 'https://rubygems.org'
-gem 'capistrano', '~> 2.15'
-gem 'baptize'
-```
-
-And a `Capfile`:
-
-```ruby
-require 'bundler'
-require 'capistrano'
-require 'baptize'
-load_configuration :roles
-Dir.glob("#{capistrano_path}/packages/**/*.rb").each do |package|
-  load(package)
-end
-Dir.glob("#{capistrano_path}/recipes/**/*.rb").each do |recipe|
-  load(recipe)
-end
-```
-
-And a couple of folders and files:
-
-    ./capistrano/
-    ./capistrano/config/
-    ./capistrano/config/roles.rb               # Globally applied configuration. Define roles here.
-    ./capistrano/config/baptize.rb             # Contains config files used by baptize packages. Define policies here.
-    ./capistrano/packages/                     # Put package definitions in here.
-    ./capistrano/recipes/                      # Put regular capistrano tasks in here.
-    ./capistrano/assets/                       # Place auxiliary files here.
-
-And Finally, run the following command:
-
-    bundle
-
-Sample configuration
----
-
-First define some roles, by opening up `config/roles.rb` - This is just regular Capistrano stuff. For example:
-
-```ruby
-role :server, "192.168.1.1"
-```
-
-Next define a policy for the server. Open up `config/baptize.rb` and put this:
-
-```ruby
-policy :server do
-  requires :system_update
-end
-```
-
-This defines that the role `:server` needs a package `system_update`.
-
-You probably should define which login credentials to use as well:
-
-```ruby
-# ssh login user
-set :user, 'ubuntu'
-# ssh key location
-ssh_options[:keys] = '~/.ssh/aws-key.pem'
-# run commands through sudo
-set :use_sudo, true
-```
-
-Note that since this is defined inside `config/baptize.rb`, it won't apply to capistrano recipes outside of baptize. The roles, on the other hand, is globally loaded (That happens in the `Capfile`).
-
-Better create that packages then. Open up `packages/system_update.rb`:
-
-```ruby
-package :system_update do
-  description "System Update"
-  install do
-    run 'apt-get update -y'
-    run 'apt-get upgrade -y'
-  end
-end
-```
-
-This defines a package, that will upgrade the apt package manager of the target system.
-
-Deploying policies
----
-
-You can now run the following command:
-
-    cap baptize
-
-Which should make capistrano ssh in to the `:server` role and try to update apt. It'll probably fail, unless you actually have a server running at that IP.
-
-If you want to just configure a single role, you can do so by running:
-
-    cap baptize:policies:server
-
-Using Baptize alongside Capistrano
----
-
-If you also want to use Capistrano for regular application deployment (what it's actually ment for), you might want to create a file in `config/deploy.rb` to hold settings for this. E.g.:
-
-```ruby
-set :application, "set your application name here"
-set :repository,  "set your repository location here"
-```
-
-And to make sure it is loaded, modify your `Capfile` to include:
-
-```ruby
-load 'deploy'
-load 'deploy/assets' # For using Rails' asset pipeline
-before 'deploy' do
-  load_configuration :deploy
-end
-```
-
----
-
-TODO: There is more to Baptize, but that'll have to wait for now.
+For now, there is virtually no documentation. Have a peek at `sample/` for an idea of how it works.

data/lib/baptize/package_definition.rb

@@ -17,8 +17,18 @@ module Baptize
     def execute
       unless @registry.packages_executed.include? full_name
         @registry.packages_executed << full_name
-        @registry.before(self).each do |task|
-          task.call
+        logger.info "Resolving dependencies for #{name}"
+        @registry.before(self).each do |dependency|
+          logger.debug "--> #{dependency}"
+          @registry.resolve_dependency(dependency).tap do |task|
+            task.call
+          end
+        end
+        @dependencies.each do |dependency|
+          logger.debug "--> #{dependency}"
+          @registry.resolve_dependency(dependency).tap do |task|
+            task.call
+          end
         end
         instance_eval(&before_block) if self.before_block
         if verify_block
@@ -49,8 +59,10 @@ module Baptize
           logger.info "Nothing to do for package #{name}"
         end
         instance_eval(&after_block) if after_block
-        @registry.after(self).each do |task|
-          task.call
+        @registry.after(self).each do |dependency|
+          @registry.resolve_dependency(dependency).tap do |task|
+            task.call
+          end
         end
       end
     end

data/lib/baptize/plugins/execution.rb

@@ -44,11 +44,11 @@ module Baptize
           SSHKit.config.output_verbosity = Logger::DEBUG
         end
         begin
-          if fetch(:use_sudo)
-            ssh.send(action, :sudo, *args)
-          else
-            ssh.send(action, *args)
+          if fetch(:use_bash)
+            args = ["bash -c " + args.join(" ; ").shellescape]
           end
+          args.unshift(:sudo) if fetch(:use_sudo)
+          ssh.send(action, *args)
         ensure
           SSHKit.config.output_verbosity = old_verbosity if old_verbosity
         end

data/lib/baptize/registry.rb

@@ -32,9 +32,7 @@ module Baptize
       @befores ||= {}
       @befores[subject_name] ||= []
       if other_task
-        task = packages[other_task] if other_task.kind_of?(String)
-        raise "Didn't find a package by that name" if task.nil?
-        @befores[subject_name] << task.method(:execute)
+        @befores[subject_name] << other_task
       elsif block_given?
         @befores[subject_name] << block
       end
@@ -45,15 +43,25 @@ module Baptize
       @afters ||= {}
       @afters[subject_name] ||= []
       if other_task
-        task = packages[other_task] if other_task.kind_of?(String)
-        raise "Didn't find a package by that name" if task.nil?
-        @afters[subject_name] << task.method(:execute)
+        @afters[subject_name] << other_task
       elsif block_given?
         @afters[subject_name] << block
       end
       @afters[subject_name]
     end
 
+    def self.resolve_dependency(mixed)
+      if mixed.kind_of?(String) || mixed.kind_of?(Symbol)
+        task = packages[mixed.to_s]
+        raise "Didn't find a package by that name: '#{mixed}'" if task.nil?
+        task.method(:execute)
+      elsif mixed.kind_of? PackageDefinition
+        mixed.method(:execute)
+      else
+        mixed
+      end
+    end
+
     def self.define_package(package_name, &config_block)
       package = PackageDefinition.new(package_name, self.execution_scope, self)
       packages[package.full_name] = package

data/lib/baptize/version.rb

@@ -1,3 +1,3 @@
 module Baptize
-  VERSION = "0.1.1"
+  VERSION = "0.1.2"
 end # module Baptize

data/lib/baptize.rb

@@ -25,4 +25,5 @@ extend Baptize::DSL
 set_if_empty :logger, Proc.new { Baptize::Registry.logger }
 set_if_empty :dry_run, true
 set_if_empty :use_sudo, true
+set_if_empty :use_bash, true
 set_if_empty :ssh_verbose, !!ENV['VERBOSE']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baptize
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Troels Knak-Nielsen