sshkey 1.3.1 → 1.3.2

data/.travis.yml

@@ -2,9 +2,11 @@ rvm:
   - 1.8.7
   - 1.9.2
   - 1.9.3
+  - 2.0.0
   - ree
   - ruby-head
   - jruby-18mode
   - jruby-19mode
+  - jruby-head
   - rbx-18mode
   - rbx-19mode

data/Gemfile

@@ -1,5 +1,5 @@
 source "https://rubygems.org"
 
-gem "jruby-openssl", "~> 0.7.7", :platform => :jruby
+gem "jruby-openssl", "~> 0.8.2", :platform => :jruby
 
 gemspec

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2011 James Miller
+Copyright (c) 2011-2013 James Miller
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/README.md

@@ -5,7 +5,7 @@ Generate private and public SSH keys (RSA and DSA supported) using pure Ruby.
 
 	gem install sshkey
 
-Tested on the following Rubies: MRI 1.8.7, 1.9.2, 1.9.3, REE, JRuby, Rubinius.  Ruby must be compiled with OpenSSL support.
+Tested on the following Rubies: MRI 1.8.7, 1.9.2, 1.9.3, 2.0.0, REE, JRuby (1.7.2 or later), Rubinius. Ruby must be compiled with OpenSSL support.
 
 [![Build Status](https://secure.travis-ci.org/bensie/sshkey.png)](http://travis-ci.org/bensie/sshkey)
 
@@ -72,4 +72,4 @@ SSHKey.valid_ssh_public_key? "ssh-rsa AAAAB3NzaC1yc2EA...."
 Copyright
 ---------
 
-Copyright (c) 2012 James Miller
+Copyright (c) 2011-2013 James Miller

data/lib/sshkey.rb

@@ -48,7 +48,8 @@ class SSHKey
     # * ssh_public_key<~String> - "ssh-rsa AAAAB3NzaC1yc2EA...."
     #
     def valid_ssh_public_key?(ssh_public_key)
-      ssh_type, encoded_key = ssh_public_key.split(" ")
+      ssh_type, encoded_key = parse_ssh_public_key(ssh_public_key)
+
       type = SSH_TYPES.invert[ssh_type]
       prefix = [0,0,0,7].pack("C*")
       decoded = Base64.decode64(encoded_key)
@@ -114,6 +115,13 @@ class SSHKey
     def fingerprint_regex
       /(.{2})(?=.)/
     end
+
+    def parse_ssh_public_key(public_key)
+      parsed = public_key.split(" ")
+      parsed.each_with_index do |el, index|
+        break parsed[index..(index+1)] if !SSH_TYPES.invert[el].nil?
+      end
+    end
   end
 
   # Create a new SSHKey object

data/lib/sshkey/version.rb

@@ -1,3 +1,3 @@
 class SSHKey
-  VERSION = "1.3.1"
+  VERSION = "1.3.2"
 end

data/test/sshkey_test.rb

@@ -165,6 +165,7 @@ EOF
     expected2 = "ssh-rsa #{SSH_PUBLIC_KEY2} me@example.com"
     expected3 = "ssh-dss #{SSH_PUBLIC_KEY3} me@example.com"
     expected4 = "ssh-rsa #{SSH_PUBLIC_KEY1}"
+    expected5 = %Q{from="trusted.eng.cam.ac.uk",no-port-forwarding,no-pty" ssh-rsa #{SSH_PUBLIC_KEY1}}
     invalid1  = "ssh-rsa #{SSH_PUBLIC_KEY1}= me@example.com"
     invalid2  = "ssh-rsa #{SSH_PUBLIC_KEY2}= me@example.com"
     invalid3  = "ssh-dss #{SSH_PUBLIC_KEY3}= me@example.com"
@@ -175,6 +176,7 @@ EOF
     assert SSHKey.valid_ssh_public_key?(expected2)
     assert SSHKey.valid_ssh_public_key?(expected3)
     assert SSHKey.valid_ssh_public_key?(expected4)
+    assert SSHKey.valid_ssh_public_key?(expected5)
 
     assert !SSHKey.valid_ssh_public_key?(invalid1)
     assert !SSHKey.valid_ssh_public_key?(invalid2)

metadata

@@ -1,32 +1,34 @@
 --- !ruby/object:Gem::Specification
 name: sshkey
 version: !ruby/object:Gem::Version
-  version: 1.3.1
-  prerelease: 
+  prerelease:
+  version: 1.3.2
 platform: ruby
 authors:
 - James Miller
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2012-06-05 00:00:00.000000000 Z
+date: 2013-01-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: !binary |-
+          MA==
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: !binary |-
+          MA==
+    none: false
+  prerelease: false
+  type: :development
 description: Generate private/public SSH keypairs using pure Ruby
 email:
 - bensie@gmail.com
@@ -34,8 +36,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .travis.yml
+- ".gitignore"
+- ".travis.yml"
 - Gemfile
 - LICENSE
 - README.md
@@ -46,26 +48,28 @@ files:
 - test/sshkey_test.rb
 homepage: https://github.com/bensie/sshkey
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: !binary |-
+        MA==
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: !binary |-
+        MA==
+  none: false
 requirements: []
 rubyforge_project: sshkey
-rubygems_version: 1.8.23
-signing_key: 
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: SSH private/public key generator in Ruby
 test_files: