specinfra 1.2.1 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a7f83e7407af2b5738c3a702d0daae790269bc1a
-  data.tar.gz: 30c501e8ce344aa57297663367feb6bf5fad9705
+  metadata.gz: f9d36561ba5c3bec832fa2088e7eaa25f0da4edd
+  data.tar.gz: 6e2a9f7498671b0a7c0cfb87cd82e0900dea92ba
 SHA512:
-  metadata.gz: 146e1af883788816aa35bd5a870fcfee73748cee29efb7bfaa45572d3004a99a80f406fa608af839153f46c85e139b5722480de1a34d801099e25b13ffba9df1
-  data.tar.gz: 9b7afc35c4640bbbef7ac6ece339dbd04f7cfd1bc6a29c73aac4458cd4ac787f2b05eccb8921257a4601d5042b73659360f99a6da0900eda3f3ee4e870676de1
+  metadata.gz: 0a1eed7f15f4e770955e3957265c5009615f6b786691057e441b4e797abb98e69fca75a876814f551d06957e09a5c7b22707e308cd2dd6f4d88560db9d865725
+  data.tar.gz: 1a01e0781977ce32a18ace566a8a5eb6d3a8db3cedc0293df8a8e4d75ac34418b1036df1a28853949729de9d5d8c605dec54578566a0fc3cbf7b52944f08bd02

data/lib/specinfra/backend/ssh.rb

@@ -61,8 +61,7 @@ module SpecInfra
 
         ssh = SpecInfra.configuration.ssh
         ssh.open_channel do |channel|
-          if not SpecInfra.configuration.sudo_password.nil?
-            # We don't need a PTY because we don't have a sudo password
+          if SpecInfra.configuration.sudo_password or SpecInfra.configuration.request_pty
             channel.request_pty do |ch, success|
               abort "Could not obtain pty " if !success
             end
@@ -78,6 +77,11 @@ module SpecInfra
             end
 
             channel.on_extended_data do |ch, type, data|
+              if data.match /you must have a tty to run sudo/
+                puts data
+                abort 'Please set "SpecInfra.configuration.request_pty = true" or "c.request_pty = true" in your spec_helper.rb or other appropreate file.'
+              end
+
               if data.match /^sudo: no tty present and no askpass program specified/
                 abort "Please set sudo password by using SUDO_PASSWORD or ASK_SUDO_PASSWORD environment variable"
               else

data/lib/specinfra/command/debian.rb

@@ -9,9 +9,9 @@ module SpecInfra
       def check_installed(package, version=nil)
         escaped_package = escape(package)
         if version
-          cmd = "dpkg-query -f '${Status} ${Version}' -W #{escaped_package} | grep -E '^install ok installed #{escape(version)}$'"
+          cmd = "dpkg-query -f '${Status} ${Version}' -W #{escaped_package} | grep -E '^\\(install\\|hold\\) ok installed #{escape(version)}$'"
         else
-          cmd = "dpkg-query -f '${Status}' -W #{escaped_package} | grep '^install ok installed$'"
+          cmd = "dpkg-query -f '${Status}' -W #{escaped_package} | grep '^\\(install\\|hold\\) ok installed$'"
         end
         cmd
       end

data/lib/specinfra/configuration.rb

@@ -11,7 +11,8 @@ module SpecInfra
         :pass_prompt,
         :sudo_options,
         :docker_image,
-        :lxc
+        :lxc,
+        :request_pty,
       ].freeze
 
       def defaults

data/lib/specinfra/version.rb

@@ -1,3 +1,3 @@
 module SpecInfra
-  VERSION = "1.2.1"
+  VERSION = "1.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: specinfra
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.3.0
 platform: ruby
 authors:
 - Gosuke Miyashita
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-17 00:00:00.000000000 Z
+date: 2014-04-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler