shelly 0.4.13 → 0.4.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c215723a3d368ed383af7f81a602aba05b518686
-  data.tar.gz: babb10677df55d5e611317d74a6126afcb6cb63e
+  metadata.gz: 59753e3f10e5571d9494a1a84d80513db2fc6ec9
+  data.tar.gz: 4f1839417e9f9f8856d202ef36c080fc8a3819c3
 SHA512:
-  metadata.gz: 4ddd0924ff53084715bca2e0d6bd86d978fe6a754ce101f3dc6e175abf7301169ab40a18e141eff8e5b8192550161687e9b4c92363ba2ba745ed01ed6061d76a
-  data.tar.gz: d2ea74d688c3a9d90f341a2488a758cee8155879d4997779f0cf68b6eb54f1da624c0cb730046a2c1d53316dd99ed2af85f5bd6858ed9826b1f35a3cc48bf693
+  metadata.gz: a143ea1a6ae2d901046b5a2fccadb93d55cb61bd23057ff215ebae481e8d930cb95117b32470ecc97e9dea74c786f679363c0efa4bcccaf5eeb5f90efdea3a89
+  data.tar.gz: 60594ff58f3263574def896e4e9946d4e0c79a83c13a5e8f282f2f84318c46b138dcd60465be9df9b0023b2bb86db207bc2cb497adf63d4a280bd012c85e27df

data/CHANGELOG.md

@@ -1,20 +1,28 @@
-# 0.4.13 / 2013-11-11
+## 0.4.14 / 2013-11-19
+
+* [bugfix] Show proper error message when login failed
+* [bugfix] `shelly backups create` without specified database kind should
+  backup all possible databases, read from Cloudfile
+* [bugfix] Deleting SSH key works even after changing user email at the end
+  of it
+
+## 0.4.13 / 2013-11-11
 
 * [improvement] Don't upload SSH key on register,
   it will be uploaded at login which is required anyway after register
 
 * internal changes
 
-# 0.4.12 / 2013-11-05
+## 0.4.12 / 2013-11-05
 
 * [bugfix] Print user-friendly message if user tries to operate on files
   on cloud which is not deployed.
 
-# 0.4.11 / 2013-10-30
+## 0.4.11 / 2013-10-30
 
 * internal changes
 
-# 0.4.10 / 2013-10-30
+## 0.4.10 / 2013-10-30
 
 * [bugfix] Certificates CLI were not Ruby 1.8 compatible
 * [bugfix] Travis was failing due to Ruby 1.8 gems incompatibility: guard, mime-types v2.x

data/lib/shelly/app.rb

@@ -9,12 +9,11 @@ module Shelly
     SERVER_SIZES = %w(small large)
 
     attr_accessor :code_name, :databases, :ruby_version, :environment,
-      :git_url, :domains, :web_server_ip, :size, :thin, :content,
+      :git_url, :domains, :web_server_ip, :size, :thin,
       :organization_name, :zone_name
 
-    def initialize(code_name = nil, content = nil)
+    def initialize(code_name = nil)
       self.code_name = code_name
-      self.content = content
     end
 
     def self.from_attributes(attributes)
@@ -327,6 +326,10 @@ module Shelly
       system "ssh #{ssh_options(conn)} -N -L #{local_port}:localhost:#{conn['service']['port']} #{conn['host']}"
     end
 
+    def content
+      @content ||= Cloudfile.new.content[code_name]
+    end
+
     # Public: Return databases for given Cloud in Cloudfile
     # Returns Array of databases
     def cloud_databases

data/lib/shelly/cli/main.rb

@@ -68,9 +68,12 @@ module Shelly
       rescue Client::ValidationException => e
         e.each_error { |error| say_error "#{error}", :with_exit => false }
       rescue Client::UnauthorizedException => e
-        say_error "Wrong email or password", :with_exit => false
-        say_error "You can reset password by using link:", :with_exit => false
-        say_error e[:url]
+        say_error e[:error], :with_exit => false
+        if e[:url]
+          say_error "You can reset password by using link:", :with_exit => false
+          say_error e[:url]
+        end
+        exit 1
       rescue Errno::ENOENT => e
         say_error e, :with_exit => false
         say_error "Use ssh-keygen to generate ssh key pair"

data/lib/shelly/cloudfile.rb

@@ -17,7 +17,7 @@ module Shelly
     # nil if there is no cloudfile
     def clouds
       content.keys.sort.map do |code_name|
-        Shelly::App.new(code_name, content[code_name.to_s])
+        Shelly::App.new(code_name)
       end if content
     end
 

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.4.13"
+  VERSION = "0.4.14"
 end

data/spec/shelly/cli/main_spec.rb

@@ -218,7 +218,8 @@ describe Shelly::CLI::Main do
 
     context "on unauthorized user" do
       it "should exit with 1 and display error message" do
-        response = {"message" => "Unauthorized", "url" => "https://admin.winniecloud.com/users/password/new"}
+        response = {"message" => "Unauthorized", "error" => "Wrong email or password",
+          "url" => "https://admin.winniecloud.com/users/password/new"}
         exception = Shelly::Client::UnauthorizedException.new(response)
         @client.stub(:authorize_with_email_and_password).and_raise(exception)
         $stdout.should_receive(:puts).with("\e[31mWrong email or password\e[0m")
@@ -231,6 +232,21 @@ describe Shelly::CLI::Main do
         }.should raise_error(SystemExit)
       end
     end
+
+    context "on unconfirmed user" do
+      it "should exit with 1 and display error message" do
+        response = {"message" => "Unauthorized",
+          "error" => "Unconfirmed account"}
+        exception = Shelly::Client::UnauthorizedException.new(response)
+        @client.stub(:authorize_with_email_and_password).and_raise(exception)
+        $stdout.should_receive(:puts).with(red "Unconfirmed account")
+        lambda {
+          fake_stdin(["megan@example.com", "secret"]) do
+            invoke(@main, :login)
+          end
+        }.should raise_error(SystemExit)
+      end
+    end
   end
 
   describe "#add" do

data/spec/shelly/cloudfile_spec.rb

@@ -82,12 +82,8 @@ foo-production:
       thin: 2
 config
       File.open("/projects/foo/Cloudfile", "w") { |f| f << content }
-      cloud1 = Shelly::App.should_receive(:new).with("foo-staging",
-         {"ruby_version"=>"1.9.3",
-           "servers"=>{"app1"=>{"size"=>"small"}}})
-      cloud2 = Shelly::App.should_receive(:new).with("foo-production",
-         {"environment"=>"production",
-           "servers"=>{"app1"=>{"thin"=>2}}})
+      cloud1 = Shelly::App.should_receive(:new).with("foo-staging")
+      cloud2 = Shelly::App.should_receive(:new).with("foo-production")
 
       @cloudfile.clouds
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.4.13
+  version: 0.4.14
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-11 00:00:00.000000000 Z
+date: 2013-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec