shelly 0.4.17 → 0.4.18

checksums.yaml

@@ -1,15 +1,7 @@
 ---
-!binary "U0hBMQ==":
-  metadata.gz: !binary |-
-    OTQwZWEzYzYyMjJiMGE4ODE4NWQ0ZjVjY2E3ZGUyYjNmYjg3MGE1Zg==
-  data.tar.gz: !binary |-
-    NmI3YWMzMzU0YzE1OGMwZmQyZTFhNDY3ZWM2OWU4YWYxMzVkNDIxNA==
+SHA1:
+  metadata.gz: 0e096d721714633a31e9f27597281ac05529cd3d
+  data.tar.gz: d679baa8bd677204515e5ff42d54d07ad0ac436b
 SHA512:
-  metadata.gz: !binary |-
-    YmM0MDMzMTU2Yzk5ODk3OTE5ZDRiOWYzOWU5MTMzYzVhNDgwODU2ZDA5MDIy
-    MzMzZjU2YzYyMzJhZjFiMzM1OTljODc3ZWI1OGEzYzFlZGU3MGI1NjI1NmNk
-    OGY1Y2Q4OTM1Y2VhNzc3NGNhYjY3Mzg1ZTIwYjhmZmVmNjYyMTE=
-  data.tar.gz: !binary |-
-    YzkwZjU5MGQzMGExMzIzMjRmMWJjZjk0Y2RiODA3NjNhZjgwMzYyZDlkNTBl
-    ZGQ0MjZkMjRiODlmYjM2YTk0NmEyMTZjMzUwOTUyMDNmOTQ0MjJhMTVmYzA4
-    ODAxNWJhODNhYmQ5OTE3Yzg4ZDNkOWY5N2RkNDFjMDc2YWFmOWQ=
+  metadata.gz: 260dbf9bc61c1bbe9b7c0e3e134c94a82d3a543120aed4b9a6fb199c7b314eceec0e625244b96dc28dbdcf0584ac207ff7486d6194eebee1335cf237ec32acd3
+  data.tar.gz: e6c665a276d89d14fef5f60d8065282e08b4649bf2011af03cd3634ba553af3da4f563cda26de8efaf8114c2d20adda48fa1c973659af9883bab513abd6b3bb1

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.4.18 / 2013-12-17
+
+* [improvement] `shelly add` should ask about databases instead of database
+* [improvement] Improved messages displayed while deleting the application
+
 ## 0.4.17 / 2013-12-03
 
 * [bugfix] Remove ssh_key from Shelly Cloud only if it was already uploaded

data/lib/shelly/cli/main.rb

@@ -228,14 +228,19 @@ Wait until cloud is in 'turned off' state and try again.}
       method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       def delete
         app = multiple_clouds(options[:cloud], "delete")
-        say "You are about to delete application: #{app}."
-        say "Press Control-C at any moment to cancel."
-        say "Please confirm each question by typing yes and pressing Enter."
+
+        say_new_line
+        say "You are going to:"
+        say " * remove all files stored in the persistent storage for #{app},"
+        say " * remove all database data for #{app},"
+        say " * remove #{app} cloud from Shelly Cloud"
+        say_new_line
+        say "This action is permanent and can not be undone.", :red
         say_new_line
-        ask_to_delete_files
-        ask_to_delete_database
-        ask_to_delete_application
+        ask_to_delete_application app
+
         app.delete
+
         say_new_line
         say "Scheduling application delete - done"
         if App.inside_git_repository?
@@ -428,7 +433,8 @@ Wait until cloud is in 'turned off' state and try again.}
 
         def ask_for_databases
           kinds = Shelly::App::DATABASE_CHOICES
-          databases = ask("Which database do you want to use #{kinds.join(", ")} (postgresql - default):")
+          databases = ask("Which databases do you want to use " \
+                          "#{kinds.join(", ")} (postgresql - default):")
           begin
             databases = databases.split(/[\s,]/).reject(&:blank?)
             valid = valid_databases?(databases)

data/lib/shelly/helpers.rb

@@ -43,19 +43,13 @@ module Shelly
       say_error "Email can't be blank, please try again"
     end
 
-    def ask_to_delete_files
-      delete_files_question = "I want to delete all files stored on Shelly Cloud (yes/no):"
-      exit 1 unless yes?(delete_files_question)
-    end
-
-    def ask_to_delete_database
-      delete_database_question = "I want to delete all database data stored on Shelly Cloud (yes/no):"
-      exit 1 unless yes?(delete_database_question)
-    end
+    def ask_to_delete_application(app)
+      code_name = ask "Please confirm with the name of the cloud:"
 
-    def ask_to_delete_application
-      delete_application_question = "I want to delete the application (yes/no):"
-      exit 1 unless yes?(delete_application_question)
+      unless code_name == app.code_name
+        say_error "The name does not match. Operation aborted."
+        exit 1
+      end
     end
 
     def ask_for_acceptance_of_terms

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.4.17"
+  VERSION = "0.4.18"
 end

data/spec/shelly/cli/main_spec.rb

@@ -375,7 +375,9 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
     end
 
     it "should use database provided by user (separated by comma or space)" do
-      $stdout.should_receive(:print).with("Which database do you want to use postgresql, mongodb, redis, none (postgresql - default): ")
+      $stdout.should_receive(:print).
+        with("Which databases do you want to use " \
+             "postgresql, mongodb, redis, none (postgresql - default): ")
       @app.should_receive(:databases=).with(["postgresql", "mongodb", "redis"])
       fake_stdin(["", "postgresql  ,mongodb redis"]) do
         invoke(@main, :add)
@@ -383,8 +385,12 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
     end
 
     it "should ask again for databases if unsupported kind typed" do
-      $stdout.should_receive(:print).with("Which database do you want to use postgresql, mongodb, redis, none (postgresql - default): ")
-      $stdout.should_receive(:print).with("Unknown database kind. Supported are: postgresql, mongodb, redis, none: ")
+      $stdout.should_receive(:print).
+        with("Which databases do you want to use " \
+             "postgresql, mongodb, redis, none (postgresql - default): ")
+      $stdout.should_receive(:print).
+        with("Unknown database kind. Supported are: " \
+             "postgresql, mongodb, redis, none: ")
       fake_stdin(["", "postgresql,doesnt-exist", "none"]) do
         invoke(@main, :add)
       end
@@ -1173,7 +1179,7 @@ Wait until cloud is in 'turned off' state and try again.")
     it "should ensure multiple_clouds check" do
       @client.stub(:delete)
       @main.should_receive(:multiple_clouds).and_return(@app)
-      fake_stdin(["yes", "yes", "yes"]) do
+      fake_stdin(["foo-staging"]) do
         invoke(@main, :delete)
       end
     end
@@ -1184,37 +1190,47 @@ Wait until cloud is in 'turned off' state and try again.")
           f.write("foo-staging:\nfoo-production:\n") }
       end
 
-      it "should ask about delete application parts" do
-        $stdout.should_receive(:puts).with("You are about to delete application: foo-staging.")
-        $stdout.should_receive(:puts).with("Press Control-C at any moment to cancel.")
-        $stdout.should_receive(:puts).with("Please confirm each question by typing yes and pressing Enter.")
+      it "should display warning and ask about deleting the application" do
+        $stdout.should_receive(:puts).with("You are going to:")
+        $stdout.should_receive(:puts).
+          with(" * remove all files stored in the persistent storage for" \
+               " foo-staging,")
+        $stdout.should_receive(:puts).
+          with(" * remove all database data for foo-staging,")
+        $stdout.should_receive(:puts).
+          with(" * remove foo-staging cloud from Shelly Cloud")
         $stdout.should_receive(:puts).with("\n")
-        $stdout.should_receive(:print).with("I want to delete all files stored on Shelly Cloud (yes/no): ")
-        $stdout.should_receive(:print).with("I want to delete all database data stored on Shelly Cloud (yes/no): ")
-        $stdout.should_receive(:print).with("I want to delete the application (yes/no): ")
+        $stdout.should_receive(:puts).
+          with(red "This action is permanent and can not be undone.")
         $stdout.should_receive(:puts).with("\n")
+        $stdout.should_receive(:print).
+          with("Please confirm with the name of the cloud: ")
         $stdout.should_receive(:puts).with("Scheduling application delete - done")
         $stdout.should_receive(:puts).with("Removing git remote - done")
         @main.options = {:cloud => "foo-staging"}
-        fake_stdin(["yes", "yes", "yes"]) do
+        fake_stdin(["foo-staging"]) do
           invoke(@main, :delete)
         end
       end
 
-      it "should return exit 1 when user doesn't type 'yes'" do
-        @app.should_not_receive(:delete)
-        lambda{
-          fake_stdin(["yes", "yes", "no"]) do
-            @main.options = {:cloud => "foo-staging"}
-            invoke(@main, :delete)
-          end
-        }.should raise_error(SystemExit)
+      context 'when given code name does not match' do
+        it "should print message and return exit 1" do
+          @app.should_not_receive(:delete)
+          $stdout.should_receive(:puts).
+            with(red "The name does not match. Operation aborted.")
+          lambda{
+            fake_stdin(["foo-production"]) do
+              @main.options = {:cloud => "foo-staging"}
+              invoke(@main, :delete)
+            end
+          }.should raise_error(SystemExit)
+        end
       end
 
       it "should remove git remote" do
         @app.should_receive(:remove_git_remote)
         @main.options = {:cloud => "foo-staging"}
-        fake_stdin(["yes", "yes", "yes"]) do
+        fake_stdin(["foo-staging"]) do
           invoke(@main, :delete)
         end
       end
@@ -1229,7 +1245,7 @@ Wait until cloud is in 'turned off' state and try again.")
       it "should say that Git remote missing" do
         Shelly::App.stub(:inside_git_repository?).and_return(false)
         $stdout.should_receive(:puts).with("Missing git remote")
-        fake_stdin(["yes", "yes", "yes"]) do
+        fake_stdin(["foo-staging"]) do
           @main.options = {:cloud => "foo-staging"}
           invoke(@main, :delete)
         end
@@ -1243,17 +1259,23 @@ Wait until cloud is in 'turned off' state and try again.")
       end
 
       it "should take the cloud from Cloudfile" do
-        $stdout.should_receive(:puts).with("You are about to delete application: foo-staging.")
-        $stdout.should_receive(:puts).with("Press Control-C at any moment to cancel.")
-        $stdout.should_receive(:puts).with("Please confirm each question by typing yes and pressing Enter.")
+        $stdout.should_receive(:puts).with("You are going to:")
+        $stdout.should_receive(:puts).
+          with(" * remove all files stored in the persistent storage for" \
+               " foo-staging,")
+        $stdout.should_receive(:puts).
+          with(" * remove all database data for foo-staging,")
+        $stdout.should_receive(:puts).
+          with(" * remove foo-staging cloud from Shelly Cloud")
         $stdout.should_receive(:puts).with("\n")
-        $stdout.should_receive(:print).with("I want to delete all files stored on Shelly Cloud (yes/no): ")
-        $stdout.should_receive(:print).with("I want to delete all database data stored on Shelly Cloud (yes/no): ")
-        $stdout.should_receive(:print).with("I want to delete the application (yes/no): ")
+        $stdout.should_receive(:puts).
+          with(red "This action is permanent and can not be undone.")
         $stdout.should_receive(:puts).with("\n")
+        $stdout.should_receive(:print).
+          with("Please confirm with the name of the cloud: ")
         $stdout.should_receive(:puts).with("Scheduling application delete - done")
         $stdout.should_receive(:puts).with("Removing git remote - done")
-        fake_stdin(["yes", "y", "yes"]) do
+        fake_stdin(["foo-staging"]) do
           invoke(@main, :delete)
         end
       end

metadata

@@ -1,209 +1,181 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.4.17
+  version: 0.4.18
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-12-03 00:00:00.000000000 Z
+date: 2013-12-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  type: :development
-  prerelease: false
   name: rspec
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: 2.11.0
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
-- !ruby/object:Gem::Dependency
   type: :development
   prerelease: false
-  name: rake
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
-  type: :development
-  prerelease: false
-  name: simplecov
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :development
   prerelease: false
-  name: ruby_gntp
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :development
   prerelease: false
-  name: rb-fsevent
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :development
   prerelease: false
-  name: fakefs
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :development
   prerelease: false
-  name: fakeweb
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: wijet-thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: 0.14.10
   type: :runtime
   prerelease: false
-  name: wijet-thor
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.10
+- !ruby/object:Gem::Dependency
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: 0.14.10
-- !ruby/object:Gem::Dependency
+        version: '0'
   type: :runtime
   prerelease: false
-  name: rest-client
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mime-types
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
+        version: '1.16'
   type: :runtime
   prerelease: false
-  name: mime-types
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.16'
+- !ruby/object:Gem::Dependency
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - '>='
       - !ruby/object:Gem::Version
-        version: '1.16'
-- !ruby/object:Gem::Dependency
+        version: '0'
   type: :runtime
   prerelease: false
-  name: json
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :runtime
   prerelease: false
-  name: progressbar
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :runtime
   prerelease: false
-  name: launchy
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: netrc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
   type: :runtime
   prerelease: false
-  name: netrc
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Tool for managing applications and clouds at shellycloud.com
@@ -310,44 +282,18 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 2.1.5
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 4
 summary: Shelly Cloud command line tool
-test_files:
-- spec/helpers.rb
-- spec/input_faker.rb
-- 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/config_spec.rb
-- spec/shelly/cli/database_spec.rb
-- spec/shelly/cli/deploy_spec.rb
-- spec/shelly/cli/file_spec.rb
-- spec/shelly/cli/logs_spec.rb
-- spec/shelly/cli/main_spec.rb
-- spec/shelly/cli/organization_spec.rb
-- spec/shelly/cli/runner_spec.rb
-- spec/shelly/cli/user_spec.rb
-- spec/shelly/client_spec.rb
-- spec/shelly/cloudfile_spec.rb
-- spec/shelly/download_progress_bar_spec.rb
-- spec/shelly/model_spec.rb
-- spec/shelly/organization_spec.rb
-- spec/shelly/ssh_key_spec.rb
-- spec/shelly/ssh_keys_spec.rb
-- spec/shelly/structure_validator_spec.rb
-- spec/shelly/user_spec.rb
-- spec/spec_helper.rb
-- spec/thor/options_spec.rb
+test_files: []