keyrack 0.2.2 → 0.2.3

data/Gemfile.lock

@@ -3,30 +3,31 @@ GEM
   specs:
     builder (3.0.0)
     copier (1.3)
-    cucumber (0.10.0)
+    cucumber (1.1.4)
       builder (>= 2.1.2)
-      diff-lcs (~> 1.1.2)
-      gherkin (~> 2.3.2)
-      json (~> 1.4.6)
-      term-ansicolor (~> 1.0.5)
-    diff-lcs (1.1.2)
-    gherkin (2.3.3)
-      json (~> 1.4.6)
+      diff-lcs (>= 1.1.2)
+      gherkin (~> 2.7.1)
+      json (>= 1.4.6)
+      term-ansicolor (>= 1.0.6)
+    diff-lcs (1.1.3)
+    gherkin (2.7.1)
+      json (>= 1.4.6)
     git (1.2.5)
-    highline (1.6.1)
+    highline (1.6.9)
     jeweler (1.5.2)
       bundler (~> 1.0.0)
       git (>= 1.2.5)
       rake
-    json (1.4.6)
-    mocha (0.9.10)
-      rake
+    json (1.6.4)
+    metaclass (0.0.1)
+    mocha (0.10.0)
+      metaclass (~> 0.0.1)
     net-scp (1.0.4)
       net-ssh (>= 1.99.1)
-    net-ssh (2.0.23)
-    rake (0.8.7)
-    rcov (0.9.9)
-    term-ansicolor (1.0.5)
+    net-ssh (2.2.1)
+    rake (0.9.2.2)
+    rcov (0.9.11)
+    term-ansicolor (1.0.7)
 
 PLATFORMS
   ruby

data/VERSION

@@ -1 +1 @@
-0.2.2
+0.2.3

data/lib/keyrack/store/ssh.rb

@@ -5,18 +5,25 @@ module Keyrack
         @host = options['host']
         @user = options['user']
         @path = options['path']
+        @port = options['port'] || 22
       end
 
       def read
         begin
-          Net::SCP.download!(@host, @user, @path)
+          result = nil
+          Net::SSH.start(@host, @user, :port => @port) do |ssh|
+            result = ssh.scp.download!(@path)
+          end
+          result
         rescue Net::SCP::Error
           nil
         end
       end
 
       def write(data)
-        Net::SCP.upload!(@host, @user, StringIO.new(data), @path)
+        Net::SSH.start(@host, @user, :port => @port) do |ssh|
+          ssh.scp.upload!(StringIO.new(data), @path)
+        end
       end
     end
   end

data/test/keyrack/store/test_ssh.rb

@@ -4,23 +4,31 @@ module Keyrack
   module Store
     class TestSSH < Test::Unit::TestCase
       def test_read
-        store = SSH.new('host' => 'example.com', 'user' => 'dude', 'path' => 'foo.txt')
-        Net::SCP.expects(:download!).with("example.com", "dude", "foo.txt").returns("foo")
+        store = SSH.new('host' => 'example.com', 'user' => 'dude', 'port' => 22, 'path' => 'foo.txt')
+        scp = mock('scp session')
+        scp.expects(:download!).with("foo.txt").returns("foo")
+        session = mock('ssh session', :scp => scp)
+        Net::SSH.expects(:start).with('example.com', 'dude', :port => 22).yields(session)
         assert_equal "foo", store.read
       end
 
       def test_write
         store = SSH.new('host' => 'example.com', 'user' => 'dude', 'path' => 'foo.txt')
-        Net::SCP.expects(:upload!).with do |host, user, local, remote|
-          host == 'example.com' && user == 'dude' && local.is_a?(StringIO) &&
-            local.read == "foo" && remote == "foo.txt"
+        scp = mock('scp session')
+        session = mock('ssh session', :scp => scp)
+        Net::SSH.expects(:start).with('example.com', 'dude', :port => 22).yields(session)
+        scp.expects(:upload!).with do |local, remote|
+          local.is_a?(StringIO) && local.read == "foo" && remote == "foo.txt"
         end
         store.write("foo")
       end
 
       def test_read_returns_nil_for_non_existant_file
-        store = SSH.new('host' => 'example.com', 'user' => 'dude', 'path' => 'foo.txt')
-        Net::SCP.expects(:download!).with("example.com", "dude", "foo.txt").raises(Net::SCP::Error)
+        store = SSH.new('host' => 'example.com', 'user' => 'dude', 'port' => 22, 'path' => 'foo.txt')
+        scp = mock('scp session')
+        scp.expects(:download!).with("foo.txt").raises(Net::SCP::Error)
+        session = mock('ssh session', :scp => scp)
+        Net::SSH.expects(:start).with('example.com', 'dude', :port => 22).yields(session)
         assert_nil store.read
       end
     end

metadata

@@ -1,144 +1,116 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: keyrack
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 2
-  - 2
-  version: 0.2.2
+version: !ruby/object:Gem::Version
+  version: 0.2.3
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Jeremy Stephens
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-01-18 00:00:00 -06:00
-default_executable: keyrack
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-01 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: net-scp
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &28232780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *28232780
+- !ruby/object:Gem::Dependency
   name: highline
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &28231960 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *28231960
+- !ruby/object:Gem::Dependency
   name: copier
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &28231280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *28231280
+- !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &28230680 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *28230680
+- !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &28230000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 5
-        - 1
+      - !ruby/object:Gem::Version
         version: 1.5.1
   type: :development
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *28230000
+- !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &28229280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *28229280
+- !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &28216480 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *28216480
+- !ruby/object:Gem::Dependency
   name: cucumber
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &28215980 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
   prerelease: false
-  version_requirements: *id008
+  version_requirements: *28215980
 description: Simple password manager with local/remote database storage and RSA encryption.
 email: viking@pillageandplunder.net
-executables: 
+executables:
 - keyrack
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE.txt
 - README.rdoc
 - TODO
-files: 
+files:
 - .document
 - .rvmrc
-- .tmux.conf
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -172,40 +144,35 @@ files:
 - test/keyrack/test_store.rb
 - test/keyrack/test_utils.rb
 - test/keyrack/ui/test_console.rb
-has_rdoc: true
 homepage: http://github.com/viking/keyrack
-licenses: 
+licenses:
 - MIT
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: -2578800290968079459
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3699145682324095706
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Simple password manager
-test_files: 
+test_files:
 - test/helper.rb
 - test/keyrack/store/test_filesystem.rb
 - test/keyrack/store/test_ssh.rb

data/.tmux.conf

@@ -1,2 +0,0 @@
-neww -n 'autotest' 'autotest'
-neww -n 'vim' 'vim'