shelly 0.0.55.pre → 0.0.55

data/lib/shelly/app.rb

@@ -25,6 +25,14 @@ module Shelly
       IO.popen("git remote").read.include?(code_name)
     end
 
+    def git_fetch_remote
+      system("git fetch #{code_name} > /dev/null 2>&1")
+    end
+
+    def git_add_tracking_branch
+      system("git checkout -b #{code_name} --track #{code_name}/master > /dev/null 2>&1")
+    end
+
     def remove_git_remote
       system("git remote rm #{code_name} > /dev/null 2>&1")
     end

data/lib/shelly/cli/main.rb

@@ -16,9 +16,9 @@ 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, :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]
+      before_hook :logged_in?, :only => [:add, :status, :list, :start, :stop, :logs, :delete, :ip, :logout, :execute, :rake, :setup]
+      before_hook :inside_git_repository?, :only => [:add, :setup]
+      before_hook :cloudfile_present?, :only => [:logs, :stop, :start, :ip, :execute, :rake, :setup]
 
       map %w(-v --version) => :version
       desc "version", "Display shelly version"
@@ -32,6 +32,7 @@ module Shelly
         say "Registering with email: #{email}" if email
         user.email = (email || ask_for_email)
         user.password = ask_for_password
+        ask_for_acceptance_of_terms
         user.register
         if user.ssh_key_exists?
           say "Uploading your public SSH key from #{user.ssh_key_path}"
@@ -81,8 +82,7 @@ module Shelly
         @app.databases = options["databases"] || ask_for_databases
         @app.create
 
-        git_remote = @app.git_remote_exist?
-        if !git_remote or (git_remote and yes?("Git remote #{@app} exists, overwrite (yes/no): "))
+        if overwrite_remote?(@app)
           say "Adding remote #{@app} #{@app.git_url}", :green
           @app.add_git_remote
         else
@@ -117,10 +117,14 @@ module Shelly
         apps = user.apps
         unless apps.empty?
           say "You have following clouds available:", :green
-          print_table(apps.map do |app|
-            state = app["state"] == "deploy_failed" ? " (Support has been notified)" : ""
-            [app["code_name"], "|  #{app["state"].gsub("_", " ")}#{state}"]
-          end, :ident => 2)
+          apps_table = apps.map do |app|
+            state = app["state"]
+            msg = if state == "deploy_failed" || state == "configuration_failed"
+              " (deployment log: `shelly deploys show last -c #{app["code_name"]}`)"
+            end
+            [app["code_name"], "|  #{state.gsub("_", " ")}#{msg}"]
+          end
+          print_table(apps_table, :ident => 2)
         else
           say "You have no clouds yet", :green
         end
@@ -150,30 +154,30 @@ module Shelly
         multiple_clouds(options[:cloud], "start")
         @app.start
         say "Starting cloud #{@app}.", :green
+        say "This can take up to 10 minutes."
         say "Check status with: `shelly list`"
       rescue Client::ConflictException => e
         case e[:state]
         when "running"
-          say_error "Not starting: cloud '#{@app}' is already running", :with_exit => false
+          say_error "Not starting: cloud '#{@app}' is already running"
         when "deploying", "configuring"
-          say_error "Not starting: cloud '#{@app}' is currently deploying", :with_exit => false
+          say_error "Not starting: cloud '#{@app}' is currently deploying"
         when "no_code"
           say_error "Not starting: no source code provided", :with_exit => false
           say_error "Push source code using:", :with_exit => false
-          say_error "  git push production master", :with_exit => false
+          say       "  git push production master"
         when "deploy_failed", "configuration_failed"
           say_error "Not starting: deployment failed", :with_exit => false
           say_error "Support has been notified", :with_exit => false
-          say_error "Check `shelly deploys show last --cloud #{@app}` for reasons of failure", :with_exit => false
+          say_error "Check `shelly deploys show last --cloud #{@app}` for reasons of failure"
         when "not_enough_resources"
           say_error %{Sorry, There are no resources for your servers.
-We have been notified about it. We will be adding new resources shortly}, :with_exit => false
-        end
-        if !e[:can_be_started] and e[:state] == "turned_off"
-          url = "#{@app.shelly.shellyapp_url}/apps/#{@app.code_name}/billing"
-          say_error "Not starting.", :with_exit => false
-          say_error "For more details please visit:", :with_exit => false
-          say_error url
+We have been notified about it. We will be adding new resources shortly}
+        when "no_billing"
+          say_error "Please fill in billing details to start #{@app}.", :with_exit => false
+          say_error "Visit: #{@app.edit_billing_url}", :with_exit => false
+        when "payment_declined"
+          say_error "Not starting. Invoice for cloud '#{@app}' was declined."
         end
         exit 1
       rescue Client::NotFoundException => e
@@ -181,6 +185,39 @@ We have been notified about it. We will be adding new resources shortly}, :with_
         say_error "You have no access to '#{@app}' cloud defined in Cloudfile"
       end
 
+      desc "setup", "Set up clouds"
+      def setup
+        say "Investigating Cloudfile"
+        cloudfile = Cloudfile.new
+        cloudfile.clouds.each do |cloud|
+          begin
+            app = App.new(cloud)
+            say "Adding #{app} cloud", :green
+            app.git_url = app.attributes["git_info"]["repository_url"]
+            if overwrite_remote?(app)
+              say "git remote add #{app} #{app.git_url}"
+              app.add_git_remote
+              say "git fetch production"
+              app.git_fetch_remote
+              say "git checkout -b #{app} --track #{app}/master"
+              app.git_add_tracking_branch
+            else
+              say "You have to manually add remote:"
+              say "`git remote add #{app} #{app.git_url}`"
+              say "`git fetch production`"
+              say "`git checkout -b #{app} --track #{app}/master`"
+            end
+
+            say_new_line
+          rescue Client::NotFoundException => e
+            raise unless e.resource == :cloud
+            say_error "You have no access to '#{app}' cloud defined in Cloudfile"
+          end
+        end
+
+        say "Your application is set up.", :green
+      end
+
       desc "stop", "Stop the cloud"
       method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       def stop
@@ -286,7 +323,7 @@ We have been notified about it. We will be adding new resources shortly}, :with_
         case e[:state]
         when "deploying", "configuring"
           say_error "Your application is being redeployed at the moment"
-        when "no_code", "turned_off"
+        when "no_code", "no_billing", "turned_off"
           say_error "Cloud #{@app} is not running", :with_exit => false
           say "Start your cloud with `shelly start --cloud #{@app}`"
           exit 1
@@ -331,6 +368,11 @@ We have been notified about it. We will be adding new resources shortly}, :with_
           databases.all? { |kind| kinds.include?(kind) }
         end
 
+        def overwrite_remote?(app)
+          git_remote = app.git_remote_exist?
+          !git_remote or (git_remote and yes?("Git remote #{app} exists, overwrite (yes/no): "))
+        end
+
         def ask_for_password(options = {})
           options = {:with_confirmation => true}.merge(options)
           loop do

data/lib/shelly/helpers.rb

@@ -45,6 +45,14 @@ module Shelly
       exit 1 unless delete_application == "yes"
     end
 
+    def ask_for_acceptance_of_terms
+      acceptance_question = "Do you accept the Terms of Service of Shelly Cloud (https://shellycloud.com/terms_of_service) (yes/no)"
+      acceptance = ask(acceptance_question)
+      unless acceptance == "yes"
+        say_error "You must accept the Terms of Service to use Shelly Cloud"
+      end
+    end
+
     def inside_git_repository?
       say_error "Must be run inside your project git repository" unless App.inside_git_repository?
     end

data/lib/shelly/templates/Cloudfile.erb

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

data/lib/shelly/version.rb

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

data/spec/shelly/app_spec.rb

@@ -67,6 +67,21 @@ describe Shelly::App do
     end
   end
 
+  describe "git_fetch_remote" do
+    it "should try to remove existing git remote" do
+      @app.should_receive(:system).with("git fetch foo-staging > /dev/null 2>&1")
+      @app.git_fetch_remote
+    end
+  end
+
+  describe "git_add_tracking_branch" do
+    it "should try to remove existing git remote" do
+      @app.should_receive(:system).with("git checkout -b foo-staging --track foo-staging/master > /dev/null 2>&1")
+      @app.git_add_tracking_branch
+    end
+  end
+
+
   describe "git_remote_exist" do
     it "should return true if git remote exist" do
       io = mock(:read => "origin\nfoo-staging")
@@ -150,7 +165,7 @@ describe Shelly::App do
       FakeFS.deactivate!
       expected = <<-config
 foo-staging:
-  ruby_version: 1.9.2 # 1.9.2 or ree-1.8.7
+  ruby_version: 1.9.3 # 1.9.3, 1.9.2 or ree-1.8.7
   environment: production # RAILS_ENV
   monitoring_email: bob@example.com
   domains:

data/spec/shelly/cli/main_spec.rb

@@ -39,6 +39,7 @@ Tasks:
   shelly rake TASK          # Run rake task
   shelly redeploy           # Redeploy application
   shelly register [EMAIL]   # Register new account
+  shelly setup              # Set up clouds
   shelly start              # Start the cloud
   shelly stop               # Stop the cloud
   shelly user <command>     # Manage collaborators
@@ -83,7 +84,7 @@ OUT
       File.exists?(@key_path).should be_false
       $stdout.should_receive(:puts).with(red "No such file or directory - #{@key_path}")
       $stdout.should_receive(:puts).with(red "Use ssh-keygen to generate ssh key pair, after that use: `shelly login`")
-      fake_stdin(["better@example.com", "secret", "secret"]) do
+      fake_stdin(["better@example.com", "secret", "secret", "yes"]) do
         invoke(@main, :register)
       end
     end
@@ -92,7 +93,7 @@ OUT
       $stdout.should_receive(:print).with("Email: ")
       $stdout.should_receive(:print).with("Password: ")
       $stdout.should_receive(:print).with("Password confirmation: ")
-      fake_stdin(["better@example.com", "secret", "secret"]) do
+      fake_stdin(["better@example.com", "secret", "secret", "yes"]) do
         invoke(@main, :register)
       end
     end
@@ -101,21 +102,21 @@ OUT
       Shelly::User.stub(:guess_email).and_return("kate@example.com")
       $stdout.should_receive(:print).with("Email (kate@example.com - default): ")
       @client.should_receive(:register_user).with("kate@example.com", "secret", "ssh-key AAbbcc")
-      fake_stdin(["", "secret", "secret"]) do
+      fake_stdin(["", "secret", "secret", "yes"]) do
         invoke(@main, :register)
       end
     end
 
     it "should use email provided by user" do
       @client.should_receive(:register_user).with("better@example.com", "secret", "ssh-key AAbbcc")
-      fake_stdin(["better@example.com", "secret", "secret"]) do
+      fake_stdin(["better@example.com", "secret", "secret", "yes"]) do
         invoke(@main, :register)
       end
     end
 
     it "should not ask about email if it's provided as argument" do
       $stdout.should_receive(:puts).with("Registering with email: kate@example.com")
-      fake_stdin(["secret", "secret"]) do
+      fake_stdin(["secret", "secret", "yes"]) do
         invoke(@main, :register, "kate@example.com")
       end
     end
@@ -125,7 +126,7 @@ OUT
         Shelly::User.stub(:guess_email).and_return("")
         $stdout.should_receive(:puts).with("\e[31mEmail can't be blank, please try again\e[0m")
         lambda {
-          fake_stdin(["", "bob@example.com", "only-pass", "only-pass"]) do
+          fake_stdin(["", "bob@example.com", "only-pass", "only-pass", "yes"]) do
             invoke(@main, :register)
           end
         }.should raise_error(SystemExit)
@@ -137,7 +138,7 @@ OUT
         FileUtils.mkdir_p("~/.ssh")
         File.open(@key_path, "w") { |f| f << "key" }
         $stdout.should_receive(:puts).with("Uploading your public SSH key from #{@key_path}")
-        fake_stdin(["kate@example.com", "secret", "secret"]) do
+        fake_stdin(["kate@example.com", "secret", "secret", "yes"]) do
           invoke(@main, :register)
         end
       end
@@ -148,7 +149,7 @@ OUT
         @user.stub(:ssh_key_registered?)
         FileUtils.rm_rf(@key_path)
         $stdout.should_not_receive(:puts).with("Uploading your public SSH key from #{@key_path}")
-        fake_stdin(["kate@example.com", "secret", "secret"]) do
+        fake_stdin(["kate@example.com", "secret", "secret", "yes"]) do
           invoke(@main, :register)
         end
       end
@@ -159,7 +160,7 @@ OUT
         @client.stub(:register_user).and_return(true)
         $stdout.should_receive(:puts).with("Successfully registered!")
         $stdout.should_receive(:puts).with("Check you mailbox for email address confirmation")
-        fake_stdin(["kate@example.com", "pass", "pass"]) do
+        fake_stdin(["kate@example.com", "pass", "pass", "yes"]) do
           invoke(@main, :register)
         end
       end
@@ -172,7 +173,18 @@ OUT
         @client.stub(:register_user).and_raise(exception)
         $stdout.should_receive(:puts).with("\e[31mEmail has been already taken\e[0m")
         lambda {
-          fake_stdin(["kate@example.com", "pass", "pass"]) do
+          fake_stdin(["kate@example.com", "pass", "pass", "yes"]) do
+            invoke(@main, :register)
+          end
+        }.should raise_error(SystemExit)
+      end
+    end
+
+    context "on rejected Terms of Service" do
+      it "should display error and exit with 1" do
+        $stdout.should_receive(:puts).with("\e[31mYou must accept the Terms of Service to use Shelly Cloud\e[0m")
+        lambda {
+          fake_stdin(["kate@example.com", "pass", "pass", "no"]) do
             invoke(@main, :register)
           end
         }.should raise_error(SystemExit)
@@ -494,8 +506,11 @@ OUT
     before do
       @user = Shelly::User.new
       @client.stub(:token).and_return("abc")
-      @client.stub(:apps).and_return([{"code_name" => "abc", "state" => "running"},
-         {"code_name" => "fooo", "state" => "deploy_failed"}])
+      @client.stub(:apps).and_return([
+        {"code_name" => "abc", "state" => "running"},
+        {"code_name" => "fooo", "state" => "deploy_failed"},
+        {"code_name" => "bar", "state" => "configuration_failed"}
+      ])
       Shelly::User.stub(:new).and_return(@user)
     end
 
@@ -506,7 +521,8 @@ OUT
     it "should display user's clouds" do
       $stdout.should_receive(:puts).with("\e[32mYou have following clouds available:\e[0m")
       $stdout.should_receive(:puts).with(/abc\s+\|  running/)
-      $stdout.should_receive(:puts).with(/fooo\s+\|  deploy failed \(Support has been notified\)/)
+      $stdout.should_receive(:puts).with(/fooo\s+\|  deploy failed \(deployment log: `shelly deploys show last -c fooo`\)/)
+      $stdout.should_receive(:puts).with(/bar\s+\|  configuration failed \(deployment log: `shelly deploys show last -c bar`\)/)
       invoke(@main, :list)
     end
 
@@ -566,6 +582,7 @@ OUT
       it "should start the cloud" do
         @client.stub(:start_cloud)
         $stdout.should_receive(:puts).with(green "Starting cloud foo-production.")
+        $stdout.should_receive(:puts).with("This can take up to 10 minutes.")
         $stdout.should_receive(:puts).with("Check status with: `shelly list`")
         invoke(@main, :start)
       end
@@ -613,7 +630,7 @@ OUT
         raise_conflict("state" => "no_code")
         $stdout.should_receive(:puts).with(red "Not starting: no source code provided")
         $stdout.should_receive(:puts).with(red "Push source code using:")
-        $stdout.should_receive(:puts).with(red "  git push production master")
+        $stdout.should_receive(:puts).with("  git push production master")
         lambda { invoke(@main, :start) }.should raise_error(SystemExit)
       end
 
@@ -635,17 +652,23 @@ We have been notified about it. We will be adding new resources shortly")
         lambda { invoke(@main, :start) }.should raise_error(SystemExit)
       end
 
-      it "should show link to billing" do
+      it "should show messages about billing" do
+        raise_conflict("state" => "no_billing")
+        @app.stub(:edit_billing_url).and_return("http://example.com/billing/edit")
+        $stdout.should_receive(:puts).with(red "Please fill in billing details to start foo-production.")
+        $stdout.should_receive(:puts).with(red "Visit: http://example.com/billing/edit")
         @client.stub(:shellyapp_url).and_return("http://example.com")
-        raise_conflict("state" => "turned_off", "can_be_started" => false)
-        $stdout.should_receive(:puts).with(red "Not starting.")
-        $stdout.should_receive(:puts).with(red "For more details please visit:")
-        $stdout.should_receive(:puts).with(red "http://example.com/apps/foo-production/billing")
+        lambda { invoke(@main, :start) }.should raise_error(SystemExit)
+      end
+
+      it "should show messge about payment declined" do
+        raise_conflict("state" => "payment_declined")
+        $stdout.should_receive(:puts).with(red "Not starting. Invoice for cloud 'foo-production' was declined.")
         lambda { invoke(@main, :start) }.should raise_error(SystemExit)
       end
 
       def raise_conflict(options = {})
-        body = {"state" => "no_code", "can_be_started" => true}.merge(options)
+        body = {"state" => "no_code"}.merge(options)
         exception = Shelly::Client::ConflictException.new(body)
         @client.stub(:start_cloud).and_raise(exception)
       end
@@ -748,6 +771,85 @@ We have been notified about it. We will be adding new resources shortly")
     end
   end
 
+  describe "#setup" do
+    before do
+      Shelly::App.stub(:inside_git_repository?).and_return(true)
+      @client.stub(:token).and_return("abc")
+      @client.stub(:app).and_return("git_info" => {"repository_url" => "git_url"})
+      @app = Shelly::App.new("foo-staging")
+      @app.stub(:git_remote_exist?).and_return(false)
+      @app.stub(:system)
+      Shelly::App.stub(:new).and_return(@app)
+      File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\n") }
+    end
+
+    it "should ensure user has logged in" do
+      hooks(@main, :setup).should include(:logged_in?)
+    end
+
+    it "should ensure that user is inside git repo" do
+      hooks(@main, :setup).should include(:inside_git_repository?)
+    end
+
+    it "should ensure that cloudfile is present" do
+      hooks(@main, :setup).should include(:cloudfile_present?)
+    end
+
+    it "should show info about adding remote and branch" do
+      $stdout.should_receive(:puts).with("Investigating Cloudfile")
+      $stdout.should_receive(:puts).with(green "Adding foo-staging cloud")
+      $stdout.should_receive(:puts).with("git remote add foo-staging git_url")
+      $stdout.should_receive(:puts).with("git fetch production")
+      $stdout.should_receive(:puts).with("git checkout -b foo-staging --track foo-staging/master")
+      $stdout.should_receive(:puts).with(green "Your application is set up.")
+      invoke(@main, :setup)
+    end
+
+    it "should add git remote" do
+      @app.should_receive(:add_git_remote)
+      invoke(@main, :setup)
+    end
+
+    it "should fetch remote" do
+      @app.should_receive(:git_fetch_remote)
+      invoke(@main, :setup)
+    end
+
+    it "should add tracking branch" do
+      @app.should_receive(:git_add_tracking_branch)
+      invoke(@main, :setup)
+    end
+
+    context "when remote exists" do
+      before do
+        @app.stub(:git_remote_exist?).and_return(true)
+      end
+
+      context "and user answers yes" do
+        it "should overwrite remote" do
+          @app.should_receive(:add_git_remote)
+          @app.should_receive(:git_fetch_remote)
+          @app.should_receive(:git_add_tracking_branch)
+          fake_stdin(["yes"]) do
+            invoke(@main, :setup)
+          end
+        end
+      end
+
+      context "and user answers no" do
+        it "should display commands to perform manually " do
+          @app.should_not_receive(:add_git_remote)
+          @app.should_not_receive(:git_fetch_remote)
+          @app.should_not_receive(:git_add_tracking_branch)
+          fake_stdin(["no"]) do
+            invoke(@main, :setup)
+          end
+        end
+      end
+
+    end
+  end
+
   describe "#delete" do
     before  do
       Shelly::App.stub(:inside_git_repository?).and_return(true)
@@ -1172,7 +1274,7 @@ We have been notified about it. We will be adding new resources shortly")
         end
       end
 
-      %w(no_code turned_off).each do |state|
+      %w(no_code no_billing turned_off).each do |state|
         context "when application is in #{state} state" do
           it "should display error that cloud is not running" do
             exception = Shelly::Client::ConflictException.new("state" => state)

metadata

@@ -1,191 +1,167 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: shelly
-version: !ruby/object:Gem::Version 
-  hash: 961916056
-  prerelease: 7
-  segments: 
-  - 0
-  - 0
-  - 55
-  - pre
-  version: 0.0.55.pre
+version: !ruby/object:Gem::Version
+  version: 0.0.55
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-03-13 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
+date: 2012-03-19 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70362431758420 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 47
-        segments: 
-        - 2
-        - 8
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.8.0
-  requirement: *id001
-  prerelease: false
   type: :development
-  name: rspec
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  requirement: *id002
   prerelease: false
-  type: :development
+  version_requirements: *70362431758420
+- !ruby/object:Gem::Dependency
   name: rake
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
+  requirement: &70362431757980 !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: *70362431757980
+- !ruby/object:Gem::Dependency
   name: guard
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
+  requirement: &70362431757520 !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: *70362431757520
+- !ruby/object:Gem::Dependency
   name: guard-rspec
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
+  requirement: &70362431757100 !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: *70362431757100
+- !ruby/object:Gem::Dependency
   name: simplecov
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
+  requirement: &70362431756680 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70362431756680
+- !ruby/object:Gem::Dependency
+  name: ruby_gntp
+  requirement: &70362431756220 !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: *70362431756220
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: &70362431755800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: *70362431755800
+- !ruby/object:Gem::Dependency
   name: fakefs
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id007 !ruby/object:Gem::Requirement 
+  requirement: &70362431755380 !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: *70362431755380
+- !ruby/object:Gem::Dependency
   name: fakeweb
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id008 !ruby/object:Gem::Requirement 
+  requirement: &70362431754960 !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: *70362431754960
+- !ruby/object:Gem::Dependency
   name: wijet-thor
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id009 !ruby/object:Gem::Requirement 
+  requirement: &70362431754460 !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: *70362431754460
+- !ruby/object:Gem::Dependency
   name: rest-client
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id010 !ruby/object:Gem::Requirement 
+  requirement: &70362431754040 !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: *70362431754040
+- !ruby/object:Gem::Dependency
   name: json
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id011 !ruby/object:Gem::Requirement 
+  requirement: &70362431753580 !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: *70362431753580
+- !ruby/object:Gem::Dependency
   name: progressbar
+  requirement: &70362431753160 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70362431753160
 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
@@ -237,38 +213,49 @@ 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: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3746119301699962948
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      hash: 25
-      segments: 
-      - 1
-      - 3
-      - 1
-      version: 1.3.1
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
+      - 0
+      hash: -3746119301699962948
 requirements: []
-
 rubyforge_project: shelly
-rubygems_version: 1.8.10
+rubygems_version: 1.8.16
 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