shh 0.1.0 → 0.1.1

data/README.rdoc

@@ -6,7 +6,7 @@ This is a command line utility for managing secure information such as accounts,
 
 You won't be hiding anything from the NSA with this level of encryption so it isn't recommended that you make your repository publicly accessible.
 
-Now with more tab completion!
+Now with more tab completion and multi line editing!
 
 = Usage
 
@@ -48,40 +48,41 @@ This mode allows you to view and edit 'entries' (which are encrypted hashes stor
   rememberthemilk (a499f612-d034-4e49-82a8-6967d29653a1)
 
 * list - list entries
-* edit,<name> - edit or create entry
-* view,<name> - view entry
+* edit <name> - edit or create entry
+* view <name> - view entry
 * quit
 
 == Viewing mode
 
 This mode allows you to view (but not edit) an existing entry
 
-  > view,bitbucket
+  > view bitbucket
   (bitbucket) > list
   id,name,password,username
-  (bitbucket) > view,username
+  (bitbucket) > view username
   markryall
 
   list keys, show key, copy key or quit?  c password
 
 * list - show entry keys
-* view,<key> - view entry value on screen
-* copy,<key> - copy entry value to clipboard
-* launch,<key> - launch entry value in default browser (available if it starts with http)
+* view <key> - view entry value on screen
+* copy <key> - copy entry value to clipboard
+* launch <key> - launch entry value in default browser (available if it starts with http)
 * quit
 
 == Editing mode
 
 This mode is viewing mode plus some editing commands
 
-  > edit,bitbucket
-  (bitbucket) > edit,foo
+  > edit bitbucket
+  (bitbucket) > set foo
   Enter new value for foo
   bar
-  (bitbucket) > delete,foo
+  (bitbucket) > delete foo
 
-* edit,<key> - edit or create key
-* delete,<key> - remove a key
+* edit <key> - edit or create key using text editor (notepad or EDITOR)
+* set <key> - edit or create key from prompt
+* delete <key> - remove a key
 
 == Quitting mode
 
@@ -91,6 +92,5 @@ You don't want to be a quitter
 
 * Add some color
 * Add help
-* Add multi line values (edit with default text editor)
 * Include uuid as part of encryption key (and upgrade encryption on existing entries)
 * add some source control (hg/git) commands

data/lib/shh/entries_menu.rb

@@ -22,9 +22,9 @@ module Shh
               refresh
             when 'list'
               @entries.sort.each {|entry| say entry }
-            when /^view,(.*)/
+            when /^view (.*)/
               view $1
-            when /^edit,(.*)/
+            when /^edit (.*)/
               edit $1
           end
           puts
@@ -40,12 +40,13 @@ module Shh
       @entries = []
       @repository.each_entry do |entry|
         @entries << "#{entry['name']} (#{entry['id']})"
-        commands << "edit,#{entry['name']}"
-        commands << "view,#{entry['name']}"
+        commands << "edit #{entry['name']}"
+        commands << "view #{entry['name']}"
       end
       Readline.completion_proc = lambda do |text|
         commands.grep( /^#{Regexp.escape(text)}/ ).sort
       end
+      Readline.completer_word_break_characters = ''
     end
 
     def edit name

data/lib/shh/entry_menu.rb

@@ -20,15 +20,17 @@ module Shh
               return @hash
             when 'list'
               say(@hash.keys.sort.join(','))
-            when /^edit,(.*)/
+            when /^set (.*)/
+              set $1
+            when /^edit (.*)/
               edit $1
-            when /^copy,(.*)/
+            when /^copy (.*)/
               copy $1
-            when /^launch,(.*)/
+            when /^launch (.*)/
               launch $1
-            when /^delete,(.*)/
+            when /^delete (.*)/
               delete $1
-            when /^view,(.*)/
+            when /^view (.*)/
               view $1
           end
         end
@@ -62,9 +64,16 @@ private
       @clipboard.content = @hash[key] if can_copy?(key) 
     end
 
+    def set key
+      if can_edit?
+        set_value key
+        refresh
+      end
+    end
+
     def edit key
       if can_edit?
-        @hash[key] = new_value(key)
+        edit_value key
         refresh
       end
     end
@@ -83,19 +92,36 @@ private
     def refresh
       commands = ['list', 'quit']
       @hash.keys.each do |key|
-        commands << "edit,#{key}" if can_edit?
-        commands << "delete,#{key}" if can_edit?
-        commands << "view,#{key}"
-        commands << "copy,#{key}" if can_copy?(key)
-        commands << "launch,#{key}" if can_launch?(key)
+        commands << "edit #{key}" if can_edit?
+        commands << "set #{key}" if can_edit?
+        commands << "delete #{key}" if can_edit?
+        commands << "view #{key}"
+        commands << "copy #{key}" if can_copy?(key)
+        commands << "launch #{key}" if can_launch?(key)
       end
       Readline.completion_proc = lambda do |text|
         commands.grep( /^#{Regexp.escape(text)}/ ).sort
       end
+      Readline.completer_word_break_characters = ''
     end
 
     def new_value key
-      @prompt.get "Enter new value for #{key}", :silent => (key =~ /pass/)
+      new_value = @prompt.get("Enter new value for #{key}", :silent => (key =~ /pass/))
+      @hash[key] = new_value if new_value.length > 0
+    end
+    
+    def edit_value key
+      tmp_file = Pathname.new("key.tmp")
+      begin
+        tmp_file.open('w') { |out| out.print @hash[key] }
+        editor = ENV["EDITOR"] || "notepad"
+        system("#{editor} key.tmp")
+        return unless $?.to_i == 0
+        new_value = tmp_file.read
+        @hash[key] = new_value if new_value.length > 0
+      ensure
+        tmp_file.unlink
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: shh
 version: !ruby/object:Gem::Version 
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors: 
 - Mark Ryall
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-26 00:00:00 +11:00
+date: 2009-12-29 00:00:00 +11:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency