shelly 0.4.42 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bd0f3635267e3be6e9d6fbff86054582b6ac3b9f
-  data.tar.gz: 63d62d167f8245525f44a317e39d72529f1a0037
+  metadata.gz: 4b85bcd0e7111d1a7bdaf59a47384141a49fb347
+  data.tar.gz: c0279a7748d978b1cb427240b4b0c9a49dbbd039
 SHA512:
-  metadata.gz: 7c4780ffcc4713f920354d5e7a4c9a8421b51382a956f3b0acea83023d28c016fe2a7cb1091093464ec8799d4963ed4c2a3b2f14a6d2d73233d85d332bb29593
-  data.tar.gz: 7dee1731a302343f71c175fe6dc87695639d21e55f77ee1d8b8a77d95d7f75a65a3ff11ddf61b4d1822422cae98877194eb9de834d1d7fb5acf3c65c94f20b51
+  metadata.gz: 72a140d37c0f1027109b1a066e9ac6b9c4e8c785be895e46c3225b8b9c92f166b15ba72fc85439137bb3f0de2c18cfd0489d76b8a82085fe8d9bafd05a12409d
+  data.tar.gz: a9c4dc381a59cd781993d8a319767552ea013eea3aace1fead433a14a369cbe58f636baadc2db18cc5d3ce32ad156e2dce5868a62f49011ab5bed84e6165f6f5

data/.travis.yml

@@ -1,4 +1,5 @@
 rvm:
+- '2.2'
 - '2.1'
 - 2.0.0
 - 1.9.3

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.5.0 / 2015-01-02
+
+* [bugfix] Catch Conflict 409 when creating or updating endpoints
+* [improvement] shelly info should print cloud region
+* [improvement] shelly add should ask about organization name instead of number
+  from the list
+* [improvement] Replaced zone with region
+* [improvement] Allow user to choose region for the new cloud
+
 ## 0.4.42 / 2014-12-14
 
 * [improvement] Added --server / -s option for shelly rake command, so user

data/lib/shelly/app.rb

@@ -11,10 +11,11 @@ module Shelly
     DATABASE_KINDS = %w(postgresql mysql mongodb redis)
     DATABASE_CHOICES = DATABASE_KINDS + %w(none)
     SERVER_SIZES = %w(small large)
+    REGIONS = %w(EU NA)
 
     attr_accessor :code_name, :databases, :ruby_version, :environment,
       :git_url, :domains, :web_server_ip, :size, :thin,
-      :organization_name, :zone, :usage, :traffic
+      :organization_name, :zone, :region, :usage, :traffic
 
     def initialize(code_name = nil)
       self.code_name = code_name
@@ -71,7 +72,8 @@ module Shelly
     def create
       attributes = {:code_name => code_name,
                     :organization_name => organization_name,
-                    :zone => zone}
+                    :zone => zone,
+                    :region => @region}
       response = shelly.create_app(attributes)
       assign_attributes(response)
     end
@@ -279,6 +281,10 @@ module Shelly
       attributes["git_info"]
     end
 
+    def region
+      attributes['region'] || @region
+    end
+
     def state
       attributes["state"]
     end

data/lib/shelly/cli/config.rb

@@ -52,7 +52,7 @@ module Shelly
       def create(path)
         app = multiple_clouds(options[:cloud], "create #{path}")
         if app.config_exists?(path)
-          say "File '#{path}' already exists. Use `shelly config edit #{path} --cloud #{options[:cloud]}` to update it.", :red
+          say "File '#{path}' already exists. Use `shelly config edit #{path} --cloud #{app}` to update it.", :red
         else
           output = open_editor(path)
           app.create_config(path, output)

data/lib/shelly/cli/endpoint.rb

@@ -34,7 +34,6 @@ module Shelly
           end
 
           print_table(to_display, :ident => 2)
-
         else
           say "No HTTP endpoints available"
         end
@@ -81,6 +80,18 @@ module Shelly
         app = multiple_clouds(options[:cloud],
           "endpoint create [CERT_PATH] [KEY_PATH] [BUNDLE_PATH]")
 
+        say "Every unique IP address assigned to endpoint costs 10€/month"
+        say "It's required for SSL/TLS"
+        if cert_path == nil && key_path == nil
+          say "You didn't provide certificate but it can be added later"
+          say "Assigned IP address can be used to catch all domains pointing to that address, without SSL/TLS enabled"
+          exit(0) unless yes?("Are you sure you want to create endpoint without certificate (yes/no):")
+        elsif app.endpoints.count > 0
+          ask_if_endpoints_were_already_created(app)
+        else
+          exit(0) unless yes?("Are you sure you want to create endpoint? (yes/no):")
+        end
+
         certificate, key = read_certificate_components(cert_path, key_path,
           bundle_path)
 
@@ -94,6 +105,8 @@ module Shelly
           say "Private IP address was requested for your cloud."
           say "Support has been notified and will contact you shortly."
         end
+      rescue Client::ConflictException => e
+        say_error e['message']
       rescue Client::ValidationException => e
         e.each_error { |error| say_error error, :with_exit => false }
         exit 1
@@ -127,6 +140,8 @@ module Shelly
       rescue Client::ValidationException => e
         e.each_error { |error| say_error error, :with_exit => false }
         exit 1
+      rescue Client::ConflictException => e
+        say_error e['message']
       rescue Client::NotFoundException => e
         raise unless e.resource == :certificate
         say_error "Endpoint not found"
@@ -168,6 +183,16 @@ module Shelly
             [certificate, key]
           end
         end
+
+        def ask_if_endpoints_were_already_created(app)
+          cli = Shelly::CLI::Endpoint.new
+          cli.options = {:cloud => app}
+          cli.list
+          say_new_line
+          exit(0) unless yes?("You already have assigned endpoint(s). Are " \
+            "you sure you want to create another one with a new IP address? " \
+            "(yes/no):")
+        end
       end
     end
   end

data/lib/shelly/cli/main.rb

@@ -111,6 +111,7 @@ module Shelly
         app = multiple_clouds(options[:cloud], "info")
         msg = info_show_last_deploy_logs(app)
         say "Cloud #{app}:", app.in_deploy_failed_state? ? :red : :green
+        print_wrapped "Region: #{app.region}", :ident => 2
         print_wrapped "State: #{app.state_description}#{msg}", :ident => 2
         say_new_line
         print_wrapped "Deployed commit sha: #{app.git_info["deployed_commit_sha"]}", :ident => 2

data/lib/shelly/cli/main/add.rb

@@ -17,6 +17,8 @@ module Shelly
         :desc => "Skip Shelly Cloud requirements check"
       method_option "zone", :type => :string, :hide => true,
         :desc => "Create cloud in given zone"
+      method_option "region", :type => :string,
+        :desc => "Create cloud in given region"
       desc "add", "Add a new cloud"
       def add
         check_options(options)
@@ -27,8 +29,13 @@ module Shelly
         app.code_name = options["code-name"] || ask_for_code_name
         app.databases = options["databases"] || ask_for_databases
         app.size = options["size"] || "small"
-        app.organization_name = options["organization"] || ask_for_organization(options)
-        app.zone = options["zone"]
+        app.organization_name = options["organization"] ||
+          ask_for_organization(options)
+        if options["zone"].present?
+          app.zone = options["zone"]
+        else
+          app.region = options["region"] || ask_for_region
+        end
 
         app.create
         say "Cloud '#{app}' created in '#{app.organization_name}' organization", :green
@@ -60,7 +67,7 @@ module Shelly
         e.each_error { |error| say_error error, :with_exit => false }
         say_new_line
         say_error "Fix erros in the below command and type it again to create your cloud" , :with_exit => false
-        say_error "shelly add --code-name=#{app.code_name.downcase.dasherize} --databases=#{app.databases.join(',')} --organization=#{app.organization_name} --size=#{app.size}"
+        say_error "shelly add --code-name=#{app.code_name.downcase.dasherize} --databases=#{app.databases.join(',')} --organization=#{app.organization_name} --size=#{app.size} --region=#{app.region}"
       rescue Client::ForbiddenException
         say_error "You have to be the owner of '#{app.organization_name}' organization to add clouds"
       rescue Client::NotFoundException => e
@@ -72,33 +79,33 @@ module Shelly
       no_tasks do
         def ask_for_organization(options)
           organizations = Shelly::User.new.organizations
+
           if organizations.blank?
             ask_for_new_organization(options)
           else
-            count = organizations.count
-            option_selected = 0
+            say "Select organization for this cloud:"
+            say_new_line
+
             loop do
-              say "Select organization for this cloud:"
-              say_new_line
               say "existing organizations:"
 
               organizations.each_with_index do |organization, i|
                 print_wrapped "#{i + 1}) #{organization.name}", :ident => 2
               end
-              say_new_line
-
-              print_wrapped "#{count + 1}) provide name for new organization", :ident => 2
 
-              option_selected = ask("Option:")
-              break if ('1'..(count + 1).to_s).include?(option_selected)
-            end
-
-            if option_selected.to_i == count + 1
-              return ask_for_new_organization(options)
-            end
+              say green "Or leave empty to create a new organization"
+              say_new_line
 
-            if (1..count).include?(option_selected.to_i)
-              return organizations[option_selected.to_i - 1].name
+              selected = ask("Organization:")
+              if organizations.select { |o| o.name == selected }.present?
+                return selected
+              elsif selected.empty?
+                say_new_line
+                return ask_for_new_organization(options)
+              else
+                say_new_line
+                say_warning "#{selected} organization does not exist"
+              end
             end
           end
         end
@@ -113,6 +120,28 @@ module Shelly
           end
         end
 
+        def ask_for_region
+          regions = Shelly::App::REGIONS
+          say "Select region for this cloud:"
+          say_new_line
+
+          loop do
+            say "available regions:"
+
+            regions.each_with_index do |region, i|
+              print_wrapped "#{i + 1}) #{region}", :ident => 2
+            end
+            say_new_line
+
+            selected = ask("Region:").upcase
+            if regions.include?(selected)
+              return selected
+            else
+              say_new_line
+              say_warning "#{selected} region is not available"
+            end
+          end
+        end
       end
     end
   end

data/lib/shelly/cli/maintenance.rb

@@ -21,10 +21,10 @@ module Shelly
           say_new_line
 
           maintenances.each do |maintenance|
-            started_at = Time.parse(maintenance['created_at']).
+            started_at = Time.parse(maintenance['created_at']).getlocal.
               strftime('%Y-%m-%d %H:%M:%S')
             finished_at = if maintenance['finished']
-              Time.parse(maintenance['updated_at']).
+              Time.parse(maintenance['updated_at']).getlocal.
                 strftime('%Y-%m-%d %H:%M:%S')
             else
               'in progress'

data/lib/shelly/client/apps.rb

@@ -1,9 +1,10 @@
 class Shelly::Client
   def create_app(attributes)
     organization = attributes.delete(:organization_name)
+    region = attributes.delete(:region)
     zone = attributes.delete(:zone)
     post("/apps", :app => attributes, :organization_name => organization,
-           :zone => zone)
+           :region => region, :zone => zone)
   end
 
   def delete_app(code_name)

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.4.42"
+  VERSION = "0.5.0"
 end

data/spec/shelly/app_spec.rb

@@ -153,6 +153,7 @@ describe Shelly::App do
   describe "#attributes" do
     before do
       @response = {"web_server_ip" => "192.0.2.1",
+                   "region" => "EU",
                    "state" => "running",
                    "maintenance" => false,
                    "organization" => {
@@ -190,6 +191,12 @@ describe Shelly::App do
       end
     end
 
+    describe "#region" do
+      it "should return cloud region" do
+        @app.region.should == "EU"
+      end
+    end
+
     describe "#state" do
       it "should return state of cloud" do
         @app.state.should == "running"
@@ -356,7 +363,8 @@ describe Shelly::App do
       attributes = {
         :code_name => "fooo",
         :organization_name => nil,
-        :zone => nil
+        :zone => nil,
+        :region => nil
       }
       @client.should_receive(:create_app).with(attributes).and_return("git_url" => "git@git.shellycloud.com:fooo.git",
         "domains" => %w(fooo.shellyapp.com))

data/spec/shelly/cli/config_spec.rb

@@ -122,7 +122,7 @@ describe Shelly::CLI::Config do
     it "should warn that config file already exists in specified path" do
       Shelly::App.stub(:new).and_return(@app)
       @app.stub(:config_exists? => true)
-      $stdout.should_receive(:puts).with(red "File 'new_config' already exists. Use `shelly config edit new_config --cloud ` to update it.")
+      $stdout.should_receive(:puts).with(red "File 'new_config' already exists. Use `shelly config edit new_config --cloud foo-production` to update it.")
       invoke(@config, :create, "new_config")
     end
 

data/spec/shelly/cli/endpoint_spec.rb

@@ -29,31 +29,6 @@ describe Shelly::CLI::Endpoint do
       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([])
@@ -98,28 +73,86 @@ describe Shelly::CLI::Endpoint 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')
+      @app.stub(:endpoints).and_return([])
     end
 
-    it "should create endpoint" do
+    it "should create endpoint with provided certificate" 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("Every unique IP address assigned to endpoint costs 10\u20AC/month")
+      $stdout.should_receive(:puts).with("It's required for SSL/TLS")
+      $stdout.should_receive(:print).with("Are you sure you want to create endpoint? (yes/no): ")
+
       $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")
+      fake_stdin(["yes"]) do
+        invoke(@cli, :create, "crt_path", "key_path")
+      end
+    end
+
+    context "without certificate" do
+      it "should create endpoint" do
+        @app.should_receive(:create_endpoint).with(nil, nil, true).
+          and_return(endpoint_response('ip_address' => '10.0.0.1'))
+
+        $stdout.should_receive(:puts).with("Every unique IP address assigned to endpoint costs 10\u20AC/month")
+        $stdout.should_receive(:puts).with("It's required for SSL/TLS")
+        $stdout.should_receive(:puts).with("You didn't provide certificate but it can be added later")
+        $stdout.should_receive(:puts).with("Assigned IP address can be used to catch all domains pointing to that address, without SSL/TLS enabled")
+        $stdout.should_receive(:print).with("Are you sure you want to create endpoint without certificate (yes/no): ")
+        $stdout.should_receive(:puts).with(green "Endpoint was created for #{@app.to_s} cloud")
+        $stdout.should_receive(:puts).with("Point your domain to private IP address: 10.0.0.1")
+
+        @cli.options = {"sni" => true}
+        fake_stdin(["yes"]) do
+          invoke(@cli, :create)
+        end
+      end
+    end
+
+    context "multiple endpoints" do
+      it "should create endpoint with provided certificate" do
+        @app.should_receive(:create_endpoint).with("crt\n", "key", nil).
+          and_return(endpoint_response('ip_address' => '10.0.0.1'))
+        @app.stub(:endpoints).and_return(endpoints_response)
+
+        $stdout.should_receive(:puts).with("Every unique IP address assigned to endpoint costs 10\u20AC/month")
+        $stdout.should_receive(:puts).with("It's required for SSL/TLS")
+        $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")
+        $stdout.should_receive(:puts).with("\n")
+        $stdout.should_receive(:print).with("You already have assigned endpoint(s). Are you sure you want to create another one with a new IP address? (yes/no): ")
+        $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")
+
+        fake_stdin(["yes"]) do
+          invoke(@cli, :create, "crt_path", "key_path")
+        end
+      end
     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("Every unique IP address assigned to endpoint costs 10\u20AC/month")
+        $stdout.should_receive(:puts).with("It's required for SSL/TLS")
+        $stdout.should_receive(:print).with("Are you sure you want to create endpoint? (yes/no): ")
         $stdout.should_receive(:puts).with(red "Key is invalid")
 
         lambda {
-          invoke(@cli, :create, "crt_path", "key_path", "bundle_path")
+          fake_stdin(["yes"]) do
+            invoke(@cli, :create, "crt_path", "key_path", "bundle_path")
+          end
         }.should raise_error(SystemExit)
       end
     end
@@ -127,10 +160,35 @@ describe Shelly::CLI::Endpoint do
     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("Every unique IP address assigned to endpoint costs 10\u20AC/month")
+        $stdout.should_receive(:puts).with("It's required for SSL/TLS")
+        $stdout.should_receive(:print).with("Are you sure you want to create endpoint? (yes/no): ")
         $stdout.should_receive(:puts).with(red "Provide both certificate and key")
 
         lambda {
-          invoke(@cli, :create, "crt_path")
+          fake_stdin(["yes"]) do
+            invoke(@cli, :create, "crt_path")
+          end
+        }.should raise_error(SystemExit)
+      end
+    end
+
+    context "conflict error" do
+      it "should show errors and exit" do
+        exception = Shelly::Client::ConflictException.new("message" =>
+          "That's an error")
+        @app.should_receive(:create_endpoint).and_raise(exception)
+
+        $stdout.should_receive(:puts).with("Every unique IP address assigned to endpoint costs 10\u20AC/month")
+        $stdout.should_receive(:puts).with("It's required for SSL/TLS")
+        $stdout.should_receive(:print).with("Are you sure you want to create endpoint? (yes/no): ")
+        $stdout.should_receive(:puts).with(red "That's an error")
+
+        lambda {
+          fake_stdin(["yes"]) do
+            invoke(@cli, :create, "crt_path", "key_path", "bundle_path")
+          end
         }.should raise_error(SystemExit)
       end
     end
@@ -164,6 +222,19 @@ describe Shelly::CLI::Endpoint do
         }.should raise_error(SystemExit)
       end
     end
+
+    context "conflict error" do
+      it "should show errors and exit" do
+        exception = Shelly::Client::ConflictException.new("message" =>
+          "That's an error")
+        @app.should_receive(:update_endpoint).and_raise(exception)
+        $stdout.should_receive(:puts).with(red "That's an error")
+
+        lambda {
+          invoke(@cli, :update, "crt_path", "key_path", "bundle_path")
+        }.should raise_error(SystemExit)
+      end
+    end
   end
 
   describe "#delete" do
@@ -183,6 +254,31 @@ describe Shelly::CLI::Endpoint do
     end
   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
+
   def endpoint_response(options = {})
     {'ip_address' => '10.0.0.1', 'sni' => true,
      'uuid' => 'uuid1', 'info' => {

data/spec/shelly/cli/main_spec.rb

@@ -317,6 +317,7 @@ describe Shelly::CLI::Main do
       @app.stub(:git_remote_exist?).and_return(false)
       @main.stub(:check => true)
       @main.stub(:ask_for_organization)
+      @main.stub(:ask_for_region).and_return('EU')
     end
 
     # This spec tests inside_git_repository? hook
@@ -370,9 +371,29 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
           invoke(@main, :add)
         end
 
-        it "should use zone from option" do
-          @app.should_receive(:zone=).with('eu1')
-          @main.options = {"zone" => "eu1"}
+        context "for zone param" do
+          it "should use zone from option" do
+            @app.should_receive(:zone=).with('zone')
+            @main.options = {"zone" => "zone"}
+            fake_stdin(["mycodename", ""]) do
+              invoke(@main, :add)
+            end
+          end
+
+          it "should not ask about the region" do
+            @app.should_not_receive(:region=)
+            $stdout.should_not_receive(:puts).
+              with("Select region for this cloud:")
+            @main.options = {"zone" => "zone"}
+            fake_stdin(["mycodename", ""]) do
+              invoke(@main, :add)
+            end
+          end
+        end
+
+        it "should use region from option" do
+          @app.should_receive(:region=).with('eu1')
+          @main.options = {"region" => "eu1"}
           fake_stdin(["mycodename", ""]) do
             invoke(@main, :add)
           end
@@ -476,7 +497,7 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
       @app.should_receive(:create).and_raise(exception)
       $stdout.should_receive(:puts).with(red "Code name has been already taken")
       $stdout.should_receive(:puts).with(red "Fix erros in the below command and type it again to create your cloud")
-      $stdout.should_receive(:puts).with(red "shelly add --code-name=big-letters --databases=postgresql --organization=org-name --size=small")
+      $stdout.should_receive(:puts).with(red "shelly add --code-name=big-letters --databases=postgresql --organization=org-name --size=small --region=EU")
       lambda {
         fake_stdin(["BiG_LETTERS", ""]) do
           invoke(@main, :add)
@@ -608,7 +629,7 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
       it "should use --organization option" do
         @main.options = {"organization" => "foo"}
         @app.should_receive(:organization_name=).with("foo")
-        fake_stdin(["foooo", "none"]) do
+        fake_stdin(["foo", "none"]) do
           invoke(@main, :add)
         end
       end
@@ -618,46 +639,51 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
           @client.stub(:organizations).and_return([{"name" => "aaa"}])
         end
 
-        it "should ask user to choose organization if present and use chosen organization" do
-          @app.should_receive(:organization_name=).with("aaa")
-          $stdout.should_receive(:puts).with("Select organization for this cloud:")
+        it "should ask user to choose organization" do
+          $stdout.should_receive(:puts).
+          with("Select organization for this cloud:")
           $stdout.should_receive(:puts).with("existing organizations:")
           $stdout.should_receive(:puts).with("  1) aaa")
-          $stdout.should_receive(:puts).with("  2) provide name for new organization")
-          $stdout.should_receive(:print).with("Option: ")
-          fake_stdin(["foooo", "none", "1"]) do
+          $stdout.should_receive(:puts).
+          with(green "Or leave empty to create a new organization")
+          $stdout.should_receive(:print).with("Organization: ")
+          fake_stdin(["foo", "none", "aaa"]) do
             invoke(@main, :add)
           end
         end
 
-        it "should ask user to create new organization" do
-          @main.options = {'redeem-code' => 'discount'}
-          @client.should_receive(:create_organization).
-            with({:name => "org-name", :redeem_code => 'discount'})
-          @app.should_receive(:organization_name=).with('org-name')
-          $stdout.should_receive(:puts).with("Select organization for this cloud:")
-          $stdout.should_receive(:puts).with("existing organizations:")
-          $stdout.should_receive(:puts).with("  1) aaa")
-          $stdout.should_receive(:puts).with("  2) provide name for new organization")
-          $stdout.should_receive(:print).with("Option: ")
-          $stdout.should_receive(:print).with("Organization name (foo - default): ")
-          $stdout.should_receive(:puts).with(green "Organization 'org-name' created")
-          fake_stdin(["foooo", "none", "2", "org-name"]) do
+        it "should keep asking until user will provide a valid option" do
+          $stdout.should_receive(:print).with("Organization: ").twice
+          fake_stdin(["foo", "none", "bbb", "aaa"]) do
+            invoke(@main, :add)
+          end
+        end
+
+        it "should use choosen organization" do
+          @app.should_receive(:organization_name=).with("aaa")
+          fake_stdin(["foo", "none", "aaa"]) do
             invoke(@main, :add)
           end
         end
 
-        it "should use redeem-code option" do
+        it "should ask user to create a new organization" do
+          @app.should_receive(:organization_name=).with('org-name')
           @client.should_receive(:create_organization).
             with({:name => "org-name", :redeem_code => nil})
-          $stdout.should_receive(:puts).with("Select organization for this cloud:")
-          $stdout.should_receive(:puts).with("existing organizations:")
-          $stdout.should_receive(:puts).with("  1) aaa")
-          $stdout.should_receive(:puts).with("  2) provide name for new organization")
-          $stdout.should_receive(:print).with("Option: ")
-          $stdout.should_receive(:print).with("Organization name (foo - default): ")
-          $stdout.should_receive(:puts).with(green "Organization 'org-name' created")
-          fake_stdin(["foooo", "none", "2", "org-name"]) do
+          $stdout.should_receive(:print).
+            with("Organization name (foo - default): ")
+          $stdout.should_receive(:puts).
+            with(green "Organization 'org-name' created")
+          fake_stdin(["foo", "none", "", "org-name"]) do
+            invoke(@main, :add)
+          end
+        end
+
+        it "should use --redeem-code option" do
+          @main.options = {'redeem-code' => 'discount'}
+          @client.should_receive(:create_organization).
+            with({:name => "org-name", :redeem_code => 'discount'})
+          fake_stdin(["foo", "none", "", "org-name"]) do
             invoke(@main, :add)
           end
         end
@@ -668,8 +694,11 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
         response = {"resource" => "organization"}
         exception = Shelly::Client::NotFoundException.new(response)
         @app.should_receive(:create).and_raise(exception)
-        $stdout.should_receive(:puts).with(red "Organization 'foo' not found")
-        $stdout.should_receive(:puts).with(red "You can list organizations you have access to with `shelly organization list`")
+        $stdout.should_receive(:puts).
+          with(red "Organization 'foo' not found")
+        $stdout.should_receive(:puts).
+          with(red "You can list organizations you have access to with" \
+            " `shelly organization list`")
 
         expect do
           fake_stdin(["foooo", "none"]) do
@@ -678,6 +707,59 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
         end.to raise_error(SystemExit)
       end
     end
+
+    context "for region" do
+      before do
+        @main.unstub(:ask_for_region)
+      end
+
+      it "should use the value from the --region option" do
+        @main.options = {"region" => "EU"}
+        @app.should_receive(:region=).with("EU")
+        fake_stdin(["foo", "none"]) do
+          invoke(@main, :add)
+        end
+      end
+
+      it "should ask user to choose the region" do
+        @app.should_receive(:region=).with("NA")
+        $stdout.should_receive(:puts).with("Select region for this cloud:")
+        $stdout.should_receive(:puts).with("available regions:")
+        $stdout.should_receive(:puts).with("  1) EU")
+        $stdout.should_receive(:puts).with("  2) NA")
+        $stdout.should_receive(:print).with("Region: ")
+        fake_stdin(["foo", "none", "NA"]) do
+          invoke(@main, :add)
+        end
+      end
+
+      context "when given region is not available" do
+        it "should print a warning message and ask again" do
+          $stdout.should_receive(:puts).
+            with(yellow "ASIA region is not available")
+          $stdout.should_receive(:puts).with("available regions:").twice
+          fake_stdin(["foo", "none", "ASIA", "NA"]) do
+            invoke(@main, :add)
+          end
+        end
+      end
+
+      context "when given region does not accepts new apps" do
+        it "should show that it is not available" do
+          @main.options = {"region" => "NA"}
+          response = {"error" => "Given region is unavailable"}
+          exception = Shelly::Client::ConflictException.new(response)
+          @app.should_receive(:create).and_raise(exception)
+          $stdout.should_receive(:puts).with(red "Given region is unavailable")
+
+          expect do
+            fake_stdin(["foo", "none", "NA"]) do
+              invoke(@main, :add)
+            end
+          end.to raise_error(SystemExit)
+        end
+      end
+    end
   end
 
   describe "#list" do
@@ -1006,6 +1088,7 @@ Wait until cloud is in 'turned off' state and try again.")
       it "should display basic information about cloud" do
         @main.should_receive(:multiple_clouds).and_return(@app)
         $stdout.should_receive(:puts).with(green "Cloud foo-production:")
+        $stdout.should_receive(:puts).with("  Region: EU")
         $stdout.should_receive(:puts).with("  State: running")
         $stdout.should_receive(:puts).with("  Deployed commit sha: 52e65ed2d085eaae560cdb81b2b56a7d76")
         $stdout.should_receive(:puts).with("  Deployed commit message: Commit message")
@@ -1068,6 +1151,7 @@ Wait until cloud is in 'turned off' state and try again.")
                          "maintenance" => true}))
             @main.should_receive(:multiple_clouds).and_return(@app)
             $stdout.should_receive(:puts).with(red "Cloud foo-production:")
+            $stdout.should_receive(:puts).with("  Region: EU")
             $stdout.should_receive(:puts).with("  State: admin maintenance in progress")
             $stdout.should_receive(:puts).with("  Deployed commit sha: 52e65ed2d085eaae560cdb81b2b56a7d76")
             $stdout.should_receive(:puts).with("  Deployed commit message: Commit message")
@@ -1101,6 +1185,7 @@ Wait until cloud is in 'turned off' state and try again.")
                          "maintenance" => false}))
             @main.should_receive(:multiple_clouds).and_return(@app)
             $stdout.should_receive(:puts).with(red "Cloud foo-production:")
+            $stdout.should_receive(:puts).with("  Region: EU")
             $stdout.should_receive(:puts).with("  State: running (last deployment failed) (deployment log: `shelly deploys show last -c foo-production`)")
             $stdout.should_receive(:puts).with("  Deployed commit sha: 52e65ed2d085eaae560cdb81b2b56a7d76")
             $stdout.should_receive(:puts).with("  Deployed commit message: Commit message")
@@ -1148,6 +1233,7 @@ Wait until cloud is in 'turned off' state and try again.")
 
     def response(options = {})
       { "code_name" => "foo-production",
+        "region" => "EU",
         "state" => "running",
         "state_description" => "running",
         "git_info" => {

data/spec/shelly/client_spec.rb

@@ -171,9 +171,10 @@ describe Shelly::Client do
   describe "#create_app" do
     it "should send post with app's attributes" do
       @client.should_receive(:post).with("/apps", :app => {:code_name => "foo",
-        :ruby_version => "1.9.2"}, :organization_name => "foo", :zone => 'eu1')
+        :ruby_version => "1.9.2"}, :organization_name => "foo", :region => 'EU',
+        :zone => nil)
       @client.create_app(:code_name => "foo", :ruby_version => "1.9.2",
-        :organization_name => "foo", :zone => "eu1")
+        :organization_name => "foo", :region => "EU", :zone => nil)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.4.42
+  version: 0.5.0
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-14 00:00:00.000000000 Z
+date: 2015-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec