shelly 0.0.18 → 0.0.19

data/lib/shelly.rb

@@ -5,6 +5,7 @@ require "core_ext/hash"
 require "shelly/helpers"
 require "shelly/base"
 require "thor/options"
+require "thor/arguments"
 
 module Shelly
   autoload :App, "shelly/app"

data/lib/shelly/cli/main.rb

@@ -1,13 +1,13 @@
 require "shelly"
 require "thor/group"
-require "shelly/cli/users"
+require "shelly/cli/user"
 
 module Shelly
   module CLI
     class Main < Thor
       include Thor::Actions
       include Helpers
-      register(Users, "users", "users <command>", "Manages users using this app")
+      register(User, "user", "user <command>", "Manages users using this app")
       check_unknown_options!
 
       map %w(-v --version) => :version
@@ -18,7 +18,7 @@ module Shelly
 
       desc "register [EMAIL]", "Registers new user account on Shelly Cloud"
       def register(email = nil)
-      	user = User.new
+      	user = Shelly::User.new
       	user.ssh_key_registered?
         say "Registering with email: #{email}" if email
 				user.email = (email || ask_for_email)
@@ -45,7 +45,7 @@ module Shelly
 
       desc "login [EMAIL]", "Logins user to Shelly Cloud"
       def login(email = nil)
-        user = User.new(email || ask_for_email, ask_for_password(:with_confirmation => false))
+        user = Shelly::User.new(email || ask_for_email, ask_for_password(:with_confirmation => false))
         user.login
         say "Login successful"
         say "Uploading your public SSH key"
@@ -70,10 +70,10 @@ module Shelly
       method_option "code-name", :type => :string, :aliases => "-c",
         :desc => "Unique code_name of your application"
       method_option :databases, :type => :array, :aliases => "-d",
-        :banner => "#{Shelly::App::DATABASE_KINDS.join(' ')}",
+        :banner => "#{Shelly::App::DATABASE_KINDS.join(', ')}",
         :desc => "Array of databases of your choice"
       method_option :domains, :type => :array,
-        :banner => "CODE-NAME.shellyapp.com YOUR-DOMAIN.com",
+        :banner => "CODE-NAME.shellyapp.com, YOUR-DOMAIN.com",
         :desc => "Array of your domains"
       desc "add", "Adds new application to Shelly Cloud"
       def add
@@ -110,8 +110,6 @@ module Shelly
       no_tasks do
         def check_options(options)
           unless options.empty?
-            options["domains"].map! {|domain| domain.gsub(",", "") } if options["domains"]
-            options["databases"].map! {|kind| kind.gsub(",", "") } if options["databases"]
             unless ["code-name", "databases", "domains"].all? do |option|
               options.include?(option.to_s) && options[option.to_s] != option.to_s
             end && valid_databases?(options["databases"])

data/lib/shelly/cli/{users.rb → user.rb}

@@ -4,7 +4,7 @@ require "shelly/cloudfile"
 
 module Shelly
   module CLI
-    class Users < Thor
+    class User < Thor
       namespace :users
       include Helpers
 
@@ -32,8 +32,10 @@ module Shelly
         @user.send_invitation(@cloudfile.clouds, user_email)
         say "Sending invitation to #{user_email}"
       rescue Client::APIError => e
-        say e.message
-        exit 1
+        if e.validation?
+          e.each_error { |error| say_error error =~ /already in the project/ ? error.gsub("Email", "User") : error, :with_exit => false }
+          exit 1
+        end
       end
 
     end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.18"
+  VERSION = "0.0.19"
 end

data/lib/thor/arguments.rb

@@ -0,0 +1,17 @@
+class Thor
+  class Arguments
+
+    private
+
+    def parse_array(name)
+      return shift if peek.is_a?(Array)
+      array = []
+      while current_is_value?
+        results = shift.split(/[\s,]/).reject(&:blank?)
+        results.each { |result| array << result  }
+      end
+      array
+    end
+
+  end
+end

data/spec/shelly/cli/main_spec.rb

@@ -27,7 +27,7 @@ Tasks:
   shelly help [TASK]       # Describe available tasks or one specific task
   shelly login [EMAIL]     # Logins user to Shelly Cloud
   shelly register [EMAIL]  # Registers new user account on Shelly Cloud
-  shelly users <command>   # Manages users using this app
+  shelly user <command>    # Manages users using this app
   shelly version           # Displays shelly version
 OUT
       out = IO.popen("bin/shelly").read.strip
@@ -240,6 +240,7 @@ OUT
     end
 
     context "command line options" do
+
       context "invalid params" do
         it "should show help and exit if not all options are passed" do
           $stdout.should_receive(:puts).with("\e[31mTry 'shelly help add' for more information\e[0m")
@@ -253,12 +254,6 @@ OUT
           lambda { @main.add }.should raise_error(SystemExit)
         end
 
-        it "should accept databases separated by comma" do
-          @main.options = {"code-name" => "foo", "databases" => ["postgresql,", "mongodb"], "domains" => ["foo.example.com"]}
-          @app.should_receive(:databases=).with(["postgresql", "mongodb"])
-          @main.add
-        end
-
         it "should display which parameter was wrong" do
           expected = "shelly: unrecognized option '--unknown=param'\n" +
                       "Usage: shelly [COMMAND]... [OPTIONS]\n" +

data/spec/shelly/cli/{users_spec.rb → user_spec.rb}

@@ -1,10 +1,10 @@
 require "spec_helper"
-require "shelly/cli/users"
+require "shelly/cli/user"
 
-describe Shelly::CLI::Users do
+describe Shelly::CLI::User do
   before do
     FileUtils.stub(:chmod)
-    @users = Shelly::CLI::Users.new
+    @users = Shelly::CLI::User.new
     @client = mock
     Shelly::Client.stub(:new).and_return(@client)
     Shelly::User.stub(:guess_email).and_return("")

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shelly
 version: !ruby/object:Gem::Version 
-  hash: 59
+  hash: 57
   prerelease: 
   segments: 
   - 0
   - 0
-  - 18
-  version: 0.0.18
+  - 19
+  version: 0.0.19
 platform: ruby
 authors: 
 - Shelly Cloud team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-11-07 00:00:00 Z
+date: 2011-11-14 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
@@ -74,7 +74,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: fakefs
+  name: growl_notify
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -88,7 +88,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: fakeweb
+  name: rb-fsevent
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -102,7 +102,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: thor
+  name: fakefs
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -113,10 +113,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: rest-client
+  name: fakeweb
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
@@ -127,10 +127,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
+  type: :development
   version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: json
+  name: thor
   prerelease: false
   requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
@@ -144,7 +144,7 @@ dependencies:
   type: :runtime
   version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: launchy
+  name: rest-client
   prerelease: false
   requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
@@ -157,6 +157,34 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id010
+- !ruby/object:Gem::Dependency 
+  name: json
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id011
+- !ruby/object:Gem::Dependency 
+  name: launchy
+  prerelease: false
+  requirement: &id012 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id012
 description: Tool for managing applications and clouds at shellycloud.com
 email: 
 - support@shellycloud.com
@@ -180,13 +208,14 @@ files:
 - lib/shelly/app.rb
 - lib/shelly/base.rb
 - lib/shelly/cli/main.rb
-- lib/shelly/cli/users.rb
+- lib/shelly/cli/user.rb
 - lib/shelly/client.rb
 - lib/shelly/cloudfile.rb
 - lib/shelly/helpers.rb
 - lib/shelly/templates/Cloudfile.erb
 - lib/shelly/user.rb
 - lib/shelly/version.rb
+- lib/thor/arguments.rb
 - lib/thor/options.rb
 - shelly.gemspec
 - spec/helpers.rb
@@ -194,7 +223,7 @@ files:
 - spec/shelly/app_spec.rb
 - spec/shelly/base_spec.rb
 - spec/shelly/cli/main_spec.rb
-- spec/shelly/cli/users_spec.rb
+- spec/shelly/cli/user_spec.rb
 - spec/shelly/client_spec.rb
 - spec/shelly/cloudfile_spec.rb
 - spec/shelly/user_spec.rb
@@ -232,5 +261,14 @@ rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Shelly Cloud command line tool
-test_files: []
-
+test_files: 
+- spec/helpers.rb
+- spec/input_faker.rb
+- spec/shelly/app_spec.rb
+- spec/shelly/base_spec.rb
+- spec/shelly/cli/main_spec.rb
+- spec/shelly/cli/user_spec.rb
+- spec/shelly/client_spec.rb
+- spec/shelly/cloudfile_spec.rb
+- spec/shelly/user_spec.rb
+- spec/spec_helper.rb