shelly 0.1.18 → 0.1.19

data/lib/core_ext/string.rb

@@ -0,0 +1,9 @@
+class String
+  def dasherize
+    self.tr('_', '-')
+  end
+
+  def humanize
+    self.tr('_', ' ')
+  end
+end

data/lib/shelly.rb

@@ -1,6 +1,7 @@
 require "rubygems"
 require "core_ext/object"
 require "core_ext/hash"
+require "core_ext/string"
 
 require "yaml"
 if YAML.const_defined?(:ENGINE)

data/lib/shelly/app.rb

@@ -92,8 +92,10 @@ module Shelly
       shelly.restore_backup(code_name, filename)
     end
 
-    def request_backup(kind)
-      shelly.request_backup(code_name, kind)
+    def request_backup(kinds)
+      Array(kinds).each do |kind|
+        shelly.request_backup(code_name, kind)
+      end
     end
 
     def logs
@@ -126,7 +128,7 @@ module Shelly
           end
         end
       end
-      "#{File.basename(Dir.pwd)}-#{guessed || 'staging'}".downcase.tr('_','-')
+      "#{File.basename(Dir.pwd)}-#{guessed || 'staging'}".downcase.dasherize
     end
 
     def collaborations

data/lib/shelly/backup.rb

@@ -1,6 +1,6 @@
 module Shelly
   class Backup < Model
-    attr_reader :filename, :size, :human_size, :code_name, :kind
+    attr_reader :filename, :size, :human_size, :code_name, :kind, :state
 
     def initialize(attributes = {})
       @filename   = attributes["filename"]
@@ -8,6 +8,7 @@ module Shelly
       @human_size = attributes["human_size"]
       @code_name  = attributes["code_name"]
       @kind       = attributes["kind"]
+      @state      = attributes["state"]
     end
 
     def download(callback)

data/lib/shelly/cli/backup.rb

@@ -17,9 +17,9 @@ module Shelly
         app = multiple_clouds(options[:cloud], "backup list")
         backups = app.database_backups
         if backups.present?
-          to_display = [["Filename", "|  Size"]]
+          to_display = [["Filename", "|  Size", "|  State"]]
           backups.each do |backup|
-            to_display << [backup.filename, "|  #{backup.human_size}"]
+            to_display << [backup.filename, "|  #{backup.human_size}", "|  #{backup.state.humanize}"]
           end
 
           say "Available backups:", :green
@@ -53,15 +53,22 @@ module Shelly
       desc "create [DB_KIND]", "Create backup of given database"
       long_desc %{
         Create backup of given database.
-        If database kind is not specified, backup of all configured databases will be performed.
+        If database kind is not specified, Cloudfile must be present to backup all configured databases.
       }
       def create(kind = nil)
         app = multiple_clouds(options[:cloud], "backup create [DB_KIND]")
-        app.request_backup(kind)
+        cloudfile = Cloudfile.new
+        unless kind || cloudfile.present?
+          say_error "Cloudfile must be present in current working directory or specify database kind with:", :with_exit => false
+          say_error "`shelly backup create DB_KIND`"
+        end
+        app.request_backup(kind || cloudfile.backup_databases(app))
         say "Backup requested. It can take up to several minutes for " +
-          "the backup process to finish and the backup to show up in backups list.", :green
+          "the backup process to finish.", :green
       rescue Client::ValidationException => e
         say_error e[:message]
+      rescue Client::ConflictException => e
+        say_error e[:message]
       end
 
       desc "restore FILENAME", "Restore database to state from given backup"
@@ -78,6 +85,8 @@ module Shelly
         raise unless e.resource == :database_backup
         say_error "Backup not found", :with_exit => false
         say "You can list available backups with `shelly backup list` command"
+      rescue Client::ConflictException => e
+        say_error e[:message]
       end
     end
   end

data/lib/shelly/cli/main.rb

@@ -117,7 +117,7 @@ module Shelly
         e.each_error { |error| say_error error, :with_exit => false }
         say_new_line
         say_error "Fix erros in the below command and type it again to create your cloud" , :with_exit => false
-        say_error "shelly add --code-name=#{app.code_name.downcase.tr('_','-')} --databases=#{app.databases.join(',')} --size=#{app.size}"
+        say_error "shelly add --code-name=#{app.code_name.downcase.dasherize} --databases=#{app.databases.join(',')} --size=#{app.size}"
       end
 
       map "status" => :list
@@ -132,7 +132,7 @@ module Shelly
             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}"]
+            [app["code_name"], "|  #{state.humanize}#{msg}"]
           end
           print_table(apps_table, :ident => 2)
         else

data/lib/shelly/cloudfile.rb

@@ -35,6 +35,20 @@ module Shelly
       File.open(path, "a+") { |f| f << generate }
     end
 
+    # Public: Return databases for given Cloud in Cloudfile
+    # Returns Array of databases
+    def databases(cloud)
+      content[cloud.to_s]["servers"].map do |server, settings|
+        settings["databases"]
+      end.flatten.uniq
+    end
+
+    # Public: Return databases to backup for given Cloud in Cloudfile
+    # Returns Array of databases, except redis db
+    def backup_databases(cloud)
+      databases(cloud) - ['redis']
+    end
+
     private
 
     # Internal: Load and parse Cloudfile

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.1.18"
+  VERSION = "0.1.19"
 end

data/spec/shelly/backup_spec.rb

@@ -14,6 +14,7 @@ describe Shelly::Backup do
     backup.filename.should == "backup.tar.gz"
     backup.human_size.should == "2KB"
     backup.size.should == 2048
+    backup.state.should == "completed"
   end
 
   describe "#download" do
@@ -29,6 +30,7 @@ describe Shelly::Backup do
     {"code_name" => "foo",
     "filename"   => "backup.tar.gz",
     "human_size" => "2KB",
-    "size"       => 2048}
+    "size"       => 2048,
+    "state"      => "completed"}
   end
 end

data/spec/shelly/cli/backup_spec.rb

@@ -31,18 +31,22 @@ describe Shelly::CLI::Backup do
 
     # multiple_clouds is tested in main_spec.rb in describe "#start" block
     it "should ensure multiple_clouds check" do
-      @client.should_receive(:database_backups).with("foo-staging").and_return([{"filename" => "backup.postgre.tar.gz", "human_size" => "10kb", "size" => 12345}])
+      @client.should_receive(:database_backups).with("foo-staging").and_return([{"filename" => "backup.postgre.tar.gz", "human_size" => "10kb", "size" => 12345, "state" => "completed"}])
       @backup.should_receive(:multiple_clouds).and_return(@app)
       invoke(@backup, :list)
     end
 
     it "should take cloud from command line for which to show backups" do
-      @client.should_receive(:database_backups).with("foo-staging").and_return([{"filename" => "backup.postgre.tar.gz", "human_size" => "10kb", "size" => 12345},{"filename" => "backup.mongo.tar.gz", "human_size" => "22kb", "size" => 333}])
+      @client.should_receive(:database_backups).with("foo-staging").and_return(
+        [{"filename" => "backup.postgre.tar.gz", "human_size" => "10kb",
+          "size" => 12345, "state" => "completed"},
+         {"filename" => "backup.mongo.tar.gz", "human_size" => "22kb",
+          "size" => 333, "state" => "in_progress"}])
       $stdout.should_receive(:puts).with(green "Available backups:")
       $stdout.should_receive(:puts).with("\n")
-      $stdout.should_receive(:puts).with("  Filename               |  Size")
-      $stdout.should_receive(:puts).with("  backup.postgre.tar.gz  |  10kb")
-      $stdout.should_receive(:puts).with("  backup.mongo.tar.gz    |  22kb")
+      $stdout.should_receive(:puts).with("  Filename               |  Size  |  State")
+      $stdout.should_receive(:puts).with("  backup.postgre.tar.gz  |  10kb  |  completed")
+      $stdout.should_receive(:puts).with("  backup.mongo.tar.gz    |  22kb  |  in progress")
       @backup.options = {:cloud => "foo-staging"}
       invoke(@backup, :list)
     end
@@ -114,8 +118,9 @@ describe Shelly::CLI::Backup do
     before do
       FileUtils.mkdir_p("/projects/foo")
       Dir.chdir("/projects/foo")
-      File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\n") }
       $stdout.stub(:puts)
+      @cloudfile = mock(:backup_databases => ['postgresql', 'mongodb'], :clouds => ['foo-staging'])
+      Shelly::Cloudfile.stub(:new).and_return(@cloudfile)
     end
 
     it "should ensure user has logged in" do
@@ -137,12 +142,31 @@ describe Shelly::CLI::Backup do
       lambda { invoke(@backup, :create) }.should raise_error(SystemExit)
     end
 
+    it "should backup db specified by cli" do
+      @app.should_receive(:request_backup).with('postgresql')
+      invoke(@backup, :create, "postgresql")
+    end
+
+    it "should backup all dbs in cloudfile" do
+      @app.should_receive(:request_backup).with(['postgresql', 'mongodb'])
+      invoke(@backup, :create)
+    end
+
     it "should display information about request backup" do
       @client.stub(:request_backup)
       $stdout.should_receive(:puts).with(green "Backup requested. It can take up to several minutes for " +
-          "the backup process to finish and the backup to show up in backups list.")
+          "the backup process to finish.")
       invoke(@backup, :create)
     end
+
+    it "should display information about missing kind or Cloudfile" do
+      @cloudfile.stub(:present?).and_return(false)
+      $stdout.should_receive(:puts).with(red "Cloudfile must be present in current working directory or specify database kind with:")
+      $stdout.should_receive(:puts).with(red "`shelly backup create DB_KIND`")
+
+      @backup.options = {:cloud => "foo-production"}
+      lambda { invoke(@backup, :create) }.should raise_error(SystemExit)
+    end
   end
 
   describe "restore" do

data/spec/shelly/cloudfile_spec.rb

@@ -88,6 +88,31 @@ config
     end
   end
 
+  describe "#databases" do
+    before do
+      content = <<-config
+foo-staging:
+  servers:
+    app1:
+      databases:
+        - postgresql
+        - redis
+    app2:
+      databases:
+        - mongodb
+config
+      File.open("Cloudfile", 'w') {|f| f.write(content) }
+    end
+
+    it "should return databases in cloudfile" do
+      @cloudfile.databases("foo-staging").should =~ ['redis', 'mongodb', 'postgresql']
+    end
+
+    it "should return databases except for redis" do
+      @cloudfile.backup_databases("foo-staging").should =~ ['postgresql', 'mongodb']
+    end
+  end
+
   describe "#create" do
     before do
       @cloudfile.stub(:generate).and_return("foo-staging:")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-23 00:00:00.000000000 Z
+date: 2012-07-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -284,6 +284,7 @@ files:
 - bin/shelly
 - lib/core_ext/hash.rb
 - lib/core_ext/object.rb
+- lib/core_ext/string.rb
 - lib/shelly.rb
 - lib/shelly/app.rb
 - lib/shelly/backup.rb