shellutils 0.0.13 → 0.0.14

data/lib/shellutils.rb

@@ -1,4 +1,4 @@
-# encoding: UTF-8  
+# encoding: UTF-8
 
 require 'thor'
 require 'timeout'
@@ -45,26 +45,26 @@ module ShellUtils
       return true if `uname` =~ /Linux/
       false
     end
-    
+
     def is_mac?
       return true if `uname` =~ /Darwin/
       false
     end
-    
+
     def get_platform
       if is_linux?
         'linux'
       elsif is_mac?
         'macos'
-      else 
+      else
         'unknown'
       end
     end
-  
+
     def is_installed?(program)
       `which #{program}`.chomp != ""
     end
-  
+
     def get_sudo_pwd
       if File.exist?(SUDO_PWD_PATH) == false || file_read(SUDO_PWD_PATH) == ""
         pw = user_input("please input sudo password")
@@ -72,11 +72,11 @@ module ShellUtils
       end
       file_read(SUDO_PWD_PATH)
     end
-  
+
     def set_sudo_pwd(pw)
       file_write(SUDO_PWD_PATH, pw)
     end
-    
+
     def user_input(desc, example = nil, choices = nil)
       if example
         puts "#{desc}: ex) #{example}"
@@ -94,7 +94,7 @@ module ShellUtils
       end
       input
     end
-  
+
     def make_file_from_template(template_path, dest_path, hash)
       puts "create #{dest_path}"
       template = ERB.new File.read(template_path)
@@ -108,24 +108,24 @@ module ShellUtils
       STDERR.puts @@color.set_color("### ERROR:#{msg}", :red)
       raise
     end
-  
+
     def current_method(index=0)
       caller[index].scan(/`(.*)'/).flatten.to_s
     end
-   
+
     def exec_cmd_and_clear_password(cmd)
       puts cmd
       PTY.spawn(cmd) do |r, w|
         w.flush
         w.sync = true
         w.flush
-        if r.expect(/[Pp]assword.*:.*$/)
+        if r.expect(/[Pp]assword.*:.*$/, 1)
           w.flush
           w.puts(get_sudo_pwd)
           w.flush
           begin
             w.flush
-            if r.expect(/[Pp]assword.*:.*$/)
+            if r.expect(/[Pp]assword.*:.*$/, 1)
               error("the sudo password is incorrect. password=#{get_sudo_pwd}\nPlease change the password ex) set_sudo_pwd PASSWORD")
             end
           rescue
@@ -139,11 +139,11 @@ module ShellUtils
         end
       end
     end
-    
+
     def sudo(cmd)
       exec_cmd_and_clear_password("sudo #{cmd}")
     end
-    
+
     def rvmsudo(cmd)
       exec_cmd_and_clear_password("rvmsudo #{cmd}")
     end
@@ -165,7 +165,7 @@ module ShellUtils
       `whoami`.chomp
     end
 
-    private 
+    private
 
     def get_config_header(config_title, comment_char)
       "#{comment_char * 2} #{config_title}\n"
@@ -179,4 +179,3 @@ module ShellUtils
 
 
 end # ShellUtils
-

data/lib/shellutils/version.rb

@@ -1,3 +1,3 @@
 module Shellutils
-  VERSION = "0.0.13"
+  VERSION = "0.0.14"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shellutils
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-15 00:00:00.000000000 Z
+date: 2013-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -82,7 +82,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: Shell utils