pwrb 0.0.1 → 0.0.2

data/bin/pwrb

@@ -4,11 +4,12 @@ $:.unshift File.join(File.dirname(__FILE__), *%w[.. lib])
 
 require 'pwrb'
 require 'optparse'
+require 'highline/import'
 
 begin
   options = {}
 
-  optparse = OptionParser.new do |opts|
+  opts = OptionParser.new do |opts|
     opts.banner = "Usage: pw add|update|edit|list|copy|remove [user@domain] [options]"
     opts.separator ""
     opts.separator "Specific options:"
@@ -18,30 +19,40 @@ begin
       exit
     end
 
-    opts.on('-p', '--print', 'Print password in text') do
+    # Default password file is "~/.pw"
+    options[:file] = File.join(Dir.home, '.pw')
+    opts.on('-f', '--file FILE', 'Use FILE as as password') do |f|
+      options[:file] = File.expand_path(f)
+    end
+
+    options[:print] = false
+    opts.on('-p', '--print', 'Print password in plain text') do
       options[:print] = true
     end
   end
 
-  optparse.parse!
+  # Read command line into `option` hash
+  opts.parse!
 
-  aliases = {'cp' => 'copy',
-             'ls' => 'list',
-             'up' => 'update',
+  # Handle commands
+  aliases = {'cp'     => 'copy',
+             'ls'     => 'list',
+             'up'     => 'update',
              'create' => 'add',
-             'rm' => 'remove',
+             'rm'     => 'remove',
              'delete' => 'remove',
-             'del' => 'remove'}
+             'del'    => 'remove'}
 
   cmd = ARGV.shift
   cmd = aliases[cmd] if aliases[cmd]
 
   unless ['list', 'copy', 'update', 'remove', 'add', 'edit'].include?(cmd)
     puts "Command not found: #{cmd}" if cmd
-    puts optparse
+    puts opts
     exit 1
   end
 
+  # Search pattern (optional), e.g. foo@github
   pattern = ARGV.shift
   abort("Unknown arguments: #{ARGV}") unless ARGV.empty?
 
@@ -50,9 +61,14 @@ begin
 
     abort("Unknow pattern: #{pattern}") if args.length > 2
 
-    options[:site] = args.last
-    options[:user] = args.first if args.length == 2
+    site = args.last
+    user = args.first if args.length == 2
   end
 
-  Pwrb::PasswordDB.new(options).send cmd
-end
+  # Open password database, master password needed
+  master_password = ask("Enter master passphrase: ") { |q| q.echo = false }
+  db = Pwrb::DB.new(options[:file], master_password)
+  cli = Pwrb::CLI.new(db, options[:print])
+
+  cli.send cmd, user, site
+end

data/lib/pwrb.rb

@@ -1,4 +1,6 @@
 require "pwrb/version"
+require 'pwrb/db'
+require 'pwrb/cli'
 
 require 'clipboard'
 require 'gpgme'
@@ -9,56 +11,34 @@ require 'securerandom'
 
 module Pwrb
   class PasswordDB
-    def initialize(options=nil)
-      @filename = File.expand_path('~/.pw')
-      @filename = File.readlink(@filename) if File.symlink?(@filename)
-      @options = options
+    def initialize(filename, password)
+      @filename = filename
+      @passwords = []
       @crypto = GPGME::Crypto.new
 
-      read_safe
-      @selected = @data.select{ |item| match(item, @options) }
-    end
-
-    def read_safe(password=nil)
-      if File.file?(@filename)
-        @password = password || ask_for_password("Enter master passphrase")
-        plain_data = @crypto.decrypt(File.open(@filename), :password => @password).to_s
-        @data = JSON.parse(plain_data, :symbolize_names => true)
+      # Read encrypted file
+      if File.exist?(filename)
+        text = @crypto.decrypt(filename, :password => password).to_s
+        @passwords = JSON.parse(text, :symbolize_names => true)
       else
-        create_safe(password)
+        FileUtils.mkdir_p(File.dirname(filename))
+        save
+        File.chmod(0600, filename)
       end
     end
 
-    def write_safe
-      plain_data = JSON.generate(@data)
-      plain_data.force_encoding('ASCII-8BIT')
-      @crypto.encrypt(plain_data, :output => File.open(@filename, 'w+'))
-    end
-
-    def create_safe(password=nil)
-      puts "No password file detected, creating one at #{@filename}"
-      @password = ask_for_password("Enter master passphrase", confirm = true) unless @password == password
-
-      FileUtils.mkdir_p(File.dirname(@filename))
-      @data = []
-      write_safe
-      File.chmod(0600, @filename)
+    def save
+      text = JSON.generate(@passwords)
+      text.force_encoding('ASCII-8BIT')
+      @crypto.encrypt(text, :output => File.open(@filename, 'w+'))
     end
 
     def to_s
-      "<*******>"
-    end
-
-    def user_match(item, user)
-      /#{user}/i =~ item[:user]
-    end
-
-    def site_match(item, site)
-      /#{site}/i =~ item[:site] || /#{site}/i =~ item[:url]
+      "<*>"
     end
 
-    def match(item, options)
-      user_match(item, options[:user]) && site_match(item, options[:site])
+    def query(user, site)
+      @passwords.select {|p| /#{user}/i =~ p[:user] && (/#{site}/i =~ p[:site] || /#{site}/i =~ p[:url]) }
     end
 
     def ask_for_password(prompt, confirm=false)

data/lib/pwrb/cli.rb

@@ -0,0 +1,118 @@
+require 'highline/import'
+require 'clipboard'
+
+module Pwrb
+  class CLI
+    def initialize(db, echo = false)
+      @db = db
+      @echo = echo
+    end
+
+    def list(user, site)
+      result = @db.query(user, site)
+      return if result.empty?
+
+      table = Tabularize.new
+
+      table << %w[# ID User Password Site Date]
+      table.separator!
+
+      result.each_with_index do |p, index|
+        user = p[:user]
+        user += "<%s>" % p[:email] unless p[:email].empty?
+        site = "%s[%s]" % [p[:site], p[:url]]
+        password = (@echo ? p[:password] : "***")
+
+        table << [index.to_s, p[:id].split('-').first, user, password, site, p[:date]]
+      end
+
+      puts table
+    end
+
+    def select(user, site)
+      result = @db.query(user, site)
+
+      case result.count
+        when 0
+          nil
+        when 1
+          result[0]
+        else
+          list(user, site)
+          index = ask('Which one?', Integer) { |q| q.in = 0...result.count }
+          result[index]
+      end
+    end
+
+    def copy(user, site)
+      item = select(user, site)
+      return unless item
+
+      seconds = 10
+      original_clipboard = Clipboard.paste
+      sleep(0.1)
+      Clipboard.copy(item[:password])
+      puts "Password for #{item[:site]} is in clipboard for #{seconds} seconds"
+
+      begin
+        sleep(seconds)
+      rescue Interrupt
+        Clipboard.copy(original_clipboard)
+        raise
+      end
+
+      Clipboard.copy(original_clipboard)
+    end
+
+    def update(user, site)
+      item = select(user, site)
+      return unless item
+
+      @db.update(item.merge(:password => new_password("Enter new password")))
+    end
+
+    def add(user, site)
+      item = new_item(:user => user, :site => site)
+      item[:password] = new_password("Enter password")
+
+      @db.insert(item)
+    end
+
+    def edit(user, site)
+      item = select(user, site)
+      return unless item
+
+      @db.update(new_item(item.dup))
+    end
+
+    def remove(user, site)
+      item = select(user, site)
+      return unless item
+
+      @db.remove(item)
+    end
+
+    def new_item(init = {})
+      item = init
+
+      item[:user]  = ask("User name: ") { |q| q.default = init[:user]; q.validate = /\A\S+\Z/ }
+      item[:email] = ask("Email: ")     { |q| q.default = init[:email] }
+      item[:site]  = ask("Site: ")      { |q| q.default = init[:site]; q.validate = /\A.+\Z/ }
+      item[:url]   = ask("URL: ")       { |q| q.default = init[:url] }
+
+      item
+    end
+
+    def new_password(prompt)
+      password = ask(prompt + ": ") { |q| q.echo = false }
+      confirm  = ask(prompt + " again: ") { |q| q.echo = false }
+
+      if password == confirm
+        password
+      else
+        puts "Password mismatch, try again!"
+        new_password(prompt)
+      end
+    end
+  end
+end

data/lib/pwrb/db.rb

@@ -0,0 +1,60 @@
+require 'gpgme'
+require 'json'
+require 'securerandom'
+
+module Pwrb
+  class DB
+    def initialize(filename, password)
+      @filename = filename
+      @passwords = []
+      @crypto = GPGME::Crypto.new
+
+      # Read encrypted file
+      if File.exist?(filename)
+        text = @crypto.decrypt(File.open(filename), :password => password).to_s
+        @passwords = JSON.parse(text, :symbolize_names => true)
+      else
+        FileUtils.mkdir_p(File.dirname(filename))
+        save
+        File.chmod(0600, filename)
+      end
+    end
+
+    def save
+      text = JSON.generate(@passwords)
+      text.force_encoding('ASCII-8BIT')
+      @crypto.encrypt(text, :output => File.open(@filename, 'w+'))
+    end
+
+    def to_s
+      "<*>"
+    end
+
+    def query(user, site)
+      @passwords.select {|p| /#{user}/i =~ p[:user] && (/#{site}/i =~ p[:site] || /#{site}/i =~ p[:url]) }
+    end
+
+    def insert(item)
+      @passwords << item.merge(:id => SecureRandom.uuid, :date => timestamp)
+      save
+    end
+
+    def update(new_item)
+      new_item.merge!(:date => timestamp)
+      item = @passwords.find { |p| p[:id] == new_item[:id] }
+      if item
+        item.merge!(new_item) { |_, oldval, newval| (newval && !newval.empty?) ? newval : oldval }
+        save
+      end
+    end
+
+    def remove(item)
+      @passwords.delete(item)
+      save
+    end
+
+    def timestamp
+      Date.today.strftime("%Y%m%d")
+    end
+  end
+end

data/lib/pwrb/version.rb

@@ -1,3 +1,3 @@
 module Pwrb
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/pwrb.iml

@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="RUBY_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$" />
+    <orderEntry type="jdk" jdkName="ruby-1.9.3-p327" jdkType="RUBY_SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" scope="PROVIDED" name="bundler (v1.2.3, ruby-1.9.3-p327) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="clipboard (v1.0.1, ruby-1.9.3-p327) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="gpgme (v2.0.1, ruby-1.9.3-p327) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="highline (v1.6.15, ruby-1.9.3-p327) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="tabularize (v0.2.9, ruby-1.9.3-p327) [gem]" level="application" />
+    <orderEntry type="library" scope="PROVIDED" name="unicode-display_width (v0.1.1, ruby-1.9.3-p327) [gem]" level="application" />
+  </component>
+</module>
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: pwrb
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-12-20 00:00:00.000000000 Z
+date: 2012-12-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gpgme
@@ -100,14 +100,30 @@ extensions: []
 extra_rdoc_files: []
 files:
 - .gitignore
+- .idea/.name
+- .idea/.rakeTasks
+- .idea/compiler.xml
+- .idea/copyright/profiles_settings.xml
+- .idea/dictionaries/hanjianwei.xml
+- .idea/encodings.xml
+- .idea/inspectionProfiles/Project_Default.xml
+- .idea/inspectionProfiles/profiles_settings.xml
+- .idea/misc.xml
+- .idea/modules.xml
+- .idea/scopes/scope_settings.xml
+- .idea/vcs.xml
+- .idea/workspace.xml
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - bin/pwrb
 - lib/pwrb.rb
+- lib/pwrb/cli.rb
+- lib/pwrb/db.rb
 - lib/pwrb/version.rb
 - pwrb.gemspec
+- pwrb.iml
 homepage: https://github.com/hanjianwei/pwrb
 licenses: []
 post_install_message: 
@@ -128,7 +144,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: pwrb is a command line password management software based on GPG. Please