knife-pkg 0.1.1 → 0.2.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 693eb26a2679a69e02ec7c5e401f658fe0bf1f7a
+  data.tar.gz: 234e8b042f480d0b6b9f25ce67a5c3a623b6a059
+SHA512:
+  metadata.gz: 43f34e39548c1a7e3c06e6e916a0b1207047b06443d29bd27ff5a017b0a8d964a58389d081d5dc2b774bfc620e0f74f010d52aceffbede87687f6342380d6357
+  data.tar.gz: 4ea377499214e59d5e453caed9cd68f13f45e053cf35c4dd0e2f8fa2b2cc176fc0a80677b2427a3f164701b5b622fd56d6eb75c59177b60adf3d3d068e575bfe

data/README.md

@@ -106,6 +106,31 @@ $ knife pkg install updates "roles:webserver" -U "libxml2,gpgv,gnupg"
 ...
 ```
 
+ - install all updates, don't ask
+
+```sh
+$ knife pkg install updates "*:*" -y
+===> s10.example.com
+	Updating libwbclient0 (3.6.6-6+deb7u1~bpo60+1)
+	Updating samba-common (3.6.6-6+deb7u1~bpo60+1)
+	Updating samba-common-bin (3.6.6-6+deb7u1~bpo60+1)
+	Updating smbclient (3.6.6-6+deb7u1~bpo60+1)
+===> s11.example.com
+	Updating libwbclient0 (3.6.6-6+deb7u1~bpo60+1)
+	Updating samba-common (3.6.6-6+deb7u1~bpo60+1)
+	Updating samba-common-bin (3.6.6-6+deb7u1~bpo60+1)
+	Updating smbclient (3.6.6-6+deb7u1~bpo60+1)
+===> s12.example.com
+	Updating libwbclient0 (3.6.6-6+deb7u1~bpo60+1)
+	Updating samba-common (3.6.6-6+deb7u1~bpo60+1)
+	Updating samba-common-bin (3.6.6-6+deb7u1~bpo60+1)
+===> s13.example.com
+	Updating libwbclient0 (3.6.6-6+deb7u1~bpo60+1)
+	Updating samba-common (3.6.6-6+deb7u1~bpo60+1)
+	Updating samba-common-bin (3.6.6-6+deb7u1~bpo60+1)
+	Updating smbclient (3.6.6-6+deb7u1~bpo60+1)
+```
+
 ## Supported Packet Managers
 
 * apt

data/lib/chef/knife/pkg_base.rb

@@ -43,6 +43,7 @@ class Chef
       pkg_options[:sudo] = config[:sudo_required]
       pkg_options[:verbose] = config[:verbose] || config[:dry_run] || config[:pkg_verbose]
       pkg_options[:dry_run] = config[:dry_run]
+      pkg_options[:yes] = config[:yes]
       pkg_options
     end
 

data/lib/chef/knife/pkg_install_updates.rb

@@ -101,6 +101,13 @@ class Chef
         :description => "QUERY is a space separated list of servers",
         :default => false
 
+      option :dry_run,
+        :short => "-D",
+        :long => "--dry-run",
+        :boolean => true,
+        :description => "Simulates package installation. Actually this is only supported by 'apt'",
+        :default => false
+
 
       def run
         super

data/lib/knife-pkg/controllers/apt.rb

@@ -22,6 +22,7 @@ module Knife
 
       def initialize(node, session, opts = {})
         super(node, session, opts)
+        @installed_packages = Array.new
       end
 
       def dry_run_supported?
@@ -33,11 +34,9 @@ module Knife
       end
 
       def last_pkg_cache_update
-        raise_update_notifier_missing! unless update_notifier_installed?
-
         result = nil
         begin
-          result = exec("stat -c %y /var/lib/apt/periodic/update-success-stamp")
+          result = exec("#{sudo} stat -c %y /var/lib/apt/lists")
           Time.parse(result.stdout.chomp)
         rescue RuntimeError => e
           e.backtrace.each { |l| Chef::Log.debug(l) }
@@ -47,7 +46,14 @@ module Knife
       end
 
       def installed_version(package)
-        exec("dpkg -p #{package.name} | grep -i Version: | awk '{print $2}' | head -1").stdout.chomp
+        package = @installed_packages.select { |p| p.name == package.name }.first || Package.new("")
+        if !package.name.empty?
+          version = package.version
+        else
+          # fallback
+          version = exec("dpkg -p #{package.name} | grep -i Version: | awk '{print $2}' | head -1").stdout.chomp
+        end
+        version
       end
 
       def update_version(package)
@@ -55,15 +61,25 @@ module Knife
       end
 
       def available_updates
-        packages = Array.new
-        raise_update_notifier_missing! unless update_notifier_installed?
-        result = exec("#{sudo}/usr/lib/update-notifier/apt_check.py -p")
-        result.stderr.split("\n").each do |item|
-          package = Package.new(item)
-          package.version = update_version(package)
-          packages << package
+        parse_upgrade(exec("#{sudo} apt-get dist-upgrade -V -s | egrep -v \"^(Conf|Inst)\"").stdout)
+      end
+
+      def parse_upgrade(upgrade_line)
+        result = Array.new
+        rx = Regexp.new(/\s+(?<name>\S+)\s\((?<installed>.+)\s=>\s(?<new>.+)\)/)
+        found = false
+        upgrade_line.split("\n").each do |line|
+          unless found
+            found = true if line.match(/will be upgraded/)
+            next
+          end
+          match = rx.match(line)
+          unless match.nil?
+            result << Package.new(match[:name], match[:new])
+            @installed_packages << Package.new(match[:name], match[:installed])
+          end
         end
-        packages.sort { |n,m| n.name <=> m.name }
+        result
       end
 
       def update_package!(package)
@@ -71,14 +87,6 @@ module Knife
         cmd_string += " -s" if @options[:dry_run]
         exec(cmd_string)
       end
-
-      def update_notifier_installed?
-        exec("dpkg-query -W update-notifier-common 2>/dev/null || echo 'false'").stdout.chomp != 'false'
-      end
-
-      def raise_update_notifier_missing!
-        raise RuntimeError, "No update-notifier(-common) installed!? Install it and try again!"
-      end
     end
   end
 end

data/lib/knife-pkg/controllers/package_controller.rb

@@ -34,20 +34,79 @@ module Knife
         @options = opts
       end
 
-      def self.ui
-        @ui ||= Chef::Knife::UI.new(STDOUT, STDERR, STDIN, {})
-      end
+      
+      class << self
 
-      def sudo
-        @options[:sudo] ? 'sudo ' : ''
-      end
+        def list_available_updates(updates)
+          updates.each do |update|
+            ui.info(ui.color("\t" + update.to_s, :yellow))
+          end
+        end
 
-      def exec(cmd)
-        ShellCommand.exec(cmd, @session)
-      end
+        def ui
+          @ui ||= Chef::Knife::UI.new(STDOUT, STDERR, STDIN, {})
+        end
 
-      def max_pkg_cache_age
-        options[:max_pkg_cache_age] || ONE_DAY_IN_SECS
+        # Connects to the node, updates packages (defined with param `packages`) without confirmation, all other available updates with confirmation
+        # @param [Hash] node the node
+        # @option node [String] :platform_family platform of the node, e.g. `debian`. if not set, `ohai` will be executed
+        # @param [Session] session the ssh session to be used to connect to the node
+        # @param [Array<String>] packages name of the packages which should be updated without confirmation
+        # @param [Hash] opts the options
+        # @option opts [Boolean] :dry_run whether the update should only be simulated (if supported by the package manager)
+        # @option opts [Boolean] :verbose whether the update process should be more verbose
+        # @option opts [Boolean] :yes whether all available updates should be installed without confirmation
+        def update!(node, session, packages, opts)
+          ctrl = self.init_controller(node, session, opts)
+
+          auto_updates = packages.map { |u| Package.new(u) }
+          updates_for_dialog = Array.new
+
+          ctrl.try_update_pkg_cache
+          available_updates = ctrl.available_updates
+
+          # install all available packages
+          if opts[:yes]
+            auto_updates = available_updates
+          end
+
+          # install packages in auto_updates without confirmation, 
+          # but only if they are available as update 
+          # don't install packages which aren't installed 
+          available_updates.each do |avail|
+            if auto_updates.select { |p| p.name == avail.name }.count == 0
+              updates_for_dialog << avail
+            else
+              ui.info("\tUpdating #{avail.to_s}")
+              ctrl.update_package_verbose!(avail)
+            end
+          end
+
+          ctrl.update_dialog(updates_for_dialog)
+        end
+
+        def available_updates(node, session, opts = {})
+          ctrl = self.init_controller(node, session, opts)
+          ctrl.try_update_pkg_cache
+          updates = ctrl.available_updates
+          list_available_updates(ctrl.update_info(updates))
+        end
+
+        def init_controller(node, session, opts)
+          platform_family = node[:platform_family] || self.platform_family_by_local_ohai(session, opts)
+          ctrl_name = PlatformFamily.map_to_pkg_ctrl(platform_family)
+          raise NotImplementedError, "I'm sorry, but #{node[:platform_family]} is not supported!" if ctrl_name == 'unknown'
+
+          Chef::Log.debug("Platform Family #{platform_family} detected, using #{ctrl_name}")
+          require File.join(File.dirname(__FILE__), ctrl_name)
+          ctrl = Object.const_get('Knife').const_get('Pkg').const_get("#{ctrl_name.capitalize}PackageController").new(node, session, opts)
+          ctrl.ui = self.ui
+          ctrl
+        end
+
+        def platform_family_by_local_ohai(session, opts)
+          ShellCommand.exec("ohai platform_family| grep \\\"", session).stdout.strip.gsub(/\"/,'')
+        end
       end
 
       ## ++ methods to implement
@@ -91,6 +150,19 @@ module Knife
       end
 
       ## ++ methods to implement
+
+
+      def sudo
+        @options[:sudo] ? 'sudo ' : ''
+      end
+
+      def exec(cmd)
+        ShellCommand.exec(cmd, @session)
+      end
+
+      def max_pkg_cache_age
+        options[:max_pkg_cache_age] || ONE_DAY_IN_SECS
+      end
       
       def update_info(packages)
         result = []
@@ -107,7 +179,7 @@ module Knife
         result = update_package!(package)
         if @options[:dry_run] || @options[:verbose]
           ui.info(result.stdout)
-          ui.error(result.stderr)
+          ui.error(result.stderr) unless result.stderr.empty?
         end
       end
 
@@ -121,8 +193,8 @@ module Knife
       def update_dialog(packages)
         return if packages.count == 0
 
-        ui.info("\tThe following updates are available:") if packages.count > 0
-        PackageController::list_available_updates(update_info(packages))
+        ui.info("\tThe following updates are available:") 
+        PackageController.list_available_updates(update_info(packages))
 
         if UserDecision.yes?("\tDo you want to update all packages? [y|n]: ")
           ui.info("\tupdating...")
@@ -139,67 +211,6 @@ module Knife
           end
         end
       end
-
-      def self.list_available_updates(updates)
-        updates.each do |update|
-          ui.info(ui.color("\t" + update.to_s, :yellow))
-        end
-      end
-
-      # Connects to the node, updates packages (defined with param `packages`) without confirmation, all other available updates with confirmation
-      # @param [Hash] node the node
-      # @option node [String] :platform_family platform of the node, e.g. `debian`. if not set, `ohai` will be executed
-      # @param [Session] session the ssh session to be used to connect to the node
-      # @param [Array<String>] packages name of the packages which should be updated without confirmation
-      # @param [Hash] opts the options
-      # @option opts [Boolean] :dry_run wether the update should only be simulated (if supported by the package manager)
-      # @option opts [Boolean] :verbose wether the update process should be more verbose
-      def self.update!(node, session, packages, opts)
-        ctrl = self.init_controller(node, session, opts)
-
-        auto_updates = packages.map { |u| Package.new(u) }
-        updates_for_dialog = Array.new
-
-        ctrl.try_update_pkg_cache
-        available_updates = ctrl.available_updates
-
-        # install packages in auto_updates without confirmation, 
-        # but only if they are available as update 
-        # don't install packages which aren't installed 
-        available_updates.each do |avail|
-          if auto_updates.select { |p| p.name == avail.name }.count == 0
-            updates_for_dialog << avail
-          else
-            ui.info("\tUpdating #{avail.to_s}")
-            ctrl.update_package_verbose!(avail)
-          end
-        end
-
-        ctrl.update_dialog(updates_for_dialog)
-      end
-
-      def self.available_updates(node, session, opts = {})
-        ctrl = self.init_controller(node, session, opts)
-        ctrl.try_update_pkg_cache
-        updates = ctrl.available_updates
-        list_available_updates(ctrl.update_info(updates))
-      end
-
-      def self.init_controller(node, session, opts)
-        platform_family = node[:platform_family] || self.platform_family_by_local_ohai(session, opts)
-        ctrl_name = PlatformFamily.map_to_pkg_ctrl(platform_family)
-        raise NotImplementedError, "I'm sorry, but #{node[:platform_family]} is not supported!" if ctrl_name == 'unknown'
-
-        Chef::Log.debug("Platform Family #{platform_family} detected, using #{ctrl_name}")
-        require File.join(File.dirname(__FILE__), ctrl_name)
-        ctrl = Object.const_get('Knife').const_get('Pkg').const_get("#{ctrl_name.capitalize}PackageController").new(node, session, opts)
-        ctrl.ui = self.ui
-        ctrl
-      end
-
-      def self.platform_family_by_local_ohai(session, opts)
-        ShellCommand.exec("ohai platform_family| grep \\\"", session).stdout.strip.gsub(/\"/,'')
-      end
     end
   end
 end

data/lib/knife-pkg/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Pkg
-    VERSION = '0.1.1'
+    VERSION = '0.2.0'
   end
 end

data/spec/controllers/apt_spec.rb

@@ -34,26 +34,90 @@ describe 'AptPackageController' do
   end
 
   describe "#available_updates" do
-    it 'should raise an error if update-notifier is not installed' do
+    it 'should return an array' do
       p = AptPackageController.new(nil, nil)
-      p.stub(:update_notifier_installed?).and_return(false)
-      expect{p.available_updates}.to raise_error(/update-notifier/)
+      result = ShellCommandResult.new(nil,"will be upgraded\n base-files2 (7.1wheezy1 => 7.1wheezy2)\nbla",nil,nil)
+      p.stub(:exec).and_return(result)
+      packages = p.available_updates
+      expect(packages).to be_an_instance_of Array
+      expect(packages[0].name).to eq("base-files2")
+      expect(packages[0].version).to eq("7.1wheezy2")
     end
+  end
 
-    it 'should return an array' do
-      result = ShellCommandResult.new(nil, nil, "b\na\nc", nil)
+  describe "#installed_version" do
+    it 'should return the installed version from internal list' do
       p = AptPackageController.new(nil, nil)
-      p.stub(:exec).and_return(result)
-      p.stub(:update_notifier_installed?).and_return(true)
-      p.stub(:installed_version).and_return("1.0.0")
-      p.stub(:update_version).and_return("2.0.0")
-
-      updates = p.available_updates
-      expect(updates).to be_an_instance_of Array
-      expect(updates.count).to eq(3)
-      expect(updates[0].name).to eq("a")
-      expect(updates[1].name).to eq("b")
-      expect(updates[2].name).to eq("c")
+      output = "will be upgraded\n base-files (7.1wheezy1 => 7.1wheezy2)\nbla"
+      p.parse_upgrade(output)
+      expect(p).not_to receive(:exec)
+      expect(p.installed_version(Package.new("base-files"))).to eq("7.1wheezy1")
+    end
+
+    it 'should return the installed version from dpkg' do
+      p = AptPackageController.new(nil, nil)
+      output = "bla\n base-files (7.1wheezy1 => 7.1wheezy2)\nbla"
+      p.parse_upgrade(output)
+      r = Struct.new(:stdout)
+      output_exec = r.new("1.0.0\n")
+      p.stub(:exec).and_return(output_exec)
+      expect(p).to receive(:exec)
+      expect(p.installed_version(Package.new("bla"))).to eq("1.0.0")
+    end
+  end
+
+  describe "#parse_upgrade" do
+    it 'should parse output from apt-get upgrade and return an array of packages' do
+      stdout = <<-END.gsub(/^ {6}/, '')
+      Reading package lists...
+      Building dependency tree...
+      Reading state information...
+      The following packages have been kept back:
+         esl-erlang (16.b-2~debian~squeeze => 16.b.2-1)
+         postgresql-client-9.2 (9.2.4-1.pgdg60+1 => 9.2.5-1.pgdg60+1)
+      The following packages will be upgraded:
+         base-files (7.1wheezy1 => 7.1wheezy2)
+         curl (7.26.0-1+wheezy3 => 7.26.0-1+wheezy4)
+         dmsetup (1.02.74-7 => 1.02.74-8)
+         dpkg (1.16.10 => 1.16.12)
+         gnupg (1.4.12-7+deb7u1 => 1.4.12-7+deb7u2)
+         gpgv (1.4.12-7+deb7u1 => 1.4.12-7+deb7u2)
+         grub-common (1.99-27+deb7u1 => 1.99-27+deb7u2)
+         grub-pc (1.99-27+deb7u1 => 1.99-27+deb7u2)
+         grub-pc-bin (1.99-27+deb7u1 => 1.99-27+deb7u2)
+         grub2-common (1.99-27+deb7u1 => 1.99-27+deb7u2)
+         initscripts (2.88dsf-41 => 2.88dsf-41+deb7u1)
+         libcurl3 (7.26.0-1+wheezy3 => 7.26.0-1+wheezy4)
+         libdevmapper-event1.02.1 (1.02.74-7 => 1.02.74-8)
+         libdevmapper1.02.1 (1.02.74-7 => 1.02.74-8)
+         libxml2 (2.8.0+dfsg1-7+nmu1 => 2.8.0+dfsg1-7+nmu2)
+         linux-headers-3.2.0-4-amd64 (3.2.46-1+deb7u1 => 3.2.51-1)
+         linux-headers-3.2.0-4-common (3.2.46-1+deb7u1 => 3.2.51-1)
+         linux-image-3.2.0-4-amd64 (3.2.46-1+deb7u1 => 3.2.51-1)
+         linux-libc-dev (3.2.46-1+deb7u1 => 3.2.51-1)
+         lvm2 (2.02.95-7 => 2.02.95-8)
+         mutt (1.5.21-6.2 => 1.5.21-6.2+deb7u1)
+         perl (5.14.2-21 => 5.14.2-21+deb7u1)
+         perl-base (5.14.2-21 => 5.14.2-21+deb7u1)
+         perl-modules (5.14.2-21 => 5.14.2-21+deb7u1)
+         python (2.7.3-4 => 2.7.3-4+deb7u1)
+         python-minimal (2.7.3-4 => 2.7.3-4+deb7u1)
+         sysv-rc (2.88dsf-41 => 2.88dsf-41+deb7u1)
+         sysvinit (2.88dsf-41 => 2.88dsf-41+deb7u1)
+         sysvinit-utils (2.88dsf-41 => 2.88dsf-41+deb7u1)
+         tzdata (2013c-0wheezy1 => 2013d-0wheezy1)
+      30 upgraded, 0 newly installed, 0 to remove and 0 not upgraded.
+      Need to get 49.9 MB of archives.
+      After this operation, 864 kB disk space will be freed.
+      Do you want to continue [Y/n]? Abort.
+      END
+      p = AptPackageController.new(nil, nil)
+      packages = p.parse_upgrade(stdout)
+      expect(packages.count).to eq(30)
+      expect(packages[0].name).to eq("base-files")
+      expect(packages[0].version).to eq("7.1wheezy2")
+      expect(packages[29].name).to eq("tzdata")
+      expect(packages[29].version).to eq("2013d-0wheezy1")
     end
   end
 end

metadata

@@ -1,20 +1,18 @@
 --- !ruby/object:Gem::Specification
 name: knife-pkg
 version: !ruby/object:Gem::Version
-  version: 0.1.1
-  prerelease: 
+  version: 0.2.0
 platform: ruby
 authors:
 - Holger Amann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -22,7 +20,6 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -30,7 +27,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -54,7 +48,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -62,7 +55,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -70,7 +62,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - '>='
       - !ruby/object:Gem::Version
@@ -111,33 +102,26 @@ files:
 homepage: https://github.com/hamann/knife-pkg
 licenses:
 - Apache 2.0
+metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3505602516276971978
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3505602516276971978
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.25
+rubygems_version: 2.1.8
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: A plugin for chef's knife to manage package updates
 test_files:
 - spec/controllers/apt_spec.rb