rubeepass 0.3.6 → 0.3.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a5dafbd55f19d4fbb3ff08d9224a66d4ea9dc4cc
-  data.tar.gz: 956f75f95cc170c856896384dfb17a5c706d40a5
+  metadata.gz: 2ad974e27286aa2e613e6bfe2e487f6b24401133
+  data.tar.gz: 1ddf8983150a4470e4e71c6fc7c9625e5bc64c59
 SHA512:
-  metadata.gz: 72102e72541d90bf45b9bcdb833423c008bce6e2866bef7ad40c57a3e6977e53a1a2b120ccd1bacb33a181032a72e5ba6d8181d02220cc6ac82dc70e9386a58c
-  data.tar.gz: e339c1817ef105c746c6eeb65b5cfea0749e9c997012b6804c6bbf307d318910cce883903e3868f47d759d543fe13f1b72e870fcc929ac48caad6170c8156042
+  metadata.gz: 7865dfba1ae5a9929cbe3b66364058a711e32dfa98c85e376cc08e7e7dd20abbcd5b1d55bb575b46acc2b215edfdf238ae5bac011b89f45ee4945ff4086dcc5b
+  data.tar.gz: 93a8a8ed4b402606c0b78ab84917aa640130f187455b5214b45597ca3d6b022984975f766c40239b5e389a68adbb32f08e99ab03bfd9d050e052130ecd20d678

data/bin/rpass

@@ -275,6 +275,7 @@ begin
     end
 # rescue SystemExit => e
 ensure
+    keepass.clear_clipboard
     keepass.wait_to_exit
 end
 exit RPassExit::GOOD

data/lib/rubeepass.rb

@@ -66,21 +66,20 @@ class RubeePass
         @thread.kill if (@thread)
         @thread = Thread.new do
             sleep time
-            copy_to_clipboard("")
+            copy_to_clipboard("", false)
         end
     end
 
-    def copy_to_clipboard(string)
+    def copy_to_clipboard(string, err = true)
         string = "" if (string.nil?)
         if (OS::Underlying.windows?)
-            puts "Your OS is not currently supported!"
+            puts "Your OS is not currently supported!" if (err)
             return
         end
 
         echo = ScoobyDoo.where_are_you("echo")
 
         if (OS.mac?)
-            string = "" if (string.nil?)
             pbcopy = ScoobyDoo.where_are_you("pbcopy")
             rn = ScoobyDoo.where_are_you("reattach-to-user-namespace")
 
@@ -93,29 +92,35 @@ class RubeePass
             if (cp)
                 system("#{echo} -n #{string.shellescape} | #{cp}")
             else
-                puts "Please install reattach-to-user-namespace!"
+                if (err)
+                    puts "Please install reattach-to-user-namespace!"
+                end
                 return
             end
         elsif (OS.posix?)
-            string = " \x7F" if (string.empty?)
             xclip = ScoobyDoo.where_are_you("xclip")
             xsel = ScoobyDoo.where_are_you("xsel")
 
-            cp = nil
-            if (xclip)
-                cp = "xclip -i -selection clipboard"
-            elsif (xsel)
-                cp = "xsel -i --clipboard"
-            end
+            ["clipboard", "primary", "secondary"].each do |sel|
+                cp = nil
+                if (xclip)
+                    # string = " \x7F" if (string.empty?)
+                    cp = "xclip -i -selection #{sel}"
+                elsif (xsel)
+                    cp = "xsel -i --#{sel}"
+                end
 
-            if (cp)
-                system("#{echo} -n #{string.shellescape} | #{cp}")
-            else
-                puts "Please install either xclip or xsel!"
-                return
+                if (cp)
+                    system("#{echo} -n #{string.shellescape} | #{cp}")
+                else
+                    if (err)
+                        puts "Please install either xclip or xsel!"
+                    end
+                    return
+                end
             end
         else
-            puts "Your OS is not currently supported!"
+            puts "Your OS is not currently supported!" if (err)
             return
         end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubeepass
 version: !ruby/object:Gem::Version
-  version: 0.3.6
+  version: 0.3.7
 platform: ruby
 authors:
 - Miles Whittaker
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-06 00:00:00.000000000 Z
+date: 2015-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest