dust-deploy 0.13.17 → 0.13.18

data/changelog.md

@@ -1,6 +1,15 @@
 Changelog
 =============
 
+0.13.18
+------------
+
+-  adds support for ppa-repositories
+-  fixes small bug with iptables ipv6 workaround
+-  newrelic now works with non-apt systems
+-  packages recipe now accepts https, http and ftp urls
+
+
 0.13.17
 ------------
 

data/lib/dust/helper.rb

@@ -2,8 +2,7 @@ class Object
   # turns an object into an array
   # this is needed, since 1.9 doesnt support "string".to_a and "string".each anymore
   def to_array
-    return [ self ] unless self.is_a? Array
-    return self
+    Array(self)
   end
 end
 

data/lib/dust/recipes/iptables.rb

@@ -263,14 +263,14 @@ class Iptables < Recipe
   def workaround_setup
     # openwrt always needs the workaround
     if @node.uses_opkg?
-      @workaround = { 'path' => '/etc/firewall.sh' }
+      @workaround ||= { 'path' => '/etc/firewall.sh' }
 
     # iptables-persistent < version 0.5.1 doesn't support ipv6
     # so doing a workaround
     elsif @node.uses_apt? and @ip_version == 6
       unless @node.package_min_version?('iptables-persistent', '0.5.1', :quiet => true)
         @node.messages.add('iptables-persistent too old (< 0.5.1), using workaround for ipv6').warning
-        @workaround = { 'path' => '/etc/network/if-pre-up.d/ip6tables' }
+        @workaround ||= { 'path' => '/etc/network/if-pre-up.d/ip6tables' }
       end
     end
 

data/lib/dust/recipes/newrelic.rb

@@ -2,12 +2,6 @@ class Newrelic < Recipe
   desc 'newrelic:deploy', 'installs and configures newrelic system monitoring'
   def deploy
     return Dust.print_failed 'no key specified' unless @config
-    return unless @node.uses_apt? :quiet=>false
-
-    if @options.restart? or @options.reload?
-      msg = @node.messages.add('updating repositories')
-      msg.parse_result(@node.exec('aptitude update')[:exit_code])
-    end
 
     unless @node.install_package 'newrelic-sysmond'
       @node.messages.add('installing newrelic monitoring daemon failed, did you setup the newrelic repositories?').failed

data/lib/dust/recipes/packages.rb

@@ -1,8 +1,8 @@
 class Packages < Recipe
   desc 'packages:deploy', 'installs packages'
-  def deploy 
-    @config.each do |package| 
-      @node.install_package package
+  def deploy
+    @config.to_array.each do |package|
+      @node.install_package(package)
     end
   end
 end

data/lib/dust/recipes/repositories.rb

@@ -16,7 +16,7 @@ class Repositories < Recipe
   # deletes all .list files under /etc/apt/sources.list.d
   def delete_old_repositories
     msg = @node.messages.add('deleting old repositories')
-    @node.rm '/etc/apt/sources.list.d/*.list', :quiet => true if @node.uses_apt?
+    @node.rm('/etc/apt/sources.list.d/*.list', :quiet => true) if @node.uses_apt?
     msg.ok
   end
 
@@ -26,37 +26,43 @@ class Repositories < Recipe
       # if repo is present but not a hash use defaults
       repo = {} unless repo.is_a? Hash
 
-      merge_with_default_settings repo
+      merge_with_default_settings(repo)
 
       # the default repository in /etc/apt/sources.list (debian)
       if name == 'default'
-        msg = @node.messages.add('deploying default repository'        )
-        sources = generate_default_repo repo
-        msg.parse_result(@node.write('/etc/apt/sources.list', sources, :quiet => true)        )
+        msg = @node.messages.add('deploying default repository')
+        sources = generate_default_repo(repo)
+        msg.parse_result(@node.write('/etc/apt/sources.list', sources, :quiet => true))
       else
-        msg = @node.messages.add("adding repository '#{name}' to sources"        )
-        sources = generate_repo repo
-        msg.parse_result(@node.write("/etc/apt/sources.list.d/#{name}.list", sources, :quiet => true)        )
-        add_repo_key name, repo
+        if repo['ppa']
+          @node.messages.add("adding ppa repository '#{name}'\n")
+          add_ppa(repo)
+        else
+          msg = @node.messages.add("adding repository '#{name}' to sources")
+          sources = generate_repo(repo)
+          msg.parse_result(@node.write("/etc/apt/sources.list.d/#{name}.list", sources, :quiet => true))
+          add_repo_key(name, repo)
+        end
       end
     end
   end
 
   # merge repo configuration with default settings
-  def merge_with_default_settings repo
+  def merge_with_default_settings(repo)
     # setting defaults
     repo['url'] ||= 'http://ftp.debian.org/debian/' if @node.is_debian?
     repo['url'] ||= 'http://archive.ubuntu.com/ubuntu/' if @node.is_ubuntu?
 
     repo['release'] ||= @node['lsbdistcodename']
-    repo['components'] ||= 'main'
+    repo['components'] ||= [ 'main' ]
+    repo['components'] = repo['components'].to_array.join(' ')
 
     # ||= doesn't work for booleans
     repo['source'] = repo['source'].nil? ? true : repo['source']
     repo['binary'] = repo['binary'].nil? ? true : repo['binary']
   end
 
-  def generate_default_repo repo
+  def generate_default_repo(repo)
     sources = ''
     sources << "deb #{repo['url']} #{repo['release']} #{repo['components']}\n"
     sources << "deb-src #{repo['url']} #{repo['release']} #{repo['components']}\n\n"
@@ -89,7 +95,18 @@ class Repositories < Recipe
     sources
   end
 
-  def generate_repo repo
+  def add_ppa(repo)
+    return false unless @node.install_package('python-software-properties', :indent => 2)
+    msg = @node.messages.add('running add-apt-repository', :indent => 2)
+    cmd = "add-apt-repository -y ppa:#{repo['ppa']}"
+    if repo['keyserver']
+      @node.messages.add("using custom keyserver '#{repo['keyserver']}'").ok
+      cmd << " -k #{repo['keyserver']}"
+    end
+    msg.parse_result(@node.exec(cmd)[:exit_code])
+  end
+
+  def generate_repo(repo)
     # add url to sources.list
     sources = ''
     repo['release'].to_array.each do |release|
@@ -99,14 +116,14 @@ class Repositories < Recipe
     sources
   end
 
-  def add_repo_key name, repo
+  def add_repo_key(name, repo)
     # add the repository key
     if repo['key']
       msg = @node.messages.add("adding #{name} repository key")
 
       # if the key is a .deb, download and install it
       if repo['key'].match /\.deb$/
-        ret = @node.exec 'mktemp --tmpdir dust.XXXXXXXXXX'
+        ret = @node.exec('mktemp --tmpdir dust.XXXXXXXXXX')
         if ret[:exit_code] != 0
           msg.failed('could not create temporary file on server')
           return false

data/lib/dust/recipes/skel.rb

@@ -4,8 +4,8 @@ class Skel < Recipe
     @config.to_array.each do |user|
       @node.messages.add("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 }
+        next unless File.file?(file)
+        @node.deploy_file(file, "#{@node.get_home(user)}/#{File.basename(file)}", { :binding => binding, :indent => 2 })
       end
     end
   end

data/lib/dust/server.rb

@@ -163,13 +163,8 @@ module Dust
 
       # if in sudo mode, copy file to temporary place, then move using sudo
       if @node['sudo']
-        ret = exec 'mktemp --tmpdir dust.XXXXXXXXXX'
-        if ret[:exit_code] != 0
-          msg.failed('could not create temporary file (needed for sudo)')
-          return false
-        end
-
-        tmpfile = ret[:stdout].chomp
+        tmpfile = mktemp
+        return msg.failed('could not create temporary file (needed for sudo)') unless tmpfile
 
         # allow user to write file without sudo (for scp)
         # then change file back to root, and copy to the destination
@@ -319,32 +314,66 @@ module Dust
       msg.failed
     end
 
-    def install_package package, options = {}
-      options = default_options.merge options
+    def install_package(package, options = {})
+      options = default_options.merge(options)
       options[:env] ||= ''
 
-      if package_installed? package, :quiet => true
+      if package_installed?(package, :quiet => true)
         return messages.add("package #{package} already installed", options).ok
       end
 
-      msg = messages.add("installing #{package}", options)
+      # if package is an url, download and install the package file
+      if package =~ /^(http:\/\/|https:\/\/|ftp:\/\/)/
+        if uses_apt?
+          messages.add("installing #{package}\n", options)
+          return false unless install_package('wget')
 
-      if uses_apt?
-        exec "DEBIAN_FRONTEND=noninteractive aptitude install -y #{package}"
-      elsif uses_emerge?
-        exec "#{options[:env]} emerge #{package}"
-      elsif uses_rpm?
-        exec "yum install -y #{package}"
-      elsif uses_pacman?
-        exec "echo y |pacman -S #{package}"
-      elsif uses_opkg?
-        exec "opkg install #{package}"
+          msg = messages.add('downloading package', options.merge(:indent => options[:indent] + 1))
+
+          # creating temporary file
+          tmpfile = mktemp
+          return msg.failed('could not create temporary file') unless tmpfile
+
+          msg.parse_result(exec("wget #{package} -O #{tmpfile}")[:exit_code])
+
+          msg = messages.add('installing package', options.merge(:indent => options[:indent] + 1))
+          ret = msg.parse_result(exec("dpkg -i #{tmpfile}")[:exit_code])
+
+          msg = messages.add('deleting downloaded file', options.merge(:indent => options[:indent] + 1))
+          msg.parse_result(rm(tmpfile, :quiet => true))
+
+          return ret
+
+        elsif uses_rpm?
+          msg = messages.add("installing #{package}", options)                             
+          return msg.parse_result(exec("rpm -U #{package}")[:exit_code])
+
+        else
+          return msg.failed("\ninstalling packages from url not yet supported " +
+                            "for your distribution. feel free to contribute!").failed
+        end
+
+      # package is not an url, use package manager
       else
-        return msg.failed("install_package only supports apt, emerge and yum systems at the moment")
-      end
+        msg = messages.add("installing #{package}", options)
+
+        if uses_apt?
+          exec "DEBIAN_FRONTEND=noninteractive aptitude install -y #{package}"
+        elsif uses_emerge?
+          exec "#{options[:env]} emerge #{package}"
+        elsif uses_rpm?
+          exec "yum install -y #{package}"
+        elsif uses_pacman?
+          exec "echo y |pacman -S #{package}"
+        elsif uses_opkg?
+          exec "opkg install #{package}"
+        else
+          return msg.failed("install_package only supports apt, emerge and yum systems at the moment")
+        end
 
-      # check if package actually was installed
-      msg.parse_result(package_installed?(package, :quiet => true))
+        # check if package actually was installed
+        return msg.parse_result(package_installed?(package, :quiet => true))
+      end
     end
 
     # check if installed package is at least version min_version
@@ -760,6 +789,13 @@ module Dust
       end
     end
 
+    # create a temporary file
+    def mktemp
+      ret = exec('mktemp --tmpdir dust.XXXXXXXXXX')
+      return false if ret[:exit_code] != 0
+      ret[:stdout].chomp
+    end
+
 
     private
 

data/lib/dust/version.rb

@@ -1,3 +1,3 @@
 module Dust
-  VERSION = "0.13.17"
+  VERSION = "0.13.18"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: dust-deploy
 version: !ruby/object:Gem::Version
-  version: 0.13.17
+  version: 0.13.18
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-05 00:00:00.000000000 Z
+date: 2012-07-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json