shelly 0.0.19 → 0.0.20.pre

data/lib/shelly/app.rb

@@ -4,12 +4,8 @@ require 'launchy'
 module Shelly
   class App < Base
     DATABASE_KINDS = %w(postgresql mongodb redis none)
-    attr_accessor :code_name, :databases, :ruby_version, :environment, :git_url, :domains
-
-    def initialize
-      @ruby_version = "MRI-1.9.2"
-      @environment = "production"
-    end
+    attr_accessor :code_name, :databases, :ruby_version, :environment,
+      :git_url, :domains
 
     def add_git_remote
       system("git remote rm production > /dev/null 2>&1")
@@ -18,8 +14,6 @@ module Shelly
 
     def generate_cloudfile
       @email = current_user.email
-      @databases = databases
-      @domains = domains
       template = File.read(cloudfile_template_path)
       cloudfile = ERB.new(template, 0, "%<>-")
       cloudfile.result(binding)
@@ -30,16 +24,12 @@ module Shelly
     end
 
     def create
-      attributes = {
-        :name         => code_name,
-        :code_name    => code_name,
-        :environment  => environment,
-        :ruby_version => ruby_version,
-        :domain_name  => domains ? domains.join(" ") : nil
-      }
+      attributes = {:name => code_name, :code_name => code_name, :domains => domains}
       response = shelly.create_app(attributes)
       self.git_url = response["git_url"]
-      self.domains = response["domain_name"].split if domains.nil?
+      self.domains = response["domains"]
+      self.ruby_version = response["ruby_version"]
+      self.environment = response["environment"]
     end
 
     def create_cloudfile

data/lib/shelly/cli/main.rb

@@ -43,7 +43,7 @@ module Shelly
         say_error "Use ssh-keygen to generate ssh key pair"
       end
 
-      desc "login [EMAIL]", "Logins user to Shelly Cloud"
+      desc "login [EMAIL]", "Logs user in to Shelly Cloud"
       def login(email = nil)
         user = Shelly::User.new(email || ask_for_email, ask_for_password(:with_confirmation => false))
         user.login

data/lib/shelly/cli/user.rb

@@ -5,40 +5,61 @@ require "shelly/cloudfile"
 module Shelly
   module CLI
     class User < Thor
-      namespace :users
+      namespace :user
       include Helpers
 
-      desc "list", "List users who have access to current application"
+      desc "list", "List users with access to clouds defined in Cloudfile"
       def list
         say_error "Must be run inside your project git repository" unless App.inside_git_repository?
         say_error "No Cloudfile found" unless Cloudfile.present?
-        @cloudfile = Shelly::Cloudfile.new
-        @cloudfile.fetch_users.each do |app, users|
-          say "Cloud #{app}:"
+        @cloudfile = check_clouds.first
+        @cloudfile.fetch_users.each do |cloud, users|
+          say "Cloud #{cloud}:"
           users.each { |user| say "  #{user}" }
         end
       rescue Client::APIError => e
-        say e.message
-        exit 1
+        if e.unauthorized?
+          e.errors.each { |error| say_error error, :with_exit => false}
+          exit 1
+        else
+          say_error e.message
+        end
       end
 
-      desc "add [EMAIL]", "Add new developer to applications defined in Cloudfile"
+      desc "add [EMAIL]", "Add new developer to clouds defined in Cloudfile"
       def add(email = nil)
         say_error "Must be run inside your project git repository" unless App.inside_git_repository?
         say_error "No Cloudfile found" unless Cloudfile.present?
+        @cloudfile, @user = check_clouds
         user_email = email || ask_for_email({:guess_email => false})
-        @cloudfile = Shelly::Cloudfile.new
-        @user = Shelly::User.new
-        @user.send_invitation(@cloudfile.clouds, user_email)
-        say "Sending invitation to #{user_email}"
+        @cloudfile.clouds.each do |cloud|
+          @user.send_invitation(cloud, user_email)
+          say "Sending invitation to #{user_email} to work on #{cloud}", :green
+        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?
+          e.errors.each { |error| say_error error, :with_exit => false}
+          exit 1
         end
       end
 
+      no_tasks do
+        def check_clouds
+          @cloudfile = Shelly::Cloudfile.new
+          @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" }
+            raise Shelly::Client::APIError.new({:message => "Unauthorized",
+              :errors => errors}.to_json)
+          end
+          [@cloudfile, @user]
+        end
+
+      end
     end
   end
 end
-

data/lib/shelly/client.rb

@@ -56,10 +56,8 @@ module Shelly
       get("/token")
     end
 
-    def send_invitation(apps, email)
-      apps.map do |app|
-        post("/apps/#{app}/collaborations", :email => email)
-      end
+    def send_invitation(cloud, email)
+      post("/apps/#{cloud}/collaborations", :email => email)
     end
 
     def create_app(attributes)
@@ -78,7 +76,7 @@ module Shelly
     	get("/users/new", :ssh_key => ssh_key)
     end
 
-    def app_users(apps)
+    def apps_users(apps)
       apps.map do |app|
         get("/apps/#{app}/users")
       end

data/lib/shelly/cloudfile.rb

@@ -36,7 +36,7 @@ module Shelly
     end
 
     def fetch_users
-      response = shelly.app_users(clouds)
+      response = shelly.apps_users(clouds)
       response.inject({}) do |result, app|
         result[app['code_name']] = app['users'].map do |user|
           "#{user['email']} (#{user['name']})"

data/lib/shelly/templates/Cloudfile.erb

@@ -1,5 +1,5 @@
 <%= @code_name %>:
-  ruby: 1.9.2 # 1.9.2 or ree
+  ruby_version: 1.9.2 # 1.9.2 or ree
   environment: production # RAILS_ENV
   monitoring_email:
     - <%= @email %>

data/lib/shelly/user.rb

@@ -29,8 +29,8 @@ module Shelly
       shelly.token["token"]
     end
 
-    def send_invitation(apps, email)
-      shelly.send_invitation(apps, email)
+    def send_invitation(cloud, email)
+      shelly.send_invitation(cloud, email)
     end
 
     def load_credentials

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.19"
+  VERSION = "0.0.20.pre"
 end

data/spec/shelly/app_spec.rb

@@ -11,16 +11,6 @@ describe Shelly::App do
     @app.code_name = "foo-staging"
   end
 
-  describe "being initialized" do
-    it "should have default ruby_version: MRI-1.9.2" do
-      @app.ruby_version.should == "MRI-1.9.2"
-    end
-
-    it "should have default environment: production" do
-      @app.environment.should == "production"
-    end
-  end
-
   describe ".guess_code_name" do
     it "should return name of current working directory" do
       Shelly::App.guess_code_name.should == "foo"
@@ -60,7 +50,7 @@ describe Shelly::App do
       FakeFS.deactivate!
       expected = <<-config
 foo-staging:
-  ruby: 1.9.2 # 1.9.2 or ree
+  ruby_version: 1.9.2 # 1.9.2 or ree
   environment: production # RAILS_ENV
   monitoring_email:
     - bob@example.com
@@ -127,21 +117,21 @@ config
         attributes = {
           :code_name => "fooo",
           :name => "fooo",
-          :environment => "production",
-          :ruby_version => "MRI-1.9.2",
-          :domain_name => nil
+          :domains => nil
         }
         @client.should_receive(:create_app).with(attributes).and_return("git_url" => "git@git.shellycloud.com:fooo.git",
-          "domain_name" => "fooo.shellyapp.com")
+          "domains" => %w(fooo.shellyapp.com))
         @app.create
       end
 
-      it "should assign returned git_url and domain" do
+      it "should assign returned git_url, domains, ruby_version and environment" do
         @client.stub(:create_app).and_return("git_url" => "git@git.example.com:fooo.git",
-          "domain_name" => "fooo.shellyapp.com")
+          "domains" => ["fooo.shellyapp.com"], "ruby_version" => "1.9.2", "environment" => "production")
         @app.create
         @app.git_url.should == "git@git.example.com:fooo.git"
         @app.domains.should == ["fooo.shellyapp.com"]
+        @app.ruby_version.should == "1.9.2"
+        @app.environment.should == "production"
       end
     end
 
@@ -152,20 +142,18 @@ config
         attributes = {
           :code_name => "boo",
           :name => "boo",
-          :environment => "production",
-          :ruby_version => "MRI-1.9.2",
-          :domain_name => "boo.shellyapp.com boo.example.com"
+          :domains => %w(boo.shellyapp.com boo.example.com)
         }
         @client.should_receive(:create_app).with(attributes).and_return("git_url" => "git@git.shellycloud.com:fooo.git",
-          "domain_name" => "boo.shellyapp.com boo.example.com")
+          "domains" => %w(boo.shellyapp.com boo.example.com))
         @app.create
       end
 
       it "should assign returned git_url and domain" do
         @client.stub(:create_app).and_return("git_url" => "git@git.example.com:fooo.git",
-          "domain_name" => "boo.shellyapp.com boo.example.com")
+          "domains" => %w(boo.shellyapp.com boo.example.com))
         @app.create
-        @app.domains.should == ["boo.shellyapp.com", "boo.example.com"]
+        @app.domains.should == %w(boo.shellyapp.com boo.example.com)
       end
     end
   end

data/spec/shelly/cli/main_spec.rb

@@ -25,7 +25,7 @@ describe Shelly::CLI::Main do
 Tasks:
   shelly add               # Adds new application to Shelly Cloud
   shelly help [TASK]       # Describe available tasks or one specific task
-  shelly login [EMAIL]     # Logins user to Shelly Cloud
+  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 version           # Displays shelly version

data/spec/shelly/cli/user_spec.rb

@@ -4,7 +4,7 @@ require "shelly/cli/user"
 describe Shelly::CLI::User do
   before do
     FileUtils.stub(:chmod)
-    @users = Shelly::CLI::User.new
+    @cli_user = Shelly::CLI::User.new
     @client = mock
     Shelly::Client.stub(:new).and_return(@client)
     Shelly::User.stub(:guess_email).and_return("")
@@ -15,9 +15,9 @@ describe Shelly::CLI::User do
   describe "#help" do
     it "should show help" do
       $stdout.should_receive(:puts).with("Tasks:")
-      $stdout.should_receive(:puts).with(/add \[EMAIL\]\s+# Add new developer to applications defined in Cloudfile/)
-      $stdout.should_receive(:puts).with(/list\s+# List users who have access to current application/)
-      @users.help
+      $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/)
+      @cli_user.help
     end
   end
 
@@ -33,7 +33,7 @@ describe Shelly::CLI::User do
       Shelly::App.stub(:inside_git_repository?).and_return(false)
       $stdout.should_receive(:puts).with("\e[31mMust be run inside your project git repository\e[0m")
       lambda {
-        @users.list
+        @cli_user.list
       }.should raise_error(SystemExit)
     end
 
@@ -41,39 +41,39 @@ describe Shelly::CLI::User do
       File.delete("Cloudfile")
       $stdout.should_receive(:puts).with("\e[31mNo Cloudfile found\e[0m")
       lambda {
-        @users.list
+        @cli_user.list
       }.should raise_error(SystemExit)
     end
 
     context "on success" do
       it "should receive clouds from the Cloudfile" do
-        @client.should_receive(:app_users).with(["foo-production", "foo-staging"]).
-          and_return(response)
-        @users.list
+        @client.should_receive(:apps).and_return([{"code_name" => "foo-production"}, {"code_name" => "foo-staging"}])
+        @client.should_receive(:apps_users).and_return(response)
+        @cli_user.list
       end
 
       it "should display clouds and users" do
-        @client.stub(:app_users).and_return(response)
-        $stdout.should_receive(:puts).with("Cloud foo-staging:")
-        $stdout.should_receive(:puts).with("  user@example.com (username)")
+        @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("Cloud foo-staging:")
         $stdout.should_receive(:puts).with("  user2@example.com (username2)")
-        @users.list
+        @cli_user.list
       end
     end
 
     def response
-      [{'code_name' => 'foo-staging','users' => [{'name' => 'username','email' => 'user@example.com'}]},
-       {'code_name' => 'foo-production','users' => [{'name' => 'username2','email' => 'user2@example.com'}]}]
+      [{'code_name' => 'foo-production', 'users' => [{'name' => 'username','email' => 'user@example.com'}]},
+       {'code_name' => 'foo-staging', 'users' => [{'name' => 'username2','email' => 'user2@example.com'}]}]
     end
 
     context "on failure" do
-      it "should raise an error if user does not have access to any app" do
-        response = {"message" => "You do not have access to this app"}
-        exception = Shelly::Client::APIError.new(response.to_json)
-        @client.stub(:app_users).and_raise(exception)
-        $stdout.should_receive(:puts).with("You do not have access to this app")
-        lambda { @users.list }.should raise_error(SystemExit)
+      it "should raise an error if user does not have access to cloud" do
+        @client.should_receive(:apps).and_return([{"code_name" => "foo-production"}])
+        @client.stub(:apps_users).and_return(response)
+        $stdout.should_receive(:puts).with("\e[31mYou have no access to 'foo-staging' cloud defined in Cloudfile\e[0m")
+        lambda { @cli_user.list }.should raise_error(SystemExit)
       end
     end
   end
@@ -94,7 +94,7 @@ describe Shelly::CLI::User do
       File.delete("Cloudfile")
       $stdout.should_receive(:puts).with("\e[31mNo Cloudfile found\e[0m")
       lambda {
-        @users.list
+        @cli_user.list
       }.should raise_error(SystemExit)
     end
 
@@ -102,32 +102,39 @@ describe Shelly::CLI::User do
       Shelly::App.stub(:inside_git_repository?).and_return(false)
       $stdout.should_receive(:puts).with("\e[31mMust be run inside your project git repository\e[0m")
       lambda {
-        @users.add
+        @cli_user.add
       }.should raise_error(SystemExit)
     end
 
     context "on success" do
       before do
-        @client.should_receive(:send_invitation).with(["foo-production", "foo-staging"], "megan@example.com")
+        @client.should_receive(:send_invitation).with("foo-production", "megan@example.com")
+        @client.should_receive(:send_invitation).with("foo-staging", "megan@example.com")
+        @client.should_receive(:apps).and_return([{"code_name" => "foo-production"}, {"code_name" => "foo-staging"}])
       end
 
       it "should ask about email" do
         fake_stdin(["megan@example.com"]) do
-          @users.add
+          @cli_user.add
         end
       end
 
       it "should receive clouds from the Cloudfile" do
-        @users.add("megan@example.com")
+        @cli_user.add("megan@example.com")
       end
 
       it "should receive clouds from the Cloudfile" do
-        $stdout.should_receive(:puts).with("Sending invitation to megan@example.com")
-        @users.add("megan@example.com")
+        $stdout.should_receive(:puts).with("\e[32mSending invitation to megan@example.com to work on foo-production\e[0m")
+        @cli_user.add("megan@example.com")
       end
     end
 
+    context "on failure" do
+      it "should raise error if user doesnt have access to cloud" do
+        @client.should_receive(:apps).and_return([{"code_name" => "foo-production"}])
+        $stdout.should_receive(:puts).with("\e[31mYou have no access to 'foo-staging' cloud defined in Cloudfile\e[0m")
+        lambda { @cli_user.add("megan@example.com") }.should raise_error(SystemExit)
+      end
+    end
   end
-
 end
-

data/spec/shelly/client_spec.rb

@@ -111,9 +111,8 @@ describe Shelly::Client do
     it "should send post with app code_names" do
       FakeWeb.register_uri(:get, @url + "/apps/staging-foo/users", :body => {:code_name => "staging-foo"}.to_json)
       FakeWeb.register_uri(:get, @url + "/apps/production-foo/users", :body => {:code_name => "production-foo"}.to_json)
-      response = @client.app_users(["staging-foo", "production-foo"])
-      response.should == [{"code_name" => "staging-foo"},
-        {"code_name" => "production-foo"}]
+      response = @client.apps_users(["staging-foo", "production-foo"])
+      response.should == [{"code_name" => "staging-foo"}, {"code_name" => "production-foo"}]
     end
   end
 
@@ -121,8 +120,8 @@ describe Shelly::Client do
     it "should send post with developer's email" do
       FakeWeb.register_uri(:post, @url + "/apps/staging-foo/collaborations", :body => {}.to_json)
       FakeWeb.register_uri(:post, @url + "/apps/production-foo/collaborations", :body => {}.to_json)
-      response = @client.send_invitation(["staging-foo", "production-foo"], "megan@example.com")
-      response.should == [{}, {}]
+      response = @client.send_invitation("staging-foo", "megan@example.com")
+      response.should == {}
     end
   end
 

data/spec/shelly/cloudfile_spec.rb

@@ -16,7 +16,7 @@ describe Shelly::Cloudfile do
       @cloudfile.yaml(@hash).should == "code_name:\n  code: test"
     end
 
-    it "should conver a hash to yaml format" do
+    it "should convert a hash to yaml format" do
       @cloudfile.write(@hash)
       @cloudfile.open.should == {"code_name" => {"code" => "test"}}
     end
@@ -25,7 +25,7 @@ describe Shelly::Cloudfile do
   describe "#fetch_users" do
     it "should return array to display with clouds and users" do
       @cloudfile.write(@hash)
-      @client.should_receive(:app_users).and_return(response)
+      @client.should_receive(:apps_users).and_return(response)
       response = @cloudfile.fetch_users
       response.should == {"foo-staging" => ["user@example.com (username)"]}
     end

data/spec/shelly/user_spec.rb

@@ -94,8 +94,8 @@ describe Shelly::User do
 
   describe "#send_invitation" do
     it "should send invitation" do
-      @client.should_receive(:send_invitation).with(["foo-staging"], "megan@example.com")
-      @user.send_invitation(["foo-staging"], "megan@example.com")
+      @client.should_receive(:send_invitation).with("foo-staging", "megan@example.com")
+      @user.send_invitation("foo-staging", "megan@example.com")
     end
   end
 

data/spec/spec_helper.rb

@@ -5,6 +5,7 @@ require "input_faker"
 require "fakefs/spec_helpers"
 require "fakeweb"
 
+ENV['THOR_COLUMNS'] = "180"
 FakeWeb.allow_net_connect = false
 
 RSpec.configure do |config|

data/spec/thor/options_spec.rb

@@ -0,0 +1,24 @@
+require 'spec_helper'
+require 'thor/parser'
+
+describe Thor::Options do
+  def create(opts, defaults={})
+    opts.each do |key, value|
+      opts[key] = Thor::Option.parse(key, value) unless value.is_a?(Thor::Option)
+    end
+    @opt = Thor::Options.new(opts, defaults)
+  end
+
+  def parse(*args)
+    @opt.parse(args.flatten)
+  end
+
+  describe "#parse" do
+    describe "with :array type" do
+      it "accepts a switch=<value> assignment, where value is a set of paramters split by comma or spaces" do
+        create "--attributes" => :array
+        parse("--attributes=a,b", "c, d", "e ,  f")["attributes"].should == ["a", "b", "c", "d", "e", "f"]
+      end
+    end
+  end
+end

metadata

@@ -1,200 +1,156 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: shelly
-version: !ruby/object:Gem::Version 
-  hash: 57
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 19
-  version: 0.0.19
+version: !ruby/object:Gem::Version
+  version: 0.0.20.pre
+  prerelease: 7
 platform: ruby
-authors: 
+authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-11-14 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-11-16 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2155914700 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *2155914700
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &2155914060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: guard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *2155914060
+- !ruby/object:Gem::Dependency
+  name: guard
+  requirement: &2155913200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: guard-rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *2155913200
+- !ruby/object:Gem::Dependency
+  name: guard-rspec
+  requirement: &2155912580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: growl_notify
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *2155912580
+- !ruby/object:Gem::Dependency
+  name: growl_notify
+  requirement: &2155911840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rb-fsevent
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *2155911840
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: &2155911160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: fakefs
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *2155911160
+- !ruby/object:Gem::Dependency
+  name: fakefs
+  requirement: &2155910340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *2155910340
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &2155909460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: thor
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *2155909460
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: &2155894380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: rest-client
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *2155894380
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &2155893340 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  version_requirements: *2155893340
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &2155892380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
-  name: launchy
   prerelease: false
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  version_requirements: *2155892380
+- !ruby/object:Gem::Dependency
+  name: launchy
+  requirement: &2155891620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-  version_requirements: *id012
+  prerelease: false
+  version_requirements: *2155891620
 description: Tool for managing applications and clouds at shellycloud.com
-email: 
+email:
 - support@shellycloud.com
-executables: 
+executables:
 - shelly
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -228,40 +184,32 @@ files:
 - spec/shelly/cloudfile_spec.rb
 - spec/shelly/user_spec.rb
 - spec/spec_helper.rb
+- spec/thor/options_spec.rb
 homepage: http://shellycloud.com
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>'
+    - !ruby/object:Gem::Version
+      version: 1.3.1
 requirements: []
-
 rubyforge_project: shelly
 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
@@ -272,3 +220,4 @@ test_files:
 - spec/shelly/cloudfile_spec.rb
 - spec/shelly/user_spec.rb
 - spec/spec_helper.rb
+- spec/thor/options_spec.rb