shelly 0.2.28 → 0.3.0

data/spec/shelly/cli/organization_spec.rb

@@ -10,7 +10,7 @@ describe Shelly::CLI::Organization do
   Shelly::Client.stub(:new).and_return(@client)
   $stdout.stub(:puts)
   $stdout.stub(:print)
-  @client.stub(:token).and_return("abc")
+  @client.stub(:authorize!)
   FileUtils.mkdir_p("/projects/foo")
   Dir.chdir("/projects/foo")
   end

data/spec/shelly/cli/runner_spec.rb

@@ -69,7 +69,7 @@ describe Shelly::CLI::Runner do
       before do
         @client = mock
         Shelly::Client.stub(:new).and_return(@client)
-        @client.stub(:token).and_return("abc")
+        @client.stub(:authorize!).and_return(true)
         @runner = Shelly::CLI::Runner.new(%w(status))
       end
 

data/spec/shelly/cli/user_spec.rb

@@ -11,7 +11,7 @@ describe Shelly::CLI::User do
     Shelly::Client.stub(:new).and_return(@client)
     $stdout.stub(:puts)
     $stdout.stub(:print)
-    @client.stub(:token).and_return("abc")
+    @client.stub(:authorize!)
     FileUtils.mkdir_p("/projects/foo")
     Dir.chdir("/projects/foo")
     @app = Shelly::App.new("foo-staging")

data/spec/shelly/client_spec.rb

@@ -46,14 +46,20 @@ describe Shelly::Client::APIException do
 end
 
 describe Shelly::Client do
+  let(:email) { "bob@example.com" }
+  let(:api_key) { "123123" }
+
   before do
     ENV['SHELLY_URL'] = nil
-    @client = Shelly::Client.new("bob@example.com", "secret")
+    @client = Shelly::Client.new
+    FileUtils.mkpath(File.expand_path("~"))
+    File.open("~/.netrc", "w") { |f|
+      f << "machine api.shellycloud.com\n  login #{email}\n  password #{api_key}" }
+    FileUtils.chmod(0600, "~/.netrc")
   end
 
   def api_url(resource = "")
-    auth = "#{CGI.escape(@client.email)}:#{@client.password}@"
-    "https://#{auth}api.shellycloud.com/apiv2/#{resource}"
+    "https://#{CGI.escape(email)}:#{api_key}@api.shellycloud.com/apiv2/#{resource}"
   end
 
   describe "#api_url" do
@@ -87,10 +93,9 @@ describe Shelly::Client do
     end
   end
 
-  describe "#token" do
-    it "should get authentication token" do
-      @client.should_receive(:get).with("/token")
-      @client.token
+  describe "#user_email" do
+    it "should take user email from .netrc" do
+      @client.user_email.should == email
     end
   end
 
@@ -271,12 +276,19 @@ describe Shelly::Client do
   end
 
   describe "#add_ssh_key" do
-    it "should send put with give SSH key" do
+    it "should send put with given SSH key" do
       @client.should_receive(:post).with("/ssh_keys", {:ssh_key => "abc"})
       @client.add_ssh_key("abc")
     end
   end
 
+  describe "#delete_ssh_key" do
+    it "should send delete with given SSH key" do
+      @client.should_receive(:delete).with("/ssh_keys", {:ssh_key => "abc"})
+      @client.delete_ssh_key("abc")
+    end
+  end
+
   describe "#apps" do
     it "should send get requests for user's applications list" do
       @client.should_receive(:get).with("/apps")
@@ -335,7 +347,7 @@ describe Shelly::Client do
   describe "#download_file" do
     before do
       @filename = "2011.11.26.04.00.10.foo.postgres.tar.gz"
-      @url = "https://bob%40example.com:secret@backup.example.com/file.gz"
+      @url = "https://#{CGI.escape(email)}:#{api_key}@backup.example.com/file.gz"
       response = Net::HTTPResponse.new('', '', '')
       # Streaming
       response.stub(:read_body).and_yield("aaa").and_yield("bbbbb").and_yield("dddf")
@@ -360,20 +372,19 @@ describe Shelly::Client do
   end
 
   describe "#application_logs_tail" do
+    let(:logs_url) { "http://#{CGI.escape(email)}:#{api_key}@logs.example.com/fooo" }
     before do
       FakeWeb.register_uri(:get, api_url("apps/fooo/application_logs/tail"),
         :body => {"url" => "http://logs.example.com/fooo"}.to_json)
     end
 
     it "should fetch tail url" do
-      FakeWeb.register_uri(:get, "http://bob%40example.com:secret@logs.example.com/fooo",
-        :body => {}.to_json)
+      FakeWeb.register_uri(:get, logs_url, :body => {}.to_json)
       @client.application_logs_tail("fooo") { }
     end
 
     it "should execute block for received data" do
-      FakeWeb.register_uri(:get, "http://bob%40example.com:secret@logs.example.com/fooo",
-        :body => "GET / 127.0.0.1")
+      FakeWeb.register_uri(:get, logs_url, :body => "GET / 127.0.0.1")
       out = ""
       @client.application_logs_tail("fooo") { |logs| out << logs }
       out.should == "GET / 127.0.0.1"
@@ -388,20 +399,20 @@ describe Shelly::Client do
         :headers  => @client.headers,
         :payload  => {:name => "bob"}.to_json,
         :user     => "bob@example.com",
-        :password => "secret"
+        :password => "123123"
       }
       @client.request_parameters("/account", :post, :name => "bob").should == expected
     end
 
     it "should not include user credentials when they are blank" do
-      client = Shelly::Client.new
+      FileUtils.rm("~/.netrc")
       expected = {
         :method => :get,
         :url => "#{@client.api_url}/account",
         :headers => @client.headers,
         :payload => {}.to_json
       }
-      client.request_parameters("/account", :get).should == expected
+      @client.request_parameters("/account", :get).should == expected
     end
   end
 

data/spec/shelly/model_spec.rb

@@ -7,12 +7,10 @@ describe Shelly::Model do
   end
 
   describe "#current_user" do
-    it "should return user with loaded credentials" do
-      File.open(File.join("~/.shelly/credentials"), "w") { |f| f << "superman@example.com\nthe-kal-el" }
+    it "should return a user" do
       base = Shelly::Model.new
       user = base.current_user
-      user.email.should == "superman@example.com"
-      user.password.should == "the-kal-el"
+      user.should be_a(Shelly::User)
     end
   end
 end

data/spec/shelly/user_spec.rb

@@ -1,14 +1,16 @@
 require "spec_helper"
 
 describe Shelly::User do
+  let(:email) { "bob@example.com" }
+  let(:password) { "secret" }
+
   before do
     FileUtils.mkdir_p("~/.ssh")
     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")
-    @user.stub(:set_credentials_permissions)
+    @user = Shelly::User.new
   end
 
   describe ".guess_email" do
@@ -22,88 +24,33 @@ describe Shelly::User do
   describe "#register" do
     before do
       @client.stub(:register_user)
+      @client.stub(:authorize_with_email_and_password)
     end
 
     it "should register user at Shelly Cloud" do
-      @client.should_receive(:register_user).with("bob@example.com", "secret", "dsa-key AAbbcc")
-      @user.register
-    end
-
-    it "should save credentials after successful registration" do
-      @user.should_receive(:save_credentials)
-      @user.register
+      @client.should_receive(:register_user).with(email, password, "dsa-key AAbbcc")
+      @user.register(email, password)
     end
 
     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
+        @client.should_receive(:register_user).with(email, password, nil)
+        @user.register(email, password)
       end
     end
   end
 
-  describe "#token" do
-    it "should return token" do
-      @client.should_receive(:token).and_return({"token" => "abc"})
-      @user.token.should == "abc"
-    end
-  end
-
-  describe "#save_credentials" do
-    it "should save credentials to file" do
-      File.exists?("~/.shelly/credentials").should be_false
-      @user.save_credentials
-      File.read("~/.shelly/credentials").should == "bob@example.com\nsecret"
-    end
-
-    it "should create config_dir if it doesn't exist" do
-      File.exists?("~/.shelly").should be_false
-      @user.save_credentials
-      File.exists?("~/.shelly").should be_true
-    end
-
-    it "should set proper permissions on config_dir and credentials file" do
-      user = Shelly::User.new("bob@example.com", "secret")
-      FileUtils.should_receive(:chmod).with(0700, File.expand_path("~/.shelly"))
-      FileUtils.should_receive(:chmod).with(0600, File.expand_path("~/.shelly/credentials"))
-      user.save_credentials
-    end
-  end
-
   describe "#delete_credentials" do
     it "should delete credentials from file" do
-      @user.save_credentials
-      File.exists?("~/.shelly/credentials").should be_true
-      File.read("~/.shelly/credentials").should == "bob@example.com\nsecret"
+      FileUtils.mkdir_p("~/.shelly")
+      File.open("~/.shelly/credentials", "w") { |f| f << "bob@example.com\nsecret" }
       @user.delete_credentials
       File.exists?("~/.shelly/credentials").should be_false
     end
   end
 
-  describe "#load_credentials" do
-    it "should load credentials from file" do
-      config_dir = File.expand_path("~/.shelly")
-      FileUtils.mkdir_p(config_dir)
-      File.open(File.join(config_dir, "credentials"), "w") { |f| f << "superman@example.com\nkal-el" }
-
-      user = Shelly::User.new
-      user.load_credentials
-      user.email.should == "superman@example.com"
-      user.password.should == "kal-el"
-    end
-
-    context "credentials file doesn't exist" do
-      it "should return nil" do
-        user = Shelly::User.new
-        user.load_credentials.should be_nil
-        user.email.should be_nil
-        user.password.should be_nil
-      end
-    end
-  end
-
   describe "#ssh_key_path" 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")
@@ -127,16 +74,16 @@ describe Shelly::User do
 
   describe "#delete_ssh_key" do
     it "should invoke logout when ssh key exists" do
-      @client.should_receive(:logout).with('rsa-key AAbbcc')
-      @client.should_receive(:logout).with('dsa-key AAbbcc')
-      @user.delete_ssh_key
+      @client.should_receive(:delete_ssh_key).with('rsa-key AAbbcc').and_return(true)
+      @client.should_receive(:delete_ssh_key).with('dsa-key AAbbcc').and_return(true)
+      @user.delete_ssh_key.should be_true
     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
+      @user.delete_ssh_key.should be_false
     end
   end
 
@@ -149,28 +96,43 @@ describe Shelly::User do
 
   describe "#login" do
     before do
-      @client.stub(:token)
+      @client.stub(:authorize_with_email_and_password)
     end
 
     it "should try to login with given credentials" do
-      @client.should_receive(:token)
-      @user.login
+      @client.should_receive(:authorize_with_email_and_password).
+        with(email, password)
+      @user.login(email, password)
     end
 
-    context "on successful authentication" do
-      it "should save user's credentials" do
-        @user.should_receive(:save_credentials)
-        @user.login
-      end
+    it "should remove legacy credentials" do
+      @user.should_receive(:delete_credentials)
+      @user.login(email, password)
     end
+  end
+
+  describe "#authorize!" do
+    it "should authorize via client" do
+      @client.should_receive(:authorize!)
+      @user.authorize!
+    end
+
+    context "when old credentials file exists" do
+      before do
+        FileUtils.mkdir_p("~/.shelly")
+        File.open("~/.shelly/credentials", "w") { |f| f << "bob@example.com\nsecret" }
+      end
+
+      it "should authorize using email and password from that file" do
+        @client.should_receive(:authorize_with_email_and_password).
+          with("bob@example.com", "secret")
+        @user.authorize!
+      end
 
-    context "on unsuccessful authentication" do
-      it "should not save credentials" do
-        @client.stub(:token).and_raise(RestClient::Unauthorized.new)
-        @client.should_not_receive(:save_credentials)
-        lambda {
-          @user.login
-        }.should raise_error
+      it "should remove the file after authorization" do
+        @client.stub(:authorize_with_email_and_password)
+        @user.authorize!
+        File.exists?("~/.shelly/credentials").should be_false
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.2.28
+  version: 0.3.0
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-18 00:00:00.000000000 Z
+date: 2013-06-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   requirement: !ruby/object:Gem::Requirement
@@ -206,6 +206,20 @@ dependencies:
   type: :runtime
   prerelease: false
   name: launchy
+- !ruby/object:Gem::Dependency
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  name: netrc
 description: Tool for managing applications and clouds at shellycloud.com
 email:
 - devs@shellycloud.com
@@ -239,6 +253,18 @@ files:
 - lib/shelly/cli/runner.rb
 - lib/shelly/cli/user.rb
 - lib/shelly/client.rb
+- lib/shelly/client/application_logs.rb
+- lib/shelly/client/apps.rb
+- lib/shelly/client/auth.rb
+- lib/shelly/client/configs.rb
+- lib/shelly/client/database_backups.rb
+- lib/shelly/client/deployment_logs.rb
+- lib/shelly/client/deploys.rb
+- lib/shelly/client/errors.rb
+- lib/shelly/client/organizations.rb
+- lib/shelly/client/shellyapp.rb
+- lib/shelly/client/ssh_keys.rb
+- lib/shelly/client/users.rb
 - lib/shelly/cloudfile.rb
 - lib/shelly/download_progress_bar.rb
 - lib/shelly/helpers.rb