knife-pkg 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 693eb26a2679a69e02ec7c5e401f658fe0bf1f7a
-  data.tar.gz: 234e8b042f480d0b6b9f25ce67a5c3a623b6a059
+  metadata.gz: 430cb5229929d0abcef9ba104bf70aca67b7e06a
+  data.tar.gz: 50cb20d7b4ee75361a572c05da9ba4c26b7daad0
 SHA512:
-  metadata.gz: 43f34e39548c1a7e3c06e6e916a0b1207047b06443d29bd27ff5a017b0a8d964a58389d081d5dc2b774bfc620e0f74f010d52aceffbede87687f6342380d6357
-  data.tar.gz: 4ea377499214e59d5e453caed9cd68f13f45e053cf35c4dd0e2f8fa2b2cc176fc0a80677b2427a3f164701b5b622fd56d6eb75c59177b60adf3d3d068e575bfe
+  metadata.gz: 770257268b2797af8a5d2d120896a78818013ba09cc158126c12872d55eb4433df0f4ce3dcc35cb8e47297f6414b4701b4a42a303211011d10c519460038bfb8
+  data.tar.gz: d2bf596d92084d0fe841f36fed886e75b9d821332bb181b4869cae6d542324bc5793c1e026370d3f4abdd5971ff61162f8b8b5c15d7639c7f311971da151542f

data/lib/chef/knife/pkg_base.rb

@@ -44,6 +44,7 @@ class Chef
       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[:password] = config[:ssh_password]
       pkg_options
     end
 

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

@@ -151,13 +151,20 @@ module Knife
 
       ## ++ methods to implement
 
-
       def sudo
-        @options[:sudo] ? 'sudo ' : ''
+        @options[:sudo] ? 'sudo -p \'knife sudo password: \' ' : ''
+      end
+
+      def get_password
+        @@password ||= prompt_for_password
+      end
+
+      def prompt_for_password(prompt = "Enter your password: ")
+        @ui.ask(prompt) { |q| q.echo = false }
       end
 
       def exec(cmd)
-        ShellCommand.exec(cmd, @session)
+        ShellCommand.exec(cmd, @session, get_password)
       end
 
       def max_pkg_cache_age

data/lib/knife-pkg/shell_command.rb

@@ -18,16 +18,21 @@ module Knife
   module Pkg
     class ShellCommand
 
-      def self.exec(cmd, session)
+      def self.exec(cmd, session, password = '')
 
         stdout_data, stderr_data = "", ""
         exit_code, exit_signal = nil, nil
         session.open_channel do |channel|
+          channel.request_pty
           channel.exec(cmd) do |_, success|
             raise RuntimeError, "Command \"#{@cmd}\" could not be executed!" if !success
-
             channel.on_data do |_, data|
-              stdout_data += data
+              if data =~ /^knife sudo password: /
+                Chef::Log.debug("sudo password required, sending password")
+                channel.send_data(password + "\n")
+              else
+                stdout_data += data
+              end
             end
 
             channel.on_extended_data do |_,_,data|

data/lib/knife-pkg/version.rb

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

data/spec/controllers/package_controller_spec.rb

@@ -15,7 +15,7 @@ describe 'PackageController' do
   describe '#sudo' do
     it 'should return sudo prefix' do
       p = PackageController.new(nil, nil, :sudo => true)
-      expect(p.sudo).to eq("sudo ")
+      expect(p.sudo).to eq("sudo -p 'knife sudo password: ' ")
     end
 
     it 'should return no sudo prefix' do
@@ -27,15 +27,27 @@ describe 'PackageController' do
   describe '#exec' do
     it 'should call ShellCommand and return a ShellCommandResult' do
       p = PackageController.new(nil, 'a')
+      p.ui = @ui
       cmd = "ls -l"
       r = Struct.new(:stdout, :stderr)
       result = r.new('a', 'b')
-      ShellCommand.stub(:exec).with(cmd, p.session).and_return(r)
-      expect(ShellCommand).to receive(:exec).with(cmd, p.session)
+      p.stub(:get_password).and_return('test')
+      ShellCommand.stub(:exec).with(cmd, p.session, p.get_password).and_return(r)
+      expect(ShellCommand).to receive(:exec).with(cmd, p.session, p.get_password)
       expect(p.exec(cmd)).to eq(r)
     end
   end
 
+  describe '#get_password' do
+    it 'should prompt for password only the first time' do
+      p = PackageController.new(nil, 'a')
+      p.ui = @ui
+      p.ui.stub(:ask).and_return('test')
+      expect(p).to receive(:prompt_for_password).exactly(1).times
+      p.get_password
+    end
+  end
+
   describe '.init_controller' do
     it 'should initialize the right package controller if node[:platform_family] is not set' do
       node = Hash.new

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-pkg
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Holger Amann
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-19 00:00:00.000000000 Z
+date: 2013-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef