baptize 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad98ebdbe3b5c570e1b16afd971758d7be6b8c94
-  data.tar.gz: f10151aab4e40be681ebf14c6e66f4881f63fbd0
+  metadata.gz: b34dd42ccdba0c8f9a4d9cca33a451db3f8ba485
+  data.tar.gz: 701640fa69056abbda8784a261a3f3f74b30719b
 SHA512:
-  metadata.gz: 2f737a1d1f690fafe84ccf3141ba1e4691b19416895079a1093f9b245c9135ee8c1148c69fbadd2388b7a48cec68d54dc84af7cbf32a23b41e418b2e04ca53f5
-  data.tar.gz: 194aa44252afe3379155932a781dbb81440cecb3d426dec36a6365f86bc59211b7d5162b33b7cc22c737f283c85b1be43b8fa10284a8bf858b37cb79ccc4d280
+  metadata.gz: b1a5fb55be30db16631eb64afb79c0005776e9e7c5dd3e801ea4f684d359e3b0eeca671f9dedbc32cbff250dcc1e39c6a79266283ff7c600e7808fdee408d55a
+  data.tar.gz: 1f00a6870ea94bc510c0fc499a851126737ad4d99150d12b30d13336b22fe7cf16d87bdaddc28043629252a329862a4e465e8c5cc404d85eda6fcb3b7740cf0b

data/lib/baptize/application.rb

@@ -14,6 +14,10 @@ module Baptize
       @name, @description, @block = name.to_sym, description, block
     end
 
+    def name_with_parameters
+      [name, *block.parameters.map(&:last).map(&:to_s).map(&:upcase)].join(" ").strip
+    end
+
     def invoke(*args)
       block.call(*args)
     end
@@ -54,10 +58,10 @@ module Baptize
         opts.separator ""
         opts.separator "COMMANDS are ..."
 
-        width = [commands.values.map(&:name).map(&:length), 31].flatten.max
+        width = [commands.values.map(&:name_with_parameters).map(&:length), 31].flatten.max
         commands.values.each do |command|
           opts.separator sprintf("    %-#{width}s  %s\n",
-            command.name,
+            command.name_with_parameters,
             command.description)
         end
 

data/lib/baptize/commands.rb

@@ -31,9 +31,16 @@ end
 Baptize.application.define_command :deploy, "Deploys the configured policies to remote servers" do
   registry = Baptize::Registry
   registry.policies.keys.each do |role|
-    registry.for_role role, in: :parallel do |host|
-      registry.apply_policy role, host, self
-    end
+    registry.apply_policy role
+  end
+end
+
+# TODO: Maybe make this into options for deploy?
+Baptize.application.define_command :force, "Force install a single package" do |package_name|
+  registry = Baptize::Registry
+  raise "No package '#{package_name}'" unless registry.has_package? package_name
+  registry.policies.keys.each do |role|
+    registry.apply_policy role, package: package_name, force: true
   end
 end
 

data/lib/baptize/package_definition.rb

@@ -14,8 +14,8 @@ module Baptize
       @after_block = nil
     end
 
-    def execute
-      unless @registry.packages_executed.include? full_name
+    def execute(options={})
+      unless @registry.packages_executed.include?(full_name) || options[:force]
         @registry.packages_executed << full_name
         logger.info "Resolving dependencies for #{name}"
         @registry.before(self).each do |dependency|

data/lib/baptize/registry.rb

@@ -24,6 +24,10 @@ module Baptize
       @packages ||= {}
     end
 
+    def self.has_package?(package_name)
+      !! @packages[package_name]
+    end
+
     def self.packages_executed
       @packages_executed ||= []
     end
@@ -85,12 +89,14 @@ module Baptize
       policies[role.to_sym] = package_names.map(&:to_s)
     end
 
-    def self.apply_policy(role, host, ssh_connection)
-      execution_scope.set :current_host, host
-      execution_scope.set :current_ssh_connection, ssh_connection
-      policies[role.to_sym].each do |package_name|
-        raise "No package '#{package_name}'" unless packages[package_name]
-        packages[package_name].execute
+    def self.apply_policy(role, options={})
+      ssh_for_role role do |host, ssh_for_role|
+        policies[role.to_sym].each do |package_name|
+          if options[:package].nil? || package_name.to_sym == options[:package].to_sym
+            raise "No package '#{package_name}'" unless packages[package_name]
+            packages[package_name].execute(force: options[:force])
+          end
+        end
       end
     end
 
@@ -122,6 +128,15 @@ module Baptize
       SSHKit::Coordinator.new(Marshal.load(subset_copy)).each(options, &block)
     end
 
+    def self.ssh_for_role(role, &block)
+      registry = self
+      for_role role, in: :parallel do |host|
+        registry.execution_scope.set :current_host, host
+        registry.execution_scope.set :current_ssh_connection, self
+        block.call
+      end
+    end
+
   end # module Registry
 
 end # module Baptize

data/lib/baptize/version.rb

@@ -1,3 +1,3 @@
 module Baptize
-  VERSION = "0.1.5"
+  VERSION = "0.1.6"
 end # module Baptize

metadata

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