pwl 0.0.2 → 0.0.3

data/lib/pwl/presenter/json.rb

@@ -1,5 +1,3 @@
-require 'jbuilder'
-
 module Pwl
   module Presenter
     class Json
@@ -8,15 +6,13 @@ module Pwl
       end
 
       def to_s
-        Jbuilder.encode do |json|
-          json.(@locker, :created, :last_accessed, :last_modified)
-
-          json.entries @locker.all do |json, entry|
-            json.key entry.first
-            json.value entry.last
-          end
+        result = {}
+        %w[created last_accessed last_modified].each do |attr|
+          result.store(attr.to_sym, @locker.send(attr))
         end
+        result[:entries] = @locker.all.collect{|e| {:uuid => e.uuid, :name => e.name, :password => e.password}}
+        result.to_json
       end
     end
   end
-end
+end

data/lib/pwl/presenter/yaml.rb

@@ -13,11 +13,15 @@ module Pwl
         result[:last_accessed] = @locker.last_accessed.to_s
         result[:last_modified] = @locker.last_modified.to_s
         result[:entries] = []
-        @locker.all.each{|entry|
-          result[:entries] << {:key => entry.first, :value => entry.last}
-        }
+        @locker.all.each do |entry|
+          result[:entries] << {
+            :uuid => entry.uuid,
+            :key => entry.name,
+            :value => entry.password
+          }
+        end
         result.to_yaml
       end
     end
   end
-end
+end

data/pwl.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "pwl"
-  s.version = "0.0.2"
+  s.version = "0.0.3"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Nicholas E. Rabenau"]
-  s.date = "2012-05-02"
+  s.date = "2012-09-05"
   s.description = "pwl is a secure password locker for the commandline"
   s.email = "nerab@gmx.net"
   s.executables = ["pwl", "pwl"]
@@ -28,11 +28,22 @@ Gem::Specification.new do |s|
     "VERSION",
     "bin/pwl",
     "lib/pwl.rb",
+    "lib/pwl/commands/add.rb",
+    "lib/pwl/commands/base.rb",
+    "lib/pwl/commands/delete.rb",
+    "lib/pwl/commands/export.rb",
+    "lib/pwl/commands/get.rb",
+    "lib/pwl/commands/init.rb",
+    "lib/pwl/commands/list.rb",
+    "lib/pwl/commands/passwd.rb",
+    "lib/pwl/commands/stats.rb",
     "lib/pwl/dialog.rb",
     "lib/pwl/dialog/base.rb",
     "lib/pwl/dialog/cocoa.rb",
     "lib/pwl/dialog/console.rb",
     "lib/pwl/dialog/gnome.rb",
+    "lib/pwl/entry.rb",
+    "lib/pwl/entry_mapper.rb",
     "lib/pwl/locker.rb",
     "lib/pwl/message.rb",
     "lib/pwl/password_policy.rb",
@@ -59,6 +70,8 @@ Gem::Specification.new do |s|
     "test/fixtures/test_empty.json",
     "test/fixtures/test_empty.yaml",
     "test/helper.rb",
+    "test/unit/test_entry.rb",
+    "test/unit/test_entry_mapper.rb",
     "test/unit/test_error.rb",
     "test/unit/test_message.rb",
     "test/unit/test_store_construction.rb",
@@ -80,16 +93,20 @@ Gem::Specification.new do |s|
       s.add_runtime_dependency(%q<encryptor>, ["~> 1.1"])
       s.add_runtime_dependency(%q<commander>, ["~> 4.1"])
       s.add_runtime_dependency(%q<activesupport>, ["~> 3.2"])
-      s.add_runtime_dependency(%q<jbuilder>, ["~> 0.4"])
+      s.add_runtime_dependency(%q<activemodel>, ["~> 3.2"])
+      s.add_runtime_dependency(%q<uuid>, ["~> 2.3"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.1"])
+      s.add_development_dependency(%q<pry>, [">= 0"])
       s.add_development_dependency(%q<bundler>, ["~> 1.1"])
       s.add_development_dependency(%q<jeweler>, ["~> 1.8"])
     else
       s.add_dependency(%q<encryptor>, ["~> 1.1"])
       s.add_dependency(%q<commander>, ["~> 4.1"])
       s.add_dependency(%q<activesupport>, ["~> 3.2"])
-      s.add_dependency(%q<jbuilder>, ["~> 0.4"])
+      s.add_dependency(%q<activemodel>, ["~> 3.2"])
+      s.add_dependency(%q<uuid>, ["~> 2.3"])
       s.add_dependency(%q<rdoc>, ["~> 3.1"])
+      s.add_dependency(%q<pry>, [">= 0"])
       s.add_dependency(%q<bundler>, ["~> 1.1"])
       s.add_dependency(%q<jeweler>, ["~> 1.8"])
     end
@@ -97,8 +114,10 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<encryptor>, ["~> 1.1"])
     s.add_dependency(%q<commander>, ["~> 4.1"])
     s.add_dependency(%q<activesupport>, ["~> 3.2"])
-    s.add_dependency(%q<jbuilder>, ["~> 0.4"])
+    s.add_dependency(%q<activemodel>, ["~> 3.2"])
+    s.add_dependency(%q<uuid>, ["~> 2.3"])
     s.add_dependency(%q<rdoc>, ["~> 3.1"])
+    s.add_dependency(%q<pry>, [">= 0"])
     s.add_dependency(%q<bundler>, ["~> 1.1"])
     s.add_dependency(%q<jeweler>, ["~> 1.8"])
   end

data/templates/export.html.erb

@@ -49,13 +49,13 @@
       </tr>
     </tfoot>
     <tbody>
-      <% locker.all.each{|key, value|%>
-      <tr>
-        <td><%= key %></td>
-        <td><%= value %></td>
+      <% locker.all.each{|entry|%>
+      <tr id="<%= entry.uuid %>">
+        <td><%= entry.name %></td>
+        <td><%= entry.password %></td>
       </tr>
       <% } %>
     </tbody>
   </table>
 </body>
-</html>
+</html>

data/test/acceptance/test_export.rb

@@ -13,10 +13,10 @@ class TestExport < Test::Pwl::AppTestCase
     test_vector.each{|k,v|
       assert_successful('', "add '#{k}' '#{v}'")
     }
-    
+
     now = DateTime.now.strftime('%F %R')
     fixture = fixture("test_all.html").gsub('CREATED_STAMP', now).gsub('MODIFIED_STAMP', now).gsub('DATABASE_FILE', locker_file)
-    
+
     assert_successful_html(fixture, 'export')
   end
 
@@ -25,10 +25,13 @@ class TestExport < Test::Pwl::AppTestCase
     assert_equal(0, rc.exitstatus, "Expected exit status 0, but it was #{rc.exitstatus}. STDERR was: #{err}")
     assert(err.empty?, "Expected empty STDERR, but it yielded #{err}")
 
+    # ignore generated UUIDs, but insist on format
+    out.gsub!(/id=\"[a-f0-9]{8}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{4}-[a-f0-9]{12}\"/, 'id="mock-uuid"')
+
     actual   = Nokogiri::HTML(out)
     expected = Nokogiri::HTML(expected_out)
 
-    differences = actual.diff(expected, :added => true, :removed => true)
+    differences = expected.diff(actual, :added => true, :removed => true)
 
     assert_equal(0, differences.count, "Unexpected differences in output. Diff:\n" << differences.collect{|change, node|
       case change

data/test/acceptance/test_export_json.rb

@@ -13,10 +13,10 @@ class TestExportJSON < Test::Pwl::AppTestCase
     test_vector.each{|k,v|
       assert_successful('', "add '#{k}' '#{v}'")
     }
-    
+
     now = DateTime.now.strftime('%F %R')
     fixture = fixture("test_all.json")
-    
+
     assert_successful_json(fixture, 'export --format json')
   end
 
@@ -27,22 +27,25 @@ class TestExportJSON < Test::Pwl::AppTestCase
 
     actual   = JSON.parse(out)
     expected = JSON.parse(expected_out)
-    
+
     # fix up actuals to match expectations
     actual["created"] = "2012-03-28T21:54:21+02:00"
     actual["last_accessed"] = "2012-03-28T22:01:49+02:00"
     actual["last_modified"] = "2012-03-29T22:46:29+02:00"
+    actual['entries'].each do |entry|
+      entry['uuid'] = 'mock-uuid'
+    end
 
     # This is essentially the same as
     #   assert_equal(expected, actual)
     # but it provides better diagnostic output on error
     json_diff(expected, actual)
   end
-  
+
   private
   def json_diff(expected, actual, context = nil)
-    assert_equal(expected.class, actual.class)
-    
+    assert_equal(expected.class, actual.class, "JSON in context #{context} has unexpected class:")
+
     case expected
     when Hash
       actual.keys.each do |key|

data/test/acceptance/test_export_yaml.rb

@@ -13,10 +13,10 @@ class TestExportYAML < Test::Pwl::AppTestCase
     test_vector.each{|k,v|
       assert_successful('', "add '#{k}' '#{v}'")
     }
-    
+
     now = DateTime.now.strftime('%F %R')
     fixture = fixture("test_all.yaml")
-    
+
     assert_successful_yaml(fixture, 'export --format yaml')
   end
 
@@ -27,22 +27,25 @@ class TestExportYAML < Test::Pwl::AppTestCase
 
     actual   = YAML.load(out)
     expected = YAML.load(expected_out)
-    
+
     # fix up actuals to match expectations
     actual[:created] = "2012-03-28T21:54:21+02:00"
     actual[:last_accessed] = "2012-03-28T22:01:49+02:00"
     actual[:last_modified] = "2012-03-29T22:46:29+02:00"
+    actual[:entries].each do |entry|
+      entry[:uuid] = 'mock-uuid'
+    end
 
     # This is essentially the same as
     #   assert_equal(expected, actual)
     # but it provides better diagnostic output on error
     yaml_diff(expected, actual)
   end
-  
+
   private
   def yaml_diff(expected, actual, context = nil)
     #assert_equal(expected.class, actual.class)
-    
+
     case expected
     when Hash
       actual.keys.each do |key|

data/test/acceptance/test_init.rb

@@ -17,7 +17,7 @@ class TestInit < Test::Pwl::AppTestCase
   # $
   #
   def test_matching_passwords
-    cmd = "bin/pwl init --force --verbose --file \"#{@locker_file}\""
+    cmd = "bin/pwl init --force --verbose --file \"#{locker_file}\""
 
     PTY.spawn(cmd){|pwl_out, pwl_in, pid|
       assert_response('Enter new master password:', pwl_out)
@@ -57,6 +57,26 @@ class TestInit < Test::Pwl::AppTestCase
     }
   end
 
+  #
+  # Tests that initing with a directory argument fail.
+  #
+  # A session is expected to look like this:
+  #
+  # $ bin/pwl init --file /tmp
+  # pwl: File expected, but /tmp is a directory. Specify a regular file for the locker.
+  # $
+  #
+  def test_locker_existing_dir
+    dir = File.dirname(locker_file)
+    assert(File.directory?(dir))
+
+    cmd = "bin/pwl init --file \"#{dir}\""
+
+    PTY.spawn(cmd){|pwl_out, pwl_in, pid|
+      assert_response("pwl: File expected, but #{dir} is a directory. Specify a regular file for the locker.", pwl_out)
+    }
+  end
+
   #
   # Tests that initing an existing locker without --force does not touch the existing locker
   #
@@ -73,9 +93,9 @@ class TestInit < Test::Pwl::AppTestCase
 
   private
 
-  def assert_response(expected, actual_io)
-    if !actual_io.expect(/#{expected}/, 1)
-      raise StandardError.new("Expected response '#{expected}' was not matched")
+  def assert_response(expected, actual_io, timeout = 5)
+    if !actual_io.expect(/#{expected}/, timeout)
+      raise StandardError.new("Expected response '#{expected}' was not found within timeout of #{timeout} seconds.")
     end
   end
 end

data/test/acceptance/test_list.rb

@@ -5,7 +5,7 @@ class TestList < Test::Pwl::AppTestCase
   def test_list_empty
     assert_empty(locker.list)
     assert_error('^$', 'list')
-    assert_error('^List is empty\.$', 'list --verbose')
+    assert_error('^pwl: List is empty\.$', 'list --verbose')
   end
 
   def test_list_all

data/test/fixtures/test_all.html

@@ -50,17 +50,17 @@
     </tfoot>
     <tbody>
 
-      <tr>
+      <tr id="mock-uuid">
         <td>foo</td>
         <td>one</td>
       </tr>
 
-      <tr>
+      <tr id="mock-uuid">
         <td>bar</td>
         <td>two</td>
       </tr>
 
-      <tr>
+      <tr id="mock-uuid">
         <td>Chuck Norris</td>
         <td>Roundhouse Kick</td>
       </tr>

data/test/fixtures/test_all.json

@@ -4,16 +4,19 @@
   "last_modified": "2012-03-29T22:46:29+02:00",
   "entries": [
     {
-      "key": "foo",
-      "value": "one"
+      "uuid": "mock-uuid",
+      "name": "foo",
+      "password": "one"
     },
     {
-      "key": "bar",
-      "value": "two"
+      "uuid": "mock-uuid",
+      "name": "bar",
+      "password": "two"
     },
     {
-      "key": "Chuck Norris",
-      "value": "Roundhouse Kick"
+      "uuid": "mock-uuid",
+      "name": "Chuck Norris",
+      "password": "Roundhouse Kick"
     }
   ]
 }

data/test/fixtures/test_all.yaml

@@ -3,9 +3,12 @@
 :last_accessed: '2012-03-28T22:01:49+02:00'
 :last_modified: '2012-03-29T22:46:29+02:00'
 :entries:
-- :key: foo
+- :uuid: mock-uuid
+  :key: foo
   :value: one
-- :key: bar
+- :uuid: mock-uuid
+  :key: bar
   :value: two
-- :key: Chuck Norris
+- :uuid: mock-uuid
+  :key: Chuck Norris
   :value: Roundhouse Kick

data/test/helper.rb

@@ -16,9 +16,11 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 require 'pwl'
 require 'tmpdir'
+require 'active_support/testing/assertions'
 
 class Test::Unit::TestCase
   FIXTURES_DIR = File.join(File.dirname(__FILE__), 'fixtures')
+  include ActiveSupport::Testing::Assertions
 end
 
 module Test
@@ -55,7 +57,7 @@ module Test
 
       def assert_successful(expected_out, cmd, password = locker_password)
         out, err, rc = execute(cmd, password)
-        assert_equal(0, rc.exitstatus, "Expected exit status 0, but it was #{rc.exitstatus}. STDERR was: #{err}")
+        assert_equal(0, rc.exitstatus, "Expected exit status 0, but it was #{rc.exitstatus}. STDERR was: #{err}. Command was '#{cmd}''")
         assert(err.empty?, "Expected empty STDERR, but it yielded #{err}")
         assert(out =~ /#{expected_out}/, "'#{out}' did not match expected response '#{expected_out}'")
       end
@@ -70,7 +72,7 @@ module Test
       def execute(cmd, password)
         Open3.capture3("echo \"#{password}\" | #{APP} #{cmd} --file \"#{locker_file}\"")
       end
-  
+
       def fixture(name)
         File.read(File.join(FIXTURES_DIR, name))
       end

data/test/unit/test_entry.rb

@@ -0,0 +1,67 @@
+require 'helper'
+
+class TestEntry < Test::Unit::TestCase
+  def setup
+    @entry = Pwl::Entry.new
+  end
+
+  def test_construction_state
+    assert(!@entry.valid?)
+    assert_not_nil(@entry.uuid)
+  end
+
+  def test_uuid_assign_nil
+    @entry.name = 'test_uuid_assign_nil'
+    @entry.uuid = nil
+    assert(!@entry.valid?)
+  end
+
+  def test_uuid_assign_empty
+    @entry.name = 'test_uuid_assign_empty'
+    @entry.uuid = ''
+    assert(!@entry.valid?)
+  end
+
+  def test_uuid_assign_invalid
+    @entry.name = 'test_uuid_assign_invalid'
+    @entry.uuid = 'invalid'
+    assert(!@entry.valid?)
+  end
+
+  def test_uuid_assign_valid
+    @entry.name = 'test_uuid_assign_valid'
+    @entry.password = 'password is require to be valid'
+    @entry.uuid = 'b1f75370-979c-012f-eed1-70def14c3504'
+    assert(@entry.valid?)
+  end
+
+  def test_name_assign
+    name = 'foobar'
+    @entry.name = name
+    assert_equal(name, @entry.name)
+
+    @entry.password = 'password is require to be valid'
+    assert(@entry.valid?)
+  end
+
+  def test_name_construction
+    name = 'foobar'
+    @entry = Pwl::Entry.new(name)
+    assert_equal(name, @entry.name)
+
+    @entry.password = 'password is require to be valid'
+    assert(@entry.valid?)
+  end
+
+  def test_name_assign_nil
+    assert_nil(@entry.name)
+    assert(!@entry.valid?)
+  end
+
+  def test_name_assign_empty
+    name = ''
+    @entry.name = name
+    assert_equal(name, @entry.name)
+    assert(!@entry.valid?)
+  end
+end