baptize 0.1.3 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 631c1cbd594a828aed8fbc7e6bfdc187460c2be0
-  data.tar.gz: c1e6b3abadd41e0aadcb82c23daa96f9bfd02096
+  metadata.gz: 21ee15f5fa163ebaa24036c18ed5f7aed06e4ba5
+  data.tar.gz: b6606c765e138843fc0cce48d87a0c76f686db24
 SHA512:
-  metadata.gz: 44943b561ce0f265ae8f7a231b88f56320de66f4ad9714790fdbe126072625264ba708a3f6135aa070a6f501556895e0d798872f6498d8de149b886cd22d434a
-  data.tar.gz: 269aac58005c16f1d619357058458c690c9c5ae0b70c6597717b7e1403cc196afb91848767ae3b55fee9ea20a204d6fd3255171913ab31b54deadf78d35a55fb
+  metadata.gz: bc396d66c705cfd836ddbb777e1cb0d577216075e0124635ec120f2ffc24ce622c787eea5047cb928957c02c72a2719bf90a0e56d48c3f4df59349f041825d39
+  data.tar.gz: 54ef22187f9def94e2b44b825de22f4507fa63384b5efb8876d2d729ef63c169e453859348a03999432c5ff01f92d32e13b92630eb355e3fc822c0e7b1593b36

data/lib/baptize/application.rb

@@ -12,8 +12,29 @@ module Baptize
       "baptize"
     end
 
+    def load_rakefile
+      super
+      standard_exception_handling do
+        in_namespace :packages do
+          Baptize::Registry.packages.values.each do |package|
+            @last_description = package.description
+            define_task(Rake::Task, package.name.to_s) do
+              puts "Invoke package: #{package.name}"
+              Baptize::Registry.policies.keys.each do |role|
+                on roles(role), in: :parallel do |host|
+                  Baptize::Registry.execution_scope.set :current_host, host
+                  Baptize::Registry.execution_scope.set :current_ssh_connection, ssh_connection
+                  package.execute
+                end
+              end
+            end
+          end
+        end
+      end
+    end
+
     def sort_options(options)
-      super.push(version, dry_run, roles, hostfilter)
+      super.push(version, dry_run, roles)
     end
 
     def handle_options
@@ -87,15 +108,5 @@ module Baptize
       ]
     end
 
-    def hostfilter
-      ['--hosts HOSTS', '-z',
-       "Run SSH commands only on matching hosts",
-       lambda { |value|
-         raise "TODO: Port this"
-         Configuration.env.add_cmdline_filter(:host, value)
-       }
-      ]
-    end
-
   end
 end

data/lib/baptize/dsl.rb

@@ -1,6 +1,8 @@
 module Baptize
 
   module DSL
+    include Baptize::Plugins::Env
+
     def package(package_name, &config_block)
       Registry.define_package(package_name, &config_block)
     end
@@ -8,6 +10,10 @@ module Baptize
     def policy(role, *packages)
       Registry.define_policy role, [packages].flatten
     end
+
+    def server(role, host, options = {})
+      Registry.define_server(role, host, options)
+    end
   end # module DSL
 
 end # module Baptize

data/lib/baptize/plugins/env.rb

@@ -1,10 +1,35 @@
-require 'capistrano/dsl/env'
-
 module Baptize
   module Plugins
     module Env
 
-      include Capistrano::DSL::Env
+      def any?(key)
+        value = fetch(key)
+        if value && value.respond_to?(:any?)
+          value.any?
+        else
+          !fetch(key).nil?
+        end
+      end
+
+      def set(key, value=nil, &block)
+        config[key] = block || value
+      end
+
+      def set_if_empty(key, value=nil, &block)
+        set(key, value, &block) unless config.has_key? key
+      end
+
+      def delete(key)
+        config.delete(key)
+      end
+
+      def fetch(key, default=nil, &block)
+        value = fetch_for(key, default, &block)
+        while callable_without_parameters?(value)
+          value = set(key, value.call)
+        end
+        return value
+      end
 
       def respond_to?(sym, include_priv = false)
         super || any?(sym)
@@ -18,6 +43,24 @@ module Baptize
         end
       end
 
+      private
+
+      def config
+        @@config ||= Hash.new
+      end
+
+      def fetch_for(key, default, &block)
+        if block_given?
+          config.fetch(key, &block)
+        else
+          config.fetch(key, default)
+        end
+      end
+
+      def callable_without_parameters?(x)
+        x.respond_to?(:call) && ( !x.respond_to?(:arity) || x.arity == 0)
+      end
+
     end
 
   end # module Plugins

data/lib/baptize/rake.rb

@@ -1,18 +1,46 @@
 Rake::Task.define_task(:list) do
-  puts "Available packages"
-  Baptize::Registry.packages.values.each do |package|
-    puts [package.name, "\t", package.description].join
+  puts "# Packages"
+  packages = Baptize::Registry.packages.values
+  width = packages.map(&:name).map(&:length).max
+  packages.each do |p|
+    printf("%-#{width}s  # %s\n",
+      p.name,
+      p.description)
+  end
+end
+
+Rake::Task.define_task(:policies) do
+  puts "# Policies"
+  registry = Baptize::Registry
+  registry.policies.each do |role, packages|
+    puts "#{role}:"
+    packages.each do |package|
+      puts "  #{package}"
+    end
+  end
+end
+
+Rake::Task.define_task(:servers) do
+  puts "# Servers"
+  registry = Baptize::Registry
+  registry.servers.values.each do |server|
+    puts server.inspect
   end
 end
 
 Rake::Task.define_task(:apply) do
-  Baptize::Registry.policies.keys.each do |role|
-    on roles(role), in: :parallel do |host|
-      Baptize::Registry.apply_policy role, host, self
+  registry = Baptize::Registry
+  registry.policies.keys.each do |role|
+    registry.for_role role, in: :parallel do |host|
+      registry.apply_policy role, host, self
     end
   end
 end
 
 Rake::Task.define_task(:default) do
   Rake::Task['list'].invoke
+  puts
+  Rake::Task['policies'].invoke
+  puts
+  Rake::Task['servers'].invoke
 end

data/lib/baptize/registry.rb

@@ -94,6 +94,55 @@ module Baptize
       end
     end
 
+    def self.servers
+      @servers ||= {}
+    end
+
+    def self.define_server(role, host, options = {})
+      role = role.to_sym
+      servers[host] = options.merge(hostname: host)
+      servers[host][:roles] ||= []
+      servers[host][:roles] << role unless servers[host][:roles].include?(role)
+      servers[host]
+    end
+
+    def self.servers_for_role(role)
+      role = role.to_sym
+      host_columns = [:password, :hostname, :port, :user, :key, :ssh_options]
+      servers.values
+      .select do |server|
+        server[:roles].include?(role)
+      end.map do |server|
+        server.select {|k,v| host_columns.include?(k) }
+      end
+    end
+
+    def self.for_role(role, options={}, &block)
+      subset_copy = Marshal.dump(servers_for_role(role))
+      SSHKit::Coordinator.new(Marshal.load(subset_copy)).each(options, &block)
+    end
+
   end # module Registry
 
 end # module Baptize
+
+=begin
+
+    def role(name, hosts, options={})
+      servers.add_role(name, hosts, options)
+    end
+
+    def roles(*names)
+      servers.roles_for(names.flatten)
+    end
+
+    def servers
+      @servers ||= Servers.new
+    end
+
+    def on(hosts, options={}, &block)
+      subset_copy = Marshal.dump(Configuration.env.filter(hosts))
+      SSHKit::Coordinator.new(Marshal.load(subset_copy)).each(options, &block)
+    end
+
+=end

data/lib/baptize/version.rb

@@ -1,3 +1,3 @@
 module Baptize
-  VERSION = "0.1.3"
+  VERSION = "0.1.4"
 end # module Baptize

data/lib/baptize.rb

@@ -1,13 +1,11 @@
 require 'rake'
 require 'sshkit'
-require 'capistrano/application'
-require 'capistrano/dsl'
-require 'capistrano/dsl/env'
 require 'baptize/version'
 require 'baptize/registry'
 require 'baptize/package_definition'
 require 'baptize/execution_scope'
 require 'baptize/verification_failure'
+require 'baptize/plugins/env'
 require 'baptize/plugins/helpers'
 require 'baptize/plugins/verifications'
 require 'baptize/plugins/execution'
@@ -15,13 +13,12 @@ require 'baptize/plugins/apt'
 require 'baptize/dsl'
 require 'baptize/application'
 
-Baptize::Registry.plugins << Capistrano::DSL::Env
+Baptize::Registry.plugins << Baptize::Plugins::Env
 Baptize::Registry.plugins << Baptize::Plugins::Helpers
 Baptize::Registry.plugins << Baptize::Plugins::Verifications
 Baptize::Registry.plugins << Baptize::Plugins::Execution
 Baptize::Registry.plugins << Baptize::Plugins::Apt
 
-extend Capistrano::DSL
 extend Baptize::DSL
 
 set_if_empty :logger, Proc.new { Baptize::Registry.logger }

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: baptize
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
 platform: ruby
 authors:
 - Troels Knak-Nielsen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-05 00:00:00.000000000 Z
+date: 2016-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: capistrano
+  name: sshkit
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '1.8'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.4'
+        version: '1.8'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
@@ -31,7 +31,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.0'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: