knife-pkg 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d88d0b8ba9e1993d05d21d5babe891083f8678e0
-  data.tar.gz: bd181ee1ab861133f88dc1dd7cd5dda4bdc7e869
+  metadata.gz: ef5dd85d6dfea7ed525de94598be3975ee647056
+  data.tar.gz: 4c8ed9c2fcabd22f44e1dd36d73168a024c60e20
 SHA512:
-  metadata.gz: 48c53c9a47a99e4562cb638729d7232a676467a6980c94bfa14434736f3a29e676b91e596305b0e94e763f8ac825258f575afbd640cba40b209313a53e75c6bd
-  data.tar.gz: 57c5c1edc477623d8e4c214b25b42eb37bba0d09b41e518a11e860adccf48967ddeeaefe21803ffa51602743fc468508b335297c3b0098ffa7134f987d0124e2
+  metadata.gz: 2cf31489b4112015c47590125510991e0b6352e1bfa53a42febe6453c07e965d2a8497c53b02d4451d3c48f58e1af3b8828b0eca6ce8c99b1253af0efe154f6e
+  data.tar.gz: 275a7d8f6f2e6522d39bbe10d39ae70ccddadd947ce1da1bd78d1a528980cc66b026beb2f7a2880191c25e8b69f0811b1b6c939f2f710ffd2de4ffa88f0846f7

data/README.md

@@ -83,8 +83,10 @@ $ knife pkg install updates "roles:webserver" -U "libxml2,gpgv,gnupg"
 
 ## Requirements
 
-* Chef(-Server) or anything else which supports `search(:node, "*:*")`
 * SSH access
+* Chef(-Server) or anything else which supports `search(:node, "*:*")` (*not required when you use `-m`*)
+* when `-m` option is given, `ohai` has to be installed on the node 
+
 
 ## Installation
 

data/Vagrantfile

@@ -0,0 +1,16 @@
+boxes = {
+  :debian => { :image => "https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_debian-7.1.0_provisionerless.box" },
+  :ubuntu => { :image => "https://opscode-vm-bento.s3.amazonaws.com/vagrant/opscode_ubuntu-12.04_provisionerless.box" }
+}
+
+Vagrant::configure("2") do |config|
+  boxes.each do |name, options|
+    config.omnibus.chef_version = 'latest'
+    config.berkshelf.enabled = false
+
+    config.vm.define name do |box_config|
+      box_config.vm.box = name.to_s
+      box_config.vm.box_url = options[:image]
+    end
+  end
+end

data/lib/chef/knife/pkg_base.rb

@@ -21,7 +21,6 @@ class Chef
       def run
         # necessary for Knife::Ssh
         @longest = 0
-        config[:manual] = false 
 
         configure_attribute
         configure_sudo
@@ -53,6 +52,7 @@ class Chef
           node = node_by_hostname(server.host)
           if node
             cur_session = server.session(true)
+            ui.info("===> " + hostname_by_attribute(node))
             process(node, cur_session)
             cur_session.close
           else
@@ -69,22 +69,31 @@ class Chef
 
     def node_by_hostname(hostname)
       node = nil
-      @action_nodes.each do |n|
-        if hostname_by_attribute(n) == hostname
-          node = n
-          break
+      if config[:manual]
+        obj = Struct.new(:fqdn)
+        node = obj.new(hostname)
+      else
+        @action_nodes.each do |n|
+          if hostname_by_attribute(n) == hostname
+            node = n
+            break
+          end
         end
       end
       node
     end
 
     def hostname_by_attribute(node)
-      if !config[:override_attribute] && node[:cloud] and node[:cloud][:public_hostname]
-        i = node[:cloud][:public_hostname]
-      elsif config[:override_attribute]
-        i = extract_nested_value(node, config[:override_attribute])
+      if config[:manual]
+        node[:fqdn]
       else
-        i = extract_nested_value(node, config[:attribute])
+        if !config[:override_attribute] && node[:cloud] and node[:cloud][:public_hostname]
+          i = node[:cloud][:public_hostname]
+        elsif config[:override_attribute]
+          i = extract_nested_value(node, config[:override_attribute])
+        else
+          i = extract_nested_value(node, config[:attribute])
+        end
       end
     end
   end

data/lib/chef/knife/pkg_install_updates.rb

@@ -93,13 +93,19 @@ class Chef
         :proc => Proc.new { |pkgs| pkgs.split(',') },
         :default => Array.new
 
+      option :manual,
+        :short => "-m",
+        :long => "--manual-list",
+        :boolean => true,
+        :description => "QUERY is a space separated list of servers",
+        :default => false
+
+
       def run
         super
       end
       
       def process(node, session)
-        ui.info("===> " + extract_nested_value(node, config[:attribute]))
-        
         ::Knife::Pkg::PackageController.update!(node, session, config[:updates], pkg_options)
       end
     end

data/lib/chef/knife/pkg_show_updates.rb

@@ -86,13 +86,19 @@ class Chef
         :boolean => true,
         :default => false
 
+      option :manual,
+        :short => "-m",
+        :long => "--manual-list",
+        :boolean => true,
+        :description => "QUERY is a space separated list of servers",
+        :default => false
+
       
       def run
         super
       end
       
       def process(node, session)
-        ui.info("===> " + extract_nested_value(node, config[:attribute]))
         ::Knife::Pkg::PackageController.available_updates(node, session, pkg_options)
       end
     end

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

@@ -29,6 +29,8 @@ module Knife
       end
 
       def last_pkg_cache_update
+        raise_update_notifier_missing! unless update_notifier_installed?
+
         result = ShellCommand.exec("stat -c %y /var/lib/apt/periodic/update-success-stamp", @session)
         Time.parse(result.stdout.chomp)
       end
@@ -39,15 +41,12 @@ module Knife
 
       def available_updates
         packages = Array.new
-        if !update_notifier_installed?
-          raise RuntimeError, "Gna!! No update-notifier(-common) installed!? Go ahead, install it and come back!"
-        else
-          result = ShellCommand.exec("#{sudo}/usr/lib/update-notifier/apt_check.py -p", @session)
-          result.stderr.split("\n").each do |item|
-            package = Package.new(item)
-            package.version = installed_version(package)
-            packages << package
-          end
+        raise_update_notifier_missing! unless update_notifier_installed?
+        result = ShellCommand.exec("#{sudo}/usr/lib/update-notifier/apt_check.py -p", @session)
+        result.stderr.split("\n").each do |item|
+          package = Package.new(item)
+          package.version = installed_version(package)
+          packages << package
         end
         packages
       end
@@ -59,7 +58,11 @@ module Knife
       end
 
       def update_notifier_installed?
-          ShellCommand.exec("dpkg-query -W update-notifier-common 2>/dev/null || echo 'false'", @session).stdout.chomp != 'false'
+        ShellCommand.exec("dpkg-query -W update-notifier-common 2>/dev/null || echo 'false'", @session).stdout.chomp != 'false'
+      end
+
+      def raise_update_notifier_missing!
+        raise RuntimeError, "No update-notifier(-common) installed!? Install it and try again!"
       end
     end
   end

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

@@ -148,7 +148,12 @@ module Knife
 
       def self.init_controller(node, session, opts)
         begin
-          ctrl_name = self.controller_name(node.platform)
+          ctrl_name = ''
+          if node.respond_to?(:platform)
+            ctrl_name = self.controller_name(node.platform)
+          else
+            ctrl_name = self.platform_by_local_ohai(session, opts)
+          end
           require File.join(File.dirname(__FILE__), ctrl_name)
         rescue LoadError
           raise NotImplementedError, "I'm sorry, but #{node.platform} is not supported!"
@@ -158,6 +163,10 @@ module Knife
         ctrl
       end
 
+      def self.platform_by_local_ohai(session, opts)
+        ShellCommand.exec("ohai platform| grep \\\"", session).stdout.strip.gsub(/\"/,'')
+      end
+
       def self.controller_name(platform)
         case platform
         when 'debian', 'ubuntu'

data/lib/knife-pkg/version.rb

@@ -1,5 +1,5 @@
 module Knife
   module Pkg
-    VERSION = '0.0.1'
+    VERSION = '0.0.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-pkg
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Holger Amann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-14 00:00:00.000000000 Z
+date: 2013-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -79,6 +79,7 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
+- Vagrantfile
 - knife-pkg.gemspec
 - lib/chef/knife/pkg_base.rb
 - lib/chef/knife/pkg_install_updates.rb