shelly 0.0.43 → 0.0.44.pre

data/spec/shelly/cli/user_spec.rb

@@ -12,6 +12,9 @@ describe Shelly::CLI::User do
     $stdout.stub(:puts)
     $stdout.stub(:print)
     @client.stub(:token).and_return("abc")
+    FileUtils.mkdir_p("/projects/foo")
+    Dir.chdir("/projects/foo")
+    File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\nfoo-production:\n") }
   end
 
   describe "#help" do
@@ -25,39 +28,16 @@ describe Shelly::CLI::User do
 
   describe "#list" do
     before do
-      FileUtils.mkdir_p("/projects/foo")
-      Dir.chdir("/projects/foo")
-      File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\nfoo-production:\n") }
-      Shelly::App.stub(:inside_git_repository?).and_return(true)
       @cloudfile = Shelly::Cloudfile.new
       Shelly::Cloudfile.stub(:new).and_return(@cloudfile)
     end
 
-    it "should exit with message if command run outside git repository" do
-      Shelly::App.stub(:inside_git_repository?).and_return(false)
-      $stdout.should_receive(:puts).with("\e[31mMust be run inside your project git repository\e[0m")
-      lambda {
-        invoke(@cli_user, :list)
-      }.should raise_error(SystemExit)
+    it "should ensure user has logged in" do
+      hooks(@cli_user, :list).should include(:logged_in?)
     end
 
-    it "should exit with message if there is no Cloudfile" do
-      File.delete("Cloudfile")
-      $stdout.should_receive(:puts).with("\e[31mNo Cloudfile found\e[0m")
-      lambda {
-        invoke(@cli_user, :list)
-      }.should raise_error(SystemExit)
-    end
-
-    it "should exit if user is not logged in" do
-      response = {"message" => "Unauthorized", "url" => "https://admin.winniecloud.com/users/password/new"}
-      exception = Shelly::Client::APIError.new(401, response)
-      @client.stub(:token).and_raise(exception)
-      $stdout.should_receive(:puts).with(red "You are not logged in. To log in use:")
-      $stdout.should_receive(:puts).with("  shelly login")
-      lambda {
-        invoke(@cli_user, :list)
-      }.should raise_error(SystemExit)
+    it "should ensure that Cloudfile is present" do
+      hooks(@cli_user, :list).should include(:cloudfile_present?)
     end
 
     context "on success" do
@@ -80,42 +60,28 @@ describe Shelly::CLI::User do
     end
 
     context "on failure" do
-      it "should raise an error if user does not have access to cloud" do
-        response = {"message" => "Couldn't find Cloud with code_name = foo-staging"}
-        exception = Shelly::Client::APIError.new(404, response)
+      it "should exit with 1 if user does not have access to cloud" do
+        exception = Shelly::Client::NotFoundException.new("resource" => "cloud")
         @client.stub(:app_users).and_raise(exception)
-        $stdout.should_receive(:puts).with(red "You have no access to 'foo-staging' cloud defined in Cloudfile")
-        invoke(@cli_user, :list)
+        $stdout.should_receive(:puts).with(red "You have no access to 'foo-production' cloud defined in Cloudfile")
+        lambda { invoke(@cli_user, :list) }.should raise_error(SystemExit)
       end
     end
   end
 
   describe "#add" do
     before do
-      FileUtils.mkdir_p("/projects/foo")
-      Dir.chdir("/projects/foo")
-      File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\nfoo-production:\n") }
-      Shelly::App.stub(:inside_git_repository?).and_return(true)
-      @client.stub(:token).and_return("abc")
       @user = Shelly::User.new
       @client.stub(:apps).and_return([{"code_name" => "abc"}, {"code_name" => "fooo"}])
       Shelly::User.stub(:new).and_return(@user)
     end
 
-    it "should exit with message if there is no Cloudfile" do
-      File.delete("Cloudfile")
-      $stdout.should_receive(:puts).with("\e[31mNo Cloudfile found\e[0m")
-      lambda {
-        invoke(@cli_user, :add)
-      }.should raise_error(SystemExit)
+    it "should ensure user has logged in" do
+      hooks(@cli_user, :add).should include(:logged_in?)
     end
 
-    it "should exit with message if command run outside git repository" do
-      Shelly::App.stub(:inside_git_repository?).and_return(false)
-      $stdout.should_receive(:puts).with("\e[31mMust be run inside your project git repository\e[0m")
-      lambda {
-        invoke(@cli_user, :add)
-      }.should raise_error(SystemExit)
+    it "should ensure that Cloudfile is present" do
+      hooks(@cli_user, :add).should include(:cloudfile_present?)
     end
 
     context "on success" do
@@ -142,11 +108,12 @@ describe Shelly::CLI::User do
 
     context "on failure" do
       it "should raise error if user doesnt have access to cloud" do
-        response = {"message" => "Cloud foo-staging not found"}
-        exception = Shelly::Client::APIError.new(404, response)
+        exception = Shelly::Client::NotFoundException.new("resource" => "cloud")
         @client.stub(:send_invitation).and_raise(exception)
-        $stdout.should_receive(:puts).with(red "You have no access to 'foo-staging' cloud defined in Cloudfile")
-        invoke(@cli_user, :add, "megan@example.com")
+        $stdout.should_receive(:puts).with(red "You have no access to 'foo-production' cloud defined in Cloudfile")
+        lambda {
+          invoke(@cli_user, :add, "megan@example.com")
+        }.should raise_error(SystemExit)
       end
     end
   end

data/spec/shelly/client_spec.rb

@@ -1,82 +1,46 @@
 require "spec_helper"
 
-describe Shelly::Client::APIError do
-  before do
-    body = {"message" => "Couldn't find Cloud with code_name = fooo",
-      "errors" => [["first", "foo"]], "url" => "https://foo.bar"}
-    @error = Shelly::Client::APIError.new(404, body)
-  end
-
-  it "should return error message" do
-    @error.message.should == "Couldn't find Cloud with code_name = fooo"
-  end
-
-  it "should return array of errors" do
-    @error.errors.should == [["first", "foo"]]
-  end
-
-  it "should return url" do
-    @error.url.should == "https://foo.bar"
+describe Shelly::Client::NotFoundException do
+  describe "#resource" do
+    it "should return name of not found resource" do
+      message = {"resource" => "log"}
+      exception = Shelly::Client::NotFoundException.new(message)
+      exception.resource.should == :log
+    end
   end
+end
 
-  it "should return user friendly string" do
-    @error.each_error { |error| error.should == "First foo" }
+describe Shelly::Client::ValidationException do
+  before do
+    @body = {"message" => "Validation Failed",
+      "errors" => [["first", "foo"]], "url" => "https://foo.bar"}
+    @exception = Shelly::Client::ValidationException.new(@body)
   end
 
-  describe "#resource_not_found?" do
-    context "on 404 response" do
-      it "should return which resource was not found" do
-        @error.resource_not_found.should == :cloud
-      end
-    end
-
-    context "on non 404 response" do
-      it "should return nil" do
-        error = Shelly::Client::APIError.new(401)
-        error.resource_not_found.should be_nil
-      end
+  describe "#errors" do
+    it "should return errors array" do
+      @exception.errors.should == [["first", "foo"]]
     end
   end
 
-  describe "#not_found?" do
-    it "should return true if response status code is 404" do
-      @error.should be_not_found
-    end
-
-    it "should return false if response status code is not 404" do
-      error = Shelly::Client::APIError.new(500)
-      error.should_not be_not_found
+  describe "#each_error" do
+    it "should return user friendly string" do
+      @exception.each_error { |error| error.should == "First foo" }
     end
   end
+end
 
-  describe "#validation?" do
-    context "when error is caused by validation errors" do
-      it "should return true" do
-        body = {"message" => "Validation Failed"}
-        error = Shelly::Client::APIError.new(422, body)
-        error.should be_validation
-      end
-    end
-
-    context "when error is not caused by validation errors" do
-      it "should return false" do
-        @error.should_not be_validation
-      end
-    end
+describe Shelly::Client::APIException do
+  before do
+    body = {"message" => "Not Found",
+      "errors" => [["first", "foo"]], "url" => "https://foo.bar"}
+    @error = Shelly::Client::APIException.new(body)
   end
 
-  describe "#unauthorized?" do
-    context "when error is caused by unauthorized error" do
-      it "should return true" do
-        error = Shelly::Client::APIError.new(401)
-        error.should be_unauthorized
-      end
-    end
-
-    context "when error is not caused by unauthorized" do
-      it "should return false" do
-        @error.should_not be_unauthorized
-      end
+  describe "#[]" do
+    it "should return value of given key from response body" do
+      @error["message"].should == "Not Found"
+      @error[:message].should == "Not Found"
     end
   end
 end
@@ -133,7 +97,7 @@ describe Shelly::Client do
   describe "#deploy_logs" do
     it "should send get request" do
       time = Time.now
-      FakeWeb.register_uri(:get, api_url("apps/staging-foo/deploys"), :body => [{:failed => false, :created_at => time},
+      FakeWeb.register_uri(:get, api_url("apps/staging-foo/deployment_logs"), :body => [{:failed => false, :created_at => time},
         {:failed => true, :created_at => time+1}].to_json)
       response = @client.deploy_logs("staging-foo")
       response.should == [{"failed"=>false, "created_at"=>time.to_s},
@@ -143,7 +107,7 @@ describe Shelly::Client do
 
   describe "#deploy_log" do
     it "should send get request with cloud and log" do
-      FakeWeb.register_uri(:get, api_url("apps/staging-foo/deploys/2011-11-29-11-50-16"), :body => {:content => "Log"}.to_json)
+      FakeWeb.register_uri(:get, api_url("apps/staging-foo/deployment_logs/2011-11-29-11-50-16"), :body => {:content => "Log"}.to_json)
       response = @client.deploy_log("staging-foo", "2011-11-29-11-50-16")
       response.should == {"content" => "Log"}
     end
@@ -192,7 +156,7 @@ describe Shelly::Client do
   describe "#application_logs" do
     it "should send get request" do
       time = Time.now
-      FakeWeb.register_uri(:get, api_url("apps/staging-foo/logs"),
+      FakeWeb.register_uri(:get, api_url("apps/staging-foo/application_logs"),
         :body => {:logs => ["application_log_1", "application_log_2"]}.to_json)
       response = @client.application_logs("staging-foo")
       response.should == {"logs" => ["application_log_1", "application_log_2"]}
@@ -214,10 +178,10 @@ describe Shelly::Client do
       response.should == [{"email" => "test@example.com"}, {"email" => "test2@example.com"}]
     end
   end
-  
+
   describe "#app" do
     it "should fetch app from API" do
-      FakeWeb.register_uri(:get, api_url("apps/staging-foo"), 
+      FakeWeb.register_uri(:get, api_url("apps/staging-foo"),
         :body => {:web_server_ip => "192.0.2.1", :mail_server_ip => "192.0.2.3"}.to_json)
       response = @client.app("staging-foo")
       response.should == {"web_server_ip" => "192.0.2.1", "mail_server_ip" => "192.0.2.3"}
@@ -235,7 +199,7 @@ describe Shelly::Client do
 
   describe "#add_ssh_key" do
     it "should send put with give SSH key" do
-      @client.should_receive(:post).with("/ssh_key", {:ssh_key => "abc"})
+      @client.should_receive(:post).with("/ssh_keys", {:ssh_key => "abc"})
       @client.add_ssh_key("abc")
     end
   end
@@ -255,6 +219,14 @@ describe Shelly::Client do
     end
   end
 
+  describe "#redeploy" do
+    it "should send post to deploys resource for given cloud" do
+      FakeWeb.register_uri(:post, api_url("apps/staging-foo/deploys"), :body => "")
+      response = @client.redeploy("staging-foo")
+      response.should == {}
+    end
+  end
+
   describe "#stop_cloud" do
     it "should sent delete request with cloud's code_name" do
       FakeWeb.register_uri(:put, api_url("apps/staging-foo/stop"), :body => {}.to_json)
@@ -367,19 +339,56 @@ describe Shelly::Client do
       @client.get('/account')
     end
 
-    %w(401, 404 422 500).each do |code|
-      context "on #{code} response code" do
-        it "should raise APIError" do
-          @response.stub(:code).and_return(code.to_i)
-          @response.stub(:body).and_return({"message" => "random error happened"}.to_json)
+    context "on 401 response" do
+      it "should raise UnauthorizedException" do
+        @response.stub(:code).and_return(401)
+        @response.stub(:body).and_return("")
+        lambda {
+          @client.post("/")
+        }.should raise_error(Shelly::Client::UnauthorizedException)
+      end
+    end
+
+    context "on 404 response" do
+      it "should raise NotFoundException" do
+        @response.stub(:code).and_return(404)
+        @response.stub(:body).and_return("")
+        lambda {
+          @client.post("/")
+        }.should raise_error(Shelly::Client::NotFoundException)
+      end
+    end
+
+    context "on 409 response" do
+      it "should raise ConflictException" do
+        @response.stub(:code).and_return(409)
+        @response.stub(:body).and_return("")
+        lambda {
+          @client.post("/")
+        }.should raise_error(Shelly::Client::ConflictException)
+      end
+    end
+
+    context "on 422 response" do
+      it "should raise ValidationException" do
+        @response.stub(:code).and_return(422)
+        @response.stub(:body).and_return("")
+        lambda {
+          @client.post("/")
+        }.should raise_error(Shelly::Client::ValidationException)
+      end
+    end
 
-          lambda {
-            @client.post("/api/apps/flower/command", :body => "puts User.count")
-          }.should raise_error(Shelly::Client::APIError, "random error happened")
-        end
+    context "on unsupported response" do
+      it "should raise generic APIException" do
+        @response.stub(:code).and_return(500)
+        @response.stub(:body).and_return("")
+        lambda {
+          @client.post("/")
+        }.should raise_error(Shelly::Client::APIException)
       end
     end
-    
+
     it "should return empty hash if response is not a valid JSON" do
       JSON.should_receive(:parse).with("").and_raise(JSON::ParserError)
       @response.stub(:code).and_return("204")

data/spec/shelly/download_progress_bar_spec.rb

@@ -6,21 +6,21 @@ describe Shelly::DownloadProgressBar do
     $stderr.stub(:print)
     @bar = Shelly::DownloadProgressBar.new(4444)
   end
-  
+
   it "should inherith from ProgressBar" do
     @bar.should be_kind_of(ProgressBar)
   end
-  
+
   it "should initialize parent with header and given size" do
     @bar.title.should == "Progress"
     @bar.total.should == 4444
   end
-  
+
   describe "#progress_callback" do
     it "should return callback for updating progress bar" do
       @bar.should_receive(:inc).with(10)
       @bar.should_receive(:inc).with(20)
-      
+
       @bar.progress_callback.call(10)
       @bar.progress_callback.call(20)
     end

data/spec/shelly/user_spec.rb

@@ -70,6 +70,16 @@ describe Shelly::User do
     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"
+      @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")
@@ -120,6 +130,19 @@ describe Shelly::User do
     end
   end
 
+  describe "#delete_ssh_key" do
+    it "should invoke logout when ssh key exists" do
+      @client.should_receive(:logout).with('ssh-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")
+      @client.should_not_receive(:logout)
+      @user.delete_ssh_key
+    end
+  end
+
   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")

data/spec/spec_helper.rb

@@ -1,3 +1,8 @@
+if ENV["COVERAGE"]
+  require "simplecov"
+  SimpleCov.start
+end
+
 require "rspec"
 require "shelly"
 require "helpers"
@@ -12,4 +17,3 @@ RSpec.configure do |config|
   config.include RSpec::Helpers
   config.include FakeFS::SpecHelpers
 end
-

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.0.43
-  prerelease: 
+  version: 0.0.44.pre
+  prerelease: 7
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-03 00:00:00.000000000 Z
+date: 2012-01-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70237654877900 !ruby/object:Gem::Requirement
+  requirement: &70206898312780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237654877900
+  version_requirements: *70206898312780
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70237654877480 !ruby/object:Gem::Requirement
+  requirement: &70206898266580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237654877480
+  version_requirements: *70206898266580
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70237654877060 !ruby/object:Gem::Requirement
+  requirement: &70206898212380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237654877060
+  version_requirements: *70206898212380
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70237654876640 !ruby/object:Gem::Requirement
+  requirement: &70206898169340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237654876640
+  version_requirements: *70206898169340
 - !ruby/object:Gem::Dependency
-  name: growl_notify
-  requirement: &70237654876180 !ruby/object:Gem::Requirement
+  name: simplecov
+  requirement: &70206898115120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237654876180
+  version_requirements: *70206898115120
+- !ruby/object:Gem::Dependency
+  name: ruby_gntp
+  requirement: &70206898084560 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70206898084560
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70237654892140 !ruby/object:Gem::Requirement
+  requirement: &70206898037160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237654892140
+  version_requirements: *70206898037160
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70237654891720 !ruby/object:Gem::Requirement
+  requirement: &70206898006080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237654891720
+  version_requirements: *70206898006080
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70237654891300 !ruby/object:Gem::Requirement
+  requirement: &70206897962100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70237654891300
+  version_requirements: *70206897962100
 - !ruby/object:Gem::Dependency
   name: wijet-thor
-  requirement: &70237654890800 !ruby/object:Gem::Requirement
+  requirement: &70206897912840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -109,10 +120,10 @@ dependencies:
         version: 0.14.7
   type: :runtime
   prerelease: false
-  version_requirements: *70237654890800
+  version_requirements: *70206897912840
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70237654890380 !ruby/object:Gem::Requirement
+  requirement: &70206897862480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70237654890380
+  version_requirements: *70206897862480
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70237654889920 !ruby/object:Gem::Requirement
+  requirement: &70206897821420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70237654889920
+  version_requirements: *70206897821420
 - !ruby/object:Gem::Dependency
   name: wijet-launchy
-  requirement: &70237654889500 !ruby/object:Gem::Requirement
+  requirement: &70206897777600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70237654889500
+  version_requirements: *70206897777600
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &70237654889080 !ruby/object:Gem::Requirement
+  requirement: &70206897756220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,7 +164,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70237654889080
+  version_requirements: *70206897756220
 description: Tool for managing applications and clouds at shellycloud.com
 email:
 - support@shellycloud.com
@@ -226,9 +237,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: shelly
 rubygems_version: 1.8.10