shelly 0.3.1 → 0.3.2

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MTBiNDgwNzhlNDdhZGU5YmY3MjQ3YTUwNTJmNjY0YTEyMTA4YTlkNA==
+    ZWM1NDEyYjYzZTUyNGQ0NDVhMzg0NjdmM2QzNWM4MGQ3NTA0NDJmYQ==
   data.tar.gz: !binary |-
-    NWQ3NTdjZGY4ZTFiNjgwMTQ2Y2FiMzYwYmNmMzRkMDcxZjA5ZGMwNQ==
+    ZjllMDk5Nzk2NjY5OWM4OTUxMTZiZmMzMDdlZWMxZDU3OGM4YzRiNw==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    YTczNTdhMjljZjEyY2ZiZDcyMDM0ODUxMDY5ZTZlYmE5YjQ0YjBlMGRlNTNj
-    OTFmYzc1MzAzOGRhYzgxMDM2NWVhN2YwNzViMjljOTljMmFmMTY4MDQ0MzU3
-    MzU3MWQ1NGFhOWUzMDg3NmNhZmZiNmFmMTFiMjY1NzUxNTk1MDk=
+    NDEzZTBmOTQ5YzA1NWY1YTEyNzQ3Njc5ZDAyOGEyNDZjMDJmM2YyZTZkOWQw
+    MGUxZmY5ODY4Y2NlZTNjZjgxYzQxMmNkNDMzMWE3NDdmNzhjMjM3ODFkYmVl
+    N2U2OGRiMTRkMTk2NmFkOGFiZWJiMWE1ZTJkMmRiNWI4MjFlY2M=
   data.tar.gz: !binary |-
-    MjA4ZjQyODRhYjRjYjIzZGUwNjczM2QyMTM4MTY4NTBlYWVmM2FlNTQ4NmFk
-    YjBiYWFhOTdkNTljOTNmODc3ZmZjNTBlMzU1YTU3MWVhNWMyNDExYjZmYzVj
-    Y2VhNzY1ODZiYTAzZTA4MmY0NzkyYzQyNDQyNmY2OTRhMWIwOGE=
+    ZDk3OTg5NjVlYmVhYWI4NTVhY2U1MjUwZWZjYjUyMjFjZDc1YzgzYTA5YzM5
+    NWM3YmRhYzIxMWE1NDVlNTFkNzAzOTkxNTM5NjYyZWZlMDNiMDdjMzZlYjg2
+    OGIwZGIwMDdlOWU4ZjA1NTE0ODgzY2E0Y2RjMTI4NGQyYTU1OTc=

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 0.3.2 / 2013-06-28
+
+* [improvement] API changes to handle user virtual server interactions
+
 ## 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

data/lib/shelly/app.rb

@@ -129,12 +129,12 @@ module Shelly
     end
 
     def import_database(kind, filename, server)
-      ssh(:command => "import_database #{kind.downcase} #{filename}",
-        :server => server, :type => :db_server)
+      ssh_with_db_server(:command => "import_database #{kind.downcase} #{filename}",
+        :server => server)
     end
 
     def reset_database(kind)
-      ssh(:command => "reset_database #{kind.downcase}", :type => :db_server)
+      ssh_with_db_server(:command => "reset_database #{kind.downcase}")
     end
 
     def request_backup(kinds)
@@ -201,7 +201,7 @@ module Shelly
     end
 
     def dbconsole
-      ssh(:command => "dbconsole", :type => :db_server)
+      ssh_with_db_server(:command => "dbconsole")
     end
 
     def attributes
@@ -257,23 +257,23 @@ module Shelly
     end
 
     def list_files(path)
-      ssh(:command => "ls -l #{persistent_disk}/#{path}", :type => :server)
+      ssh(:command => "ls -l #{persistent_disk}/#{path}")
     end
 
     def upload(source)
-      server_connection.tap do |conn|
+      console_connection.tap do |conn|
         rsync(source, "#{conn['host']}:#{persistent_disk}", conn)
       end
     end
 
     def upload_database(source)
-      db_server_connection.tap do |conn|
+      configured_db_server_connection.tap do |conn|
         rsync(source, "#{conn['host']}:#{persistent_disk}", conn)
       end
     end
 
     def download(relative_source, destination)
-      server_connection.tap do |conn|
+      console_connection.tap do |conn|
         source = File.join("#{conn['host']}:#{persistent_disk}", relative_source)
         rsync(source, destination, conn)
       end
@@ -365,34 +365,23 @@ module Shelly
       content["servers"].any? {|_, settings| settings.has_key?(option)}
     end
 
+    # Returns first at least configured virtual server
     def console_connection(server = nil)
       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)
+    # Returns first at least configured virtual server if databases are configured
+    def configured_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
+    def ssh(options = {})
+      conn = console_connection(options[:server])
+      system "ssh #{ssh_options(conn)} -t #{conn['host']} #{options[:command]}"
     end
 
-    def ssh(options = {})
-      options[:type] = :console unless options[:type]
-      conn = connection(options)
+    def ssh_with_db_server(options = {})
+      conn = configured_db_server_connection(options[:server])
       system "ssh #{ssh_options(conn)} -t #{conn['host']} #{options[:command]}"
     end
 

data/lib/shelly/cli/backup.rb

@@ -132,7 +132,7 @@ module Shelly
         app.import_database(kind, archive, connection["server"])
         say "Database imported successfully", :green
       rescue Client::ConflictException => e
-        say_error e[:message]
+        say_error "Cloud #{app} wasn't deployed properly. Cannot import database."
       end
 
       no_tasks do

data/lib/shelly/cli/database.rb

@@ -20,6 +20,8 @@ module Shelly
         say "All database objects and data will be removed"
         ask_to_reset_database
         app.reset_database(kind)
+      rescue Client::ConflictException
+        say_error "Cloud #{app} wasn't deployed properly. Cannot reset database."
       end
     end
   end

data/lib/shelly/cli/file.rb

@@ -15,7 +15,7 @@ module Shelly
         app = multiple_clouds(options[:cloud], "file list #{path}")
         app.list_files(path)
       rescue Client::ConflictException
-        say_error "Cloud #{app} is not running. Cannot list files."
+        say_error "Cloud #{app} wasn't deployed properly. Cannot list files."
       end
 
       desc "upload PATH", "Upload files to persistent data storage"
@@ -23,7 +23,7 @@ module Shelly
         app = multiple_clouds(options[:cloud], "file upload #{path}")
         app.upload(path)
       rescue Client::ConflictException
-        say_error "Cloud #{app} is not running. Cannot upload files."
+        say_error "Cloud #{app} wasn't deployed properly. Cannot upload files."
       end
 
       desc "download [SOURCE_PATH] [DEST_PATH]", "Download files from persistent data storage"
@@ -36,7 +36,7 @@ module Shelly
         app = multiple_clouds(options[:cloud], "file download #{relative_source} #{destination}")
         app.download(relative_source, destination)
       rescue Client::ConflictException
-        say_error "Cloud #{app} is not running. Cannot download files."
+        say_error "Cloud #{app} wasn't deployed properly. Cannot download files."
       end
 
       method_option :force, :type => :boolean, :aliases => "-f",
@@ -52,7 +52,7 @@ module Shelly
 
         app.delete_file(path)
       rescue Client::ConflictException
-        say_error "Cloud #{app} is not running. Cannot delete files."
+        say_error "Cloud #{app} wasn't deployed properly. Cannot delete files."
       end
 
       no_tasks do

data/lib/shelly/client/apps.rb

@@ -38,10 +38,6 @@ class Shelly::Client
     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

data/lib/shelly/version.rb

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

data/spec/shelly/app_spec.rb

@@ -348,15 +348,14 @@ 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 /home/foo-staging/disk/foo",
-        :type => :server)
+      @app.should_receive(:ssh).with(:command => "ls -l /home/foo-staging/disk/foo")
       @app.list_files("foo")
     end
   end
 
   describe "#upload" do
     it "should run rsync with proper parameters" do
-      @client.stub(:configured_server).and_return(
+      @client.stub(:console).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:/home/foo-staging/disk")
       @app.upload("/path")
@@ -365,7 +364,7 @@ describe Shelly::App do
 
   describe "#download" do
     it "should run rsync with proper parameters" do
-      @client.stub(:configured_server).and_return(
+      @client.stub(:console).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:/home/foo-staging/disk/. /tmp")
       @app.download(".", "/tmp")

data/spec/shelly/cli/backup_spec.rb

@@ -265,6 +265,7 @@ describe Shelly::CLI::Backup do
     before do
       FileUtils.touch("dump.sql")
       @app.stub(:upload_database => {"server" => "app1"}, :ssh => nil)
+      @app.stub(:import_database)
       @backup.stub(:system)
       $stdout.stub(:puts)
       $stdout.stub(:print)
@@ -292,8 +293,9 @@ describe Shelly::CLI::Backup do
     end
 
     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", :type => :db_server)
+      @app.unstub(:import_database)
+      @app.should_receive(:ssh_with_db_server).with(:command => "import_database postgresql dump.sql-1370879705.tar.bz2",
+        :server => "app1")
       $stdout.should_receive(:puts).with(green "Importing database")
       fake_stdin(["yes"]) do
         invoke(@backup, :import, "PostgreSQL", "dump.sql")
@@ -327,10 +329,11 @@ describe Shelly::CLI::Backup do
 
     context "with --reset option" do
       it "should reset database first" do
+        @app.unstub(:import_database)
         @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)
+        @app.should_receive(:ssh_with_db_server).with(:command => "import_database postgresql dump.sql-1370879705.tar.bz2",
+          :server => "app1")
         $stdout.should_receive(:puts).with(green "Importing database")
         fake_stdin(["yes"]) do
           invoke(@backup, :import, "postgresql", "dump.sql")

data/spec/shelly/cli/file_spec.rb

@@ -28,8 +28,8 @@ describe Shelly::CLI::File do
 
     context "cloud is not running" do
       it "should display error" do
-        @client.stub(:configured_server).and_raise(Shelly::Client::ConflictException)
-        $stdout.should_receive(:puts).with(red "Cloud foo-production is not running. Cannot list files.")
+        @client.stub(:console).and_raise(Shelly::Client::ConflictException)
+        $stdout.should_receive(:puts).with(red "Cloud foo-production wasn't deployed properly. Cannot list files.")
         lambda {
           invoke(@cli_files, :list, "some/path")
         }.should raise_error(SystemExit)
@@ -59,8 +59,8 @@ describe Shelly::CLI::File do
 
     context "cloud is not running" do
       it "should display error" do
-        @client.stub(:configured_server).and_raise(Shelly::Client::ConflictException)
-        $stdout.should_receive(:puts).with(red "Cloud foo-production is not running. Cannot upload files.")
+        @client.stub(:console).and_raise(Shelly::Client::ConflictException)
+        $stdout.should_receive(:puts).with(red "Cloud foo-production wasn't deployed properly. Cannot upload files.")
         lambda {
           invoke(@cli_files, :upload, "some/path")
         }.should raise_error(SystemExit)
@@ -85,6 +85,16 @@ describe Shelly::CLI::File do
       @app.should_receive(:download).with("some/path", "/destination")
       invoke(@cli_files, :download, "some/path", "/destination")
     end
+
+    context "cloud is 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 wasn't deployed properly. Cannot download files.")
+        lambda {
+          invoke(@cli_files, :download, "some/path")
+        }.should raise_error(SystemExit)
+      end
+    end
   end
 
   describe "#delete" do
@@ -130,5 +140,15 @@ describe Shelly::CLI::File do
         }.should raise_error(SystemExit)
       end
     end
+
+    context "cloud is not running" do
+      it "should display error" do
+        @app.stub(:delete_file).and_raise(Shelly::Client::ConflictException)
+        $stdout.should_receive(:puts).with(red "Cloud foo-production wasn't deployed properly. Cannot delete files.")
+        lambda {
+          fake_stdin(["yes"]) { invoke(@cli_files, :delete, "some/path") }
+        }.should raise_error(SystemExit)
+      end
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Shelly Cloud team