dust-deploy 0.10.7 → 0.10.8

data/changelog.md

@@ -1,6 +1,16 @@
 Changelog
 =============
 
+0.10.8
+------------
+
+-  only use colors if stdout is a tty
+-  switches to colorize gem
+-  replaces basic_setup with skel recipe, to copy e.g. basic configuration files placed in templates/skel
+
+    skel: [ root, john ]
+
+
 0.10.7
 ------------
 

data/dust.gemspec

@@ -25,4 +25,5 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'net-sftp'
   s.add_runtime_dependency 'thor'
   s.add_runtime_dependency 'ipaddress'
+  s.add_runtime_dependency 'colorize'
 end

data/lib/dust/examples/templates/motd/motd.erb

@@ -1,16 +1,15 @@
-this is <%= Dust.blue %><%= @node['hostname'] %><%= Dust.none %>, a <%= @node['domain'] %> <%= @node['environment'] %> server
+% require 'colorize'
+this is <%= @node['hostname'].blue %>, a <%= @node['domain'] %> <%= @node['environment'] %> server
 
 % if @node['environment'] == 'production'
 just in case you didn't notice the line above, maybe this cow helps:
 
  ___________________________________ 
-< <%= Dust.red %>YOU ARE ON A PRODUCTION SERVER!<%= Dust.none %> >
+< <%= 'YOU ARE ON A PRODUCTION SERVER!'.red %> >
  -----------------------------------
-<%= Dust.yellow %>
         \   ^__^
          \  (oo)\_______
             (__))\/\
                 ||----w |
                 ||     ||
-<%= Dust.none %>
 % end

data/lib/dust/print_status.rb

@@ -1,15 +1,6 @@
-module Dust
-  # colors for terminal
-  def self.red thick=1;      "\033[#{thick};31m"; end
-  def self.green thick=1;    "\033[#{thick};32m"; end
-  def self.yellow thick=1;   "\033[#{thick};33m"; end
-  def self.blue thick=1;     "\033[#{thick};34m"; end
-  def self.pink thick=1;     "\033[#{thick};35m"; end
-  def self.turquois thick=1; "\033[#{thick};36m"; end
-  def self.grey thick=1;     "\033[#{thick};37m"; end
-  def self.black thick=1;    "\033[#{thick};38m"; end
-  def self.none;             "\033[0m"; end
+require 'colorize'
 
+module Dust
   $stdout.sync = true # autoflush
 
   def self.print_result ret, options={:quiet => false, :indent => 1}
@@ -25,29 +16,29 @@ module Dust
   def self.print_ok string='', options={:quiet => false, :indent => 1}
     opts = options.clone
     opts[:indent] = 0 if string.empty?
-    print_msg "#{string} #{blue}[ ok ]#{none}\n", opts
+    print_msg "#{string} #{'[ ok ]'.green}\n", opts
     true
   end
 
   def self.print_failed string='', options={:quiet => false, :indent => 1}
     opts = options.clone
     opts[:indent] = 0 if string.empty?
-    print_msg "#{string} #{red}[ failed ]#{none}\n", opts
+    print_msg "#{string} #{'[ failed ]'.red}\n", opts
     false
   end
 
   def self.print_warning string='', options={:quiet => false, :indent => 1}
     opts = options.clone
     opts[:indent] = 0 if string.empty?
-    print_msg "#{string} #{yellow}[ warning ]#{none}\n", opts
+    print_msg "#{string} #{'[ warning ]'.yellow}\n", opts
   end
 
   def self.print_hostname hostname, options={:quiet => false, :indent => 0}
-    print_msg "\n[ #{blue}#{hostname}#{none} ]\n\n", options
+    print_msg "\n[ #{hostname.blue} ]\n\n", options
   end
 
   def self.print_recipe recipe, options={:quiet => false, :indent => 0}
-    print_msg "#{green}|#{recipe}|#{none}\n", options
+    print_msg "|#{recipe}|\n".green, options
   end
 
   # prints stdout in grey and stderr in red (if existend)
@@ -55,8 +46,8 @@ module Dust
     opts = options.clone
 
     opts[:indent] += 1
-    print_msg "#{green 0}#{ret[:stdout].chomp}#{none}\n", opts unless ret[:stdout].empty?
-    print_msg "#{red 0}#{ret[:stderr].chomp}#{none}\n", opts unless ret[:stderr].empty?
+    print_msg "#{ret[:stdout].chomp.green}\n", opts unless ret[:stdout].empty?
+    print_msg "#{ret[:stderr].chomp.red}\n", opts unless ret[:stderr].empty?
   end
 
   # indent according to options[:indent]

data/lib/dust/recipes/skel.rb

@@ -0,0 +1,13 @@
+class Skel < Recipe
+  desc 'skel:deploy', 'copy default configuration files to users home directory'
+  def deploy 
+    @config.to_array.each do |user|
+      ::Dust.print_msg "deploying homedir skeleton for #{user}\n"
+      Dir["#{@template_path}/.*"].each do |file|
+        next unless File.file? file
+        @node.deploy_file file, "/#{@node.get_home user}/#{File.basename file}", { :binding => binding, :indent => 2 }
+      end
+      puts
+    end
+  end
+end

data/lib/dust/server.rb

@@ -84,13 +84,13 @@ module Dust
               sudo_authenticated = true
             else
               stdout += data
-              Dust.print_msg "#{Dust.green 0}#{data}#{Dust.none}", :indent => 0 if options[:live] and not data.empty?
+              Dust.print_msg data.green, :indent => 0 if options[:live] and not data.empty?
             end
           end
 
           channel.on_extended_data do |ch, type, data|
             stderr += data
-            Dust.print_msg "#{Dust.red 0}#{data}#{Dust.none}", :indent => 0 if options[:live] and not data.empty?
+            Dust.print_msg data.red, :indent => 0 if options[:live] and not data.empty?
           end
 
           channel.on_request('exit-status') { |ch, data| exit_code = data.read_long }

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.10.7"
+  VERSION = "0.10.8"
 end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 10
-  - 7
-  version: 0.10.7
+  - 8
+  version: 0.10.8
 platform: ruby
 authors: 
 - kris kechagia
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-04-23 00:00:00 +02:00
+date: 2012-05-03 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -89,6 +89,18 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id006
+- !ruby/object:Gem::Dependency 
+  name: colorize
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id007
 description: when puppet and chef suck because you want to be in control and sprinkle just cannot do enough for you
 email: 
 - kk@rndsec.net
@@ -135,7 +147,6 @@ files:
 - lib/dust/recipe.rb
 - lib/dust/recipes/aliases.rb
 - lib/dust/recipes/apt.rb
-- lib/dust/recipes/basic_setup.rb
 - lib/dust/recipes/cjdroute.rb
 - lib/dust/recipes/cups_client.rb
 - lib/dust/recipes/debsecan.rb
@@ -160,6 +171,7 @@ files:
 - lib/dust/recipes/repositories.rb
 - lib/dust/recipes/resolv_conf.rb
 - lib/dust/recipes/ruby_rvm.rb
+- lib/dust/recipes/skel.rb
 - lib/dust/recipes/ssh_authorized_keys.rb
 - lib/dust/recipes/sshd.rb
 - lib/dust/recipes/sudoers.rb

data/lib/dust/recipes/basic_setup.rb

@@ -1,32 +0,0 @@
-class BasicSetup < Recipe
-  desc 'basic_setup:deploy', 'installs basic packages and config files'
-  def deploy 
-    # install some basic packages
-    ::Dust.print_msg "installing basic packages\n"
-
-    @node.install_package 'tmux', :indent => 2
-    @node.install_package 'rsync', :indent => 2
-    @node.install_package 'psmisc', :indent => 2 if @node.uses_apt?
-
-    if @node.uses_rpm?
-      @node.install_package 'vim-enhanced', :indent => 2
-    else
-      @node.install_package 'vim', :indent => 2
-    end
-
-    if @node.uses_apt?
-      @node.install_package 'git-core', :indent => 2
-    else
-      @node.install_package 'git', :indent => 2
-    end
-    puts
-    
-    # deploy basic configuration for root user
-    ::Dust.print_msg "deploying configuration files for root\n"
-    Dir["#{@template_path}/.*"].each do |file|
-      next unless File.file? file
-      @node.deploy_file file, "/root/#{File.basename file}", { :binding => binding, :indent => 2 }
-    end
-
-  end
-end