shelly 0.3.0 → 0.3.1

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    OTBkYWQ5MTBjMzM5ODk3NzA2MjUxNmI1YmYxNjFkYjQ5ZDA3YmIzMA==
+    MTBiNDgwNzhlNDdhZGU5YmY3MjQ3YTUwNTJmNjY0YTEyMTA4YTlkNA==
   data.tar.gz: !binary |-
-    ZDEyM2ZiYzNhNjJjYWUwMmMxMjEzNWIzZDk3ZjI2NjEyMGUwN2RiMg==
+    NWQ3NTdjZGY4ZTFiNjgwMTQ2Y2FiMzYwYmNmMzRkMDcxZjA5ZGMwNQ==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    NDYyMGIzMDdhMDFkNTEzNjk0MzUyNjlkYTU5ZjViYjkzZTM4ZmVmN2E1OGNk
-    MmQwYjg5MDQ3MTVmMGRiZDFlMGFkNDhmNmMzMTdmZjc1ZWU0NTcyMTQ0NDE0
-    MDI1NWRlYjJiYTVkODcyODFkM2YxNWU1YzU5NmJlMzJjM2Q2ZjI=
+    YTczNTdhMjljZjEyY2ZiZDcyMDM0ODUxMDY5ZTZlYmE5YjQ0YjBlMGRlNTNj
+    OTFmYzc1MzAzOGRhYzgxMDM2NWVhN2YwNzViMjljOTljMmFmMTY4MDQ0MzU3
+    MzU3MWQ1NGFhOWUzMDg3NmNhZmZiNmFmMTFiMjY1NzUxNTk1MDk=
   data.tar.gz: !binary |-
-    ODk0MDZkZjRiOWIwYWM5YzNmNGU3YjU5MDZmYzE2OWJiYjc4ZTg4OWE2NjFk
-    MDQ3MWI3M2VhOGIwYmE4ODc1ODJlODk1M2ExZmQ1YzgxM2ZmZjNkNDliYzJh
-    MGFjYTg4NDkxMjcwZjgxMmM2NTdkMWJmM2I1ZmQ2ZDNiNzY3ZDA=
+    MjA4ZjQyODRhYjRjYjIzZGUwNjczM2QyMTM4MTY4NTBlYWVmM2FlNTQ4NmFk
+    YjBiYWFhOTdkNTljOTNmODc3ZmZjNTBlMzU1YTU3MWVhNWMyNDExYjZmYzVj
+    Y2VhNzY1ODZiYTAzZTA4MmY0NzkyYzQyNDQyNmY2OTRhMWIwOGE=

data/.travis.yml

@@ -8,4 +8,5 @@ rvm:
   - jruby-19mode
 notifications:
   email:
-    - devs@shellycloud.com
+    recipients:
+      - devs@shellycloud.com

data/CHANGELOG.md

@@ -1,3 +1,12 @@
+## 0.3.1 / 2013-06-28
+
+* [feature] `shelly database reset` reset PostgreSQL or MongoDB database, also possible to use with `shelly backup import DB_KIND dump --reset` option
+* [improvement] Puma starting/stopping output shows up in deployment logs
+* [improvement] Affects all commands using ssh connection:
+    * `shelly backup import` works when deployment failed
+    * `shelly dbconsole` works if database was configured
+    * `shelly files *` works if virutal server was at least configured
+
 ## 0.3.0 / 2013-06-23
 
 * [improvement] API key is now stored in .netrc

data/lib/shelly/app.rb

@@ -130,7 +130,11 @@ module Shelly
 
     def import_database(kind, filename, server)
       ssh(:command => "import_database #{kind.downcase} #{filename}",
-        :server => server)
+        :server => server, :type => :db_server)
+    end
+
+    def reset_database(kind)
+      ssh(:command => "reset_database #{kind.downcase}", :type => :db_server)
     end
 
     def request_backup(kinds)
@@ -197,7 +201,7 @@ module Shelly
     end
 
     def dbconsole
-      ssh(:command => "dbconsole")
+      ssh(:command => "dbconsole", :type => :db_server)
     end
 
     def attributes
@@ -253,19 +257,26 @@ module Shelly
     end
 
     def list_files(path)
-      ssh(:command => "ls -l /srv/glusterfs/disk/#{path}")
+      ssh(:command => "ls -l #{persistent_disk}/#{path}", :type => :server)
     end
 
     def upload(source)
-      console_connection.tap do |conn|
-        rsync(source, "#{conn['host']}:/srv/glusterfs/disk")
+      server_connection.tap do |conn|
+        rsync(source, "#{conn['host']}:#{persistent_disk}", conn)
+      end
+    end
+
+    def upload_database(source)
+      db_server_connection.tap do |conn|
+        rsync(source, "#{conn['host']}:#{persistent_disk}", conn)
       end
     end
 
     def download(relative_source, destination)
-      conn = console_connection
-      source = File.join("#{conn['host']}:/srv/glusterfs/disk", relative_source)
-      rsync(source, destination)
+      server_connection.tap do |conn|
+        source = File.join("#{conn['host']}:#{persistent_disk}", relative_source)
+        rsync(source, destination, conn)
+      end
     end
 
     def delete_file(remote_path)
@@ -341,6 +352,10 @@ module Shelly
       self.environment = response["environment"]
     end
 
+    def persistent_disk
+      "/home/#{code_name}/disk"
+    end
+
     def jruby?
       RUBY_PLATFORM == 'java'
     end
@@ -354,17 +369,39 @@ module Shelly
       shelly.console(code_name, server)
     end
 
+    # Returns first configured virtual server
+    def server_connection
+      shelly.configured_server(code_name)
+    end
+
+    # Returns first configured virtual server with database
+    def db_server_connection(server = nil)
+      shelly.configured_db_server(code_name, server)
+    end
+
+    def connection(options)
+      case options[:type]
+        when :console
+          console_connection(options[:server])
+        when :server
+          server_connection
+        when :db_server
+          db_server_connection(options[:server])
+      end
+    end
+
     def ssh(options = {})
-      conn = console_connection(options[:server])
+      options[:type] = :console unless options[:type]
+      conn = connection(options)
       system "ssh #{ssh_options(conn)} -t #{conn['host']} #{options[:command]}"
     end
 
-    def ssh_options(conn = console_connection)
+    def ssh_options(conn)
       "-o StrictHostKeyChecking=no -p #{conn['port']} -l #{conn['user']}"
     end
 
-    def rsync(source, destination)
-      system "rsync -avz -e 'ssh #{ssh_options}' --progress #{source} #{destination}"
+    def rsync(source, destination, conn)
+      system "rsync -avz -e 'ssh #{ssh_options(conn)}' --progress #{source} #{destination}"
     end
   end
 end

data/lib/shelly/cli/backup.rb

@@ -105,20 +105,34 @@ module Shelly
         KIND - Database kind. Possible values are: postgresql or mongodb
         FILENAME - Database dump file or directory (mongodb)
       }
+      method_option :reset, :type => :boolean, :aliases => "-r",
+        :desc => "Reset database before importing from file"
       def import(kind, filename)
         app = multiple_clouds(options[:cloud], "backup import KIND FILENAME")
         unless ::File.exist?(filename)
           say_error "File #{filename} doesn't exist"
         end
-        say "You are about import #{kind} database for cloud #{app} to state from file #{filename}"
-        ask_to_import_database
+        if options[:reset]
+          say_warning "You are about to reset database #{kind} for cloud #{app}"
+          say_warning "Next, database will be restored to state from file #{filename}"
+          question = "I want to reset and import the database from dump (yes/no):"
+          say_new_line
+          yes?(question) ? app.reset_database(kind) : say_error("Canceled")
+        else
+          say_warning "You are about to import #{kind} database for cloud #{app} to state from file #{filename}"
+          question = "I want to import the database from dump (yes/no):"
+          say_new_line
+          say_error "Canceled" unless yes?(question)
+        end
         archive = compress(filename)
         say "Uploading #{archive}", :green
-        connection = app.upload(archive)
+        connection = app.upload_database(archive)
         say "Uploading done", :green
         say "Importing database", :green
         app.import_database(kind, archive, connection["server"])
         say "Database imported successfully", :green
+      rescue Client::ConflictException => e
+        say_error e[:message]
       end
 
       no_tasks do

data/lib/shelly/cli/database.rb

@@ -0,0 +1,26 @@
+require "shelly/cli/command"
+require "time"
+
+module Shelly
+  module CLI
+    class Database < Command
+      namespace :database
+      include Helpers
+      before_hook :logged_in?, :only => [:reset]
+      class_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
+
+      desc "reset KIND", "Reset database"
+      long_desc %{
+        Removes all objects from the database
+        KIND - Database kind. Possible values are: postgresql or mongodb
+      }
+      def reset(kind)
+        app = multiple_clouds(options[:cloud], "database reset")
+        say "You are about to reset database #{kind} for cloud #{app}"
+        say "All database objects and data will be removed"
+        ask_to_reset_database
+        app.reset_database(kind)
+      end
+    end
+  end
+end

data/lib/shelly/cli/deploy.rb

@@ -57,6 +57,9 @@ module Shelly
         if content["thin_restart"]
           say("Starting thin", :green); say(content["thin_restart"])
         end
+        if content["puma_restart"]
+          say("Starting puma", :green); say(content["puma_restart"])
+        end
       rescue Client::NotFoundException => e
         raise unless e.resource == :log
         say_error "Log not found, list all deploy logs using `shelly deploys list --cloud=#{app.code_name}`"

data/lib/shelly/cli/main.rb

@@ -3,6 +3,7 @@ require "shelly/cli/command"
 require "shelly/cli/user"
 require "shelly/cli/backup"
 require "shelly/cli/deploy"
+require "shelly/cli/database"
 require "shelly/cli/config"
 require "shelly/cli/file"
 require "shelly/cli/organization"
@@ -13,6 +14,7 @@ module Shelly
     class Main < Command
       register_subcommand(User, "user", "user <command>", "Manage collaborators")
       register_subcommand(Backup, "backup", "backup <command>", "Manage database backups")
+      register_subcommand(Database, "database", "database <command>", "Manage databases")
       register_subcommand(Deploy, "deploy", "deploy <command>", "View deploy logs")
       register_subcommand(Config, "config", "config <command>", "Manage application configuration files")
       register_subcommand(File, "file", "file <command>", "Upload and download files to and from persistent storage")
@@ -339,7 +341,7 @@ Wait until cloud is in 'turned off' state and try again.}
         app = multiple_clouds(options[:cloud], "dbconsole")
         app.dbconsole
       rescue Client::ConflictException
-        say_error "Cloud #{app} is not running. Cannot run dbconsole."
+        say_error "Cloud #{app} wasn't deployed properly. Can not run dbconsole."
       end
 
       desc "redeploy", "Redeploy application"

data/lib/shelly/client/apps.rb

@@ -37,4 +37,12 @@ class Shelly::Client
   def console(code_name, server = nil)
     get("/apps/#{code_name}/console", {:server => server})
   end
+
+  def configured_server(code_name)
+    get("/apps/#{code_name}/configured_server")
+  end
+
+  def configured_db_server(code_name, server = nil)
+    get("/apps/#{code_name}/configured_db_server", {:server => server})
+  end
 end

data/lib/shelly/helpers.rb

@@ -19,6 +19,10 @@ module Shelly
       exit 1 if options[:with_exit]
     end
 
+    def say_warning(message)
+      say message, :yellow
+    end
+
     def ask_for_email(options = {})
       options = {:guess_email => true}.merge(options)
       email_question = options[:guess_email] && !User.guess_email.blank? ? "Email (#{User.guess_email} - default):" : "Email:"
@@ -50,6 +54,11 @@ module Shelly
       end
     end
 
+    def ask_to_reset_database
+      reset_database_question = "I want to reset the database (yes/no):"
+      exit 1 unless yes?(reset_database_question)
+    end
+
     def inside_git_repository?
       unless App.inside_git_repository?
         say_error %q{Current directory is not a git repository.
@@ -67,11 +76,6 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository}
       say_new_line say_error "Canceled" unless yes?(question)
     end
 
-    def ask_to_import_database
-      question = "I want to import the database (yes/no):"
-      say_new_line say_error "Canceled" unless yes?(question)
-    end
-
     def logged_in?
       user = Shelly::User.new
       user.authorize!
@@ -126,7 +130,7 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository}
     end
 
     def yellow(string)
-      "\e[0;33m#{string}\e[0m"
+      "\e[33m#{string}\e[0m"
     end
 
     def print_check(check, success_message, failure_message, options = {})

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/spec/helpers.rb

@@ -17,7 +17,7 @@ module RSpec
     end
 
     def yellow(string)
-      "\e[0;33m#{string}\e[0m"
+      "\e[33m#{string}\e[0m"
     end
 
     def hooks(model, method)

data/spec/shelly/app_spec.rb

@@ -300,7 +300,7 @@ describe Shelly::App do
 
   describe "#dbconsole" do
     it "should return result of dbconsole" do
-      @client.stub(:console).and_return(
+      @client.stub(:configured_db_server).and_return(
         {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
       @app.should_receive(:system).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t console.example.com dbconsole")
       @app.dbconsole
@@ -348,25 +348,26 @@ describe Shelly::App do
 
   describe "#list_files" do
     it "should list files for given subpath in disk" do
-      @app.should_receive(:ssh).with(:command => "ls -l /srv/glusterfs/disk/foo")
+      @app.should_receive(:ssh).with(:command => "ls -l /home/foo-staging/disk/foo",
+        :type => :server)
       @app.list_files("foo")
     end
   end
 
   describe "#upload" do
     it "should run rsync with proper parameters" do
-      @client.stub(:console).and_return(
+      @client.stub(:configured_server).and_return(
         {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
-      @app.should_receive(:system).with("rsync -avz -e 'ssh -o StrictHostKeyChecking=no -p 40010 -l foo' --progress /path console.example.com:/srv/glusterfs/disk")
+      @app.should_receive(:system).with("rsync -avz -e 'ssh -o StrictHostKeyChecking=no -p 40010 -l foo' --progress /path console.example.com:/home/foo-staging/disk")
       @app.upload("/path")
     end
   end
 
   describe "#download" do
     it "should run rsync with proper parameters" do
-      @client.stub(:console).and_return(
+      @client.stub(:configured_server).and_return(
         {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
-      @app.should_receive(:system).with("rsync -avz -e 'ssh -o StrictHostKeyChecking=no -p 40010 -l foo' --progress console.example.com:/srv/glusterfs/disk/. /tmp")
+      @app.should_receive(:system).with("rsync -avz -e 'ssh -o StrictHostKeyChecking=no -p 40010 -l foo' --progress console.example.com:/home/foo-staging/disk/. /tmp")
       @app.download(".", "/tmp")
     end
   end

data/spec/shelly/cli/backup_spec.rb

@@ -264,7 +264,7 @@ describe Shelly::CLI::Backup do
   describe "#import" do
     before do
       FileUtils.touch("dump.sql")
-      @app.stub(:upload => {"server" => "app1"}, :ssh => nil)
+      @app.stub(:upload_database => {"server" => "app1"}, :ssh => nil)
       @backup.stub(:system)
       $stdout.stub(:puts)
       $stdout.stub(:print)
@@ -284,7 +284,7 @@ describe Shelly::CLI::Backup do
     end
 
     it "should upload compressed file" do
-      @app.should_receive(:upload).with("dump.sql-1370879705.tar.bz2")
+      @app.should_receive(:upload_database).with("dump.sql-1370879705.tar.bz2")
       $stdout.should_receive(:puts).with(green "Uploading dump.sql-1370879705.tar.bz2")
       fake_stdin(["yes"]) do
         invoke(@backup, :import, "postgresql", "dump.sql")
@@ -293,7 +293,7 @@ describe Shelly::CLI::Backup do
 
     it "should import given database from uploaded file" do
       @app.should_receive(:ssh).with(:command => "import_database postgresql dump.sql-1370879705.tar.bz2",
-        :server => "app1")
+        :server => "app1", :type => :db_server)
       $stdout.should_receive(:puts).with(green "Importing database")
       fake_stdin(["yes"]) do
         invoke(@backup, :import, "PostgreSQL", "dump.sql")
@@ -302,8 +302,8 @@ describe Shelly::CLI::Backup do
 
     context "on answering no" do
       it "should cancel database import" do
-        $stdout.should_receive(:puts).with("You are about import postgresql database for cloud foo-staging to state from file dump.sql")
-        $stdout.should_receive(:print).with("I want to import the database (yes/no): ")
+        $stdout.should_receive(:puts).with(yellow "You are about to import postgresql database for cloud foo-staging to state from file dump.sql")
+        $stdout.should_receive(:print).with("I want to import the database from dump (yes/no): ")
         $stdout.should_receive(:puts).with(red "Canceled")
         lambda {
           fake_stdin(["no"]) do
@@ -324,5 +324,18 @@ describe Shelly::CLI::Backup do
         }.should raise_error(SystemExit)
       end
     end
+
+    context "with --reset option" do
+      it "should reset database first" do
+        @backup.options = {:cloud => "foo-staging", :reset => true}
+        @app.should_receive(:reset_database).with("postgresql")
+        @app.should_receive(:ssh).with(:command => "import_database postgresql dump.sql-1370879705.tar.bz2",
+          :server => "app1", :type => :db_server)
+        $stdout.should_receive(:puts).with(green "Importing database")
+        fake_stdin(["yes"]) do
+          invoke(@backup, :import, "postgresql", "dump.sql")
+        end
+      end
+    end
   end
 end

data/spec/shelly/cli/database_spec.rb

@@ -0,0 +1,33 @@
+require "spec_helper"
+require "shelly/cli/database"
+
+describe Shelly::CLI::Database do
+  before do
+    @database = Shelly::CLI::Database.new
+    Shelly::CLI::Database.stub(:new).and_return(@database)
+    $stdout.stub(:puts)
+    $stdout.stub(:print)
+    @client = mock
+    Shelly::Client.stub(:new).and_return(@client)
+    @client.stub(:authorize!)
+    @client.stub(:console)
+    @app = mock(:to_s => "foo-staging")
+    Shelly::App.stub(:new).and_return(@app)
+    File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\n") }
+  end
+
+  describe "#reset" do
+    it "should ensure user has logged in" do
+      hooks(@database, :reset).should include(:logged_in?)
+    end
+
+    it "should reset given database via SSH" do
+      $stdout.should_receive(:puts).with("You are about to reset database Mongodb for cloud foo-staging")
+      $stdout.should_receive(:puts).with("All database objects and data will be removed")
+      @app.should_receive(:reset_database).with("Mongodb")
+      fake_stdin(["yes"]) do
+        invoke(@database, :reset, "Mongodb")
+      end
+    end
+  end
+end

data/spec/shelly/cli/deploy_spec.rb

@@ -100,13 +100,15 @@ describe Shelly::CLI::Deploy do
       $stdout.should_receive(:puts).with("sidekiq workers")
       $stdout.should_receive(:puts).with(green "Starting thin")
       $stdout.should_receive(:puts).with("thins up and running")
+      $stdout.should_receive(:puts).with(green "Starting puma")
+      $stdout.should_receive(:puts).with("pumas up and running")
     end
 
     def response
       {"created_at" => "2011-12-12 at 14:14:59", "bundle_install" => "Installing gems",
         "whenever" => "Looking up schedule.rb", "thin_restart" => "thins up and running",
-        "delayed_job" => "delayed jobs", "sidekiq" => "sidekiq workers",
-        "callbacks" => "rake db:migrate"}
+        "puma_restart" => "pumas up and running", "delayed_job" => "delayed jobs",
+        "sidekiq" => "sidekiq workers", "callbacks" => "rake db:migrate"}
     end
   end
 

data/spec/shelly/cli/file_spec.rb

@@ -28,7 +28,7 @@ describe Shelly::CLI::File do
 
     context "cloud is not running" do
       it "should display error" do
-        @client.stub(:console).and_raise(Shelly::Client::ConflictException)
+        @client.stub(:configured_server).and_raise(Shelly::Client::ConflictException)
         $stdout.should_receive(:puts).with(red "Cloud foo-production is not running. Cannot list files.")
         lambda {
           invoke(@cli_files, :list, "some/path")
@@ -59,7 +59,7 @@ describe Shelly::CLI::File do
 
     context "cloud is not running" do
       it "should display error" do
-        @client.stub(:console).and_raise(Shelly::Client::ConflictException)
+        @client.stub(:configured_server).and_raise(Shelly::Client::ConflictException)
         $stdout.should_receive(:puts).with(red "Cloud foo-production is not running. Cannot upload files.")
         lambda {
           invoke(@cli_files, :upload, "some/path")

data/spec/shelly/cli/main_spec.rb

@@ -35,6 +35,7 @@ describe Shelly::CLI::Main do
       out.should include("shelly check                   # Check if application fulfills Shelly Cloud requirements")
       out.should include("shelly config <command>        # Manage application configuration files")
       out.should include("shelly console                 # Open application console")
+      out.should include("shelly database <command>      # Manage databases")
       out.should include("shelly dbconsole               # Run rails dbconsole")
       out.should include("shelly delete                  # Delete the cloud")
       out.should include("shelly deploy <command>        # View deploy logs")
@@ -1413,8 +1414,8 @@ Wait until cloud is in 'turned off' state and try again.")
 
     context "Instances are not running" do
       it "should display error" do
-        @client.stub(:console).and_raise(Shelly::Client::ConflictException)
-        $stdout.should_receive(:puts).with(red "Cloud foo-production is not running. Cannot run dbconsole.")
+        @client.stub(:configured_db_server).and_raise(Shelly::Client::ConflictException)
+        $stdout.should_receive(:puts).with(red "Cloud foo-production wasn't deployed properly. Can not run dbconsole.")
         lambda {
           invoke(@main, :dbconsole)
         }.should raise_error(SystemExit)

data/spec/shelly/cli/organization_spec.rb

@@ -3,16 +3,16 @@ require "shelly/cli/organization"
 
 describe Shelly::CLI::Organization do
   before do
-  FileUtils.stub(:chmod)
-  @organization = Shelly::CLI::Organization.new
-  Shelly::CLI::Organization.stub(:new).and_return(@organization)
-  @client = mock
-  Shelly::Client.stub(:new).and_return(@client)
-  $stdout.stub(:puts)
-  $stdout.stub(:print)
-  @client.stub(:authorize!)
-  FileUtils.mkdir_p("/projects/foo")
-  Dir.chdir("/projects/foo")
+    FileUtils.stub(:chmod)
+    @organization = Shelly::CLI::Organization.new
+    Shelly::CLI::Organization.stub(:new).and_return(@organization)
+    @client = mock
+    Shelly::Client.stub(:new).and_return(@client)
+    $stdout.stub(:puts)
+    $stdout.stub(:print)
+    @client.stub(:authorize!)
+    FileUtils.mkdir_p("/projects/foo")
+    Dir.chdir("/projects/foo")
   end
 
   describe "#list" do

metadata

@@ -1,225 +1,225 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-23 00:00:00.000000000 Z
+date: 2013-06-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
+  name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.11.0
-  type: :development
-  prerelease: false
-  name: rspec
 - !ruby/object:Gem::Dependency
+  name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  name: rake
 - !ruby/object:Gem::Dependency
+  name: guard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  name: guard
 - !ruby/object:Gem::Dependency
+  name: guard-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  name: guard-rspec
 - !ruby/object:Gem::Dependency
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  name: simplecov
 - !ruby/object:Gem::Dependency
+  name: ruby_gntp
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  name: ruby_gntp
 - !ruby/object:Gem::Dependency
+  name: rb-fsevent
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  name: rb-fsevent
 - !ruby/object:Gem::Dependency
+  name: fakefs
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  name: fakefs
 - !ruby/object:Gem::Dependency
+  name: fakeweb
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :development
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :development
-  prerelease: false
-  name: fakeweb
 - !ruby/object:Gem::Dependency
+  name: wijet-thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.9
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.14.9
-  type: :runtime
-  prerelease: false
-  name: wijet-thor
 - !ruby/object:Gem::Dependency
+  name: rest-client
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  name: rest-client
 - !ruby/object:Gem::Dependency
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  name: json
 - !ruby/object:Gem::Dependency
+  name: progressbar
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  name: progressbar
 - !ruby/object:Gem::Dependency
+  name: launchy
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  name: launchy
 - !ruby/object:Gem::Dependency
+  name: netrc
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+  type: :runtime
+  prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  name: netrc
 description: Tool for managing applications and clouds at shellycloud.com
 email:
 - devs@shellycloud.com
@@ -245,6 +245,7 @@ files:
 - lib/shelly/cli/backup.rb
 - lib/shelly/cli/command.rb
 - lib/shelly/cli/config.rb
+- lib/shelly/cli/database.rb
 - lib/shelly/cli/deploy.rb
 - lib/shelly/cli/file.rb
 - lib/shelly/cli/logs.rb
@@ -286,6 +287,7 @@ files:
 - spec/shelly/backup_spec.rb
 - spec/shelly/cli/backup_spec.rb
 - spec/shelly/cli/config_spec.rb
+- spec/shelly/cli/database_spec.rb
 - spec/shelly/cli/deploy_spec.rb
 - spec/shelly/cli/file_spec.rb
 - spec/shelly/cli/logs_spec.rb
@@ -332,6 +334,7 @@ test_files:
 - spec/shelly/backup_spec.rb
 - spec/shelly/cli/backup_spec.rb
 - spec/shelly/cli/config_spec.rb
+- spec/shelly/cli/database_spec.rb
 - spec/shelly/cli/deploy_spec.rb
 - spec/shelly/cli/file_spec.rb
 - spec/shelly/cli/logs_spec.rb