shelly 0.4.11 → 0.4.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adf2341b021f82d9ea1afdecdb788d68aa1d9ad8
-  data.tar.gz: 178d7244fe5cfedaee8eba8886654124706fc979
+  metadata.gz: 3db6979b83360ab5ec5289105c40db990afeb6ec
+  data.tar.gz: a897299673d1c2e26a1702bd7b69a4ab3de9b694
 SHA512:
-  metadata.gz: 22405e5e1f6667007c1881fb5919f34404bd0e43213fc0393364b39bbd415cc0873c849b49369f3a32cb9a60a8bc13b238b7bbc50c73ead4c8c3dd444193427d
-  data.tar.gz: 3eb6b521480439d2e74d60c71175568e5c9d83f474063b3304b98c4c789f99580c1d9aae66ad703f91ef571c0bae6af154b6dd9c04a0312730d6f18119a1876c
+  metadata.gz: 3ea8b51d8271633030d0647bcc6da3b96801506d82de8245a9ba082047185a6e6f9f3d7c7e43885e6ad8a41419f27131a8f4ae503bee67b87bc036a8975b96d0
+  data.tar.gz: 5a018835c3e98760a88f0cec95658b6db742f38833e738db8d815efbd6f12226b1628c3bbf0879dd3830be9d74c0bf89d9272baa7fad5b89b77e0ed19787748e

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+# 0.4.12 / 2013-11-05
+
+* [bugfix] Print user-friendly message if user tries to operate on files
+  on cloud which is not deployed.
+
 # 0.4.11 / 2013-10-30
 
 * internal changes

data/lib/shelly/cli/file.rb

@@ -14,6 +14,8 @@ module Shelly
       def list(path = "/")
         app = multiple_clouds(options[:cloud], "file list #{path}")
         app.list_files(path)
+      rescue Client::NotFoundException => e
+        say_error e["message"]
       rescue Client::ConflictException
         say_error "Cloud #{app} wasn't deployed properly. Cannot list files."
       end
@@ -22,6 +24,8 @@ module Shelly
       def upload(path)
         app = multiple_clouds(options[:cloud], "file upload #{path}")
         app.upload(path)
+      rescue Client::NotFoundException => e
+        say_error e["message"]
       rescue Client::ConflictException
         say_error "Cloud #{app} wasn't deployed properly. Cannot upload files."
       end
@@ -35,6 +39,8 @@ module Shelly
       def download(relative_source = ".", destination = ".")
         app = multiple_clouds(options[:cloud], "file download #{relative_source} #{destination}")
         app.download(relative_source, destination)
+      rescue Client::NotFoundException => e
+        say_error e["message"]
       rescue Client::ConflictException
         say_error "Cloud #{app} wasn't deployed properly. Cannot download files."
       end
@@ -51,6 +57,8 @@ module Shelly
         end
 
         app.delete_file(path)
+      rescue Client::NotFoundException => e
+        say_error e["message"]
       rescue Client::ConflictException
         say_error "Cloud #{app} wasn't deployed properly. Cannot delete files."
       end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.4.11"
+  VERSION = "0.4.12"
 end

data/spec/shelly/cli/file_spec.rb

@@ -37,6 +37,19 @@ describe Shelly::CLI::File do
       end
     end
 
+    context "when cloud is not deployed" do
+      it "should display error" do
+        @app.stub(:attributes => {"system_user" => "system_user"})
+        exception = Shelly::Client::NotFoundException.
+          new({"message" => "Virtual server not found or not configured"})
+        @client.stub(:tunnel).and_raise(exception)
+        $stdout.should_receive(:puts).
+          with(red "Virtual server not found or not configured")
+        lambda {
+          invoke(@cli_files, :list, "some/path")
+        }.should raise_error(SystemExit)
+      end
+    end
   end
 
   describe "#upload" do
@@ -67,6 +80,19 @@ describe Shelly::CLI::File do
         }.should raise_error(SystemExit)
       end
     end
+
+    context "when cloud is not deployed" do
+      it "should display error" do
+        exception = Shelly::Client::NotFoundException.
+          new({"message" => "Virtual server not found or not configured"})
+        @client.stub(:tunnel).and_raise(exception)
+        $stdout.should_receive(:puts).
+          with(red "Virtual server not found or not configured")
+        lambda {
+          invoke(@cli_files, :upload, "some/path")
+        }.should raise_error(SystemExit)
+      end
+    end
   end
 
   describe "#download" do
@@ -96,6 +122,19 @@ describe Shelly::CLI::File do
         }.should raise_error(SystemExit)
       end
     end
+
+    context "when cloud is not deployed" do
+      it "should display error" do
+        exception = Shelly::Client::NotFoundException.
+          new({"message" => "Virtual server not found or not configured"})
+        @client.stub(:tunnel).and_raise(exception)
+        $stdout.should_receive(:puts).
+          with(red "Virtual server not found or not configured")
+        lambda {
+          invoke(@cli_files, :download, "some/path")
+        }.should raise_error(SystemExit)
+      end
+    end
   end
 
   describe "#delete" do
@@ -151,5 +190,18 @@ describe Shelly::CLI::File do
         }.should raise_error(SystemExit)
       end
     end
+
+    context "when cloud is not deployed" do
+      it "should display error" do
+        exception = Shelly::Client::NotFoundException.
+          new({"message" => "Virtual server not found or not configured"})
+        @app.stub(:delete_file).and_raise(exception)
+        $stdout.should_receive(:puts).
+          with(red "Virtual server not found or not configured")
+        lambda {
+          fake_stdin(["yes"]) { invoke(@cli_files, :delete, "some/path") }
+        }.should raise_error(SystemExit)
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.4.11
+  version: 0.4.12
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -52,34 +52,6 @@ dependencies:
     - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: ruby_gntp
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - '>='
-      - !ruby/object:Gem::Version
-        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -316,32 +288,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 2.1.8
+rubygems_version: 2.1.10
 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/structure_validator_spec.rb
-- spec/shelly/user_spec.rb
-- spec/spec_helper.rb
-- spec/thor/options_spec.rb
+test_files: []