shelly 0.1.33 → 0.1.34.pre

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+* [feature] Accept DSA keys when logging in or registering
+
+DSA key is used in the first place, if it doesn't exist RSA key is used
+
 ## 0.1.31 / 2012-10-10
 
 * [bug] Writing backups to disk in binary mode to avoid ascii/utf8 conversion errors.

data/lib/shelly/user.rb

@@ -53,7 +53,8 @@ module Shelly
     end
 
     def delete_ssh_key
-      shelly.logout(File.read(ssh_key_path)) if ssh_key_exists?
+      shelly.logout(File.read(dsa_key)) if File.exists?(dsa_key)
+      shelly.logout(File.read(rsa_key)) if File.exists?(rsa_key)
     end
 
     def ssh_key_exists?
@@ -61,6 +62,15 @@ module Shelly
     end
 
     def ssh_key_path
+      return dsa_key if File.exists?(dsa_key)
+      rsa_key
+    end
+
+    def dsa_key
+      File.expand_path("~/.ssh/id_dsa.pub")
+    end
+
+    def rsa_key
       File.expand_path("~/.ssh/id_rsa.pub")
     end
 

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.1.33"
+  VERSION = "0.1.34.pre"
 end

data/spec/shelly/user_spec.rb

@@ -3,7 +3,8 @@ require "spec_helper"
 describe Shelly::User do
   before do
     FileUtils.mkdir_p("~/.ssh")
-    File.open("~/.ssh/id_rsa.pub", "w") { |f| f << "ssh-key AAbbcc" }
+    File.open("~/.ssh/id_rsa.pub", "w") { |f| f << "rsa-key AAbbcc" }
+    File.open("~/.ssh/id_dsa.pub", "w") { |f| f << "dsa-key AAbbcc" }
     @client = mock
     Shelly::Client.stub(:new).and_return(@client)
     @user = Shelly::User.new("bob@example.com", "secret")
@@ -24,7 +25,7 @@ describe Shelly::User do
     end
 
     it "should register user at Shelly Cloud" do
-      @client.should_receive(:register_user).with("bob@example.com", "secret", "ssh-key AAbbcc")
+      @client.should_receive(:register_user).with("bob@example.com", "secret", "dsa-key AAbbcc")
       @user.register
     end
 
@@ -36,6 +37,7 @@ describe Shelly::User do
     context "when ssh key is not available" do
       it "should register without it" do
         FileUtils.rm_rf("~/.ssh/id_rsa.pub")
+        FileUtils.rm_rf("~/.ssh/id_dsa.pub")
         @client.should_receive(:register_user).with("bob@example.com", "secret", nil)
         @user.register
       end
@@ -117,7 +119,12 @@ describe Shelly::User do
   end
 
   describe "#ssh_key_path" do
-    it "should return path to public ssh key file" do
+    it "should return path to public dsa key file in the first place" do
+      @user.ssh_key_path.should == File.expand_path("~/.ssh/id_dsa.pub")
+    end
+
+    it "should return path to public rsa key file if dsa key is not present" do
+      FileUtils.rm_rf("~/.ssh/id_dsa.pub")
       @user.ssh_key_path.should == File.expand_path("~/.ssh/id_rsa.pub")
     end
   end
@@ -126,18 +133,22 @@ describe Shelly::User do
     it "should return true if key exists, false otherwise" do
       @user.should be_ssh_key_exists
       FileUtils.rm_rf("~/.ssh/id_rsa.pub")
+      @user.should be_ssh_key_exists
+      FileUtils.rm_rf("~/.ssh/id_dsa.pub")
       @user.should_not be_ssh_key_exists
     end
   end
 
   describe "#delete_ssh_key" do
     it "should invoke logout when ssh key exists" do
-      @client.should_receive(:logout).with('ssh-key AAbbcc')
+      @client.should_receive(:logout).with('rsa-key AAbbcc')
+      @client.should_receive(:logout).with('dsa-key AAbbcc')
       @user.delete_ssh_key
     end
 
     it "should not invoke logout when ssh key doesn't exist" do
       FileUtils.rm_rf("~/.ssh/id_rsa.pub")
+      FileUtils.rm_rf("~/.ssh/id_dsa.pub")
       @client.should_not_receive(:logout)
       @user.delete_ssh_key
     end
@@ -145,7 +156,7 @@ describe Shelly::User do
 
   describe "#upload_ssh_key" do
     it "should read and upload user's public SSH key" do
-      @client.should_receive(:add_ssh_key).with("ssh-key AAbbcc")
+      @client.should_receive(:add_ssh_key).with("dsa-key AAbbcc")
       @user.upload_ssh_key
     end
   end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.1.33
-  prerelease: 
+  version: 0.1.34.pre
+  prerelease: 7
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-30 00:00:00.000000000 Z
+date: 2012-11-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -343,18 +343,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 3939130509060040795
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: 3939130509060040795
+      version: 1.3.1
 requirements: []
 rubyforge_project: shelly
 rubygems_version: 1.8.24