shelly 0.4.24 → 0.4.25

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25534c9362fd63574107232cf2eadd9c2b200627
-  data.tar.gz: 833dd066a7c2451b69f719c84fdfdbc1a15222a4
+  metadata.gz: 106d6edae76cb35406b5e329777d79c62ac57468
+  data.tar.gz: 648eee3408d79455c04569aa36bb92c4b30fa93e
 SHA512:
-  metadata.gz: 37591a488e05a52e64d0f49eff04dedfc8199b98186ea9deeb7dff40e55d6f0896a21042d4cea1043a5826328092a5b4a945dad98ccce36849b8baadeb6d9921
-  data.tar.gz: 46d2dc570e9f0c519be6117bd040c8be91e8d1352e8ca5ec00dacf5744f018a845f85a3c91c696a9e7315eee947bfcdb738f611403c8df8ca1c18c4e56e33197
+  metadata.gz: 72777b59e6efcb2da05aa3289eb652c62042033939dc05b650b9510dfbc92ae544be875816e7bfb146f312f4adbd7a72da5663fbf52b6fb8980fa25760384942
+  data.tar.gz: b4d08dd51e6bf5ed91c325aaa6c9e355ff8f326043eacfbf15c61256ac93f7885cb9dabe0ce2c075341a10ad6686daa200799cde1b201d6841b0a3bd9ab23fdb

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.4.25 / 2014-02-28
+
+* [bugfix] Print user-friendly message if user tries to open console on non
+ application virtual server
+* [improvement] Add `add` alias for `shelly config create`
+* [improvement] Add `new` and `create` aliases for `shelly user add`
+* [improvement] Add `new` alias for `shelly backup create`
+* [improvement] Add `new` and `create` aliases for `shelly organization add`
+
 ## 0.4.24 / 2014-02-25
 
 * [improvement] Show recent information about filesystem, database and traffic

data/lib/shelly/cli/backup.rb

@@ -9,7 +9,7 @@ module Shelly
       namespace :backup
       include Helpers
 
-      before_hook :logged_in?, :only => [:list, :get, :create, :restore, :import]
+      before_hook :logged_in?, :only => [:list, :get, :create, :new, :restore, :import]
 
       class_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
 
@@ -64,6 +64,7 @@ module Shelly
         Create backup of given database.
         If database kind is not specified, Cloudfile must be present to backup all configured databases.
       }
+      map "new" => :create
       def create(kind = nil)
         app = multiple_clouds(options[:cloud], "backup create [DB_KIND]")
         cloudfile = Cloudfile.new

data/lib/shelly/cli/config.rb

@@ -6,7 +6,7 @@ module Shelly
       namespace :config
       include Helpers
 
-      before_hook :logged_in?, :only => [:list, :show, :create, :new, :edit,
+      before_hook :logged_in?, :only => [:list, :show, :create, :new, :add, :edit,
         :update, :upload, :delete]
       class_option :cloud, :type => :string, :aliases => "-c",
         :desc => "Specify cloud"
@@ -46,6 +46,7 @@ module Shelly
         say_error "You can list available config files with `shelly config list --cloud #{app}`"
       end
 
+      map "add" => :create
       map "new" => :create
       desc "create PATH", "Create configuration file"
       def create(path)

data/lib/shelly/cli/main.rb

@@ -360,7 +360,7 @@ Wait until cloud is in 'turned off' state and try again.}
         say_error "Cloud #{app} is not running. Cannot run console."
       rescue Client::NotFoundException => e
         raise unless e.resource == :virtual_server
-        say_error "Virtual Server '#{options[:server]}' not found"
+        say_error "Virtual server '#{options[:server]}' not found or not configured for running console"
       end
 
       # FIXME: move to helpers

data/lib/shelly/cli/organization.rb

@@ -6,7 +6,7 @@ module Shelly
       namespace :organization
       include Helpers
 
-      before_hook :logged_in?, :only => [:list, :add]
+      before_hook :logged_in?, :only => [:list, :add, :create, :new]
 
       desc "list", "Lists organizations"
       def list
@@ -27,6 +27,8 @@ module Shelly
       method_option "redeem-code", :type => :string, :aliases => "-r",
         :desc => "Redeem code for free credits"
       desc "add", "Add a new organization"
+      map "create" => :add
+      map "new" => :add
       def add
         create_new_organization(options)
       rescue Client::ValidationException => e

data/lib/shelly/cli/user.rb

@@ -8,7 +8,7 @@ module Shelly
       namespace :user
       include Helpers
 
-      before_hook :logged_in?, :only => [:list, :add, :delete]
+      before_hook :logged_in?, :only => [:list, :add, :new, :create, :delete]
 
       method_option :organization, :type => :string, :aliases => "-o", :desc => "Specify organization"
       desc "list", "List users with access to organizations"
@@ -38,6 +38,8 @@ module Shelly
 
       method_option :organization, :type => :string, :aliases => "-o", :desc => "Specify organization"
       desc "add [EMAIL]", "Add new developer to organization"
+      map "new" => :add
+      map "create" => :add
       def add(email = nil)
         organization = organization_present?(options[:organization], "user add [EMAIL]")
 

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.4.24"
+  VERSION = "0.4.25"
 end

data/spec/shelly/cli/backup_spec.rb

@@ -158,6 +158,17 @@ describe Shelly::CLI::Backup do
       hooks(@backup, :create).should include(:logged_in?)
     end
 
+    context "for aliases" do
+      it "should respond to 'new' alias" do
+        @app.should_receive(:request_backup)
+        invoke(@backup, :new)
+      end
+
+      it "should ensure user has logged in for 'new' alias" do
+        hooks(@backup, :new).should include(:logged_in?)
+      end
+    end
+
     # multiple_clouds is tested in main_spec.rb in describe "#start" block
     it "should ensure multiple_clouds check" do
       @app.stub(:request_backup)

data/spec/shelly/cli/config_spec.rb

@@ -90,8 +90,18 @@ describe Shelly::CLI::Config do
       hooks(@config, :create).should include(:logged_in?)
     end
 
-    it "should ensure user has logged in" do
-      hooks(@config, :new).should include(:logged_in?)
+    context "for aliases" do
+      [:add, :new].each do |a|
+        it "should respond to '#{a}' alias" do
+          @config.should_receive(:system).and_return(true)
+          @client.should_receive(:app_create_config)
+          invoke(@config, a, "path")
+        end
+
+        it "should ensure user has logged in for #{a}" do
+          hooks(@config, a).should include(:logged_in?)
+        end
+      end
     end
 
     # multiple_clouds is tested in main_spec.rb in describe "#start" block

data/spec/shelly/cli/main_spec.rb

@@ -1543,7 +1543,7 @@ Wait until cloud is in 'turned off' state and try again.")
         ex = Shelly::Client::NotFoundException.new("resource" => "virtual_server")
         @client.stub(:tunnel).and_raise(ex)
         @main.options = {:server => "foobar"}
-        $stdout.should_receive(:puts).with(red "Virtual Server 'foobar' not found")
+        $stdout.should_receive(:puts).with(red "Virtual server 'foobar' not found or not configured for running console")
         lambda {
           invoke(@main, :console)
         }.should raise_error(SystemExit)

data/spec/shelly/cli/organization_spec.rb

@@ -53,6 +53,21 @@ describe Shelly::CLI::Organization do
       hooks(@cli, :add).should include(:logged_in?)
     end
 
+    context "for aliases" do
+      [:new, :create].each do |a|
+        it "should respond to '#{a}' alias" do
+          @organization.should_receive(:create)
+          fake_stdin("org-name") do
+            invoke(@cli, a)
+          end
+        end
+
+        it "should ensure user has logged in for '#{a}' alias" do
+          hooks(@cli, a).should include(:logged_in?)
+        end
+      end
+    end
+
     it "should create new organization" do
       @organization.should_receive(:create)
       $stdout.should_receive(:print).with("Organization name (foo - default): ")

data/spec/shelly/cli/user_spec.rb

@@ -117,6 +117,21 @@ describe Shelly::CLI::User do
       hooks(@cli_user, :add).should include(:logged_in?)
     end
 
+    context "for aliases" do
+      [:new, :create].each do |a|
+        it "should respond to '#{a}' alias" do
+          @client.should_receive(:send_invitation)
+          fake_stdin(["yes"]) do
+            invoke(@cli_user, a, "megan@example.com")
+          end
+        end
+
+        it "should ensure user has logged in for '#{a}' alias" do
+          hooks(@cli_user, a).should include(:logged_in?)
+        end
+      end
+    end
+
     context "on success" do
       before do
         @client.should_receive(:send_invitation).with("foo-org", "megan@example.com", true)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.4.24
+  version: 0.4.25
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-25 00:00:00.000000000 Z
+date: 2014-02-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -320,7 +320,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 2.2.2
+rubygems_version: 2.2.1
 signing_key: 
 specification_version: 4
 summary: Shelly Cloud command line tool