shelly 0.0.49 → 0.0.50.pre

data/Rakefile

@@ -4,5 +4,5 @@ require "rspec/core/rake_task"
 task :default => :spec
 desc "Run specs"
 RSpec::Core::RakeTask.new do |t|
-  t.rspec_opts = %w(-fs --color)
+  t.rspec_opts = %w(-fp --color)
 end

data/lib/shelly/app.rb

@@ -13,12 +13,16 @@ module Shelly
     end
 
     def add_git_remote
-      system("git remote rm production > /dev/null 2>&1")
-      system("git remote add production #{git_url}")
+      system("git remote rm #{code_name} > /dev/null 2>&1")
+      system("git remote add #{code_name} #{git_url}")
+    end
+
+    def git_remote_exist?
+      IO.popen("git remote").read.include?(code_name)
     end
 
     def remove_git_remote
-      system("git remote rm production > /dev/null 2>&1")
+      system("git remote rm #{code_name} > /dev/null 2>&1")
     end
 
     def generate_cloudfile
@@ -33,7 +37,7 @@ module Shelly
     end
 
     def create
-      attributes = {:name => code_name, :code_name => code_name, :domains => domains}
+      attributes = {:code_name => code_name, :domains => domains}
       response = shelly.create_app(attributes)
       self.git_url = response["git_url"]
       self.domains = response["domains"]
@@ -102,11 +106,32 @@ module Shelly
     end
 
     def self.guess_code_name
-      File.basename(Dir.pwd)
+      guessed = nil
+      if Cloudfile.present?
+        clouds = Cloudfile.new.clouds
+        if clouds.grep(/staging/)
+          guessed = "production"
+          production_clouds = clouds.grep(/production/)
+          production_clouds.sort.each do  |cloud|
+            cloud =~ /production(\d*)/
+            guessed = "production#{$1.to_i+1}"
+          end
+        end
+      end
+      "#{File.basename(Dir.pwd)}-#{guessed || 'staging'}"
+    end
+
+    def collaborations
+      @collaborations ||= Array(shelly.collaborations(code_name)).
+        sort_by { |c| c["email"] }
+    end
+
+    def active_collaborations
+      collaborations.select { |c| c["active"] }
     end
 
-    def users
-      shelly.app_users(code_name)
+    def inactive_collaborations
+      collaborations.select { |c| !c["active"] }
     end
 
     def configs

data/lib/shelly/cli/main.rb

@@ -16,7 +16,7 @@ module Shelly
       check_unknown_options!(:except => :rake)
 
       # FIXME: it should be possible to pass single symbol, instead of one element array
-      before_hook :logged_in?, :only => [:add, :list, :start, :stop, :logs, :delete, :ip, :logout, :execute, :rake]
+      before_hook :logged_in?, :only => [:add, :status, :list, :start, :stop, :logs, :delete, :ip, :logout, :execute, :rake]
       before_hook :inside_git_repository?, :only => [:add]
       before_hook :cloudfile_present?, :only => [:logs, :stop, :start, :ip, :execute, :rake]
 
@@ -85,8 +85,14 @@ module Shelly
         @app.domains = options["domains"] || ["#{@app.code_name}.shellyapp.com"]
         @app.create
 
-        say "Adding remote production #{@app.git_url}", :green
-        @app.add_git_remote
+        git_remote = @app.git_remote_exist?
+        if !git_remote or (git_remote and yes?("Git remote #{@app} exists, overwrite (yes/no): "))
+          say "Adding remote #{@app} #{@app.git_url}", :green
+          @app.add_git_remote
+        else
+          say "You have to manually add git remote:"
+          say "`git remote add NAME #{@app.git_url}`"
+        end
 
         say "Creating Cloudfile", :green
         @app.create_cloudfile
@@ -100,7 +106,7 @@ module Shelly
         end
 
         info_adding_cloudfile_to_repository
-        info_deploying_to_shellycloud
+        info_deploying_to_shellycloud(@app)
 
       rescue Client::ValidationException => e
         e.each_error { |error| say_error error, :with_exit => false }
@@ -344,8 +350,8 @@ module Shelly
         end
 
         def ask_for_code_name
-          default_code_name = "#{Shelly::App.guess_code_name}-production"
-          code_name = ask("Cloud code name (#{default_code_name} - default):")
+          default_code_name = Shelly::App.guess_code_name
+          code_name = ask("Cloud code name (#{Shelly::App.guess_code_name} - default):")
           code_name.blank? ? default_code_name : code_name
         end
 
@@ -369,15 +375,15 @@ module Shelly
           say "  git status"
         end
 
-        def info_deploying_to_shellycloud
+        def info_deploying_to_shellycloud(remote)
           say_new_line
           say "When you make sure all settings are correct please issue following commands:", :green
           say "  git add ."
           say '  git commit -m "Application added to Shelly Cloud"'
           say "  git push"
           say_new_line
-          say "Deploy to production using:", :green
-          say "  git push production master"
+          say "Deploy to your cloud using:", :green
+          say "  git push #{remote} master"
           say_new_line
         end
       end

data/lib/shelly/cli/runner.rb

@@ -18,11 +18,16 @@ module Shelly
       def start
         Shelly::CLI::Main.start(args)
       rescue SystemExit; raise
+      rescue Client::UnauthorizedException
+        raise if debug?
+        say_error "You are not logged in. To log in use: `shelly login`"
       rescue Client::GemVersionException => e
+        raise if debug?
         say "Required shelly gem version: #{e.body["required_version"]}"
         say "Your version: #{VERSION}"
         say_error "Update shelly gem with `gem install shelly`"
       rescue Interrupt
+        raise if debug?
         say_new_line
         say_error "[canceled]"
       rescue Exception

data/lib/shelly/cli/user.rb

@@ -16,7 +16,9 @@ module Shelly
           begin
             @app = App.new(cloud)
             say "Cloud #{cloud}:"
-            @app.users.each { |user| say "  #{user["email"]}" }
+            @app.active_collaborations.each { |c| say "  #{c["email"]}" }
+            @app.inactive_collaborations.each { |c|
+              say "  #{c["email"]} (invited)" }
           rescue Client::NotFoundException => e
             raise unless e.resource == :cloud
             say_error "You have no access to '#{cloud}' cloud defined in Cloudfile"
@@ -56,6 +58,8 @@ module Shelly
           begin
             @user.delete_collaboration(cloud, user_email)
             say "User #{user_email} deleted from cloud #{cloud}"
+          rescue Client::ConflictException => e
+            say_error e[:message]
           rescue Client::NotFoundException => e
             case e.resource
             when :cloud

data/lib/shelly/client.rb

@@ -152,8 +152,8 @@ module Shelly
       post("/apps/#{code_name}/database_backups", :kind => kind)
     end
 
-    def app_users(cloud)
-      get("/apps/#{cloud}/users")
+    def collaborations(cloud)
+      get("/apps/#{cloud}/collaborations")
     end
 
     def redeploy(cloud)

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.49"
+  VERSION = "0.0.50.pre"
 end

data/shelly.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.description = %q{Tool for managing applications and clouds at shellycloud.com}
 
   s.rubyforge_project = "shelly"
-  s.add_development_dependency "rspec"
+  s.add_development_dependency "rspec", "~> 2.8.0"
   s.add_development_dependency "rake"
   s.add_development_dependency "guard"
   s.add_development_dependency "guard-rspec"

data/spec/shelly/app_spec.rb

@@ -12,15 +12,29 @@ describe Shelly::App do
   end
 
   describe ".guess_code_name" do
-    it "should return name of current working directory" do
-      Shelly::App.guess_code_name.should == "foo"
+    context "no Cloudfile" do
+      it "should return name of current working directory" do
+        Shelly::App.guess_code_name.should == "foo-staging"
+      end
+    end
+
+    context "with Cloudfile" do
+      it "should return production" do
+        File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\n") }
+        Shelly::App.guess_code_name.should == "foo-production"
+      end
+
+      it "should return productionNUMBER" do
+        File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\nfoo-production:\n") }
+        Shelly::App.guess_code_name.should == "foo-production1"
+      end
     end
   end
 
-  describe "#users" do
+  describe "#collaborations" do
     it "should fetch app's users" do
-      @client.should_receive(:app_users).with("foo-staging")
-      @app.users
+      @client.should_receive(:collaborations).with("foo-staging")
+      @app.collaborations
     end
   end
 
@@ -31,16 +45,24 @@ describe Shelly::App do
     end
 
     it "should try to remove existing git remote" do
-      @app.should_receive(:system).with("git remote rm production > /dev/null 2>&1")
+      @app.should_receive(:system).with("git remote rm foo-staging > /dev/null 2>&1")
       @app.add_git_remote
     end
 
     it "should add git remote with proper name and git repository" do
-      @app.should_receive(:system).with("git remote add production git@git.shellycloud.com:foo-staging.git")
+      @app.should_receive(:system).with("git remote add foo-staging git@git.shellycloud.com:foo-staging.git")
       @app.add_git_remote
     end
   end
 
+  describe "git_remote_exist" do
+    it "should return true if git remote exist" do
+      io = mock(:read => "origin\nfoo-staging")
+      IO.should_receive(:popen).with("git remote").and_return(io)
+      @app.git_remote_exist?.should be_true
+    end
+  end
+
   describe "#configs" do
     it "should get configs from client" do
       @client.should_receive(:app_configs).with("foo-staging").and_return(config_response)
@@ -229,7 +251,6 @@ config
         @app.code_name = "fooo"
         attributes = {
           :code_name => "fooo",
-          :name => "fooo",
           :domains => nil
         }
         @client.should_receive(:create_app).with(attributes).and_return("git_url" => "git@git.shellycloud.com:fooo.git",
@@ -254,7 +275,6 @@ config
         @app.domains = ["boo.shellyapp.com", "boo.example.com"]
         attributes = {
           :code_name => "boo",
-          :name => "boo",
           :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",

data/spec/shelly/cli/main_spec.rb

@@ -274,6 +274,7 @@ OUT
       Shelly::App.stub(:new).and_return(@app)
       @client.stub(:token).and_return("abc")
       @app.stub(:attributes).and_return({"trial" => false})
+      @app.stub(:git_remote_exist?).and_return(false)
     end
 
     # This spec tests inside_git_repository? hook
@@ -328,7 +329,7 @@ OUT
     end
 
     it "should use code name provided by user" do
-      $stdout.should_receive(:print).with("Cloud code name (foo-production - default): ")
+      $stdout.should_receive(:print).with("Cloud code name (foo-staging - default): ")
       @app.should_receive(:code_name=).with("mycodename")
       fake_stdin(["mycodename", ""]) do
         invoke(@main, :add)
@@ -337,8 +338,8 @@ OUT
 
     context "when user provided empty code name" do
       it "should use 'current_dirname-purpose' as default" do
-        $stdout.should_receive(:print).with("Cloud code name (foo-production - default): ")
-        @app.should_receive(:code_name=).with("foo-production")
+        $stdout.should_receive(:print).with("Cloud code name (foo-staging - default): ")
+        @app.should_receive(:code_name=).with("foo-staging")
         fake_stdin(["", ""]) do
           invoke(@main, :add)
         end
@@ -393,7 +394,7 @@ OUT
       $stdout.should_receive(:puts).with(green "Billing information")
       $stdout.should_receive(:puts).with("Cloud created with 20 Euro credit.")
       $stdout.should_receive(:puts).with("Remember to provide billing details before trial ends.")
-      $stdout.should_receive(:puts).with("http://example.com/apps/foo-production/billing/edit")
+      $stdout.should_receive(:puts).with("http://example.com/apps/foo-staging/billing/edit")
 
       fake_stdin(["", ""]) do
         invoke(@main, :add)
@@ -415,7 +416,7 @@ OUT
       @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 cloud\e[0m")
-      $stdout.should_receive(:puts).with("\e[31mshelly add --code-name=foo-production --databases=postgresql --domains=foo-production.shellyapp.com\e[0m")
+      $stdout.should_receive(:puts).with("\e[31mshelly add --code-name=foo-staging --databases=postgresql --domains=foo-staging.shellyapp.com\e[0m")
       lambda {
         fake_stdin(["", ""]) do
           invoke(@main, :add)
@@ -436,11 +437,39 @@ OUT
       }.should raise_error(SystemExit)
     end
 
-    it "should add git remote" do
-      $stdout.should_receive(:puts).with("\e[32mAdding remote production git@git.shellycloud.com:foooo.git\e[0m")
-      @app.should_receive(:add_git_remote)
-      fake_stdin(["foooo", ""]) do
-        invoke(@main, :add)
+    context "git remote" do
+      it "should add one if it doesn't exist" do
+        $stdout.should_receive(:puts).with("\e[32mAdding remote foooo git@git.shellycloud.com:foooo.git\e[0m")
+        @app.should_receive(:add_git_remote)
+        fake_stdin(["foooo", ""]) do
+          invoke(@main, :add)
+        end
+      end
+
+      context "does exist" do
+        before do
+          @app.stub(:git_remote_exist?).and_return(true)
+        end
+
+        it "should ask if one exist and overwrite" do
+          $stdout.should_receive(:print).with("Git remote foooo exists, overwrite (yes/no):  ")
+          $stdout.should_receive(:puts).with(green "Adding remote foooo git@git.shellycloud.com:foooo.git")
+          @app.should_receive(:add_git_remote)
+          fake_stdin(["foooo", "", "yes"]) do
+            invoke(@main, :add)
+          end
+        end
+
+        it "should ask if one exist and not overwrite" do
+          $stdout.should_receive(:print).with("Git remote foooo exists, overwrite (yes/no):  ")
+          $stdout.should_receive(:puts).with("You have to manually add git remote:")
+          $stdout.should_receive(:puts).with("`git remote add NAME git@git.shellycloud.com:foooo.git`")
+          @app.should_not_receive(:add_git_remote)
+          fake_stdin(["foooo", "", "no"]) do
+            invoke(@main, :add)
+          end
+        end
+
       end
     end
 
@@ -466,8 +495,8 @@ OUT
       $stdout.should_receive(:puts).with("  git add .")
       $stdout.should_receive(:puts).with('  git commit -m "Application added to Shelly Cloud"')
       $stdout.should_receive(:puts).with("  git push")
-      $stdout.should_receive(:puts).with("\e[32mDeploy to production using:\e[0m")
-      $stdout.should_receive(:puts).with("  git push production master")
+      $stdout.should_receive(:puts).with("\e[32mDeploy to your cloud using:\e[0m")
+      $stdout.should_receive(:puts).with("  git push foooo master")
       fake_stdin(["foooo", "none"]) do
         invoke(@main, :add)
       end
@@ -500,10 +529,16 @@ OUT
       invoke(@main, :list)
     end
 
-    it "should have a 'status' alias" do
-      @client.stub(:apps).and_return([])
-      $stdout.should_receive(:puts).with("\e[32mYou have no clouds yet\e[0m")
-      invoke(@main, :status)
+    context "#status" do
+      it "should ensure user has logged in" do
+        hooks(@main, :status).should include(:logged_in?)
+      end
+
+      it "should have a 'status' alias" do
+        @client.stub(:apps).and_return([])
+        $stdout.should_receive(:puts).with("\e[32mYou have no clouds yet\e[0m")
+        invoke(@main, :status)
+      end
     end
   end
 

data/spec/shelly/cli/runner_spec.rb

@@ -64,6 +64,18 @@ describe Shelly::CLI::Runner do
       }.should raise_error(SystemExit)
     end
 
+    it "should rescue unauthorized exception and display message" do
+      @client = mock
+      runner = Shelly::CLI::Runner.new(%w(status))
+      Shelly::Client.stub(:new).and_return(@client)
+      @client.stub(:token).and_return("abc")
+      @client.stub(:apps).and_raise(Shelly::Client::UnauthorizedException.new)
+      $stdout.should_receive(:puts).with("You are not logged in. To log in use: `shelly login`")
+      lambda {
+        runner.start
+      }.should raise_error(SystemExit)
+    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)
@@ -71,6 +83,27 @@ describe Shelly::CLI::Runner do
           @runner.start
         }.should raise_error(RuntimeError)
       end
+
+      it "should re-raise unauthorized exception" do
+        Shelly::CLI::Main.stub(:start).and_raise(Shelly::Client::UnauthorizedException.new)
+        lambda {
+          @runner.start
+        }.should raise_error(Shelly::Client::UnauthorizedException)
+      end
+
+      it "should re-raise gem version exception" do
+        Shelly::CLI::Main.stub(:start).and_raise(Shelly::Client::GemVersionException.new)
+        lambda {
+          @runner.start
+        }.should raise_error(Shelly::Client::GemVersionException)
+      end
+
+      it "should re-raise interupt exception" do
+        Shelly::CLI::Main.stub(:start).and_raise(Interrupt.new)
+        lambda {
+          @runner.start
+        }.should raise_error(Interrupt)
+      end
     end
 
     context "without --debug option (normal mode)" do

data/spec/shelly/cli/user_spec.rb

@@ -27,6 +27,10 @@ describe Shelly::CLI::User do
   end
 
   describe "#list" do
+    let(:response) {
+      [{'email' => 'user@example.com', 'active' => true},
+       {'email' => 'auser2@example2.com', 'active' => false}]
+    }
     before do
       @cloudfile = Shelly::Cloudfile.new
       Shelly::Cloudfile.stub(:new).and_return(@cloudfile)
@@ -42,27 +46,24 @@ describe Shelly::CLI::User do
 
     context "on success" do
       it "should receive clouds from the Cloudfile" do
-        @client.stub(:app_users).and_return(response)
+        @client.stub(:collaborations).and_return(response)
         @cloudfile.should_receive(:clouds).and_return(["foo-staging", "foo-production"])
         invoke(@cli_user, :list)
       end
 
       it "should display clouds and users" do
-        @client.stub(:app_users).and_return(response)
+        @client.stub(:collaborations).and_return(response)
         $stdout.should_receive(:puts).with("Cloud foo-production:")
         $stdout.should_receive(:puts).with("  user@example.com")
+        $stdout.should_receive(:puts).with("  auser2@example2.com (invited)")
         invoke(@cli_user, :list)
       end
     end
 
-    def response
-      [{'email' => 'user@example.com'}]
-    end
-
     context "on failure" do
       it "should exit with 1 if user does not have access to cloud" do
         exception = Shelly::Client::NotFoundException.new("resource" => "cloud")
-        @client.stub(:app_users).and_raise(exception)
+        @client.stub(:collaborations).and_raise(exception)
         $stdout.should_receive(:puts).with(red "You have no access to 'foo-production' cloud defined in Cloudfile")
         lambda { invoke(@cli_user, :list) }.should raise_error(SystemExit)
       end
@@ -175,6 +176,16 @@ describe Shelly::CLI::User do
           invoke(@cli_user, :delete, "megan@example.com")
         }.should raise_error(SystemExit)
       end
+
+      it "should show that user can't delete own collaboration" do
+        exception = Shelly::Client::ConflictException.new("message" =>
+          "Can't remove own collaboration")
+        @client.stub(:delete_collaboration).and_raise(exception)
+        $stdout.should_receive(:puts).with(red "Can't remove own collaboration")
+        lambda {
+          invoke(@cli_user, :delete, "megan@example.com")
+        }.should raise_error(SystemExit)
+      end
     end
   end
 end

data/spec/shelly/client_spec.rb

@@ -170,12 +170,14 @@ describe Shelly::Client do
     end
   end
 
-  describe "#app_users" do
+  describe "#collaborations" do
     it "should send get request with app code_names" do
-      FakeWeb.register_uri(:get, api_url("apps/staging-foo/users"), :body => [{:email => "test@example.com"},
-        {:email => "test2@example.com"}].to_json)
-      response = @client.app_users("staging-foo")
-      response.should == [{"email" => "test@example.com"}, {"email" => "test2@example.com"}]
+      FakeWeb.register_uri(:get, api_url("apps/staging-foo/collaborations"),
+        :body => [{:email => "test@example.com", :active => true},
+                  {:email => "test2@example.com", :active => false}].to_json)
+      response = @client.collaborations("staging-foo")
+      response.should == [{"email" => "test@example.com", 'active' => true},
+                          {"email" => "test2@example.com", 'active' => false}]
     end
   end
 

metadata

@@ -1,188 +1,167 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: shelly
-version: !ruby/object:Gem::Version 
-  hash: 125
-  prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 49
-  version: 0.0.49
+version: !ruby/object:Gem::Version
+  version: 0.0.50.pre
+  prerelease: 7
 platform: ruby
-authors: 
+authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-20 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id001
-  prerelease: false
-  type: :development
+date: 2012-02-28 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
+  requirement: &70352069078820 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
-  prerelease: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
   type: :development
+  prerelease: false
+  version_requirements: *70352069078820
+- !ruby/object:Gem::Dependency
   name: rake
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70352069078400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id003
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: *70352069078400
+- !ruby/object:Gem::Dependency
   name: guard
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70352069077940 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id004
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: *70352069077940
+- !ruby/object:Gem::Dependency
   name: guard-rspec
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70352069077520 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id005
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: *70352069077520
+- !ruby/object:Gem::Dependency
   name: simplecov
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70352069077100 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70352069077100
+- !ruby/object:Gem::Dependency
+  name: ruby_gntp
+  requirement: &70352069076580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id006
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
+  version_requirements: *70352069076580
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: &70352069076120 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: *70352069076120
+- !ruby/object:Gem::Dependency
   name: fakefs
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70352069075600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id007
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: *70352069075600
+- !ruby/object:Gem::Dependency
   name: fakeweb
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &70352069075060 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 41
-        segments: 
-        - 0
-        - 14
-        - 7
-        version: 0.14.7
-  requirement: *id008
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
   prerelease: false
-  type: :runtime
+  version_requirements: *70352069075060
+- !ruby/object:Gem::Dependency
   name: wijet-thor
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &70352069074100 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id009
-  prerelease: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.7
   type: :runtime
+  prerelease: false
+  version_requirements: *70352069074100
+- !ruby/object:Gem::Dependency
   name: rest-client
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &70352069073660 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id010
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
+  prerelease: false
+  version_requirements: *70352069073660
+- !ruby/object:Gem::Dependency
   name: json
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: &70352069073200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id011
-  prerelease: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
+  prerelease: false
+  version_requirements: *70352069073200
+- !ruby/object:Gem::Dependency
   name: progressbar
+  requirement: &70352069072600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70352069072600
 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
@@ -234,36 +213,43 @@ files:
 - 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
+- spec/shelly/backup_spec.rb
+- spec/shelly/cli/backup_spec.rb
+- spec/shelly/cli/config_spec.rb
+- spec/shelly/cli/deploys_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/download_progress_bar_spec.rb
+- spec/shelly/model_spec.rb
+- spec/shelly/user_spec.rb
+- spec/spec_helper.rb
+- spec/thor/options_spec.rb