dust-deploy 0.9.1 → 0.9.2

data/changelog.md

@@ -1,6 +1,15 @@
 Changelog
 =============
 
+0.9.2
+------------
+
+-  adds openssl dev packages as dependency for ruby_rvm recipe
+-  improves @node.package_installed?, was failing for apt systems recently
+-  sudo uses sh -c for executing commands, this prevents problems when > < || | && ; is used
+-  repositories recipe now can handle keyring .deb files with the 'key' option
+
+
 0.9.1
 ------------
 

data/lib/dust/recipes/repositories.rb

@@ -102,7 +102,24 @@ class Repositories < Recipe
     # add the repository key
     if repo['key']
       ::Dust.print_msg "adding #{name} repository key"
-      ::Dust.print_result @node.exec("wget -O- '#{repo['key']}' | apt-key add -")[:exit_code]
+
+      # if the key is a .deb, download and install it
+      if repo['key'].match /\.deb$/
+        ret = @node.exec 'mktemp --tmpdir dust.XXXXXXXXXX'
+        if ret[:exit_code] != 0
+          puts
+          ::Dust.print_failed 'could not create temporary file on server'
+          return false
+        end
+
+        tmpfile = ret[:stdout].chomp
+
+        ::Dust.print_result @node.exec("wget -q -O #{tmpfile} '#{repo['key']}' && dpkg -i #{tmpfile}")[:exit_code]
+
+      # if not, just download and add the key
+      else
+        ::Dust.print_result @node.exec("wget -q -O- '#{repo['key']}' |apt-key add -")[:exit_code]
+      end
     end
   end
 end

data/lib/dust/recipes/ruby_rvm.rb

@@ -10,6 +10,7 @@ class RubyRvm < Recipe
     if @node.uses_apt?
       return unless @node.install_package 'dh-autoreconf'
       return unless @node.install_package 'build-essential'
+      @node.install_package 'libssl-dev'
       @node.install_package 'libyaml-dev'
       @node.install_package 'libxml2-dev'
       @node.install_package 'libxslt1-dev'
@@ -19,6 +20,7 @@ class RubyRvm < Recipe
     elsif @node.uses_rpm?
       return unless @node.install_package 'gcc'
       return unless @node.install_package 'make'
+      @node.install_package 'openssl-devel'
       @node.install_package 'libyaml-devel'
       @node.install_package 'libxml2-devel'
       @node.install_package 'libxslt-devel'

data/lib/dust/recipes/unattended_upgrades.rb

@@ -22,5 +22,6 @@ class UnattendedUpgrades < Recipe
     periodic += "APT::Periodic::Verbose \"#{@config['verbose']}\";\n"
 
     @node.write '/etc/apt/apt.conf.d/02periodic', periodic      
+    @node.chmod '644', '/etc/apt/apt.conf.d/02periodic'
   end
 end

data/lib/dust/server.rb

@@ -64,11 +64,14 @@ module Dust
 
         # request a terminal (sudo needs it)
         # and prepend "sudo"
+        # command is wrapped in ", escapes " in the command string
+        # and then executed using "sh -c", so that
+        # the use of > < && || | and ; doesn't screw things up
         if @node['sudo']          
           channel.request_pty
-          command = "sudo #{command}"
+          command = "sudo sh -c \"#{command.gsub('"','\\"')}\""
         end
-        
+
         channel.exec command do |ch, success|
           abort "FAILED: couldn't execute command (ssh.channel.exec)" unless success
           
@@ -260,7 +263,7 @@ module Dust
 
       packages.each do |package|
         if uses_apt?
-          return Dust.print_ok '', options unless exec("dpkg -s #{package} |grep 'install ok'")[:stdout].empty?
+          return Dust.print_ok '', options if exec("dpkg -l #{package} |grep '^ii'")[:exit_code] == 0
         elsif uses_emerge?
           return Dust.print_ok '', options unless exec("qlist -I #{package}")[:stdout].empty?
         elsif uses_rpm?
@@ -288,7 +291,9 @@ module Dust
       elsif uses_rpm?
         exec "yum install -y #{package}"
       else
-        Dust.print_failed 'install_package only supports apt, emerge and rpm systems at the moment', options
+        puts
+        return Dust.print_failed "install_package only supports apt, emerge and yum systems at the moment",
+                                 { :quiet => options[:quiet], :indent => options[:indent] + 1 }
       end
 
       # check if package actually was installed

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.9.1"
+  VERSION = "0.9.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dust-deploy
 version: !ruby/object:Gem::Version
-  version: 0.9.1
+  version: 0.9.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000 Z
+date: 2012-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: net-ssh
-  requirement: &70343805618200 !ruby/object:Gem::Requirement
+  requirement: &70357952436820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70343805618200
+  version_requirements: *70357952436820
 - !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &70343805617720 !ruby/object:Gem::Requirement
+  requirement: &70357952436280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70343805617720
+  version_requirements: *70357952436280
 - !ruby/object:Gem::Dependency
   name: net-sftp
-  requirement: &70343805617280 !ruby/object:Gem::Requirement
+  requirement: &70357952435600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70343805617280
+  version_requirements: *70357952435600
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &70343805616760 !ruby/object:Gem::Requirement
+  requirement: &70357952434660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70343805616760
+  version_requirements: *70357952434660
 - !ruby/object:Gem::Dependency
   name: ipaddress
-  requirement: &70343805616300 !ruby/object:Gem::Requirement
+  requirement: &70357952434240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,7 +65,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70343805616300
+  version_requirements: *70357952434240
 description: when puppet and chef suck because you want to be in control and sprinkle
   just cannot do enough for you
 email: