shelly 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8ceb2fd1ee786894862ba5705645a85570e3cd2
-  data.tar.gz: 09486cb2b72d9926e1e9788f6aa47adbadc13fea
+  metadata.gz: fa55d8fb185ab635a3242a8728cf151b252f04ba
+  data.tar.gz: e2cb634ae3e3bd10913044564c6d74734876f39a
 SHA512:
-  metadata.gz: 88c7950e4fa032ecbdadd102520fd5d824e16980dda250aa270e449671840fbefa1f72aa836621151c83a78f1eb4c97d2306dd626ab1b1b1a4b13915c2bd3c1a
-  data.tar.gz: b34402a098cb424aea9e1f843a31f411c499656e2caaf8b8cfc52ca913514129a73682e0d175e591b2cbb20c58f0c511df3540b3eee83ad2eadec61527e86b6d
+  metadata.gz: dcd8b23f3f24a86d7a0b981dde92d7cdc199720de9a5aadef94006feac6b8bc6ad12f2796cf738c09d3fa6abcf3dd324a1f553e0a0f5cdf875e37e4caecbeca9
+  data.tar.gz: e0f9432da5457a0414550f54f12fc7c7e937cebcbd576622ce5d3099832394aa2166b378b6b3fe3fc64ce88e66b2826fffbc48899efdfc2ea0e7e7bb915877b6

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## 0.5.4 / 2015-02-19
+
+* [improvement] Print organization / region list only one time on creating new
+  cloud
+* [bugfix] Added information about default region while creating new cloud
+* [bugfix] Use unordered list in choosing organization and region
+
 ## 0.5.3 / 2015-02-15
 
 * [bugfix] Don't ask user about assigning new ip address on creating new

data/lib/shelly/cli/endpoint.rb

@@ -190,7 +190,7 @@ module Shelly
           cli.options = {:cloud => app}
           cli.list
           say_new_line
-          question = unless sni.nil?
+          question = if sni
             "You already have assigned endpoint(s). Are you sure you" \
             " want to create another one with SNI? (yes/no):"
           else

data/lib/shelly/cli/main.rb

@@ -480,44 +480,6 @@ Wait until cloud is in 'turned off' state and try again.}
           end
         end
 
-        def ask_for_code_name
-          default_code_name = default_name_from_dir_name
-          code_name = ask("Cloud code name (#{default_code_name} - default):")
-          code_name.blank? ? default_code_name : code_name
-        end
-
-        def ask_for_databases
-          kinds = Shelly::App::DATABASE_CHOICES
-          databases = ask("Which databases do you want to use " \
-                          "#{kinds.join(", ")} (postgresql - default):")
-          begin
-            databases = databases.split(/[\s,]/).reject(&:blank?)
-            valid = valid_databases?(databases)
-            break if valid
-            databases = ask("Unknown database kind. Supported are: #{kinds.join(", ")}:")
-          end while not valid
-
-          databases.empty? ? ["postgresql"] : databases
-        end
-
-        def info_adding_cloudfile_to_repository
-          say_new_line
-          say "Project is now configured for use with Shelly Cloud:", :green
-          say "You can review changes using", :green
-          say "  git status"
-        end
-
-        def info_deploying_to_shellycloud(remote = 'shelly')
-          say_new_line
-          say "When you make sure all settings are correct, add changes to your repository:", :green
-          say "  git add ."
-          say '  git commit -m "Application added to Shelly Cloud"'
-          say_new_line
-          say "Deploy to your cloud using:", :green
-          say "  git push #{remote} master"
-          say_new_line
-        end
-
         def upload_ssh_key(given_key_path = nil)
           user = Shelly::User.new
           ssh_key = given_key_path ? Shelly::SshKey.new(given_key_path) : user.ssh_key

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

@@ -79,6 +79,44 @@ module Shelly
       end
 
       no_tasks do
+        def ask_for_code_name
+          default_code_name = default_name_from_dir_name
+          code_name = ask("Cloud code name (#{default_code_name} - default):")
+          code_name.blank? ? default_code_name : code_name
+        end
+
+        def ask_for_databases
+          kinds = Shelly::App::DATABASE_CHOICES
+          databases = ask("Which databases do you want to use " \
+                          "#{kinds.join(", ")} (postgresql - default):")
+          begin
+            databases = databases.split(/[\s,]/).reject(&:blank?)
+            valid = valid_databases?(databases)
+            break if valid
+            databases = ask("Unknown database kind. Supported are: #{kinds.join(", ")}:")
+          end while not valid
+
+          databases.empty? ? ["postgresql"] : databases
+        end
+
+        def info_adding_cloudfile_to_repository
+          say_new_line
+          say "Project is now configured for use with Shelly Cloud:", :green
+          say "You can review changes using", :green
+          say "  git status"
+        end
+
+        def info_deploying_to_shellycloud(remote = 'shelly')
+          say_new_line
+          say "When you make sure all settings are correct, add changes to your repository:", :green
+          say "  git add ."
+          say '  git commit -m "Application added to Shelly Cloud"'
+          say_new_line
+          say "Deploy to your cloud using:", :green
+          say "  git push #{remote} master"
+          say_new_line
+        end
+
         def ask_for_organization(options)
           organizations = Shelly::User.new.organizations
 
@@ -88,16 +126,14 @@ module Shelly
             say "Select organization for this cloud:"
             say_new_line
 
-            loop do
-              say "existing organizations:"
-
-              organizations.each_with_index do |organization, i|
-                print_wrapped "#{i + 1}) #{organization.name}", :ident => 2
-              end
+            organizations.each do |organization|
+              print_wrapped "\u2219 #{organization.name}", :ident => 2
+            end
 
-              say green "Or leave empty to create a new organization"
-              say_new_line
+            say green "Or leave empty to create a new organization"
+            say_new_line
 
+            loop do
               selected = ask("Organization:")
               if organizations.select { |o| o.name == selected }.present?
                 return selected
@@ -105,8 +141,8 @@ module Shelly
                 say_new_line
                 return ask_for_new_organization(options)
               else
-                say_new_line
                 say_warning "#{selected} organization does not exist"
+                say_new_line
               end
             end
           end
@@ -124,23 +160,25 @@ module Shelly
 
         def ask_for_region
           regions = Shelly::App::REGIONS
-          say "Select region for this cloud:"
           say_new_line
 
-          loop do
-            say "available regions:"
+          say "Select region for this cloud:"
+          say_new_line
 
-            regions.each_with_index do |region, i|
-              print_wrapped "#{i + 1}) #{region}", :ident => 2
-            end
-            say_new_line
+          regions.each do |region|
+            print_wrapped "\u2219 #{region}", :ident => 2
+          end
+          say_new_line
 
-            selected = ask("Region:").upcase
+          loop do
+            selected = ask("Region (EU - default):").upcase
             if regions.include?(selected)
               return selected
+            elsif selected.empty?
+              return "EU"
             else
-              say_new_line
               say_warning "#{selected} region is not available"
+              say_new_line
             end
           end
         end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.5.3"
+  VERSION = "0.5.4"
 end

data/spec/shelly/cli/main_spec.rb

@@ -640,11 +640,10 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
 
         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")
+            with("Select organization for this cloud:")
+          $stdout.should_receive(:puts).with("  \u2219 aaa")
           $stdout.should_receive(:puts).
-          with(green "Or leave empty to create a new organization")
+            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)
@@ -732,10 +731,9 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
       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: ")
+        $stdout.should_receive(:puts).with("  \u2219 EU")
+        $stdout.should_receive(:puts).with("  \u2219 NA")
+        $stdout.should_receive(:print).with("Region (EU - default): ")
         fake_stdin(["foo", "none", "NA"]) do
           invoke(@main, :add)
         end
@@ -745,11 +743,21 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
         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
+          @app.should_not_receive(:region=).with("ASIA")
+          @app.should_receive(:region=).with("NA")
           fake_stdin(["foo", "none", "ASIA", "NA"]) do
             invoke(@main, :add)
           end
         end
+
+        context "and empty string was on the input" do
+          it "should assign EU region by default" do
+            @app.should_receive(:region=).with("EU")
+            fake_stdin(["foo", "none", ""]) do
+              invoke(@main, :add)
+            end
+          end
+        end
       end
 
       context "when given region does not accepts new apps" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-15 00:00:00.000000000 Z
+date: 2015-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -359,7 +359,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 2.4.5
+rubygems_version: 2.4.6
 signing_key: 
 specification_version: 4
 summary: Shelly Cloud command line tool