shelly 0.1.21 → 0.1.22

data/CHANGELOG.md

@@ -0,0 +1,11 @@
+## 0.1.22 / 2012-08-06
+
+* [feature] Add dbconsole to access 'rails dbconsole' on Shelly Cloud.
+
+* [feature] Limit backups list to 10 backups, --all option to list all backups.
+
+  Usage: ```shelly backup list --all```
+
+## 0.1.21 / 2012-08-06
+
+* [refactoring] Adjusted shelly console to match new API.

data/lib/shelly/app.rb

@@ -176,6 +176,10 @@ module Shelly
       ssh_command("rake_runner \"#{task}\"")
     end
 
+    def dbconsole
+      ssh_command("dbconsole")
+    end
+
     def attributes
       @attributes ||= shelly.app(code_name)
     end
@@ -244,7 +248,7 @@ module Shelly
     end
 
     def ssh_command(command = "")
-      exec "ssh #{ssh_options} #{ssh['host']} #{command}"
+      exec "ssh #{ssh_options} -t #{ssh['host']} #{command}"
     end
 
     def ssh_options

data/lib/shelly/backup.rb

@@ -1,5 +1,6 @@
 module Shelly
   class Backup < Model
+    LIMIT = 10
     attr_reader :filename, :size, :human_size, :code_name, :kind, :state
 
     def initialize(attributes = {})

data/lib/shelly/cli/backup.rb

@@ -12,13 +12,21 @@ module Shelly
 
       class_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
 
+      method_option :all, :type => :boolean, :aliases => "-a",
+        :desc => "Show all backups"
       desc "list", "List available database backups"
       def list
         app = multiple_clouds(options[:cloud], "backup list")
         backups = app.database_backups
         if backups.present?
+          limit = -1
+          unless options[:all] || backups.count < (Shelly::Backup::LIMIT + 1)
+            limit = Shelly::Backup::LIMIT - 1
+            say "Limiting the number of backups to #{Shelly::Backup::LIMIT}."
+            say "Use --all or -a option to list all backups."
+          end
           to_display = [["Filename", "|  Size", "|  State"]]
-          backups.each do |backup|
+          backups[0..limit].each do |backup|
             to_display << [backup.filename, "|  #{backup.human_size}", "|  #{backup.state.humanize}"]
           end
 

data/lib/shelly/cli/main.rb

@@ -20,7 +20,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, :status, :list, :start, :stop, :logs, :delete, :info, :ip, :logout, :execute, :rake, :setup, :console]
+      before_hook :logged_in?, :only => [:add, :status, :list, :start, :stop, :logs, :delete, :info, :ip, :logout, :execute, :rake, :setup, :console, :dbconsole]
       before_hook :inside_git_repository?, :only => [:add, :setup, :check]
 
       map %w(-v --version) => :version
@@ -318,6 +318,15 @@ We have been notified about it. We will be adding new resources shortly}
         say_error "Cloud #{app} is not running. Cannot run rake task."
       end
 
+      desc "dbconsole", "Run rails dbconsole"
+      method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
+      def dbconsole(task = nil)
+        app = multiple_clouds(options[:cloud], "dbconsole")
+        app.dbconsole
+      rescue Client::ConflictException
+        say_error "Cloud #{app} is not running. Cannot run dbconsole."
+      end
+
       desc "redeploy", "Redeploy application"
       method_option :cloud, :type => :string, :aliases => "-c",
         :desc => "Specify which cloud to redeploy application for"

data/lib/shelly/client.rb

@@ -147,9 +147,7 @@ module Shelly
     end
 
     def application_logs(cloud, options = {})
-      query = "?" + options.map { |k, v|
-        URI.escape(k.to_s) + "=" + URI.escape(v.to_s) }.join("&")
-      get("/apps/#{cloud}/application_logs#{query}")
+      get("/apps/#{cloud}/application_logs#{query(options)}")
     end
 
     def database_backups(code_name)
@@ -176,6 +174,11 @@ module Shelly
       post("/apps/#{cloud}/deploys")
     end
 
+    def query(options = {})
+      "?" + options.map { |k, v|
+        URI.escape(k.to_s) + "=" + URI.escape(v.to_s) }.join("&")
+    end
+
     def post(path, params = {})
       request(path, :post, params)
     end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.1.21"
+  VERSION = "0.1.22"
 end

data/lib/thor/thor.rb

@@ -12,6 +12,7 @@ class Thor
     def send(*args)
       if args.first == :dispatch && !args[2].empty?
         running_task = args[2].first
+
         @hook.each do |method, options|
           if options[:only].include?(running_task.to_sym)
             new.send(method)

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", "~> 2.8.0"
+  s.add_development_dependency "rspec", "~> 2.11.0"
   s.add_development_dependency "rake"
   s.add_development_dependency "guard"
   s.add_development_dependency "guard-rspec"

data/spec/shelly/app_spec.rb

@@ -253,6 +253,14 @@ describe Shelly::App do
     end
   end
 
+  describe "#database_backups" do
+    it "should add limit parameter" do
+      @client.stub_chain(:database_backups, :map)
+      @client.should_receive(:database_backups).with("foo-staging")
+      @app.database_backups
+    end
+  end
+
   describe "#database_backup" do
     before do
       @description = {
@@ -312,11 +320,20 @@ describe Shelly::App do
     it "should return result of rake task" do
       @client.stub(:console).and_return(
         {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
-      @app.should_receive(:exec).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo console.example.com rake_runner \"test\"")
+      @app.should_receive(:exec).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t console.example.com rake_runner \"test\"")
       @app.rake("test")
     end
   end
 
+  describe "#dbconsole" do
+    it "should return result of dbconsole" do
+      @client.stub(:console).and_return(
+        {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
+      @app.should_receive(:exec).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t console.example.com dbconsole")
+      @app.dbconsole
+    end
+  end
+
   describe "#to_s" do
     it "should return code_name" do
       @app.to_s.should == "foo-staging"
@@ -342,7 +359,7 @@ describe Shelly::App do
     it "should run ssh with all parameters" do
       @client.stub(:console).and_return(
         {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
-      @app.should_receive(:exec).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo console.example.com ")
+      @app.should_receive(:exec).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t console.example.com ")
       @app.console
     end
   end

data/spec/shelly/cli/backup_spec.rb

@@ -31,23 +31,39 @@ 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, "state" => "completed"}])
+      @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
+      stub_const("Shelly::Backup::LIMIT", 1)
       @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_not_receive(:puts).with("Limiting the number of backups to 1.")
       $stdout.should_receive(:puts).with(green "Available backups:")
       $stdout.should_receive(:puts).with("\n")
       $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"}
+      @backup.options = {:cloud => "foo-staging", :all => true}
+      invoke(@backup, :list)
+    end
+
+    it "should show --all option if not present" do
+      stub_const("Shelly::Backup::LIMIT", 1)
+      $stdout.should_receive(:puts).with("Limiting the number of backups to 1.")
+      $stdout.should_receive(:puts).with("Use --all or -a option to list all backups.")
+      @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"}])
       invoke(@backup, :list)
     end
 

data/spec/shelly/cli/main_spec.rb

@@ -9,6 +9,7 @@ describe Shelly::CLI::Main do
     @main = Shelly::CLI::Main.new
     Shelly::CLI::Main.stub(:new).and_return(@main)
     @client = mock
+    @client.stub(:token).and_return("abc")
     Shelly::Client.stub(:new).and_return(@client)
     Shelly::User.stub(:guess_email).and_return("")
     $stdout.stub(:puts)
@@ -31,6 +32,7 @@ Tasks:
   shelly check              # Check if application fulfills Shelly Cloud requirements
   shelly config <command>   # Manage application configuration files
   shelly console            # Open application console
+  shelly dbconsole          # Run rails dbconsole
   shelly delete             # Delete the cloud
   shelly deploys <command>  # View deploy logs
   shelly execute CODE       # Run code on one of application servers
@@ -563,16 +565,10 @@ OUT
 
   describe "#start" do
     before do
-      @user = Shelly::User.new
-      @client.stub(:token).and_return("abc")
-      FileUtils.mkdir_p("/projects/foo")
-      Dir.chdir("/projects/foo")
-      File.open("Cloudfile", 'w') {|f| f.write("foo-production:\n") }
-      Shelly::User.stub(:new).and_return(@user)
-      @client.stub(:apps).and_return([{"code_name" => "foo-production", "state" => "running"},
-         {"code_name" => "foo-staging", "state" => "no_code"}])
-      @app = Shelly::App.new
-      Shelly::App.stub(:new).and_return(@app)
+      setup_project
+      @client.stub(:apps).and_return([
+        {"code_name" => "foo-production", "state" => "running"},
+        {"code_name" => "foo-staging", "state" => "no_code"}])
     end
 
     it "should ensure user has logged in" do
@@ -1074,16 +1070,7 @@ We have been notified about it. We will be adding new resources shortly")
 
   describe "#logs" do
     before do
-      @user = Shelly::User.new
-      @client.stub(:token).and_return("abc")
-      FileUtils.mkdir_p("/projects/foo")
-      Dir.chdir("/projects/foo")
-      File.open("Cloudfile", 'w') { |f| f.write("foo-production:\n") }
-      Shelly::User.stub(:new).and_return(@user)
-      @client.stub(:apps).and_return([{"code_name" => "foo-production"},
-                                     {"code_name" => "foo-staging"}])
-      @app = Shelly::App.new
-      Shelly::App.stub(:new).and_return(@app)
+      setup_project
       @sample_logs = {"entries" => [['app1', 'log1'], ['app1', 'log2']]}
     end
 
@@ -1123,14 +1110,7 @@ We have been notified about it. We will be adding new resources shortly")
 
   describe "#rake" do
     before do
-      FileUtils.mkdir_p("/projects/foo")
-      Dir.chdir("/projects/foo")
-      File.open("Cloudfile", 'w') {|f| f.write("foo-production:\n") }
-      @user = Shelly::User.new
-      @user.stub(:token)
-      Shelly::User.stub(:new).and_return(@user)
-      @app = Shelly::App.new("foo-production")
-      Shelly::App.stub(:new).and_return(@app)
+      setup_project
       @main.stub(:rake_args).and_return(%w(db:migrate))
     end
 
@@ -1167,13 +1147,7 @@ We have been notified about it. We will be adding new resources shortly")
 
   describe "#redeploy" do
     before do
-      @user = Shelly::User.new
-      @client.stub(:token).and_return("abc")
-      @app = Shelly::App.new("foo-production")
-      Shelly::App.stub(:new).and_return(@app)
-      FileUtils.mkdir_p("/projects/foo")
-      Dir.chdir("/projects/foo")
-      File.open("Cloudfile", 'w') { |f| f.write("foo-production:\n") }
+      setup_project
     end
 
     # multiple_clouds is tested in main_spec.rb in describe "#start" block
@@ -1229,14 +1203,8 @@ We have been notified about it. We will be adding new resources shortly")
 
   describe "#open" do
     before do
-      @user = Shelly::User.new
-      @client.stub(:token).and_return("abc")
-      @app = Shelly::App.new("foo-production")
+      setup_project
       @app.stub(:open)
-      Shelly::App.stub(:new).and_return(@app)
-      FileUtils.mkdir_p("/projects/foo")
-      Dir.chdir("/projects/foo")
-      File.open("Cloudfile", 'w') { |f| f.write("foo-production:\n") }
     end
 
     # multiple_clouds is tested in main_spec.rb in describe "#start" block
@@ -1254,12 +1222,7 @@ We have been notified about it. We will be adding new resources shortly")
 
   describe "#console" do
     before do
-      @client.stub(:token).and_return("abc")
-      @app = Shelly::App.new("foo-production")
-      Shelly::App.stub(:new).and_return(@app)
-      FileUtils.mkdir_p("/projects/foo")
-      Dir.chdir("/projects/foo")
-      File.open("Cloudfile", 'w') { |f| f.write("foo-production:\n") }
+      setup_project
     end
 
     it "should ensure user has logged in" do
@@ -1282,6 +1245,31 @@ We have been notified about it. We will be adding new resources shortly")
     end
   end
 
+  describe "#dbconsole" do
+    before do
+      setup_project
+    end
+
+    it "should ensure user has logged in" do
+      hooks(@main, :dbconsole).should include(:logged_in?)
+    end
+
+    it "should execute ssh command" do
+      @app.should_receive(:dbconsole)
+      invoke(@main, :dbconsole)
+    end
+
+    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.")
+        lambda {
+          invoke(@main, :dbconsole)
+        }.should raise_error(SystemExit)
+      end
+    end
+  end
+
   describe "#check" do
     before do
       Shelly::App.stub(:inside_git_repository?).and_return(true)
@@ -1390,4 +1378,12 @@ We have been notified about it. We will be adding new resources shortly")
       @main.check(false)
     end
   end
+
+  def setup_project(code_name = "foo")
+    @app = Shelly::App.new("#{code_name}-production")
+    Shelly::App.stub(:new).and_return(@app)
+    FileUtils.mkdir_p("/projects/#{code_name}")
+    Dir.chdir("/projects/#{code_name}")
+    File.open("Cloudfile", 'w') { |f| f.write("#{code_name}-production:\n") }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.1.21
+  version: 0.1.22
   prerelease: 
 platform: ruby
 authors:
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.11.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.8.0
+        version: 2.11.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -277,6 +277,7 @@ extra_rdoc_files: []
 files:
 - .gitignore
 - .travis.yml
+- CHANGELOG.md
 - Gemfile
 - Guardfile
 - README.md
@@ -342,18 +343,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2910498490410578861
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: 2910498490410578861
 requirements: []
 rubyforge_project: shelly
 rubygems_version: 1.8.24