shelly 0.4.38 → 0.4.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a378b3163f2759b50c3527162a36a2e448aaa0a2
-  data.tar.gz: e51cc9e70dc529e7ebf7e1b638dd7972afc4a94c
+  metadata.gz: b5d9e5112799516f4300810c0c9d4bc63a755a18
+  data.tar.gz: ef02f4bd1ef58a34a5c72a566e22d99a685938dc
 SHA512:
-  metadata.gz: 65b56e13341eb0e9ae7a8ed219c9537ab43d96c78b9c7e98ac9cb1f6c1d1d38752cc7f843b3105bbd30a5212aa95d236e97706be858c4af4ae0d23e577aeb0db
-  data.tar.gz: 605a7ea1cd53db41017d14f98432c793ac332983911425b325fed46885ebe8029860523070f487c40f61c84b480f68ccca80f18d3d52a17ac165b73ce6a0c43a
+  metadata.gz: 3eaac18b74f4977637ff4d26d0d019ba4f3288a469caaa819fde9b90190c850198ec184ca0e4bf67c25d9bb7bc65ca105fd4e9c4e446bcd72cd5bc22c0f953de
+  data.tar.gz: 8fa35d39646836f2405484650bbba28b26b8f836349d7ff9e0e68e5c5b58b12a7cc4e3bab8e0c1cfe64554f6306f0e900f43efca319319ef6a2f803d63e43d6a

data/.travis.yml

@@ -1,9 +1,9 @@
 rvm:
-  - "2.1"
-  - 2.0.0
-  - 1.9.3
-  - jruby-19mode
+- '2.1'
+- 2.0.0
+- 1.9.3
+- jruby-19mode
 notifications:
   email: false
-  campfire:
-    secure: 'ZSIx+w/r0QrOtpWu8EfmlypA9+pCRYSNU01Hv0ZvxOBu1EEp1Z/sDif0dCyyLrhv7lUOESdlcfmwVXUx93zEk2f+YMakG0NBnvMUhlkUhBLEsxDdPIgihhTirUIcWLrtPhtUbFA68/eXAP55wlz4Vcou5CHz8kk0+qmUX7QnqlI='
+  slack:
+    secure: D5ohRHtjO58jbSOGxZIGFIBQ0GLGhpgojxgrNFxwebzyvfN4kQK9iDdurWapwuXPpsDukLz8gnnlaboJ0wjmqjp4MEtXoAO+3PdYHChPOiL/bSpOAtuE5o/Gh2LVu6RXI+//cuxjfREE2bSbdFJnFzlb3lccuoU4x1c3JB5YbS4=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.39 / 2014-11-17
+
+* [improvement] API changed to support multiple certificates and IP addresses,
+  resource name changed from Cert to Endpoint
+
 ## 0.4.38 / 2014-10-20
 
 * [improvement] Deployment logs procesess moved after puma

data/lib/shelly/app.rb

@@ -215,16 +215,24 @@ module Shelly
       configs.any? { |config| config["path"] == path }
     end
 
-    def cert
-      shelly.cert(code_name)
+    def endpoints
+      shelly.endpoints(code_name)
     end
 
-    def create_cert(content, key)
-      shelly.create_cert(code_name, content, key)
+    def endpoint(uuid)
+      shelly.endpoint(code_name, uuid)
     end
 
-    def update_cert(content, key)
-      shelly.update_cert(code_name, content, key)
+    def create_endpoint(certificate, key, sni)
+      shelly.create_endpoint(code_name, certificate, key, sni)
+    end
+
+    def update_endpoint(uuid, certificate, key)
+      shelly.update_endpoint(code_name, uuid, certificate, key)
+    end
+
+    def delete_endpoint(uuid)
+      shelly.delete_endpoint(code_name, uuid)
     end
 
     def rake(task)

data/lib/shelly/cli/backup.rb

@@ -87,7 +87,7 @@ module Shelly
       def restore(filename)
         app = multiple_clouds(options[:cloud], "backup restore FILENAME")
         backup = app.database_backup(filename)
-        say "You are about restore #{backup.kind} database for cloud #{backup.code_name} to state from #{backup.filename}"
+        say "You are about to restore #{backup.kind} database for cloud #{backup.code_name} to state from #{backup.filename}"
         say_new_line
         ask_to_restore_database
         app.restore_backup(filename)

data/lib/shelly/cli/endpoint.rb

@@ -0,0 +1,175 @@
+# encoding: utf-8
+
+require "shelly/cli/command"
+
+module Shelly
+  module CLI
+    class Endpoint < Command
+      namespace :endpoint
+      include Helpers
+
+      before_hook :logged_in?, :only => [:index, :show, :create, :update]
+
+      class_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
+
+      desc "list", "List HTTP endpoints"
+      def list
+        app = multiple_clouds(options[:cloud], "endpoint list")
+
+        endpoints = app.endpoints
+
+        if endpoints.present?
+          say "Available HTTP endpoints", :green
+          say_new_line
+          to_display = [["UUID", "|  IP address", "|  Certificate", "|  SNI"]]
+
+          endpoints.each do |endpoint|
+
+            to_display << [
+              endpoint['uuid'],
+              "|  #{print_check(endpoint['ip_address'], :return_value => true)}",
+              "|  #{print_check(endpoint['info']['domain'], :return_value => true)}",
+              "|  #{print_check(endpoint['sni'])}"
+            ]
+          end
+
+          print_table(to_display, :ident => 2)
+
+        else
+          say "No HTTP endpoints available"
+        end
+      end
+
+      desc "show", "Show detail information about HTTP endpoint"
+      def show(uuid)
+        app = multiple_clouds(options[:cloud], "endpoint show UUID")
+
+        endpoint = app.endpoint(uuid)
+
+        say "UUID: #{endpoint['uuid']}"
+        say "IP address: #{endpoint['ip_address']}", nil, true
+        say "SNI: #{"✓" if endpoint['sni']}", nil, true
+
+        say_new_line
+        if endpoint['info']['subject'] && endpoint['info']['issuer']
+          say "Certificate details:", :green
+          say "Domain: #{endpoint['info']['domain']}", nil, true
+          say "Issuer: #{endpoint['info']['issuer']}"
+          say "Subject: #{endpoint['info']['subject']}"
+          say "Not valid before: #{Time.parse(endpoint['info']['since']).
+            getlocal.strftime("%Y-%m-%d %H:%M:%S")}"
+          say "Expires: #{Time.parse(endpoint['info']['to']).
+            getlocal.strftime("%Y-%m-%d %H:%M:%S")}"
+        else
+          say "No SSL certificate added"
+        end
+      rescue Client::NotFoundException => e
+        raise unless e.resource == :endpoint
+        say_error "Endpoint not found"
+      end
+
+      desc "create [CERT_PATH] [KEY_PATH] [BUNDLE_PATH]", "Add HTTP endpoint " \
+        "to your cloud"
+      long_desc %{
+        Add HTTP endpoint to your cloud. Adding SSL certificate is optional and not required\n
+        CERT_PATH - path to certificate.\n
+        KEY_PATH - path to private key.\n
+        BUNDLE_PATH - optional path to certificate bundle path.
+      }
+      method_option "sni", :type => :boolean,
+        :desc => "Create SNI endpoint"
+      def create(cert_path = nil, key_path = nil, bundle_path = nil)
+        app = multiple_clouds(options[:cloud],
+          "endpoint create [CERT_PATH] [KEY_PATH] [BUNDLE_PATH]")
+
+        certificate, key = read_certificate_components(cert_path, key_path,
+          bundle_path)
+
+        endpoint = app.create_endpoint(certificate, key, options["sni"])
+
+        say "Endpoint was created for #{app} cloud", :green
+        if endpoint['ip_address']
+          say "Deployed certificate on front end servers." if certificate && key
+          say "Point your domain to private IP address: #{endpoint['ip_address']}"
+        else
+          say "Private IP address was requested for your cloud."
+          say "Support has been notified and will contact you shortly."
+        end
+      rescue Client::ValidationException => e
+        e.each_error { |error| say_error error, :with_exit => false }
+        exit 1
+      end
+
+      desc "update UUID CERT_PATH KEY_PATH [BUNDLE_PATH]", "Update HTTP "\
+        "endpoint by adding SSL certificate"
+      long_desc %{
+        Update current HTTP endpoint with SSL certificate\n
+        CERT_PATH - path to certificate.\n
+        KEY_PATH - path to private key.\n
+        BUNDLE_PATH - optional path to certificate bundle path.
+      }
+      def update(uuid, cert_path, key_path, bundle_path = nil)
+        app = multiple_clouds(options[:cloud],
+          "endpoint update UUID CERT_PATH KEY_PATH [BUNDLE_PATH]")
+
+        certificate, key = read_certificate_components(cert_path, key_path,
+          bundle_path)
+
+        endpoint = app.update_endpoint(uuid, certificate, key)
+
+        say "Endpoint was updated", :green
+        if endpoint['ip_address']
+          say "Deployed certificate on front end servers."
+          say "Point your domain to private IP address: #{endpoint['ip_address']}"
+        else
+          say "Private IP address was requested for your cloud."
+          say "Support has been notified and will contact you shortly."
+        end
+      rescue Client::ValidationException => e
+        e.each_error { |error| say_error error, :with_exit => false }
+        exit 1
+      rescue Client::NotFoundException => e
+        raise unless e.resource == :certificate
+        say_error "Endpoint not found"
+      end
+
+      desc "delete UUID", "Delete HTTP endpoint"
+      def delete(uuid)
+        app = multiple_clouds(options[:cloud], "endpoint delete UUID")
+        endpoint = app.endpoint(uuid)
+
+        if endpoint['ip_address']
+          say_warning "Removing endpoint will release #{endpoint['ip_address']} IP address."
+        end
+        if yes?("Are you sure you want to delete endpoint (yes/no):")
+          app.delete_endpoint(uuid)
+          say "Endpoint was deleted"
+        end
+      rescue Client::NotFoundException => e
+        raise unless e.resource == :certificate
+        say_error "Endpoint not found"
+      end
+
+      no_tasks do
+        def print_check(check, options = {})
+          return check if options[:return_value] && check
+          check ? "✓" : "✗"
+        end
+
+        def read_certificate_components(cert_path, key_path, bundle_path)
+          if cert_path || key_path
+            say_error "Provide both certificate and key" unless (cert_path && key_path)
+
+            certificate = ::File.read(cert_path).strip
+            bundle = bundle_path ? ::File.read(bundle_path).strip : ""
+            key = ::File.read(key_path).strip
+
+            certificate = certificate + "\n" + bundle
+
+            [certificate, key]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shelly/cli/main.rb

@@ -7,7 +7,7 @@ require "shelly/cli/config"
 require "shelly/cli/file"
 require "shelly/cli/organization"
 require "shelly/cli/logs"
-require "shelly/cli/cert"
+require "shelly/cli/endpoint"
 require "shelly/cli/maintenance"
 
 require "shelly/cli/main/add"
@@ -26,7 +26,7 @@ module Shelly
       register_subcommand(File, "file", "file <command>", "Upload and download files to and from persistent storage")
       register_subcommand(Organization, "organization", "organization <command>", "View organizations")
       register_subcommand(Logs, "log", "logs <command>", "View application logs")
-      register_subcommand(Cert, "cert", "cert <command>", "Mange application certificates")
+      register_subcommand(Endpoint, "endpoint", "cert <command>", "Mange application HTTP(S) endpoints")
       register_subcommand(Maintenance, "maintenance", "maintenance <command>", "Mange application maintenance events")
 
       check_unknown_options!(:except => :rake)
@@ -118,7 +118,7 @@ module Shelly
         print_wrapped "Deployed by: #{app.git_info["deployed_push_author"]}", :ident => 2
         say_new_line
         print_wrapped "Repository URL: #{app.git_info["repository_url"]}", :ident => 2
-        print_wrapped "Web server IP: #{app.web_server_ip}", :ident => 2
+        print_wrapped "Web server IP: #{app.web_server_ip.join(', ')}", :ident => 2
         say_new_line
 
         print_wrapped "Usage:", :ident => 2

data/lib/shelly/client.rb

@@ -18,7 +18,7 @@ module Shelly
     require 'shelly/client/ssh_keys'
     require 'shelly/client/organizations'
     require 'shelly/client/auth'
-    require 'shelly/client/cert'
+    require 'shelly/client/endpoint'
     require 'shelly/client/maintenance'
 
     def api_url

data/lib/shelly/client/endpoint.rb

@@ -0,0 +1,25 @@
+class Shelly::Client
+  def endpoints(cloud)
+    get("/apps/#{cloud}/endpoints")
+  end
+
+  def endpoint(cloud, uuid)
+    get("/apps/#{cloud}/endpoints/#{uuid}")
+  end
+
+  def create_endpoint(cloud, certificate, key, sni)
+    endpoint = certificate && key ? {:certificate => certificate,
+      :key => key} : {}
+
+    post("/apps/#{cloud}/endpoints", :endpoint => endpoint.merge(:sni => sni))
+  end
+
+  def update_endpoint(cloud, uuid, certificate, key)
+    put("/apps/#{cloud}/endpoints/#{uuid}",
+      :endpoint => {:certificate => certificate, :key => key})
+  end
+
+  def delete_endpoint(cloud, uuid)
+    delete("/apps/#{cloud}/endpoints/#{uuid}")
+  end
+end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.4.38"
+  VERSION = "0.4.39"
 end

data/spec/shelly/app_spec.rb

@@ -541,20 +541,39 @@ describe Shelly::App do
     end
   end
 
-  context "certificate" do
-    it "#show_cert should query api" do
-      @client.should_receive(:cert).with(@app.code_name)
-      @app.cert
+  describe "#endpoints" do
+    it "should use api" do
+      @client.should_receive(:endpoints).with(@app.code_name)
+      @app.endpoints
     end
+  end
+
+  describe "#show_endpoint" do
+    it "should use api" do
+      @client.should_receive(:endpoint).with(@app.code_name, 'uuid')
+      @app.endpoint('uuid')
+    end
+  end
 
-    it "#create_cert should query api" do
-      @client.should_receive(:create_cert).with(@app.code_name, 'crt', 'key')
-      @app.create_cert("crt", "key")
+  describe "#create_cert" do
+    it "should use api" do
+      @client.should_receive(:create_endpoint).with(@app.code_name, 'crt', 'key', true)
+      @app.create_endpoint("crt", "key", true)
     end
+  end
+
+  describe "#update_cert" do
+    it "should use api" do
+      @client.should_receive(:update_endpoint).with(@app.code_name, 'uuid',
+        "crt", "key")
+      @app.update_endpoint("uuid", "crt", "key")
+    end
+  end
 
-    it "#update_cert should query api" do
-      @client.should_receive(:update_cert).with(@app.code_name, 'crt', 'key')
-      @app.update_cert("crt", "key")
+  describe "#delete_endpoint" do
+    it "should use api" do
+      @client.should_receive(:delete_endpoint).with(@app.code_name, "uuid")
+      @app.delete_endpoint("uuid")
     end
   end
 

data/spec/shelly/cli/backup_spec.rb

@@ -233,7 +233,7 @@ describe Shelly::CLI::Backup do
     end
 
     it "should restore database" do
-      $stdout.should_receive(:puts).with("You are about restore postgresql database for cloud foo-staging to state from better.tar.gz")
+      $stdout.should_receive(:puts).with("You are about to restore postgresql database for cloud foo-staging to state from better.tar.gz")
       $stdout.should_receive(:print).with("I want to restore the database (yes/no): ")
       $stdout.should_receive(:puts).with("\n")
       @client.stub(:restore_backup).with("todo-list-test","better.tar.gz")
@@ -247,7 +247,7 @@ describe Shelly::CLI::Backup do
 
     context "when answering no" do
       it "should cancel restore database" do
-        $stdout.should_receive(:puts).with("You are about restore postgresql database for cloud foo-staging to state from better.tar.gz")
+        $stdout.should_receive(:puts).with("You are about to restore postgresql database for cloud foo-staging to state from better.tar.gz")
         $stdout.should_receive(:print).with("I want to restore the database (yes/no): ")
         $stdout.should_receive(:puts).with("\n")
         $stdout.should_receive(:puts).with(red "Canceled")

data/spec/shelly/cli/endpoint_spec.rb

@@ -0,0 +1,197 @@
+require "spec_helper"
+require "shelly/cli/endpoint"
+
+describe Shelly::CLI::Endpoint do
+  before do
+    FileUtils.stub(:chmod)
+    @cli = Shelly::CLI::Endpoint.new
+    Shelly::CLI::Endpoint.stub(:new).and_return(@cli)
+    @client = mock
+    Shelly::Client.stub(:new).and_return(@client)
+    @client.stub(:authorize!)
+    FileUtils.mkdir_p("/projects/foo")
+    Dir.chdir("/projects/foo")
+    @app = Shelly::App.new("foo-production")
+    Shelly::App.stub(:new).and_return(@app)
+    File.open("Cloudfile", 'w') { |f| f.write("foo-production:\n") }
+  end
+
+  describe "#index" do
+    it "should show all endpoints" do
+      @app.should_receive(:endpoints).and_return(endpoints_response)
+
+      $stdout.should_receive(:puts).with(green "Available HTTP endpoints")
+      $stdout.should_receive(:puts).with("\n")
+      $stdout.should_receive(:puts).with("  UUID   |  IP address  |  Certificate  |  SNI")
+      $stdout.should_receive(:puts).with("  uuid1  |  10.0.0.1    |  example.com  |  \u2713")
+      $stdout.should_receive(:puts).with("  uuid2  |  10.0.0.2    |  \u2717            |  \u2717")
+
+      invoke(@cli, :list)
+    end
+
+    def endpoints_response
+      [
+        {'ip_address' => '10.0.0.1',
+          'sni' => true,
+          'uuid' => 'uuid1', 'info' => {
+            'domain' => 'example.com',
+            'issuer' => 'CA',
+            'subjcet' => 'organization info',
+            'since' => '2012-06-11 23:00:00 UTC',
+            'to' => '2015-06-11 23:00:00 UTC'
+          }
+        },
+        {'ip_address' => '10.0.0.2',
+          'sni' => false,
+          'uuid' => 'uuid2', 'info' => {
+            'domain' => nil,
+            'issuer' => nil,
+            'subjcet' => nil,
+            'since' => nil,
+            'to' => nil
+           }
+        }
+      ]
+    end
+
+    context "no endpoints" do
+      it "should display information" do
+        @app.should_receive(:endpoints).and_return([])
+        $stdout.should_receive(:puts).with("No HTTP endpoints available")
+        invoke(@cli, :list)
+      end
+    end
+  end
+
+  describe "#show" do
+    it "should description" do
+      @app.should_receive(:endpoint).with('uuid1').and_return(endpoint_response)
+      $stdout.should_receive(:puts).with("UUID: uuid1")
+      $stdout.should_receive(:puts).with("IP address: 10.0.0.1")
+      $stdout.should_receive(:puts).with("SNI: \u2713")
+      $stdout.should_receive(:puts).with("\n")
+      $stdout.should_receive(:puts).with(green "Certificate details:")
+      $stdout.should_receive(:puts).with("Domain: example.com")
+      $stdout.should_receive(:puts).with("Issuer: CA")
+      $stdout.should_receive(:puts).with("Subject: organization info")
+      $stdout.should_receive(:puts).with("Not valid before:"\
+        " #{Time.parse(endpoint_response['info']['since']).getlocal.strftime("%Y-%m-%d %H:%M:%S")}")
+      $stdout.should_receive(:puts).with("Expires:"\
+        " #{Time.parse(endpoint_response['info']['to']).getlocal.strftime("%Y-%m-%d %H:%M:%S")}")
+      invoke(@cli, :show, 'uuid1')
+    end
+
+    context "endpoint not found" do
+      it "should exit" do
+        exception = Shelly::Client::NotFoundException.new("resource" => "endpoint")
+        @app.should_receive(:endpoint).with('uuid').and_raise(exception)
+        $stdout.should_receive(:puts).with(red "Endpoint not found")
+        lambda {
+          invoke(@cli, :show, 'uuid')
+        }.should raise_error(SystemExit)
+      end
+    end
+  end
+
+  describe "#create" do
+    before do
+      File.stub(:read).with('crt_path').and_return('crt')
+      File.stub(:read).with('key_path').and_return('key')
+      File.stub(:read).with('bundle_path').and_return('bundle')
+    end
+
+    it "should create endpoint" do
+      @app.should_receive(:create_endpoint).with("crt\n", "key", true).
+        and_return(endpoint_response('ip_address' => '10.0.0.1'))
+
+      $stdout.should_receive(:puts).with(green "Endpoint was created for #{@app.to_s} cloud")
+      $stdout.should_receive(:puts).with("Deployed certificate on front end servers.")
+      $stdout.should_receive(:puts).with("Point your domain to private IP address: 10.0.0.1")
+
+      @cli.options = {"sni" => true}
+      invoke(@cli, :create, "crt_path", "key_path")
+    end
+
+    context "validation errors" do
+      it "should show errors and exit" do
+        exception = Shelly::Client::ValidationException.new({"errors" => [["key", "is invalid"]]})
+        @app.should_receive(:create_endpoint).and_raise(exception)
+        $stdout.should_receive(:puts).with(red "Key is invalid")
+
+        lambda {
+          invoke(@cli, :create, "crt_path", "key_path", "bundle_path")
+        }.should raise_error(SystemExit)
+      end
+    end
+
+    context "providing one only part of certificate" do
+      it "should show error and exit" do
+        @app.should_not_receive(:create_endpoint)
+        $stdout.should_receive(:puts).with(red "Provide both certificate and key")
+
+        lambda {
+          invoke(@cli, :create, "crt_path")
+        }.should raise_error(SystemExit)
+      end
+    end
+  end
+
+  describe "#update" do
+    before do
+      File.stub(:read).with('crt_path').and_return('crt')
+      File.stub(:read).with('key_path').and_return('key')
+      File.stub(:read).with('bundle_path').and_return('bundle')
+    end
+
+    it "should create endpoint" do
+      @app.should_receive(:update_endpoint).with('uuid', "crt\nbundle", "key").
+        and_return(endpoint_response)
+      $stdout.should_receive(:puts).with(green "Endpoint was updated")
+      $stdout.should_receive(:puts).with("Deployed certificate on front end servers.")
+      $stdout.should_receive(:puts).with("Point your domain to private IP address: 10.0.0.1")
+
+      invoke(@cli, :update, 'uuid', "crt_path", "key_path", "bundle_path")
+    end
+
+    context "validation errors" do
+      it "should show errors and exit" do
+        exception = Shelly::Client::ValidationException.new({"errors" => [["key", "is invalid"]]})
+        @app.should_receive(:update_endpoint).and_raise(exception)
+        $stdout.should_receive(:puts).with(red "Key is invalid")
+
+        lambda {
+          invoke(@cli, :update, 'uuid', "crt_path", "key_path", "bundle_path")
+        }.should raise_error(SystemExit)
+      end
+    end
+  end
+
+  describe "#delete" do
+    it "should ask to delete endpoint" do
+      @app.should_receive(:endpoint).with('uuid').
+        and_return(endpoint_response)
+      @app.should_receive(:delete_endpoint).with('uuid')
+
+      $stdout.should_receive(:puts).with(yellow "Removing endpoint will release 10.0.0.1 IP address.")
+      $stdout.should_receive(:print).with("Are you sure you want to delete endpoint (yes/no): ")
+      $stdout.should_receive(:puts).with("Endpoint was deleted")
+
+      fake_stdin(["yes"]) do
+        invoke(@cli, :delete, 'uuid')
+      end
+
+    end
+  end
+
+  def endpoint_response(options = {})
+    {'ip_address' => '10.0.0.1', 'sni' => true,
+     'uuid' => 'uuid1', 'info' => {
+        'domain' => 'example.com',
+        'issuer' => 'CA',
+        'subject' => 'organization info',
+        'since' => '2012-06-11 23:00:00 UTC',
+        'to' => '2015-06-11 23:00:00 UTC'
+      }
+    }.merge(options)
+  end
+end

data/spec/shelly/cli/main_spec.rb

@@ -1176,7 +1176,7 @@ Wait until cloud is in 'turned off' state and try again.")
             }
           }
         },
-        "web_server_ip" => "22.22.22.22"}.merge(options)
+        "web_server_ip" => ["22.22.22.22"]}.merge(options)
     end
   end
 

data/spec/shelly/client_spec.rb

@@ -432,22 +432,32 @@ describe Shelly::Client do
     end
   end
 
-  context "certificate" do
-    it "#cert should perform a get request" do
-      @client.should_receive(:get).with("/apps/staging-foo/cert")
-      @client.cert("staging-foo")
+  context "endpoints" do
+    it "#endpoints should perform a get request" do
+      @client.should_receive(:get).with("/apps/staging-foo/endpoints")
+      @client.endpoints("staging-foo")
     end
 
-    it "#create_cert should perform a post request" do
-      @client.should_receive(:post).with("/apps/staging-foo/cert",
-        :cert => {:content => 'crt', :key => 'key'})
-      @client.create_cert("staging-foo", "crt", "key")
+    it "#endpoint should perform a get request" do
+      @client.should_receive(:get).with("/apps/staging-foo/endpoints/uuid")
+      @client.endpoint("staging-foo", 'uuid')
     end
 
-    it "#update_cert should perform a put request" do
-      @client.should_receive(:put).with("/apps/staging-foo/cert",
-        :cert => {:content => 'crt', :key => 'key'})
-      @client.update_cert("staging-foo", "crt", "key")
+    it "#create_endpoint should perform a post request" do
+      @client.should_receive(:post).with("/apps/staging-foo/endpoints",
+        :endpoint => {:certificate => 'crt', :key => 'key', :sni => true})
+      @client.create_endpoint("staging-foo", 'crt', 'key', true)
+    end
+
+    it "#update_endpoint should perform a put request" do
+      @client.should_receive(:put).with("/apps/staging-foo/endpoints/uuid",
+        :endpoint => {:certificate => 'crt', :key => 'key'})
+      @client.update_endpoint("staging-foo", 'uuid', 'crt', 'key')
+    end
+
+    it "#delete_endpoint should perform a delete request" do
+      @client.should_receive(:delete).with("/apps/staging-foo/endpoints/uuid")
+      @client.delete_endpoint('staging-foo', 'uuid')
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.4.38
+  version: 0.4.39
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-20 00:00:00.000000000 Z
+date: 2014-11-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -257,11 +257,11 @@ files:
 - lib/shelly/app.rb
 - lib/shelly/backup.rb
 - lib/shelly/cli/backup.rb
-- lib/shelly/cli/cert.rb
 - lib/shelly/cli/command.rb
 - lib/shelly/cli/config.rb
 - lib/shelly/cli/database.rb
 - lib/shelly/cli/deploy.rb
+- lib/shelly/cli/endpoint.rb
 - lib/shelly/cli/errors.rb
 - lib/shelly/cli/file.rb
 - lib/shelly/cli/logs.rb
@@ -276,11 +276,11 @@ files:
 - lib/shelly/client/application_logs.rb
 - lib/shelly/client/apps.rb
 - lib/shelly/client/auth.rb
-- lib/shelly/client/cert.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/endpoint.rb
 - lib/shelly/client/errors.rb
 - lib/shelly/client/maintenance.rb
 - lib/shelly/client/organizations.rb
@@ -310,11 +310,11 @@ files:
 - spec/shelly/app_spec.rb
 - spec/shelly/backup_spec.rb
 - spec/shelly/cli/backup_spec.rb
-- spec/shelly/cli/cert_spec.rb
 - spec/shelly/cli/command_spec.rb
 - spec/shelly/cli/config_spec.rb
 - spec/shelly/cli/database_spec.rb
 - spec/shelly/cli/deploy_spec.rb
+- spec/shelly/cli/endpoint_spec.rb
 - spec/shelly/cli/file_spec.rb
 - spec/shelly/cli/logs_spec.rb
 - spec/shelly/cli/main_spec.rb
@@ -353,7 +353,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 2.4.2
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Shelly Cloud command line tool
@@ -363,11 +363,11 @@ test_files:
 - spec/shelly/app_spec.rb
 - spec/shelly/backup_spec.rb
 - spec/shelly/cli/backup_spec.rb
-- spec/shelly/cli/cert_spec.rb
 - spec/shelly/cli/command_spec.rb
 - spec/shelly/cli/config_spec.rb
 - spec/shelly/cli/database_spec.rb
 - spec/shelly/cli/deploy_spec.rb
+- spec/shelly/cli/endpoint_spec.rb
 - spec/shelly/cli/file_spec.rb
 - spec/shelly/cli/logs_spec.rb
 - spec/shelly/cli/main_spec.rb

data/lib/shelly/cli/cert.rb

@@ -1,99 +0,0 @@
-require "shelly/cli/command"
-
-module Shelly
-  module CLI
-    class Cert < Command
-      namespace :cert
-      include Helpers
-
-      before_hook :logged_in?, :only => [:show, :create, :update]
-
-      class_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
-
-      desc "show", "Show current certificate information"
-      def show
-        app = multiple_clouds(options[:cloud], "backup list")
-
-        cert = app.cert
-        say "Issuer: #{cert['info']['issuer']}"
-        say "Subject: #{cert['info']['subject']}"
-        say "Not valid before: #{Time.parse(cert['info']['since']).
-          getlocal.strftime("%Y-%m-%d %H:%M:%S")}"
-        say "Expires: #{Time.parse(cert['info']['to']).
-          getlocal.strftime("%Y-%m-%d %H:%M:%S")}"
-      rescue Client::NotFoundException => e
-        raise unless e.resource == :certificate
-        say_error "Certificate not found"
-      end
-
-      desc "create CERT_PATH KEY_PATH [BUNDLE_PATH]", "Add certificate to your cloud"
-      long_desc %{
-        Add certificate to your cloud.\n
-        CERT_PATH - path to certificate.\n
-        KEY_PATH - path to private key.\n
-        BUNDLE_PATH - optional path to certificate bundle path.
-      }
-      def create(cert_path, key_path, bundle_path = nil)
-        app = multiple_clouds(options[:cloud], "cert create CERT_PATH [BUNDLE_PATH] KEY_PATH")
-
-        content = ::File.read(cert_path).strip
-        bundle = bundle_path ? ::File.read(bundle_path).strip : ""
-        key = ::File.read(key_path).strip
-
-        content = content + "\n" + bundle
-        cert = app.create_cert(content, key)
-
-        say "Certificate was added to your cloud", :green
-        if cert['ip_address']
-          say "Deploying certificate on front end."
-          say "Point your domain to private IP address: #{cert['ip_address']}"
-        else
-          say "SSL requires certificate and private IP address."
-          say "Private IP address was requested for your cloud."
-          say "Support has been notified and will contact you shortly."
-        end
-      rescue Client::ValidationException => e
-        e.each_error { |error| say_error error, :with_exit => false }
-        exit 1
-      rescue Client::ConflictException => e
-        say_error e[:message]
-      end
-
-      desc "update CERT_PATH KEY_PATH [BUNDLE_PATH]", "Update current certificate"
-      long_desc %{
-        Update current certificate.\n
-        CERT_PATH - path to certificate.\n
-        KEY_PATH - path to private key.\n
-        BUNDLE_PATH - optional path to certificate bundle path.
-      }
-      def update(cert_path, key_path, bundle_path = nil)
-        app = multiple_clouds(options[:cloud], "cert update CERT_PATH [BUNDLE_PATH] KEY_PATH")
-
-        content = ::File.read(cert_path).strip
-        bundle = bundle_path ? ::File.read(bundle_path).strip : ""
-        key = ::File.read(key_path).strip
-
-        content = content + "\n" + bundle
-        cert = app.update_cert(content, key)
-
-        say "Certificate was updated", :green
-        if cert['ip_address']
-          say "Deploying certificate on front end."
-          say "Point your domain to private IP address: #{cert['ip_address']}"
-        else
-          say "SSL requires certificate and private IP address."
-          say "Private IP address was requested for your cloud."
-          say "Support has been notified and will contact you shortly."
-        end
-      rescue Client::ValidationException => e
-        e.each_error { |error| say_error error, :with_exit => false }
-        exit 1
-      rescue Client::NotFoundException => e
-        raise unless e.resource == :certificate
-        say_error "Certificate not found"
-      rescue Client::ConflictException => e
-        say_error e[:message]
-      end
-    end
-  end
-end

data/lib/shelly/client/cert.rb

@@ -1,13 +0,0 @@
-class Shelly::Client
-  def cert(cloud)
-    get("/apps/#{cloud}/cert")
-  end
-
-  def create_cert(cloud, content, key)
-    post("/apps/#{cloud}/cert", :cert => {:content => content, :key => key})
-  end
-
-  def update_cert(cloud, content, key)
-    put("/apps/#{cloud}/cert", :cert => {:content => content, :key => key})
-  end
-end

data/spec/shelly/cli/cert_spec.rb

@@ -1,161 +0,0 @@
-require "spec_helper"
-require "shelly/cli/cert"
-
-describe Shelly::CLI::Cert do
-  before do
-    FileUtils.stub(:chmod)
-    @cli = Shelly::CLI::Cert.new
-    Shelly::CLI::Cert.stub(:new).and_return(@cli)
-    @client = mock
-    Shelly::Client.stub(:new).and_return(@client)
-    @client.stub(:authorize!)
-    FileUtils.mkdir_p("/projects/foo")
-    Dir.chdir("/projects/foo")
-    @app = Shelly::App.new("foo-production")
-    Shelly::App.stub(:new).and_return(@app)
-    File.open("Cloudfile", 'w') { |f| f.write("foo-production:\n") }
-  end
-
-  describe "#show" do
-    it "should description" do
-      @app.should_receive(:cert).and_return(cert_response)
-      $stdout.should_receive(:puts).with("Issuer: Some issuer")
-      $stdout.should_receive(:puts).with("Subject: Some subject")
-      $stdout.should_receive(:puts).with("Not valid before:"\
-        " #{Time.parse(cert_response['info']['since']).getlocal.strftime("%Y-%m-%d %H:%M:%S")}")
-      $stdout.should_receive(:puts).with("Expires:"\
-        " #{Time.parse(cert_response['info']['to']).getlocal.strftime("%Y-%m-%d %H:%M:%S")}")
-      invoke(@cli, :show)
-    end
-
-    context "certificate not found" do
-      it "should exit" do
-        exception = Shelly::Client::NotFoundException.new("resource" => "certificate")
-        @app.should_receive(:cert).and_raise(exception)
-        $stdout.should_receive(:puts).with(red "Certificate not found")
-        lambda {
-          invoke(@cli, :show)
-        }.should raise_error(SystemExit)
-      end
-    end
-  end
-
-  describe "#create" do
-    before do
-      File.stub(:read).with('crt_path').and_return('crt')
-      File.stub(:read).with('key_path').and_return('key')
-      File.stub(:read).with('bundle_path').and_return('bundle')
-    end
-
-    it "should create certificate" do
-      @app.should_receive(:create_cert).with("crt\nbundle", "key").
-        and_return(cert_response)
-      $stdout.should_receive(:puts).with(green "Certificate was added to your cloud")
-      $stdout.should_receive(:puts).with("Deploying certificate on front end.")
-      $stdout.should_receive(:puts).with("Point your domain to private IP address: 10.0.0.1")
-
-      invoke(@cli, :create, "crt_path", "key_path", "bundle_path")
-    end
-
-    it "should create certificate without bundle" do
-      @app.should_receive(:create_cert).with("crt\n", "key").
-        and_return(cert_response('ip_address' => nil))
-
-      $stdout.should_receive(:puts).with(green "Certificate was added to your cloud")
-      $stdout.should_receive(:puts).with("SSL requires certificate and private IP address.")
-      $stdout.should_receive(:puts).with("Private IP address was requested for your cloud.")
-      $stdout.should_receive(:puts).with("Support has been notified and will contact you shortly.")
-
-      invoke(@cli, :create, "crt_path", "key_path")
-    end
-
-    context "validation errors" do
-      it "should show errors and exit" do
-        exception = Shelly::Client::ValidationException.new({"errors" => [["key", "is invalid"]]})
-        @app.should_receive(:create_cert).and_raise(exception)
-        $stdout.should_receive(:puts).with(red "Key is invalid")
-
-        lambda {
-          invoke(@cli, :create, "crt_path", "key_path", "bundle_path")
-        }.should raise_error(SystemExit)
-      end
-    end
-
-    context "deployment conflict" do
-      it "should show errors and exit" do
-        exception = Shelly::Client::ConflictException.new({"message" => "Deployment is in progress"})
-        @app.should_receive(:create_cert).and_raise(exception)
-        $stdout.should_receive(:puts).with(red "Deployment is in progress")
-
-        lambda {
-          invoke(@cli, :create, "crt_path", "key_path", "bundle_path")
-        }.should raise_error(SystemExit)
-      end
-    end
-  end
-
-  describe "#update" do
-    before do
-      File.stub(:read).with('crt_path').and_return('crt')
-      File.stub(:read).with('key_path').and_return('key')
-      File.stub(:read).with('bundle_path').and_return('bundle')
-    end
-
-    it "should create certificate" do
-      @app.should_receive(:update_cert).with("crt\nbundle", "key").
-        and_return(cert_response)
-      $stdout.should_receive(:puts).with(green "Certificate was updated")
-      $stdout.should_receive(:puts).with("Deploying certificate on front end.")
-      $stdout.should_receive(:puts).with("Point your domain to private IP address: 10.0.0.1")
-
-      invoke(@cli, :update, "crt_path", "key_path", "bundle_path")
-    end
-
-    it "should create certificate without bundle" do
-      @app.should_receive(:update_cert).with("crt\n", "key").
-        and_return(cert_response('ip_address' => nil))
-
-      $stdout.should_receive(:puts).with(green "Certificate was updated")
-      $stdout.should_receive(:puts).with("SSL requires certificate and private IP address.")
-      $stdout.should_receive(:puts).with("Private IP address was requested for your cloud.")
-      $stdout.should_receive(:puts).with("Support has been notified and will contact you shortly.")
-
-      invoke(@cli, :update, "crt_path", "key_path")
-    end
-
-    context "validation errors" do
-      it "should show errors and exit" do
-        exception = Shelly::Client::ValidationException.new({"errors" => [["key", "is invalid"]]})
-        @app.should_receive(:update_cert).and_raise(exception)
-        $stdout.should_receive(:puts).with(red "Key is invalid")
-
-        lambda {
-          invoke(@cli, :update, "crt_path", "key_path", "bundle_path")
-        }.should raise_error(SystemExit)
-      end
-    end
-
-    context "deployment conflict" do
-      it "should show errors and exit" do
-        exception = Shelly::Client::ConflictException.new({"message" => "Deployment is in progress"})
-        @app.should_receive(:update_cert).and_raise(exception)
-        $stdout.should_receive(:puts).with(red "Deployment is in progress")
-
-        lambda {
-          invoke(@cli, :update, "crt_path", "key_path", "bundle_path")
-        }.should raise_error(SystemExit)
-      end
-    end
-  end
-
-  def cert_response(options = {})
-    {
-      'info' => {
-        'issuer' => 'Some issuer',
-        'subject' => 'Some subject',
-        'since' =>  '2012-06-11 23:00:00 UTC',
-        'to' => '2013-06-11 11:00:00 UTC'},
-      'ip_address' => '10.0.0.1'
-    }.merge(options)
-  end
-end