shelly 0.0.12 → 0.0.13

data/lib/shelly/app.rb

@@ -4,10 +4,11 @@ require 'launchy'
 module Shelly
   class App < Base
     DATABASE_KINDS = %w(postgresql mongodb redis none)
-    attr_accessor :purpose, :code_name, :databases, :ruby_version, :environment
+    attr_accessor :purpose, :code_name, :databases, :ruby_version, :environment, :git_url
 
     def initialize
       @ruby_version = "MRI-1.9.2"
+      @environment = "production"
     end
 
     def add_git_remote(force = false)
@@ -19,14 +20,6 @@ module Shelly
       IO.popen("git remote").read.split("\n").include?(purpose)
     end
 
-    def git_host
-      ENV["SHELLY_GIT_HOST"] || "git.shellycloud.com"
-    end
-
-    def git_url
-      "git@#{git_host}:#{code_name}.git"
-    end
-
     def generate_cloudfile
       @email = current_user.email
       @databases = databases
@@ -43,11 +36,12 @@ module Shelly
       attributes = {
         :name         => code_name,
         :code_name    => code_name,
-        :environment  => purpose,
+        :environment  => environment,
         :ruby_version => ruby_version,
         :domain_name  => "#{code_name}.shellycloud.com"
       }
-      shelly.create_app(attributes)
+      response = shelly.create_app(attributes)
+      self.git_url = response["git_url"]
     end
 
     def create_cloudfile

data/lib/shelly/cli/main.rb

@@ -24,8 +24,10 @@ module Shelly
         say "Successfully registered!"
         say "Check you mailbox for email address confirmation"
       rescue Client::APIError => e
-        if e.message == "Validation Failed"
-          e.errors.each { |error| say "#{error.first} #{error.last}" }
+        if e.validation?
+          e.errors.each do |error|
+            say "#{error.first} #{error.last}"
+          end
           exit 1
         end
       end
@@ -37,9 +39,18 @@ module Shelly
         say "Login successful"
         say "Uploading your public SSH key"
         user.upload_ssh_key
+        say "You have following applications available:", :green
+        user.apps.each do |app|
+          say "  #{app["code_name"]}"
+        end
       rescue RestClient::Unauthorized
         say "Wrong email or password or your email is unconfirmend"
         exit 1
+      rescue Client::APIError
+        if e.validation?
+          e.errors.each { |error| say "#{error.first} #{error.last}" }
+          exit 1
+        end
       end
 
       desc "add", "Adds new application to Shelly Cloud"
@@ -71,13 +82,12 @@ module Shelly
         info_adding_cloudfile_to_repository
         info_deploying_to_shellycloud
       rescue Client::APIError => e
-        if e.message == "Validation Failed"
+        if e.validation?
           e.errors.each { |error| say "#{error.first} #{error.last}" }
           exit 1
         end
       end
 
-
       # FIXME: move to helpers
       no_tasks do
         def ask_for_email
@@ -121,7 +131,7 @@ module Shelly
           kinds = Shelly::App::DATABASE_KINDS
           databases = ask("Which database do you want to use #{kinds.join(", ")} (postgresql - default):")
           begin
-            databases = databases.split(/[\s,]/)
+            databases = databases.split(/[\s,]/).reject(&:blank?)
             valid = databases.all? { |kind| kinds.include?(kind) }
             break if valid
             databases = ask("Unknown database kind. Supported are: #{kinds.join(", ")}:")

data/lib/shelly/client.rb

@@ -4,8 +4,8 @@ require "json"
 module Shelly
   class Client
     class APIError < Exception
-      def initialize(response)
-        @response = response
+      def initialize(response_body)
+        @response = JSON.parse(response_body)
       end
 
       def message
@@ -15,6 +15,10 @@ module Shelly
       def errors
         @response["errors"]
       end
+
+      def validation?
+        message == "Validation Failed"
+      end
     end
 
     def initialize(email = nil, password = nil)
@@ -42,6 +46,10 @@ module Shelly
       put("/ssh_key", :ssh_key => ssh_key)
     end
 
+    def apps
+      get("/apps")
+    end
+
     def post(path, params = {})
       request(path, :post, params)
     end
@@ -81,9 +89,7 @@ module Shelly
 
     def process_response(response)
       if [404, 422, 500].include?(response.code)
-        # FIXME: move parsing JSON to APIError class
-        error_details = JSON.parse(response.body)
-        raise APIError.new(error_details)
+        raise APIError.new(response.body)
       end
 
       response.return!

data/lib/shelly/user.rb

@@ -7,6 +7,10 @@ module Shelly
       @password = password
     end
 
+    def apps
+      shelly.apps
+    end
+
     def register
       ssh_key = File.read(ssh_key_path) if ssh_key_exists?
       shelly.register_user(email, password, ssh_key)

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.12"
+  VERSION = "0.0.13"
 end

data/spec/shelly/app_spec.rb

@@ -12,6 +12,16 @@ describe Shelly::App do
     @app.code_name = "foo-staging"
   end
 
+  describe "being initialized" do
+    it "should have default ruby_version: MRI-1.9.2" do
+      @app.ruby_version.should == "MRI-1.9.2"
+    end
+
+    it "should have default environment: production" do
+      @app.environment.should == "production"
+    end
+  end
+
   describe ".guess_code_name" do
     it "should return name of current working directory" do
       Shelly::App.guess_code_name.should == "foo"
@@ -19,7 +29,11 @@ describe Shelly::App do
   end
 
   describe "#add_git_remote" do
-    before { @app.stub(:system) }
+    before do
+      @app.stub(:git_url).and_return("git@git.shellycloud.com:foo-staging.git")
+      @app.stub(:system)
+    end
+
     it "should add git remote with proper name and git repository" do
       @app.should_receive(:system).with("git remote add staging git@git.shellycloud.com:foo-staging.git")
       @app.add_git_remote
@@ -98,25 +112,26 @@ config
     end
   end
 
-  describe "#git_url" do
-    it "should return URL to git repository on shelly" do
-      @app.git_url.should == "git@git.shellycloud.com:foo-staging.git"
-    end
-  end
-
   describe "#create" do
     it "should create the app on shelly cloud via API client" do
       @app.purpose = "dev"
       @app.code_name = "fooo"
-      @client.should_receive(:create_app).with({
+      attributes = {
         :code_name => "fooo",
         :name => "fooo",
-        :environment => "dev",
+        :environment => "production",
         :ruby_version => "MRI-1.9.2",
         :domain_name => "fooo.shellycloud.com"
-      })
+      }
+      @client.should_receive(:create_app).with(attributes).and_return("git_url" => "git@git.shellycloud.com:fooo.git")
       @app.create
     end
+
+    it "should assign returned git_url" do
+      @client.stub(:create_app).and_return("git_url" => "git@git.example.com:fooo.git")
+      @app.create
+      @app.git_url.should == "git@git.example.com:fooo.git"
+    end
   end
 
   describe "#remote_exists?" do
@@ -136,17 +151,4 @@ config
       end
     end
   end
-
-  describe "#git_host" do
-    it "should return default git host" do
-      @app.git_host.should == "git.shellycloud.com"
-    end
-
-    context "SHELLY_GIT_HOST set" do
-      it "should return value of SHELLY_GIT_HOST env variable" do
-        ENV['SHELLY_GIT_HOST'] = "git.example.com"
-        @app.git_host.should == "git.example.com"
-      end
-    end
-  end
 end

data/spec/shelly/cli/main_spec.rb

@@ -137,7 +137,7 @@ OUT
     context "on unsuccessful registration" do
       it "should display errors and exit with 1" do
         response = {"message" => "Validation Failed", "errors" => [["email", "has been already taken"]]}
-        exception = Shelly::Client::APIError.new(response)
+        exception = Shelly::Client::APIError.new(response.to_json)
         @client.stub(:register_user).and_raise(exception)
         $stdout.should_receive(:puts).with("email has been already taken")
         lambda {
@@ -154,6 +154,7 @@ OUT
       @user = Shelly::User.new
       @user.stub(:upload_ssh_key)
       @client.stub(:token).and_return("abc")
+      @client.stub(:apps).and_return([{"code_name" => "abc"}, {"code_name" => "fooo"}])
       Shelly::User.stub(:new).and_return(@user)
     end
 
@@ -179,7 +180,14 @@ OUT
         end
       end
 
-      it "should display list of applications to which user has access"
+      it "should display list of applications to which user has access" do
+        $stdout.should_receive(:puts).with("\e[32mYou have following applications available:\e[0m")
+        $stdout.should_receive(:puts).with("  abc")
+        $stdout.should_receive(:puts).with("  fooo")
+        fake_stdin(["megan@example.com", "secret"]) do
+          @main.login
+        end
+      end
     end
 
     context "on unauthorized user" do
@@ -206,6 +214,7 @@ OUT
       @app.stub(:generate_cloudfile).and_return("Example Cloudfile")
       @app.stub(:open_billing_page)
       @app.stub(:remote_exists?).and_return(false)
+      @app.stub(:git_url).and_return("git@git.shellycloud.com:foooo.git")
       Shelly::App.stub(:inside_git_repository?).and_return(true)
       Shelly::App.stub(:new).and_return(@app)
     end
@@ -260,7 +269,7 @@ OUT
     it "should use database provided by user (separated by comma or space)" do
       $stdout.should_receive(:print).with("Which database do you want to use postgresql, mongodb, redis, none (postgresql - default): ")
       @app.should_receive(:databases=).with(["postgresql", "mongodb", "redis"])
-      fake_stdin(["staging", "", "postgresql,mongodb redis"]) do
+      fake_stdin(["staging", "", "postgresql  ,mongodb redis"]) do
         @main.add
       end
     end
@@ -291,7 +300,7 @@ OUT
 
     it "should display validation errors if they are any" do
       response = {"message" => "Validation Failed", "errors" => [["code_name", "has been already taken"]]}
-      exception = Shelly::Client::APIError.new(response)
+      exception = Shelly::Client::APIError.new(response.to_json)
       @app.should_receive(:create).and_raise(exception)
       $stdout.should_receive(:puts).with("code_name has been already taken")
       lambda {

data/spec/shelly/client_spec.rb

@@ -1,5 +1,36 @@
 require "spec_helper"
 
+describe Shelly::Client::APIError do
+  before do
+    body = {"message" => "something went wrong", "errors" => [{"first" => "foo"}]}
+    @error = Shelly::Client::APIError.new(body.to_json)
+  end
+
+  it "should return error message" do
+    @error.message.should == "something went wrong"
+  end
+
+  it "should return list of errors" do
+    @error.errors.should == [{"first" => "foo"}]
+  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(body.to_json)
+        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
+  end
+end
+
 describe Shelly::Client do
   before do
     ENV['SHELLY_URL'] = nil
@@ -52,6 +83,13 @@ describe Shelly::Client do
     end
   end
 
+  describe "#apps" do
+    it "should send get requests for user's applications list" do
+      @client.should_receive(:get).with("/apps")
+      @client.apps
+    end
+  end
+
   describe "#request_parameters" do
     it "should return hash of resquest parameters" do
       expected = {

data/spec/shelly/user_spec.rb

@@ -140,4 +140,11 @@ describe Shelly::User do
       end
     end
   end
+
+  describe "#apps" do
+    it "should fetch list of apps via API client" do
+      @client.should_receive(:apps)
+      @user.apps
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-11 00:00:00.000000000Z
+date: 2011-10-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2161489060 !ruby/object:Gem::Requirement
+  requirement: &2160815840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161489060
+  version_requirements: *2160815840
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2161488640 !ruby/object:Gem::Requirement
+  requirement: &2160815420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161488640
+  version_requirements: *2160815420
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2161488220 !ruby/object:Gem::Requirement
+  requirement: &2160814660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161488220
+  version_requirements: *2160814660
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2161487780 !ruby/object:Gem::Requirement
+  requirement: &2160813620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161487780
+  version_requirements: *2160813620
 - !ruby/object:Gem::Dependency
   name: growl_notify
-  requirement: &2161487280 !ruby/object:Gem::Requirement
+  requirement: &2160811840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161487280
+  version_requirements: *2160811840
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2161486760 !ruby/object:Gem::Requirement
+  requirement: &2160810620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161486760
+  version_requirements: *2160810620
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &2161486240 !ruby/object:Gem::Requirement
+  requirement: &2160809600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2161486240
+  version_requirements: *2160809600
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2161481240 !ruby/object:Gem::Requirement
+  requirement: &2160809060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161481240
+  version_requirements: *2160809060
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2161480620 !ruby/object:Gem::Requirement
+  requirement: &2160795800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161480620
+  version_requirements: *2160795800
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2161479960 !ruby/object:Gem::Requirement
+  requirement: &2160795340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161479960
+  version_requirements: *2160795340
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &2161479400 !ruby/object:Gem::Requirement
+  requirement: &2160794900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +131,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2161479400
+  version_requirements: *2160794900
 description: Tool for managing applications and clouds at shellycloud.com
 email:
 - support@shellycloud.com