shelly 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 83e74344b4c23aff3f2f79ef0bd82fa18a29ecba
-  data.tar.gz: d3209d7422dacfb73880d9decae3e1a33842787b
+  metadata.gz: dd192bdbee3cd98e33fbd2e78a851b8d0cac5128
+  data.tar.gz: d3761b36a486e6cfd94a29e16761bcd0e4e36d14
 SHA512:
-  metadata.gz: 28dadb4647b9a14dc80e719c140cdbdd93c1eeb17f41df8918bdc6cc99fc0ce2c261432df172daa34089e9bcb38c3b945aa1b467a8f9040bdf9d34015faa5e3d
-  data.tar.gz: 65bbeb3801cf0ca8cbff4bd213718a811ebccd8a9fee33e890ea83deda24b891738433d4feeb3078ac9baa0ee66d8bd2eb4506f9467679a0ce7012c9da236e0c
+  metadata.gz: 3c511a51af3df6bb06929b837b24bbc9a161f3e7922349553b34bc4a7d15ab896f0f3bb4f80224bd340d3cbebf068ff80f352fcf9dfdc28b94f0e53efda93cab
+  data.tar.gz: b4b29d932dd5ac3cca8d6db3410e1e6e82872370f4f0908d1ee24334b64f54571886dd1cf0fcada45f787690497ac25a6b8ec66314f7653f8ca5af54ace772cb

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.5.6 / 2015-08-31
+
+* [improvement] shelly rake accepts rake arguments and properly escapes whitespaces
+* [bugfix] Display proper error for shelly files commands depending on resource
+
 ## 0.5.5 / 2015-03-16
 
 * [improvement] Do not list supported Ruby versions in Cloudfile
@@ -220,7 +225,7 @@
 
 ## 0.4.7 / 2013-10-18
 
-* [feature] Mange SSL certificate with `shelly cert`
+* [feature] Manage SSL certificate with `shelly cert`
 
 ## 0.4.6 / 2013-10-01
 

data/lib/shelly/app.rb

@@ -238,7 +238,7 @@ module Shelly
     end
 
     def rake(task, server = nil)
-      ssh(:command => "rake_runner \"#{task}\"", :server => server)
+      ssh(:command => "rake_runner '#{task.inspect}'", :server => server)
     end
 
     def dbconsole

data/lib/shelly/cli/file.rb

@@ -15,6 +15,7 @@ module Shelly
         app = multiple_clouds(options[:cloud], "file list #{path}")
         app.list_files(path)
       rescue Client::NotFoundException => e
+        raise unless e.resource == :virtual_server
         say_error e["message"]
       rescue Client::ConflictException
         say_error "Cloud #{app} wasn't deployed properly. Cannot list files."
@@ -25,6 +26,7 @@ module Shelly
         app = multiple_clouds(options[:cloud], "file upload #{source} #{destination}")
         app.upload(source, destination)
       rescue Client::NotFoundException => e
+        raise unless e.resource == :virtual_server
         say_error e["message"]
       rescue Client::ConflictException
         say_error "Cloud #{app} wasn't deployed properly. Cannot upload files."
@@ -40,6 +42,7 @@ module Shelly
         app = multiple_clouds(options[:cloud], "file download #{relative_source} #{destination}")
         app.download(relative_source, destination)
       rescue Client::NotFoundException => e
+        raise unless e.resource == :virtual_server
         say_error e["message"]
       rescue Client::ConflictException
         say_error "Cloud #{app} wasn't deployed properly. Cannot download files."
@@ -58,6 +61,7 @@ module Shelly
 
         app.delete_file(path)
       rescue Client::NotFoundException => e
+        raise unless e.resource == :virtual_server
         say_error e["message"]
       rescue Client::ConflictException
         say_error "Cloud #{app} wasn't deployed properly. Cannot delete files."

data/lib/shelly/cli/main.rb

@@ -27,7 +27,7 @@ module Shelly
       register_subcommand(Organization, "organization", "organization <command>", "View organizations")
       register_subcommand(Logs, "log", "logs <command>", "View application logs")
       register_subcommand(Endpoint, "endpoint", "endpoint <command>", "Manage application HTTP(S) endpoints")
-      register_subcommand(Maintenance, "maintenance", "maintenance <command>", "Mange application maintenance events")
+      register_subcommand(Maintenance, "maintenance", "maintenance <command>", "Manage application maintenance events")
 
       check_unknown_options!(:except => :rake)
 

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.5.5"
+  VERSION = "0.5.6"
 end

data/spec/shelly/app_spec.rb

@@ -426,7 +426,7 @@ describe Shelly::App do
     it "should return result of rake task" do
       @client.stub(:tunnel).and_return(
         {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
-      @app.should_receive(:childprocess).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t -t console.example.com rake_runner \"test\"")
+      @app.should_receive(:childprocess).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t -t console.example.com rake_runner '\"test\"'")
       @app.rake("test")
     end
 

data/spec/shelly/cli/file_spec.rb

@@ -41,7 +41,7 @@ describe Shelly::CLI::File 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"})
+          new(not_found_response)
         @client.stub(:tunnel).and_raise(exception)
         $stdout.should_receive(:puts).
           with(red "Virtual server not found or not configured")
@@ -84,7 +84,7 @@ describe Shelly::CLI::File do
     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"})
+          new(not_found_response)
         @client.stub(:tunnel).and_raise(exception)
         $stdout.should_receive(:puts).
           with(red "Virtual server not found or not configured")
@@ -126,7 +126,7 @@ describe Shelly::CLI::File do
     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"})
+          new(not_found_response)
         @client.stub(:tunnel).and_raise(exception)
         $stdout.should_receive(:puts).
           with(red "Virtual server not found or not configured")
@@ -194,7 +194,7 @@ describe Shelly::CLI::File do
     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"})
+          new(not_found_response)
         @app.stub(:delete_file).and_raise(exception)
         $stdout.should_receive(:puts).
           with(red "Virtual server not found or not configured")
@@ -204,4 +204,11 @@ describe Shelly::CLI::File do
       end
     end
   end
+
+  def not_found_response
+    {
+      "message" => "Virtual server not found or not configured",
+      "resource" => :virtual_server
+    }
+  end
 end

data/spec/shelly/cli/main_spec.rb

@@ -47,7 +47,7 @@ describe Shelly::CLI::Main do
       out.should include("shelly login [EMAIL]           # Log into Shelly Cloud")
       out.should include("shelly logout                  # Logout from Shelly Cloud")
       out.should include("shelly logs <command>          # View application logs")
-      out.should include("shelly maintenance <command>   # Mange application maintenance events")
+      out.should include("shelly maintenance <command>   # Manage application maintenance events")
       out.should include("shelly mongoconsole            # Run MongoDB console")
       out.should include("shelly open                    # Open application page in browser")
       out.should include("shelly organization <command>  # View organizations")

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-16 00:00:00.000000000 Z
+date: 2015-08-31 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.6
+rubygems_version: 2.4.3
 signing_key: 
 specification_version: 4
 summary: Shelly Cloud command line tool
@@ -392,4 +392,3 @@ test_files:
 - spec/shelly/user_spec.rb
 - spec/spec_helper.rb
 - spec/thor/options_spec.rb
-has_rdoc: