shelly 0.0.14 → 0.0.15

data/lib/shelly/app.rb

@@ -4,25 +4,22 @@ require 'launchy'
 module Shelly
   class App < Base
     DATABASE_KINDS = %w(postgresql mongodb redis none)
-    attr_accessor :purpose, :code_name, :databases, :ruby_version, :environment, :git_url
+    attr_accessor :purpose, :code_name, :databases, :ruby_version, :environment, :git_url, :domains
 
     def initialize
       @ruby_version = "MRI-1.9.2"
       @environment = "production"
     end
 
-    def add_git_remote(force = false)
-      system("git remote rm #{purpose}") if force
+    def add_git_remote
+      system("git remote rm #{purpose} &> /dev/null")
       system("git remote add #{purpose} #{git_url}")
     end
 
-    def remote_exists?
-      IO.popen("git remote").read.split("\n").include?(purpose)
-    end
-
     def generate_cloudfile
       @email = current_user.email
       @databases = databases
+      @domains = domains.nil? ? ["#{code_name}.winniecloud.com"] : domains
       template = File.read(cloudfile_template_path)
       cloudfile = ERB.new(template, 0, "%<>-")
       cloudfile.result(binding)
@@ -57,13 +54,18 @@ module Shelly
       File.basename(Dir.pwd)
     end
 
+    def users(apps)
+      shelly.app_users(apps)
+    end
+
     def open_billing_page
-      url = "#{shelly.api_url}/apps/#{code_name}/edit_billing?api_key=#{current_user.token}"
+      url = "#{shelly.shellyapp_url}/login?api_key=#{current_user.token}&return_to=/apps/#{code_name}/edit_billing"
       Launchy.open(url)
     end
 
     def self.inside_git_repository?
-      system("git status &> /dev/null")
+      system("git status > /dev/null 2>&1")
     end
   end
 end
+

data/lib/shelly/cli/main.rb

@@ -1,11 +1,13 @@
 require "shelly"
 require "thor/group"
+require "shelly/cli/users"
 
 module Shelly
   module CLI
     class Main < Thor
       include Thor::Actions
       include Helpers
+      register(Users, "users", "users <command>", "Manages users using this app")
 
       map %w(-v --version) => :version
       desc "version", "Displays shelly version"
@@ -15,8 +17,11 @@ module Shelly
 
       desc "register [EMAIL]", "Registers new user account on Shelly Cloud"
       def register(email = nil)
+      	user = User.new
+      	user.ssh_key_registered?
         say "Registering with email: #{email}" if email
-        user = User.new(email || ask_for_email, ask_for_password)
+				user.email = (email || ask_for_email)
+				user.password = ask_for_password
         user.register
         if user.ssh_key_exists?
           say "Uploading your public SSH key from #{user.ssh_key_path}"
@@ -26,10 +31,14 @@ module Shelly
       rescue Client::APIError => e
         if e.validation?
           e.errors.each do |error|
-            say "#{error.first} #{error.last}"
+            say_error "#{error.first} #{error.last}", :with_exit => false
           end
           exit 1
         end
+       rescue RestClient::Conflict
+       	say_error "User with your ssh key already exists.", :with_exit => false
+				say_error "You can login using: shelly login [EMAIL]", :with_exit => false
+				exit 1
       end
 
       desc "login [EMAIL]", "Logins user to Shelly Cloud"
@@ -44,34 +53,40 @@ module Shelly
           say "  #{app["code_name"]}"
         end
       rescue RestClient::Unauthorized
-        say "Wrong email or password or your email is unconfirmend"
+        say_error "Wrong email or password", :with_exit => false
+        say_error "You can reset password by using link:", :with_exit => false
+        say_error "https://admin.winniecloud.com/users/password/new", :with_exit => false
         exit 1
-      rescue Client::APIError
+      rescue Client::APIError => e
         if e.validation?
-          e.errors.each { |error| say "#{error.first} #{error.last}" }
+          e.errors.each { |error| say_error "#{error.first} #{error.last}", :with_exit => false }
           exit 1
         end
       end
 
+      method_option :code_name, :type => :string, :aliases => "-c",
+        :desc => "Unique code_name of your application"
+      method_option :environment, :type => :string, :aliases => "-e",
+        :desc => "Environment that your application will be running"
+      method_option :databases, :type => :array, :aliases => "-d",
+        :banner => "#{Shelly::App::DATABASE_KINDS.join(' ')}",
+        :desc => "Array of databases of your choice"
+      method_option :domains, :type => :array,
+        :banner => "CODE_NAME.shellycloud.com YOUR_DOMAIN.com",
+        :desc => "Array of your domains"
       desc "add", "Adds new application to Shelly Cloud"
       def add
         say_error "Must be run inside your project git repository" unless App.inside_git_repository?
-
+        check_options(options)
         @app = Shelly::App.new
-        @app.purpose = ask_for_purpose
-        @app.code_name = ask_for_code_name
-        @app.databases = ask_for_databases
+        @app.purpose = options["environment"] || ask_for_purpose
+        @app.code_name = options["code_name"] || ask_for_code_name
+        @app.databases = options["databases"] || ask_for_databases
+        @app.domains = options["domains"]
         @app.create
 
-        unless @app.remote_exists?
-          say "Adding remote #{@app.purpose} #{@app.git_url}", :green
-          @app.add_git_remote
-        else
-          say "Remote #{@app.purpose} already exists"
-          if yes?("Would you like to overwrite remote #{@app.purpose} with #{@app.git_url} (Y/N)?:")
-            @app.add_git_remote(true)
-          end
-        end
+        say "Adding remote #{@app.purpose} #{@app.git_url}", :green
+        @app.add_git_remote
 
         say "Creating Cloudfile", :green
         @app.create_cloudfile
@@ -83,13 +98,27 @@ module Shelly
         info_deploying_to_shellycloud
       rescue Client::APIError => e
         if e.validation?
-          e.errors.each { |error| say "#{error.first} #{error.last}" }
+          e.errors.each { |error| say_error "#{error.first} #{error.last}", :with_exit => false }
           exit 1
         end
       end
 
       # FIXME: move to helpers
       no_tasks do
+        def check_options(options)
+          unless ["environment", "code_name", "databases", "domains"].all? do |option|
+            options.include?(option.to_s) && options[option.to_s] != option.to_s
+          end && valid_databases?(options["databases"])
+            say "Wrong parameters. See 'shelly help add' for further information"
+            exit 1
+          end unless options.empty?
+        end
+
+        def valid_databases?(databases)
+          kinds = Shelly::App::DATABASE_KINDS
+          databases.all? { |kind| kinds.include?(kind) }
+        end
+
         def ask_for_email
           email_question = User.guess_email.blank? ? "Email:" : "Email (#{User.guess_email} - default):"
           email = ask(email_question)
@@ -110,9 +139,9 @@ module Shelly
             say_new_line
             if password.present?
               return password if password == password_confirmation
-              say "Password and password confirmation don't match, please type them again"
+              say_error "Password and password confirmation don't match, please type them again"
             else
-              say "Password can't be blank"
+              say_error "Password can't be blank"
             end
           end
         end
@@ -133,7 +162,7 @@ module Shelly
           databases = ask("Which database do you want to use #{kinds.join(", ")} (postgresql - default):")
           begin
             databases = databases.split(/[\s,]/).reject(&:blank?)
-            valid = databases.all? { |kind| kinds.include?(kind) }
+            valid = valid_databases?(databases)
             break if valid
             databases = ask("Unknown database kind. Supported are: #{kinds.join(", ")}:")
           end while not valid
@@ -163,3 +192,4 @@ module Shelly
     end
   end
 end
+

data/lib/shelly/cli/users.rb

@@ -0,0 +1,30 @@
+require "yaml"
+require "shelly/user"
+
+module Shelly
+  module CLI
+    class Users < Thor
+      namespace :users
+      include Helpers
+
+      desc "list", "List users who have access to current application"
+      def list
+        say_error "Must be run inside your project git repository" unless App.inside_git_repository?
+        code_names = YAML.load(File.open(File.join(Dir.pwd, "Cloudfile"))).keys
+        @app = Shelly::App.new
+        response = @app.users(code_names.sort)
+        response.each do |app|
+          say "Cloud #{app['code_name']}:"
+          app['users'].each do |user|
+            say "  #{user['email']} (#{user['name']})"
+          end
+        end
+      rescue Client::APIError => e
+        say e.message
+        exit 1
+      end
+
+    end
+  end
+end
+

data/lib/shelly/client.rb

@@ -30,6 +30,10 @@ module Shelly
       ENV["SHELLY_URL"] || "https://admin.winniecloud.com/apiv2"
     end
 
+    def shellyapp_url
+      get("/shellyapp")["url"]
+    end
+
     def register_user(email, password, ssh_key)
       post("/users", :user => {:email => email, :password => password, :ssh_key => ssh_key})
     end
@@ -50,6 +54,16 @@ module Shelly
       get("/apps")
     end
 
+    def ssh_key_available?(ssh_key)
+    	get("/users/new", :ssh_key => ssh_key)
+    end
+
+    def app_users(apps)
+      apps.map do |app|
+        get("/apps/#{app}/users")
+      end
+    end
+
     def post(path, params = {})
       request(path, :post, params)
     end
@@ -58,8 +72,8 @@ module Shelly
       request(path, :put, params)
     end
 
-    def get(path)
-      request(path, :get)
+    def get(path, params = {})
+      request(path, :get, params)
     end
 
     def request(path, method, params = {})
@@ -97,3 +111,4 @@ module Shelly
     end
   end
 end
+

data/lib/shelly/helpers.rb

@@ -11,9 +11,10 @@ module Shelly
       say "\n"
     end
 
-    def say_error(message)
-      say message
-      exit 1
+    def say_error(message, options = {})
+      options = {:with_exit => true}.merge(options)
+      say "\033[91m " + message + " \033[0m"
+      return exit 1 if options[:with_exit]
     end
   end
 end

data/lib/shelly/templates/Cloudfile.erb

@@ -4,7 +4,9 @@
   monitoring_email:
     - <%= @email %>
   domains:
-    - <%= @code_name %>.winniecloud.com
+    <%- @domains.each do |domain| -%>
+    - <%= domain %>
+    <%- end -%>
   servers:
     app1:
       size: large
@@ -17,3 +19,4 @@
       database:
         - <%= kind %>
     <%- end -%>
+

data/lib/shelly/user.rb

@@ -1,6 +1,6 @@
 module Shelly
   class User < Base
-    attr_reader :email, :password
+    attr_accessor :email, :password
 
     def initialize(email = nil, password = nil)
       @email = email
@@ -47,6 +47,11 @@ module Shelly
     def ssh_key_path
       File.expand_path("~/.ssh/id_rsa.pub")
     end
+    
+    def ssh_key_registered?
+    	ssh_key = File.read(ssh_key_path).strip
+    	shelly.ssh_key_available?(ssh_key)
+    end
 
     def self.guess_email
       @@guess_email ||= IO.popen("git config --get user.email").read.strip

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 end

data/shelly.gemspec

@@ -21,6 +21,7 @@ Gem::Specification.new do |s|
     s.add_development_dependency "rb-fsevent"
   end
   s.add_development_dependency "fakefs"
+  s.add_development_dependency "fakeweb"
   s.add_runtime_dependency "thor"
   s.add_runtime_dependency "rest-client"
   s.add_runtime_dependency "json"
@@ -31,3 +32,4 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 end
+

data/spec/shelly/app_spec.rb

@@ -5,7 +5,7 @@ describe Shelly::App do
   before do
     FileUtils.mkdir_p("/projects/foo")
     Dir.chdir("/projects/foo")
-    @client = mock(:api_url => "https://api.example.com")
+    @client = mock(:api_url => "https://api.example.com", :shellyapp_url => "http://shellyapp.example.com")
     Shelly::Client.stub(:new).and_return(@client)
     @app = Shelly::App.new
     @app.purpose = "staging"
@@ -28,20 +28,27 @@ describe Shelly::App do
     end
   end
 
+  describe "#users" do
+    it "should " do
+      @client.should_receive(:app_users).with(["staging-foo", "production-foo"])
+      @app.users(["staging-foo", "production-foo"])
+    end
+  end
+
   describe "#add_git_remote" do
     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")
+    it "should try to remove existing git remote" do
+      @app.should_receive(:system).with("git remote rm staging &> /dev/null")
       @app.add_git_remote
     end
 
-    it "should remove existing git remote first if invoked with true as first argument" do
-      @app.should_receive(:system).with("git remote rm staging")
-      @app.add_git_remote(true)
+    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
     end
   end
 
@@ -50,6 +57,7 @@ describe Shelly::App do
       user = mock(:email => "bob@example.com")
       @app.stub(:current_user).and_return(user)
       @app.databases = %w(postgresql mongodb)
+      @app.domains = %w(foo-staging.winniecloud.com foo.example.com)
       FakeFS.deactivate!
       expected = <<-config
 foo-staging:
@@ -59,6 +67,7 @@ foo-staging:
     - bob@example.com
   domains:
     - foo-staging.winniecloud.com
+    - foo.example.com
   servers:
     app1:
       size: large
@@ -74,7 +83,7 @@ foo-staging:
       database:
         - mongodb
 config
-      @app.generate_cloudfile.should == expected
+      @app.generate_cloudfile.strip.should == expected.strip
     end
   end
 
@@ -106,7 +115,7 @@ config
     it "should open browser window" do
       user = mock(:token => "abc", :email => nil, :password => nil, :config_dir => "~/.shelly")
       @app.stub(:current_user).and_return(user)
-      url = "#{@app.shelly.api_url}/apps/foo-staging/edit_billing?api_key=abc"
+      url = "#{@app.shelly.shellyapp_url}/login?api_key=abc&return_to=/apps/foo-staging/edit_billing"
       Launchy.should_receive(:open).with(url)
       @app.open_billing_page
     end
@@ -133,22 +142,5 @@ config
       @app.git_url.should == "git@git.example.com:fooo.git"
     end
   end
-
-  describe "#remote_exists?" do
-    context "remote with purpose as name exists" do
-      it "should return true" do
-        @app.purpose = "shelly-prod"
-        IO.stub_chain(:popen, :read => "origin\nshelly-prod\ntest")
-        @app.should be_remote_exists
-      end
-    end
-
-    context "remote with purpose as name doesn't exist" do
-      it "should return false" do
-        @app.purpose = "shelly"
-        IO.stub_chain(:popen, :read => "origin\nshelly-prod\ntest")
-        @app.should_not be_remote_exists
-      end
-    end
-  end
 end
+

data/spec/shelly/cli/main_spec.rb

@@ -28,6 +28,7 @@ Tasks:
   shelly help [TASK]       # Describe available tasks or one specific task
   shelly login [EMAIL]     # Logins user to Shelly Cloud
   shelly register [EMAIL]  # Registers new user account on Shelly Cloud
+  shelly users <command>   # Manages users using this app
   shelly version           # Displays shelly version
 OUT
       out = IO.popen("bin/shelly").read.strip
@@ -39,6 +40,18 @@ OUT
     before do
       @client.stub(:register_user)
       @key_path = File.expand_path("~/.ssh/id_rsa.pub")
+      @user = Shelly::User.new
+      @user.stub(:ssh_key_registered?)
+      Shelly::User.stub(:new).and_return(@user)
+    end
+
+    it "should check ssh key in database" do
+      @user.stub(:ssh_key_registered?).and_raise(RestClient::Conflict)
+      $stdout.should_receive(:puts).with("\e[91m User with your ssh key already exists. \e[0m")
+      $stdout.should_receive(:puts).with("\e[91m You can login using: shelly login [EMAIL] \e[0m")
+      lambda {
+        @main.register
+      }.should raise_error(SystemExit)
     end
 
     it "should ask for email, password and password confirmation" do
@@ -76,7 +89,7 @@ OUT
     context "when user enters blank email" do
       it "should show error message and exit with 1" do
         Shelly::User.stub(:guess_email).and_return("")
-        $stdout.should_receive(:puts).with("Email can't be blank, please try again")
+        $stdout.should_receive(:puts).with("\e[91m Email can't be blank, please try again \e[0m")
         lambda {
           fake_stdin(["", "bob@example.com", "only-pass", "only-pass"]) do
             @main.register
@@ -85,24 +98,6 @@ OUT
       end
     end
 
-    context "when user enters blank password" do
-      it "should ask for it again" do
-        $stdout.should_receive(:puts).with("Password can't be blank")
-        fake_stdin(["better@example.com", "", "", "secret", "secret"]) do
-          @main.register
-        end
-      end
-    end
-
-    context "when user enters password and password confirmation which don't match each other" do
-      it "should ask for them again" do
-        $stdout.should_receive(:puts).with("Password and password confirmation don't match, please type them again")
-        fake_stdin(["better@example.com", "secret", "sec-TYPO-ret", "secret", "secret"]) do
-          @main.register
-        end
-      end
-    end
-
     context "public SSH key exists" do
       it "should register with the public SSH key" do
         FileUtils.mkdir_p("~/.ssh")
@@ -139,7 +134,7 @@ OUT
         response = {"message" => "Validation Failed", "errors" => [["email", "has been already taken"]]}
         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")
+        $stdout.should_receive(:puts).with("\e[91m email has been already taken \e[0m")
         lambda {
           fake_stdin(["kate@example.com", "pass", "pass"]) do
             @main.register
@@ -194,7 +189,10 @@ OUT
       it "should exit with 1 and display error message" do
         exception = RestClient::Unauthorized.new
         @client.stub(:token).and_raise(exception)
-        $stdout.should_receive(:puts).with("Wrong email or password or your email is unconfirmend")
+        $stdout.should_receive(:puts).with("\e[91m Wrong email or password \e[0m")
+        $stdout.should_receive(:puts).with("\e[91m You can reset password by using link: \e[0m")
+        $stdout.should_receive(:puts).with("\e[91m https://admin.winniecloud.com/users/password/new \e[0m")
+
         lambda {
           fake_stdin(["megan@example.com", "secret"]) do
             @main.login
@@ -213,7 +211,6 @@ OUT
       @app.stub(:create)
       @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)
@@ -221,7 +218,7 @@ OUT
 
     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("Must be run inside your project git repository")
+      $stdout.should_receive(:puts).with("\e[91m Must be run inside your project git repository \e[0m")
       lambda {
         fake_stdin(["staging", "", ""]) do
           @main.add
@@ -237,6 +234,30 @@ OUT
       end
     end
 
+    context "command line options" do
+      context "invalid params" do
+        it "should show help and exit if not all options are passed" do
+          $stdout.should_receive(:puts).with("Wrong parameters. See 'shelly help add' for further information")
+          @main.options = {"code_name" => "foo"}
+          lambda { @main.add }.should raise_error(SystemExit)
+        end
+
+        it "should exit if databases are not valid" do
+          $stdout.should_receive(:puts).with("Wrong parameters. See 'shelly help add' for further information")
+          @main.options = {"code_name" => "foo", "environment" => "production", "databases" => ["not existing"], "domains" => ["foo.example.com"]}
+          lambda { @main.add }.should raise_error(SystemExit)
+        end
+      end
+
+      context "valid params" do
+        it "should create app on shelly cloud" do
+          @app.should_receive(:create)
+          @main.options = {"code_name" => "foo", "environment" => "production", "databases" => ["postgresql"], "domains" => ["foo.example.com"]}
+          @main.add
+        end
+      end
+    end
+
     context "when user provided empty purpose" do
       it "should use 'production' as default" do
         $stdout.should_receive(:print).with("How will you use this system (production - default,staging): ")
@@ -302,7 +323,7 @@ OUT
       response = {"message" => "Validation Failed", "errors" => [["code_name", "has been already taken"]]}
       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")
+      $stdout.should_receive(:puts).with("\e[91m code_name has been already taken \e[0m")
       lambda {
         fake_stdin(["", "", ""]) do
           @main.add
@@ -310,41 +331,11 @@ OUT
       }.should raise_error(SystemExit)
     end
 
-    context "git remote doesn't exist" do
-      it "should add git remote" do
-        $stdout.should_receive(:puts).with("\e[32mAdding remote staging git@git.shellycloud.com:foooo.git\e[0m")
-        @app.should_receive(:add_git_remote)
-        fake_stdin(["staging", "foooo", ""]) do
-          @main.add
-        end
-      end
-    end
-
-    context "git remote exist" do
-      before do
-        @app.stub(:remote_exists?).and_return(true)
-      end
-
-      it "should ask user if he wants to overwrite existing git remote" do
-        $stdout.should_receive(:puts).with("Remote staging already exists")
-        $stdout.should_receive(:print).with("Would you like to overwrite remote staging with git@git.shellycloud.com:foooo.git (Y/N)?: ")
-        fake_stdin(["staging", "foooo", "", "y"]) do
-          @main.add
-        end
-      end
-
-      it "should overwrite existing git remote on 'yes' from user" do
-        @app.should_receive(:add_git_remote).with(true)
-        fake_stdin(["staging", "foooo", "", "y"]) do
-          @main.add
-        end
-      end
-
-      it "should not overwrite existing git remote on 'no' from user" do
-        @app.should_not_receive(:add_git_remote).with(true)
-        fake_stdin(["staging", "foooo", "", "n"]) do
-          @main.add
-        end
+    it "should add git remote" do
+      $stdout.should_receive(:puts).with("\e[32mAdding remote staging git@git.shellycloud.com:foooo.git\e[0m")
+      @app.should_receive(:add_git_remote)
+      fake_stdin(["staging", "foooo", ""]) do
+        @main.add
       end
     end
 
@@ -386,3 +377,4 @@ OUT
     end
   end
 end
+

data/spec/shelly/cli/users_spec.rb

@@ -0,0 +1,66 @@
+require "spec_helper"
+require "shelly/cli/users"
+
+describe Shelly::CLI::Users do
+  before do
+    FileUtils.stub(:chmod)
+    @users = Shelly::CLI::Users.new
+    @client = mock
+    Shelly::Client.stub(:new).and_return(@client)
+    Shelly::User.stub(:guess_email).and_return("")
+    $stdout.stub(:puts)
+    $stdout.stub(:print)
+  end
+
+  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") }
+      @app = mock
+      Shelly::App.stub(:new).and_return(@app)
+      Shelly::App.stub(:inside_git_repository?).and_return(true)
+    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[91m Must be run inside your project git repository \e[0m")
+      lambda {
+        @users.list
+      }.should raise_error(SystemExit)
+    end
+
+    context "on success" do
+      it "should receive clouds from the Cloudfile" do
+        @app.should_receive(:users).with(["foo-production","foo-staging"]).
+          and_return(response)
+        @users.list
+      end
+
+      it "should display clouds and users" do
+        @app.stub(:users).and_return(response)
+        $stdout.should_receive(:puts).with("Cloud foo-staging:")
+        $stdout.should_receive(:puts).with("  user@example.com (username)")
+        $stdout.should_receive(:puts).with("Cloud foo-production:")
+        $stdout.should_receive(:puts).with("  user2@example.com (username2)")
+        @users.list
+      end
+
+      def response
+        [{'code_name' => 'foo-staging','users' => [{'name' => 'username','email' => 'user@example.com'}]},
+         {'code_name' => 'foo-production','users' => [{'name' => 'username2','email' => 'user2@example.com'}]}]
+      end
+    end
+
+    context "on failure" do
+      it "should raise an error if user does not have to any app" do
+        response = {"message" => "You do not have access to this app"}
+        exception = Shelly::Client::APIError.new(response.to_json)
+        @app.stub(:users).and_raise(exception)
+        $stdout.should_receive(:puts).with("You do not have access to this app")
+        lambda { @users.list }.should raise_error(SystemExit)
+      end
+    end
+  end
+end
+

data/spec/shelly/client_spec.rb

@@ -35,7 +35,7 @@ describe Shelly::Client do
   before do
     ENV['SHELLY_URL'] = nil
     @client = Shelly::Client.new("bob@example.com", "secret")
-    RestClient::Request.stub!(:execute)
+    @url = "https://#{CGI.escape("bob@example.com")}:secret@admin.winniecloud.com/apiv2"
   end
 
   describe "#api_url" do
@@ -54,6 +54,13 @@ describe Shelly::Client do
     end
   end
 
+  describe "#shellyapp_url" do
+    it "should sent get request" do
+      @client.should_receive(:get).with("/shellyapp").and_return({"url" => "shellyurl"})
+      @client.shellyapp_url.should == "shellyurl"
+    end
+  end
+
   describe "#register_user" do
     it "should send post request with login and password" do
       @client.should_receive(:post).with("/users", {:user => {:email => "test@example.com",
@@ -76,6 +83,16 @@ describe Shelly::Client do
     end
   end
 
+  describe "#app_users" do
+    it "should send post with app code_names" do
+      FakeWeb.register_uri(:get, @url + "/apps/staging-foo/users", :body => {:code_name => "staging-foo"}.to_json)
+      FakeWeb.register_uri(:get, @url + "/apps/production-foo/users", :body => {:code_name => "production-foo"}.to_json)
+      response = @client.app_users(["staging-foo", "production-foo"])
+      response.should == [{"code_name" => "staging-foo"},
+        {"code_name" => "production-foo"}]
+    end
+  end
+
   describe "#update_ssh_key" do
     it "should send put with give SSH key" do
       @client.should_receive(:put).with("/ssh_key", {:ssh_key => "abc"})
@@ -90,6 +107,13 @@ describe Shelly::Client do
     end
   end
 
+  describe "#ssh_key_available?" do
+    it "should send get request with ssh key" do
+      @client.should_receive(:get).with("/users/new", {:ssh_key => "ssh-key Abb"})
+      @client.ssh_key_available?("ssh-key Abb")
+    end
+  end
+
   describe "#request_parameters" do
     it "should return hash of resquest parameters" do
       expected = {
@@ -172,7 +196,7 @@ describe Shelly::Client do
 
   describe "#get" do
     it "should make GET request to given path" do
-      @client.should_receive(:request).with("/account", :get)
+      @client.should_receive(:request).with("/account", :get, {})
       @client.get("/account")
     end
   end
@@ -191,3 +215,4 @@ describe Shelly::Client do
     end
   end
 end
+

data/spec/shelly/user_spec.rb

@@ -105,6 +105,13 @@ describe Shelly::User do
       @user.should_not be_ssh_key_exists
     end
   end
+  
+  describe "#ssh_key_registered?" do
+    it "should read and check if ssh key exists in database" do
+      @client.should_receive(:ssh_key_available?).with('ssh-key AAbbcc')
+      @user.ssh_key_registered?
+    end
+  end
 
   describe "#upload_ssh_key" do
     it "should read and upload user's public SSH key" do

data/spec/spec_helper.rb

@@ -3,8 +3,12 @@ require "shelly"
 require "helpers"
 require "input_faker"
 require "fakefs/spec_helpers"
+require "fakeweb"
+
+FakeWeb.allow_net_connect = false
 
 RSpec.configure do |config|
   config.include RSpec::Helpers
   config.include FakeFS::SpecHelpers
 end
+

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.0.14
+  version: 0.0.15
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-17 00:00:00.000000000Z
+date: 2011-10-25 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2153611320 !ruby/object:Gem::Requirement
+  requirement: &2153577060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153611320
+  version_requirements: *2153577060
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153610440 !ruby/object:Gem::Requirement
+  requirement: &2153576460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153610440
+  version_requirements: *2153576460
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2153609940 !ruby/object:Gem::Requirement
+  requirement: &2153575660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153609940
+  version_requirements: *2153575660
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2153609480 !ruby/object:Gem::Requirement
+  requirement: &2153575240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153609480
+  version_requirements: *2153575240
 - !ruby/object:Gem::Dependency
   name: growl_notify
-  requirement: &2153609000 !ruby/object:Gem::Requirement
+  requirement: &2153574660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153609000
+  version_requirements: *2153574660
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2153608560 !ruby/object:Gem::Requirement
+  requirement: &2153574240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153608560
+  version_requirements: *2153574240
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &2153608100 !ruby/object:Gem::Requirement
+  requirement: &2153573820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153608100
+  version_requirements: *2153573820
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &2153573360 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2153573360
 - !ruby/object:Gem::Dependency
   name: thor
-  requirement: &2153607680 !ruby/object:Gem::Requirement
+  requirement: &2153572920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +109,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153607680
+  version_requirements: *2153572920
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2153607220 !ruby/object:Gem::Requirement
+  requirement: &2153572500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153607220
+  version_requirements: *2153572500
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2153606680 !ruby/object:Gem::Requirement
+  requirement: &2153572080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153606680
+  version_requirements: *2153572080
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &2153606160 !ruby/object:Gem::Requirement
+  requirement: &2153571660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,7 +142,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2153606160
+  version_requirements: *2153571660
 description: Tool for managing applications and clouds at shellycloud.com
 email:
 - support@shellycloud.com
@@ -152,6 +163,7 @@ files:
 - lib/shelly/app.rb
 - lib/shelly/base.rb
 - lib/shelly/cli/main.rb
+- lib/shelly/cli/users.rb
 - lib/shelly/client.rb
 - lib/shelly/helpers.rb
 - lib/shelly/templates/Cloudfile.erb
@@ -163,6 +175,7 @@ files:
 - spec/shelly/app_spec.rb
 - spec/shelly/base_spec.rb
 - spec/shelly/cli/main_spec.rb
+- spec/shelly/cli/users_spec.rb
 - spec/shelly/client_spec.rb
 - spec/shelly/user_spec.rb
 - spec/spec_helper.rb
@@ -196,6 +209,7 @@ test_files:
 - spec/shelly/app_spec.rb
 - spec/shelly/base_spec.rb
 - spec/shelly/cli/main_spec.rb
+- spec/shelly/cli/users_spec.rb
 - spec/shelly/client_spec.rb
 - spec/shelly/user_spec.rb
 - spec/spec_helper.rb