shelly 0.0.21.pre → 0.0.21.pre2

data/.travis.yml

@@ -1,4 +1,5 @@
 rvm:
-  - 1.8.7
+  - 1.9.3
   - 1.9.2
+  - 1.8.7
   - ree

data/bin/shelly

@@ -1,3 +1,4 @@
 #!/usr/bin/env ruby
-require "shelly/cli/main"
-Shelly::CLI::Main.start
+require "shelly/cli/runner"
+runner = Shelly::CLI::Runner.new(ARGV)
+runner.start

data/lib/shelly.rb

@@ -1,11 +1,8 @@
 require "rubygems"
-require "thor"
 require "core_ext/object"
 require "core_ext/hash"
 require "shelly/helpers"
-require "shelly/base"
-require "thor/options"
-require "thor/arguments"
+require "shelly/model"
 
 module Shelly
   autoload :App, "shelly/app"
@@ -14,4 +11,3 @@ module Shelly
   autoload :User, "shelly/user"
   autoload :VERSION, "shelly/version"
 end
-

data/lib/shelly/app.rb

@@ -2,8 +2,9 @@ require 'erb'
 require 'launchy'
 
 module Shelly
-  class App < Base
+  class App < Model
     DATABASE_KINDS = %w(postgresql mongodb redis none)
+
     attr_accessor :code_name, :databases, :ruby_version, :environment,
       :git_url, :domains
 

data/lib/shelly/cli/command.rb

@@ -0,0 +1,13 @@
+require "shelly"
+require "thor"
+require "thor/group"
+require "thor/options"
+require "thor/arguments"
+
+module Shelly
+  module CLI
+    class Command < Thor
+      class_option :debug, :type => :boolean, :desc => "Show debug information"
+    end
+  end
+end

data/lib/shelly/cli/main.rb

@@ -1,13 +1,12 @@
-require "shelly"
-require "thor/group"
+require "shelly/cli/command"
 require "shelly/cli/user"
 
 module Shelly
   module CLI
-    class Main < Thor
+    class Main < Command
       include Thor::Actions
       include Helpers
-      register(User, "user", "user <command>", "Manages users using this app")
+      register(User, "user", "user <command>", "Manages users using this cloud")
       check_unknown_options!
 
       map %w(-v --version) => :version
@@ -50,7 +49,7 @@ module Shelly
         say "Login successful"
         say "Uploading your public SSH key"
         user.upload_ssh_key
-        say "You have following applications available:", :green
+        say "You have following clouds available:", :green
         user.apps.each do |app|
           say "  #{app["code_name"]}"
         end
@@ -68,14 +67,14 @@ module Shelly
       end
 
       method_option "code-name", :type => :string, :aliases => "-c",
-        :desc => "Unique code_name of your application"
+        :desc => "Unique code-name of your cloud"
       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",
         :desc => "Array of your domains"
-      desc "add", "Adds new application to Shelly Cloud"
+      desc "add", "Adds new cloud to Shelly Cloud"
       def add
         say_error "Must be run inside your project git repository" unless App.inside_git_repository?
         check_options(options)
@@ -99,9 +98,9 @@ module Shelly
 
       rescue Client::APIError => e
         if e.validation?
-          e.each_error { |error| say_error "#{error}", :with_exit => false }
+          e.each_error { |error| say_error error, :with_exit => false }
           say_new_line
-          say_error "Fix erros in the below command and type it again to create your application" , :with_exit => false
+          say_error "Fix erros in the below command and type it again to create your cloud" , :with_exit => false
           say_error "shelly add --code-name=#{@app.code_name} --databases=#{@app.databases.join} --domains=#{@app.code_name}.shellyapp.com"
         end
       end
@@ -144,7 +143,7 @@ module Shelly
 
         def ask_for_code_name
           default_code_name = "#{Shelly::App.guess_code_name}-production"
-          code_name = ask("Application code name (#{default_code_name} - default):")
+          code_name = ask("Cloud code name (#{default_code_name} - default):")
           code_name.blank? ? default_code_name : code_name
         end
 

data/lib/shelly/cli/runner.rb

@@ -0,0 +1,26 @@
+require "shelly/cli/main"
+
+module Shelly
+  module CLI
+    class Runner < Thor::Shell::Basic
+      include Helpers
+      attr_accessor :args
+
+      def initialize(args)
+        super()
+        @args = args
+      end
+
+      def debug?
+        args.include?("--debug")
+      end
+
+      def start
+        Shelly::CLI::Main.start(args)
+      rescue => e
+        raise e if debug?
+        say_error "Unknown error, to see debug information run command with --debug"
+      end
+    end
+  end
+end

data/lib/shelly/cli/user.rb

@@ -1,10 +1,6 @@
-require "yaml"
-require "shelly/user"
-require "shelly/cloudfile"
-
 module Shelly
   module CLI
-    class User < Thor
+    class User < Command
       namespace :user
       include Helpers
 
@@ -33,14 +29,21 @@ module Shelly
         @cloudfile, @user = check_clouds
         user_email = email || ask_for_email({:guess_email => false})
         @cloudfile.clouds.each do |cloud|
-          @user.send_invitation(cloud, user_email)
-          say "Sending invitation to #{user_email} to work on #{cloud}", :green
+          begin
+            @user.send_invitation(cloud, user_email)
+          rescue Client::APIError => e
+            if e.validation? && e.errors.include?(["email", "#{email} has already been taken"])
+              say_error "User #{email} is already in the cloud #{cloud}", :with_exit => false
+            elsif e.validation?
+              e.each_error { |error| say_error error, :with_exit => false }
+              exit 1
+            end
+          else
+            say "Sending invitation to #{user_email} to work on #{cloud}", :green
+          end
         end
       rescue Client::APIError => e
-        if e.validation?
-          e.each_error { |error| say_error error =~ /already in the project/ ? error.gsub("Email", "User") : error, :with_exit => false }
-          exit 1
-        elsif e.unauthorized?
+        if e.unauthorized?
           e.errors.each { |error| say_error error, :with_exit => false}
           exit 1
         end
@@ -52,7 +55,9 @@ module Shelly
           @user = Shelly::User.new
           user_apps = @user.apps.map { |cloud| cloud['code_name'] }
           unless @cloudfile.clouds.all? { |cloud| user_apps.include?(cloud) }
-            errors = (@cloudfile.clouds - user_apps).map { |cloud| "You have no access to '#{cloud}' cloud defined in Cloudfile" }
+            errors = (@cloudfile.clouds - user_apps).map do |cloud|
+              "You have no access to '#{cloud}' cloud defined in Cloudfile"
+            end
             raise Shelly::Client::APIError.new({:message => "Unauthorized",
               :errors => errors}.to_json)
           end

data/lib/shelly/cloudfile.rb

@@ -1,5 +1,5 @@
 module Shelly
-  class Cloudfile < Base
+  class Cloudfile < Model
     attr_accessor :content
 
     def self.present?
@@ -39,7 +39,7 @@ module Shelly
       response = shelly.apps_users(clouds)
       response.inject({}) do |result, app|
         result[app['code_name']] = app['users'].map do |user|
-          "#{user['email']} (#{user['name']})"
+          user['name'] ? "#{user['email']} (#{user['name']})" : user['email']
         end
         result
       end

data/lib/shelly/helpers.rb

@@ -11,6 +11,7 @@ module Shelly
       say "\n"
     end
 
+    # FIXME: errors should be printed on STDERR
     def say_error(message, options = {})
       options = {:with_exit => true}.merge(options)
       say  message, :red

data/lib/shelly/{base.rb → model.rb}

@@ -1,5 +1,5 @@
 module Shelly
-  class Base
+  class Model
     def current_user
       @user = User.new
       @user.load_credentials

data/lib/shelly/user.rb

@@ -1,5 +1,5 @@
 module Shelly
-  class User < Base
+  class User < Model
     attr_accessor :email, :password
 
     def initialize(email = nil, password = nil)

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.21.pre"
+  VERSION = "0.0.21.pre2"
 end

data/shelly.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |s|
   end
   s.add_development_dependency "fakefs"
   s.add_development_dependency "fakeweb"
-  s.add_runtime_dependency "thor"
+  s.add_runtime_dependency "wijet-thor", "~> 0.14.7"
   s.add_runtime_dependency "rest-client"
   s.add_runtime_dependency "json"
   s.add_runtime_dependency "wijet-launchy"

data/spec/shelly/cli/main_spec.rb

@@ -23,12 +23,15 @@ describe Shelly::CLI::Main do
     it "should display available commands" do
       expected = <<-OUT
 Tasks:
-  shelly add               # Adds new application to Shelly Cloud
+  shelly add               # Adds new cloud to Shelly Cloud
   shelly help [TASK]       # Describe available tasks or one specific task
   shelly login [EMAIL]     # Logs user in to Shelly Cloud
   shelly register [EMAIL]  # Registers new user account on Shelly Cloud
-  shelly user <command>    # Manages users using this app
+  shelly user <command>    # Manages users using this cloud
   shelly version           # Displays shelly version
+
+Options:
+  [--debug]  # Show debug information
 OUT
       out = IO.popen("bin/shelly").read.strip
       out.should == expected.strip
@@ -189,7 +192,7 @@ OUT
       end
 
       it "should display list of applications to which user has access" do
-        $stdout.should_receive(:puts).with("\e[32mYou have following applications available:\e[0m")
+        $stdout.should_receive(:puts).with("\e[32mYou have following clouds available:\e[0m")
         $stdout.should_receive(:puts).with("  abc")
         $stdout.should_receive(:puts).with("  fooo")
         fake_stdin(["megan@example.com", "secret"]) do
@@ -277,7 +280,7 @@ OUT
     end
 
     it "should use code name provided by user" do
-      $stdout.should_receive(:print).with("Application code name (foo-production - default): ")
+      $stdout.should_receive(:print).with("Cloud code name (foo-production - default): ")
       @app.should_receive(:code_name=).with("mycodename")
       fake_stdin(["mycodename", ""]) do
         @main.add
@@ -286,7 +289,7 @@ OUT
 
     context "when user provided empty code name" do
       it "should use 'current_dirname-purpose' as default" do
-        $stdout.should_receive(:print).with("Application code name (foo-production - default): ")
+        $stdout.should_receive(:print).with("Cloud code name (foo-production - default): ")
         @app.should_receive(:code_name=).with("foo-production")
         fake_stdin(["", ""]) do
           @main.add
@@ -331,7 +334,7 @@ OUT
       exception = Shelly::Client::APIError.new(response.to_json)
       @app.should_receive(:create).and_raise(exception)
       $stdout.should_receive(:puts).with("\e[31mCode name has been already taken\e[0m")
-      $stdout.should_receive(:puts).with("\e[31mFix erros in the below command and type it again to create your application\e[0m")
+      $stdout.should_receive(:puts).with("\e[31mFix erros in the below command and type it again to create your cloud\e[0m")
       $stdout.should_receive(:puts).with("\e[31mshelly add --code-name=foo-production --databases=postgresql --domains=foo-production.shellyapp.com\e[0m")
       lambda {
         fake_stdin(["", ""]) do

data/spec/shelly/cli/runner_spec.rb

@@ -0,0 +1,57 @@
+require "spec_helper"
+require "shelly/cli/runner"
+
+describe Shelly::CLI::Runner do
+  before do
+    @runner = Shelly::CLI::Runner.new(%w(version --debug))
+  end
+
+  describe "#initialize" do
+    it "should initialize parent class" do
+      @runner.should be_kind_of(Thor::Shell::Basic)
+      @runner.should respond_to(:say) # if responds to parent class method
+    end
+
+    it "should assign args" do
+      @runner.args.should == %w(version --debug)
+    end
+  end
+
+  describe "#debug?" do
+    it "should be true if args include --debug option" do
+      @runner.should be_debug
+    end
+
+    it "should be failse if args doesn't include --debug option" do
+      runner = Shelly::CLI::Runner.new(%w(version))
+      runner.should_not be_debug
+    end
+  end
+
+  describe "#start" do
+    it "should start main CLI with given args" do
+      Shelly::CLI::Main.should_receive(:start).with(%w(version --debug))
+      @runner.start
+    end
+
+    context "with --debug option (debug mode)" do
+      it "should re-raise caught exception to the console" do
+        Shelly::CLI::Main.stub(:start).and_raise(RuntimeError.new)
+        lambda {
+          @runner.start
+        }.should raise_error(RuntimeError)
+      end
+    end
+
+    context "without --debug option (normal mode)" do
+      it "should rescue exception and display generic error message" do
+        Shelly::CLI::Main.stub(:start).and_raise(RuntimeError.new)
+        runner = Shelly::CLI::Runner.new(%w(version))
+        $stdout.should_receive(:puts).with("Unknown error, to see debug information run command with --debug")
+        lambda {
+          runner.start
+        }.should raise_error(SystemExit)
+      end
+    end
+  end
+end

data/spec/shelly/cli/user_spec.rb

@@ -16,7 +16,7 @@ describe Shelly::CLI::User do
     it "should show help" do
       $stdout.should_receive(:puts).with("Tasks:")
       $stdout.should_receive(:puts).with(/add \[EMAIL\]\s+# Add new developer to clouds defined in Cloudfile/)
-      $stdout.should_receive(:puts).with(/list\s+# List users with access to clouds defined in Cloudfile/)
+        $stdout.should_receive(:puts).with(/list\s+# List users with access to clouds defined in Cloudfile/)
       @cli_user.help
     end
   end
@@ -56,7 +56,7 @@ describe Shelly::CLI::User do
         @client.should_receive(:apps).and_return([{"code_name" => "foo-production"}, {"code_name" => "foo-staging"}])
         @client.stub(:apps_users).and_return(response)
         $stdout.should_receive(:puts).with("Cloud foo-production:")
-        $stdout.should_receive(:puts).with("  user@example.com (username)")
+        $stdout.should_receive(:puts).with("  user@example.com")
         $stdout.should_receive(:puts).with("Cloud foo-staging:")
         $stdout.should_receive(:puts).with("  user2@example.com (username2)")
         @cli_user.list
@@ -64,7 +64,7 @@ describe Shelly::CLI::User do
     end
 
     def response
-      [{'code_name' => 'foo-production', 'users' => [{'name' => 'username','email' => 'user@example.com'}]},
+      [{'code_name' => 'foo-production', 'users' => [{'email' => 'user@example.com'}]},
        {'code_name' => 'foo-staging', 'users' => [{'name' => 'username2','email' => 'user2@example.com'}]}]
     end
 

data/spec/shelly/{base_spec.rb → model_spec.rb}

@@ -1,6 +1,6 @@
 require "spec_helper"
 
-describe Shelly::Base do
+describe Shelly::Model do
   before do
     config_dir = File.expand_path("~/.shelly")
     FileUtils.mkdir_p(config_dir)
@@ -9,7 +9,7 @@ describe Shelly::Base do
   describe "#current_user" do
     it "should return user with loaded credentials" do
       File.open(File.join("~/.shelly/credentials"), "w") { |f| f << "superman@example.com\nthe-kal-el" }
-      base = Shelly::Base.new
+      base = Shelly::Model.new
       user = base.current_user
       user.email.should == "superman@example.com"
       user.password.should == "the-kal-el"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.0.21.pre
+  version: 0.0.21.pre2
   prerelease: 7
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-16 00:00:00.000000000Z
+date: 2011-11-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &2152869040 !ruby/object:Gem::Requirement
+  requirement: &2156497740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152869040
+  version_requirements: *2156497740
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2152868540 !ruby/object:Gem::Requirement
+  requirement: &2156497220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152868540
+  version_requirements: *2156497220
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &2152868020 !ruby/object:Gem::Requirement
+  requirement: &2156496760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152868020
+  version_requirements: *2156496760
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &2152861100 !ruby/object:Gem::Requirement
+  requirement: &2156496320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152861100
+  version_requirements: *2156496320
 - !ruby/object:Gem::Dependency
   name: growl_notify
-  requirement: &2152860640 !ruby/object:Gem::Requirement
+  requirement: &2156495760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152860640
+  version_requirements: *2156495760
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &2152860220 !ruby/object:Gem::Requirement
+  requirement: &2156495020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152860220
+  version_requirements: *2156495020
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &2152859800 !ruby/object:Gem::Requirement
+  requirement: &2156494560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152859800
+  version_requirements: *2156494560
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &2152859380 !ruby/object:Gem::Requirement
+  requirement: &2156493960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,21 +98,21 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152859380
+  version_requirements: *2156493960
 - !ruby/object:Gem::Dependency
-  name: thor
-  requirement: &2152858960 !ruby/object:Gem::Requirement
+  name: wijet-thor
+  requirement: &2156493440 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ! '>='
+    - - ~>
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.14.7
   type: :runtime
   prerelease: false
-  version_requirements: *2152858960
+  version_requirements: *2156493440
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &2152858540 !ruby/object:Gem::Requirement
+  requirement: &2156493000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -120,10 +120,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152858540
+  version_requirements: *2156493000
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &2152858120 !ruby/object:Gem::Requirement
+  requirement: &2156492380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152858120
+  version_requirements: *2156492380
 - !ruby/object:Gem::Dependency
   name: wijet-launchy
-  requirement: &2152857640 !ruby/object:Gem::Requirement
+  requirement: &2156491660 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,7 +142,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152857640
+  version_requirements: *2156491660
 description: Tool for managing applications and clouds at shellycloud.com
 email:
 - support@shellycloud.com
@@ -162,12 +162,14 @@ files:
 - lib/core_ext/object.rb
 - lib/shelly.rb
 - lib/shelly/app.rb
-- lib/shelly/base.rb
+- lib/shelly/cli/command.rb
 - lib/shelly/cli/main.rb
+- lib/shelly/cli/runner.rb
 - lib/shelly/cli/user.rb
 - lib/shelly/client.rb
 - lib/shelly/cloudfile.rb
 - lib/shelly/helpers.rb
+- lib/shelly/model.rb
 - lib/shelly/templates/Cloudfile.erb
 - lib/shelly/user.rb
 - lib/shelly/version.rb
@@ -177,11 +179,12 @@ 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/runner_spec.rb
 - spec/shelly/cli/user_spec.rb
 - spec/shelly/client_spec.rb
 - spec/shelly/cloudfile_spec.rb
+- spec/shelly/model_spec.rb
 - spec/shelly/user_spec.rb
 - spec/spec_helper.rb
 - spec/thor/options_spec.rb
@@ -213,11 +216,12 @@ 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/runner_spec.rb
 - spec/shelly/cli/user_spec.rb
 - spec/shelly/client_spec.rb
 - spec/shelly/cloudfile_spec.rb
+- spec/shelly/model_spec.rb
 - spec/shelly/user_spec.rb
 - spec/spec_helper.rb
 - spec/thor/options_spec.rb