shelly 0.0.32 → 0.0.33

data/.gitignore

@@ -1,5 +1,6 @@
 *.gem
 .bundle
+.tmp.swp
 Gemfile.lock
 pkg/*
 .rvmrc

data/lib/shelly/app.rb

@@ -106,6 +106,22 @@ module Shelly
       configs.find_all { |config| config["created_by_user"] == false }
     end
 
+    def config(id)
+      shelly.app_config(code_name, id)
+    end
+
+    def create_config(path, content)
+      shelly.app_create_config(code_name, path, content)
+    end
+
+    def update_config(id, content)
+      shelly.app_update_config(code_name, id, content)
+    end
+
+    def delete_config(id)
+      shelly.app_delete_config(code_name, id)
+    end
+
     def open_billing_page
       url = "#{shelly.shellyapp_url}/login?api_key=#{current_user.token}&return_to=/apps/#{code_name}/edit_billing"
       Launchy.open(url)

data/lib/shelly/cli/backup.rb

@@ -6,12 +6,14 @@ module Shelly
       namespace :backup
       include Helpers
 
-      desc "list", "List database backup clouds defined in Cloudfile"
-      def list(cloud = nil)
+      desc "list", "List database backups"
+      method_option :cloud, :type => :string, :aliases => "-c",
+        :desc => "Specify which cloud to list backups for"
+      def list
         logged_in?
         say_error "Must be run inside your project git repository" unless App.inside_git_repository?
         say_error "No Cloudfile found" unless Cloudfile.present?
-        multiple_clouds(cloud, "backup list", "Select cloud to view database backups using:")
+        multiple_clouds(options[:cloud], "backup list", "Select cloud to view database backups for using:")
         backups = @app.database_backups
         unless backups.empty?
           backups.unshift({"filename" => "Filename", "size" => "Size"})

data/lib/shelly/cli/config.rb

@@ -20,14 +20,14 @@ module Shelly
               user_configs = @app.user_configs
               unless user_configs.empty?
                 say "Custom configuration files:"
-                user_configs.each { |config| say " * #{config["path"]}" }
+                print_configs(user_configs)
               else
                 say "You have no custom configuration files."
               end
               shelly_configs = @app.shelly_generated_configs
               unless shelly_configs.empty?
                 say "Following files are created by Shelly Cloud:"
-                shelly_configs.each { |config| say " * #{config["path"]}" }
+                print_configs(shelly_configs)
               end
             else
               say "Cloud #{cloud} has no configuration files"
@@ -42,6 +42,121 @@ module Shelly
         end
       end
 
+      method_option :cloud, :type => :string, :aliases => "-c",
+        :desc => "Specify which cloud to show configuration file for"
+      desc "show CONFIG_ID", "View configuration file"
+      def show(id = nil)
+        logged_in?
+        say_error "No Cloudfile found" unless Cloudfile.present?
+        say_error "No configuration file specified" unless id
+        multiple_clouds(options[:cloud], "show #{id}", "Specify cloud using:")
+        config = @app.config(id)
+        say "Content of #{config["path"]}:", :green
+        say config["content"]
+      end
+
+      map "new" => :create
+      method_option :cloud, :type => :string, :aliases => "-c",
+        :desc => "Specify for which cloud create configuration file"
+      desc "create PATH", "Create configuration file"
+      def create(path = nil)
+        logged_in?
+        say_error "No Cloudfile found" unless Cloudfile.present?
+        say_error "No path specified" unless path
+        output = open_editor(path)
+        multiple_clouds(options[:cloud], "create #{path}", "Specify cloud using:")
+        @app.create_config(path, output)
+        say "File '#{path}' created, it will be used after next code deploy", :green
+      rescue Client::APIError => e
+        if e.unauthorized?
+          say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
+        elsif e.validation?
+          e.each_error { |error| say_error error, :with_exit => false }
+          exit 1
+        else
+          say_error e.message
+        end
+      end
+
+      map "update" => :edit
+      method_option :cloud, :type => :string, :aliases => "-c",
+        :desc => "Specify for which cloud edit configuration file"
+      desc "edit CONFIG_ID", "Edit configuration file"
+      def edit(id = nil)
+        logged_in?
+        say_error "No Cloudfile found" unless Cloudfile.present?
+        say_error "No configuration file specified" unless id
+        multiple_clouds(options[:cloud], "edit #{id}", "Specify cloud using:")
+        config = @app.config(id)
+        content = open_editor(config["path"], config["content"])
+        @app.update_config(id, content)
+        say "File '#{config["path"]}' updated, it will be used after next code deploy", :green
+      rescue Client::APIError => e
+        if e.unauthorized?
+          say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
+        elsif e.validation?
+          e.each_error { |error| say_error error, :with_exit => false }
+          exit 1
+        else
+          say_error e.message
+        end
+      end
+
+      method_option :cloud, :type => :string, :aliases => "-c",
+        :desc => "Specify for which cloud delete configuration file"
+      desc "delete CONFIG_ID", "Delete configuration file"
+      def delete(id = nil)
+        logged_in?
+        say_error "No Cloudfile found" unless Cloudfile.present?
+        say_error "No configuration file specified" unless id
+        multiple_clouds(options[:cloud], "delete #{id}", "Specify cloud using:")
+        config = @app.config(id)
+        answer = ask("Are you sure you want to delete '#{config["path"]}' [y/n]: ")
+        if answer =~ /yes|YES|y|Y/
+          @app.delete_config(id)
+          say "File deleted, redeploy your cloud to make changes", :green
+        else
+          say "File not deleted"
+        end
+      rescue Client::APIError => e
+        if e.unauthorized?
+          say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
+        elsif e.validation?
+          e.each_error { |error| say_error error, :with_exit => false }
+          exit 1
+        else
+          say_error e.message
+        end
+      end
+
+      no_tasks do
+        def print_configs(configs)
+          print_table(configs.map { |config|
+            [" * ", config["id"], config["path"]] })
+        end
+
+        def open_editor(path, output = "")
+          filename = "shelly-edit-"
+          0.upto(20) { filename += rand(9).to_s }
+          filename << File.extname(path)
+          filename = File.join(Dir.tmpdir, filename)
+          tf = File.open(filename, "w")
+          tf.sync = true
+          tf.puts output
+          tf.close
+          no_editor unless system("#{ENV['EDITOR']} #{tf.path}")
+          tf = File.open(filename, "r")
+          output = tf.gets(nil)
+          tf.close
+          File.unlink(filename)
+          output
+        end
+
+        def no_editor
+          say_error "Please set EDITOR environment variable"
+        end
+      end
+
     end
   end
 end

data/lib/shelly/cli/deploys.rb

@@ -8,10 +8,12 @@ module Shelly
       include Helpers
 
       desc "list", "Lists deploy logs"
-      def list(cloud = nil)
+      method_option :cloud, :type => :string, :aliases => "-c",
+        :desc => "Specify which cloud to show deploy logs for"
+      def list
         logged_in?
         say_error "No Cloudfile found" unless Cloudfile.present?
-        multiple_clouds(cloud, "deploys list", "Select cloud to view deploy logs using:")
+        multiple_clouds(options[:cloud], "deploys list", "Select cloud to view deploy logs using:")
         logs = @app.deploy_logs
         unless logs.empty?
           say "Available deploy logs", :green
@@ -30,10 +32,12 @@ module Shelly
       end
 
       desc "show LOG", "Show specific deploy log"
-      def show(log = nil, cloud = nil)
+      method_option :cloud, :type => :string, :aliases => "-c",
+        :desc => "Specify which cloud to show deploy logs for"
+      def show(log = nil)
         say_error "No Cloudfile found" unless Cloudfile.present?
         specify_log(log)
-        multiple_clouds(cloud, "deploys show #{log}", "Select log and cloud to view deploy logs using:")
+        multiple_clouds(options[:cloud], "deploys show #{log}", "Select log and cloud to view deploy logs using:")
         content = @app.deploy_log(log)
         say "Log for deploy done on #{content["created_at"]}", :green
         if content["bundle_install"]

data/lib/shelly/cli/main.rb

@@ -161,11 +161,13 @@ module Shelly
         end
       end
 
-      desc "start [CODE-NAME]", "Starts specific cloud"
-      def start(cloud = nil)
+      desc "start", "Starts the cloud"
+      method_option :cloud, :type => :string, :aliases => "-c",
+        :desc => "Specify which cloud to start"
+      def start
         logged_in?
         say_error "No Cloudfile found" unless Cloudfile.present?
-        multiple_clouds(cloud, "start", "Select which to start using:")
+        multiple_clouds(options[:cloud], "start", "Select cloud to start using:")
         @app.start
         say "Starting cloud #{@app.code_name}. Check status with:", :green
         say "  shelly list"
@@ -195,11 +197,13 @@ module Shelly
         end
       end
 
-      desc "stop [CODE-NAME]", "Stops specific cloud"
-      def stop(cloud = nil)
+      desc "stop", "Stops the cloud"
+      method_option :cloud, :type => :string, :aliases => "-c",
+        :desc => "Specify which cloud to stop"
+      def stop
         logged_in?
         say_error "No Cloudfile found" unless Cloudfile.present?
-        multiple_clouds(cloud, "stop", "Select which to stop using:")
+        multiple_clouds(options[:cloud], "stop", "Select cloud to stop using:")
         @app.stop
         say "Cloud '#{@app.code_name}' stopped"
       rescue Client::APIError => e
@@ -208,31 +212,28 @@ module Shelly
         end
       end
 
-      desc "delete CODE-NAME", "Delete cloud from Shelly Cloud"
-      def delete(code_name = nil)
+      desc "delete", "Delete cloud from Shelly Cloud"
+      method_option :cloud, :type => :string, :aliases => "-c",
+        :desc => "Specify which cloud to delete"
+      def delete
         user = Shelly::User.new
         user.token
-        if code_name.present?
-          app = Shelly::App.new(code_name)
-          say "You are about to delete application: #{code_name}."
-          say "Press Control-C at any moment to cancel."
-          say "Please confirm each question by typing yes and pressing Enter."
-          say_new_line
-          ask_to_delete_files
-          ask_to_delete_database
-          ask_to_delete_application
-          app.delete
-          say_new_line
-          say "Scheduling application delete - done"
-          if App.inside_git_repository?
-            app.remove_git_remote
-            say "Removing git remote - done"
-          else
-            say "Missing git remote"
-          end
+        multiple_clouds(options[:cloud], "delete", "Select cloud to delete using:")
+        say "You are about to delete application: #{@app.code_name}."
+        say "Press Control-C at any moment to cancel."
+        say "Please confirm each question by typing yes and pressing Enter."
+        say_new_line
+        ask_to_delete_files
+        ask_to_delete_database
+        ask_to_delete_application
+        @app.delete
+        say_new_line
+        say "Scheduling application delete - done"
+        if App.inside_git_repository?
+          @app.remove_git_remote
+          say "Removing git remote - done"
         else
-          say_error "Missing CODE-NAME", :with_exit => false
-          say_error "Use: shelly delete CODE-NAME"
+          say "Missing git remote"
         end
       rescue Client::APIError => e
         say_error e.message
@@ -245,13 +246,13 @@ module Shelly
         cloud = options[:cloud]
         logged_in?
         say_error "No Cloudfile found" unless Cloudfile.present?
-        multiple_clouds(cloud, "logs --cloud", "Select which to show logs for using:")
+        multiple_clouds(cloud, "logs", "Select which to show logs for using:")
         begin
           logs = @app.application_logs
           say "Cloud #{@app.code_name}:", :green
           logs.each_with_index do |log, i|
-            say "Instance #{i+1}:"
-            print_wrapped log, :ident => 2
+            say "Instance #{i+1}:", :green
+            say log
           end
         rescue Client::APIError => e
           if e.unauthorized?

data/lib/shelly/client.rb

@@ -62,6 +62,22 @@ module Shelly
       get("/apps/#{cloud}/configs")
     end
 
+    def app_config(cloud, id)
+      get("/apps/#{cloud}/configs/#{id}")
+    end
+
+    def app_create_config(cloud, path, content)
+      post("/apps/#{cloud}/configs", :config => {:path => path, :content => content})
+    end
+
+    def app_update_config(cloud, id, content)
+      put("/apps/#{cloud}/configs/#{id}", :config => {:content => content})
+    end
+
+    def app_delete_config(cloud, id)
+      delete("/apps/#{cloud}/configs/#{id}")
+    end
+
     def send_invitation(cloud, email)
       post("/apps/#{cloud}/collaborations", :email => email)
     end

data/lib/shelly/helpers.rb

@@ -61,7 +61,7 @@ module Shelly
       clouds = Cloudfile.new.clouds
       if clouds.count > 1 && cloud.nil?
         say "You have multiple clouds in Cloudfile. #{message}"
-        say "  shelly #{action} #{clouds.first}"
+        say "  shelly #{action} --cloud #{clouds.first}"
         say "Available clouds:"
         clouds.each do |cloud|
           say " * #{cloud}"

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.32"
+  VERSION = "0.0.33"
 end

data/spec/shelly/cli/backup_spec.rb

@@ -38,8 +38,8 @@ describe Shelly::CLI::Backup do
       end
 
       it "should show information to select specific cloud and exit" do
-        $stdout.should_receive(:puts).with("You have multiple clouds in Cloudfile. Select cloud to view database backups using:")
-        $stdout.should_receive(:puts).with("  shelly backup list foo-production")
+        $stdout.should_receive(:puts).with("You have multiple clouds in Cloudfile. Select cloud to view database backups for using:")
+        $stdout.should_receive(:puts).with("  shelly backup list --cloud foo-production")
         $stdout.should_receive(:puts).with("Available clouds:")
         $stdout.should_receive(:puts).with(" * foo-production")
         $stdout.should_receive(:puts).with(" * foo-staging")
@@ -53,7 +53,8 @@ describe Shelly::CLI::Backup do
         $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")
-        @backup.list("foo-staging")
+        @backup.options = {:cloud => 'foo-staging'}
+        @backup.list
       end
     end
   end

data/spec/shelly/cli/config_spec.rb

@@ -10,14 +10,18 @@ describe Shelly::CLI::Config do
     Shelly::Client.stub(:new).and_return(@client)
     $stdout.stub(:puts)
     $stdout.stub(:print)
+    FileUtils.mkdir_p("/projects/foo")
+    Dir.chdir("/projects/foo")
+    @client.stub(:token).and_return("abc")
+    File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\n") }
+    FileUtils.mkdir_p("/tmp")
+    Dir.stub(:tmpdir).and_return("/tmp")
+    ENV["EDITOR"] = "vim"
   end
 
   describe "#list" do
     before do
-      FileUtils.mkdir_p("/projects/foo")
-      Dir.chdir("/projects/foo")
       File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\nfoo-production:\n") }
-      @client.stub(:token).and_return("abc")
     end
 
     it "should exit with message if there is no Cloudfile" do
@@ -37,19 +41,201 @@ describe Shelly::CLI::Config do
     end
 
     it "should list available configuration files for clouds" do
-      @client.should_receive(:app_configs).with("foo-staging").and_return([{"created_by_user" => true, "path" => "config/settings.yml"}])
-      @client.should_receive(:app_configs).with("foo-production").and_return([{"created_by_user" => false, "path" => "config/app.yml"}])
+      @client.should_receive(:app_configs).with("foo-staging").and_return([{"id" => 1, "created_by_user" => true, "path" => "config/settings.yml"}])
+      @client.should_receive(:app_configs).with("foo-production").and_return([{"id" => 2, "created_by_user" => false, "path" => "config/app.yml"}])
       $stdout.should_receive(:puts).with(green "Configuration files for foo-production")
       $stdout.should_receive(:puts).with("You have no custom configuration files.")
       $stdout.should_receive(:puts).with("Following files are created by Shelly Cloud:")
-      $stdout.should_receive(:puts).with(" * config/app.yml")
+      $stdout.should_receive(:puts).with(/ * 2\s+config\/app.yml/)
       $stdout.should_receive(:puts).with(green "Configuration files for foo-staging")
       $stdout.should_receive(:puts).with("Custom configuration files:")
-      $stdout.should_receive(:puts).with(" * config/settings.yml")
+      $stdout.should_receive(:puts).with(/ * 1\s+config\/settings.yml/)
 
       @config.list
     end
 
   end
 
+  describe "#show" do
+    it "should exit with message if there is no Cloudfile" do
+      File.delete("Cloudfile")
+      $stdout.should_receive(:puts).with(red "No Cloudfile found")
+      lambda { @config.show(1) }.should raise_error(SystemExit)
+    end
+
+    it "should exit if no id was specified" do
+      $stdout.should_receive(:puts).with(red "No configuration file specified")
+      lambda { @config.show }.should raise_error(SystemExit)
+    end
+
+    it "should show config" do
+      @client.should_receive(:app_config).with("foo-staging", 1).and_return({"path" => "test.rb", "content" => "example content"})
+      $stdout.should_receive(:puts).with(green "Content of test.rb:")
+      $stdout.should_receive(:puts).with("example content")
+      @config.show(1)
+    end
+
+    context "multiple clouds" do
+      before do
+        File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\nfoo-production:\n") }
+      end
+
+      it "should show info to select cloud and exit" do
+        $stdout.should_receive(:puts).with("You have multiple clouds in Cloudfile. Specify cloud using:")
+        lambda { @config.show(1) }.should raise_error(SystemExit)
+      end
+
+      it "should use cloud specified by parameter" do
+        @client.should_receive(:app_config).with("foo-production", 1).and_return({"path" => "test.rb", "content" => "example content"})
+        @config.options = {:cloud => "foo-production"}
+        @config.show(1)
+      end
+    end
+  end
+
+  describe "#create" do
+    it "should exit with message if there is no Cloudfile" do
+      File.delete("Cloudfile")
+      $stdout.should_receive(:puts).with(red "No Cloudfile found")
+      lambda { @config.create("path") }.should raise_error(SystemExit)
+    end
+
+    it "should exit if no id was specified" do
+      $stdout.should_receive(:puts).with(red "No path specified")
+      lambda { @config.create }.should raise_error(SystemExit)
+    end
+
+    it "should ask to set EDITOR environment variable if not set" do
+      @config.stub(:system) {false}
+      $stdout.should_receive(:puts).with(red "Please set EDITOR environment variable")
+      lambda { @config.create("path") }.should raise_error(SystemExit)
+    end
+
+    it "should create file" do
+      @config.should_receive(:system).with(/vim \/tmp\/shelly-edit/).and_return(true)
+      @client.should_receive(:app_create_config).with("foo-staging", "path", "\n").and_return({})
+      $stdout.should_receive(:puts).with(green "File 'path' created, it will be used after next code deploy")
+      @config.create("path")
+    end
+
+    context "multiple clouds" do
+      before do
+        File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\nfoo-production:\n") }
+      end
+
+      it "should show info to select cloud and exit" do
+        @config.stub(:system) {true}
+        $stdout.should_receive(:puts).with("You have multiple clouds in Cloudfile. Specify cloud using:")
+        lambda { @config.create("path") }.should raise_error(SystemExit)
+      end
+
+      it "should use cloud specified by parameter" do
+        @config.should_receive(:system).with(/vim \/tmp\/shelly-edit/).and_return(true)
+        @client.should_receive(:app_create_config).with("foo-production", "path", "\n").and_return({})
+        @config.options = {:cloud => "foo-production"}
+        @config.create("path")
+      end
+    end
+  end
+
+
+  describe "#edit" do
+    it "should exit with message if there is no Cloudfile" do
+      File.delete("Cloudfile")
+      $stdout.should_receive(:puts).with(red "No Cloudfile found")
+      lambda { @config.edit(1) }.should raise_error(SystemExit)
+    end
+
+    it "should exit if no path was specified" do
+      $stdout.should_receive(:puts).with(red "No configuration file specified")
+      lambda { @config.edit }.should raise_error(SystemExit)
+    end
+
+    it "should ask to set EDITOR environment variable if not set" do
+      @client.should_receive(:app_config).with("foo-staging", 1).and_return({"path" => "test.rb", "content" => "example content"})
+      @config.stub(:system) {false}
+      $stdout.should_receive(:puts).with(red "Please set EDITOR environment variable")
+      lambda { @config.edit(1) }.should raise_error(SystemExit)
+    end
+
+    it "should create file" do
+      @client.should_receive(:app_config).with("foo-staging", 1).and_return({"path" => "test.rb", "content" => "example content"})
+      @config.should_receive(:system).with(/vim \/tmp\/shelly-edit/).and_return(true)
+      @client.should_receive(:app_update_config).with("foo-staging", 1, "example content\n").and_return({"path" => "test.rb", "content" => "example content"})
+      $stdout.should_receive(:puts).with(green "File 'test.rb' updated, it will be used after next code deploy")
+      @config.edit(1)
+    end
+
+    context "multiple clouds" do
+      before do
+        File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\nfoo-production:\n") }
+      end
+
+      it "should show info to select cloud and exit" do
+        @config.stub(:system) {true}
+        $stdout.should_receive(:puts).with("You have multiple clouds in Cloudfile. Specify cloud using:")
+        lambda { @config.edit(1) }.should raise_error(SystemExit)
+      end
+
+      it "should use cloud specified by parameter" do
+        @client.should_receive(:app_config).with("foo-production", 1).and_return({"path" => "test.rb", "content" => "example content"})
+        @config.should_receive(:system).with(/vim \/tmp\/shelly-edit/).and_return(true)
+        @client.should_receive(:app_update_config).with("foo-production", 1, "example content\n").and_return({"path" => "test.rb", "content" => "example content"})
+        @config.options = {:cloud => "foo-production"}
+        @config.edit(1)
+      end
+    end
+  end
+
+  describe "#delete" do
+    it "should exit with message if there is no Cloudfile" do
+      File.delete("Cloudfile")
+      $stdout.should_receive(:puts).with(red "No Cloudfile found")
+      lambda { @config.delete(1) }.should raise_error(SystemExit)
+    end
+
+    it "should exit if no path was specified" do
+      $stdout.should_receive(:puts).with(red "No configuration file specified")
+      lambda { @config.delete }.should raise_error(SystemExit)
+    end
+
+    it "should delete configuration file" do
+      @client.should_receive(:app_config).with("foo-staging", 1).and_return({"path" => "test.rb", "content" => "example content"})
+      @client.should_receive(:app_delete_config).with("foo-staging", 1).and_return({})
+      $stdout.should_receive(:puts).with(green "File deleted, redeploy your cloud to make changes")
+      fake_stdin(["y"]) do
+        @config.delete(1)
+      end
+    end
+
+    it "should not delete file if user answered other than yes/y" do
+      @client.should_receive(:app_config).with("foo-staging", 1).and_return({"path" => "test.rb", "content" => "example content"})
+      @client.should_not_receive(:app_delete_config)
+      $stdout.should_receive(:puts).with("File not deleted")
+      fake_stdin(["n"]) do
+        @config.delete(1)
+      end
+    end
+
+    context "multiple clouds" do
+      before do
+        File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\nfoo-production:\n") }
+      end
+
+      it "should show info to select cloud and exit" do
+        $stdout.should_receive(:puts).with("You have multiple clouds in Cloudfile. Specify cloud using:")
+        lambda { @config.delete(1) }.should raise_error(SystemExit)
+      end
+
+      it "should use cloud specified by parameter" do
+        @client.should_receive(:app_config).with("foo-production", 1).and_return({"path" => "test.rb", "content" => "example content"})
+        @client.should_receive(:app_delete_config).with("foo-production", 1).and_return({})
+        $stdout.should_receive(:puts).with(green "File deleted, redeploy your cloud to make changes")
+        @config.options = {:cloud => "foo-production"}
+        fake_stdin(["y"]) do
+          @config.delete(1)
+        end
+      end
+    end
+  end
 end

data/spec/shelly/cli/deploys_spec.rb

@@ -42,7 +42,7 @@ describe Shelly::CLI::Deploys do
 
       it "should show information to select specific cloud and exit" do
         $stdout.should_receive(:puts).with("You have multiple clouds in Cloudfile. Select cloud to view deploy logs using:")
-        $stdout.should_receive(:puts).with("  shelly deploys list foo-production")
+        $stdout.should_receive(:puts).with("  shelly deploys list --cloud foo-production")
         $stdout.should_receive(:puts).with("Available clouds:")
         $stdout.should_receive(:puts).with(" * foo-production")
         $stdout.should_receive(:puts).with(" * foo-staging")
@@ -53,7 +53,8 @@ describe Shelly::CLI::Deploys do
         @client.should_receive(:deploy_logs).with("foo-staging").and_return([{"failed" => false, "created_at" => "2011-12-12-14-14-59"}])
         $stdout.should_receive(:puts).with(green "Available deploy logs")
         $stdout.should_receive(:puts).with(" * 2011-12-12-14-14-59")
-        @deploys.list("foo-staging")
+        @deploys.options = {:cloud => "foo-staging"}
+        @deploys.list
       end
     end
 
@@ -99,7 +100,7 @@ describe Shelly::CLI::Deploys do
 
       it "should show information to select specific cloud and exit" do
         $stdout.should_receive(:puts).with("You have multiple clouds in Cloudfile. Select log and cloud to view deploy logs using:")
-        $stdout.should_receive(:puts).with("  shelly deploys show last foo-production")
+        $stdout.should_receive(:puts).with("  shelly deploys show last --cloud foo-production")
         $stdout.should_receive(:puts).with("Available clouds:")
         $stdout.should_receive(:puts).with(" * foo-production")
         $stdout.should_receive(:puts).with(" * foo-staging")
@@ -109,7 +110,8 @@ describe Shelly::CLI::Deploys do
       it "should render the logs" do
         @client.should_receive(:deploy_log).with("foo-staging", "last").and_return(response)
         expected_output
-        @deploys.show("last", "foo-staging")
+        @deploys.options = {:cloud => "foo-staging"}
+        @deploys.show("last")
       end
     end
 

data/spec/shelly/cli/main_spec.rb

@@ -26,7 +26,7 @@ Tasks:
   shelly add                # Adds new cloud to Shelly Cloud
   shelly backup <command>   # Manages database backups from this cloud
   shelly config <command>   # Manages cloud configuration files
-  shelly delete CODE-NAME   # Delete cloud from Shelly Cloud
+  shelly delete             # Delete cloud from Shelly Cloud
   shelly deploys <command>  # View cloud deploy logs
   shelly help [TASK]        # Describe available tasks or one specific task
   shelly ip                 # Lists clouds IP's
@@ -34,8 +34,8 @@ Tasks:
   shelly login [EMAIL]      # Logs user in to Shelly Cloud
   shelly logs               # Show latest application logs from each instance
   shelly register [EMAIL]   # Registers new user account on Shelly Cloud
-  shelly start [CODE-NAME]  # Starts specific cloud
-  shelly stop [CODE-NAME]   # Stops specific cloud
+  shelly start              # Starts the cloud
+  shelly stop               # Stops the cloud
   shelly user <command>     # Manages users using this cloud
   shelly version            # Displays shelly version
 
@@ -538,8 +538,8 @@ OUT
       end
 
       it "should show information to start specific cloud and exit" do
-        $stdout.should_receive(:puts).with("You have multiple clouds in Cloudfile. Select which to start using:")
-        $stdout.should_receive(:puts).with("  shelly start foo-production")
+        $stdout.should_receive(:puts).with("You have multiple clouds in Cloudfile. Select cloud to start using:")
+        $stdout.should_receive(:puts).with("  shelly start --cloud foo-production")
         $stdout.should_receive(:puts).with("Available clouds:")
         $stdout.should_receive(:puts).with(" * foo-production")
         $stdout.should_receive(:puts).with(" * foo-staging")
@@ -550,7 +550,8 @@ OUT
         @client.should_receive(:start_cloud).with("foo-staging")
         $stdout.should_receive(:puts).with(green "Starting cloud foo-staging. Check status with:")
         $stdout.should_receive(:puts).with("  shelly list")
-        @main.start("foo-staging")
+        @main.options = {:cloud => "foo-staging"}
+        @main.start
       end
     end
 
@@ -654,8 +655,8 @@ OUT
       end
 
       it "should show information to start specific cloud and exit" do
-        $stdout.should_receive(:puts).with("You have multiple clouds in Cloudfile. Select which to stop using:")
-        $stdout.should_receive(:puts).with("  shelly stop foo-production")
+        $stdout.should_receive(:puts).with("You have multiple clouds in Cloudfile. Select cloud to stop using:")
+        $stdout.should_receive(:puts).with("  shelly stop --cloud foo-production")
         $stdout.should_receive(:puts).with("Available clouds:")
         $stdout.should_receive(:puts).with(" * foo-production")
         $stdout.should_receive(:puts).with(" * foo-staging")
@@ -665,7 +666,8 @@ OUT
       it "should fetch from command line which cloud to start" do
         @client.should_receive(:stop_cloud).with("foo-staging")
         $stdout.should_receive(:puts).with("Cloud 'foo-staging' stopped")
-        @main.stop("foo-staging")
+        @main.options = {:cloud => "foo-staging"}
+        @main.stop
       end
     end
   end
@@ -734,9 +736,14 @@ OUT
       Shelly::App.stub(:new).and_return(@app)
     end
 
-    context "when code_name is not nil" do
+    context "when cloud is given" do
+      before do
+        File.open("Cloudfile", 'w') {|f|
+          f.write("foo-staging:\nfoo-production:\n") }
+      end
+
       it "should ask about delete application parts" do
-        $stdout.should_receive(:puts).with("You are about to delete application: foo-bar.")
+        $stdout.should_receive(:puts).with("You are about to delete application: foo-staging.")
         $stdout.should_receive(:puts).with("Press Control-C at any moment to cancel.")
         $stdout.should_receive(:puts).with("Please confirm each question by typing yes and pressing Enter.")
         $stdout.should_receive(:puts).with("\n")
@@ -747,7 +754,8 @@ OUT
         $stdout.should_receive(:puts).with("Scheduling application delete - done")
         $stdout.should_receive(:puts).with("Removing git remote - done")
         fake_stdin(["yes", "yes", "yes"]) do
-          @main.delete("foo-bar")
+          @main.options = {:cloud => "foo-staging"}
+          @main.delete
         end
       end
 
@@ -755,23 +763,35 @@ OUT
         @app.should_not_receive(:delete)
         lambda{
           fake_stdin(["yes", "yes", "no"]) do
-            @main.delete("foo-bar")
+            @main.options = {:cloud => "foo-staging"}
+            @main.delete
           end
         }.should raise_error(SystemExit)
       end
     end
 
     context "when git repository doesn't exist" do
+      before do
+        File.open("Cloudfile", 'w') {|f|
+          f.write("foo-staging:\n") }
+      end
+
       it "should say that Git remote missing" do
         Shelly::App.stub(:inside_git_repository?).and_return(false)
         $stdout.should_receive(:puts).with("Missing git remote")
         fake_stdin(["yes", "yes", "yes"]) do
-          @main.delete("foo-bar")
+          @main.options = {:cloud => "foo-staging"}
+          @main.delete
         end
       end
     end
 
-    context "when application with CODE-NAME doesn't exist" do
+    context "when cloud given in option doesn't exist" do
+      before do
+        File.open("Cloudfile", 'w') {|f|
+          f.write("foo-staging:\n") }
+      end
+
       it "should raise Client::APIError" do
         response = {:message => "Application not found"}
         exception = Shelly::Client::APIError.new(response.to_json)
@@ -779,17 +799,33 @@ OUT
         $stdout.should_receive(:puts).with("\e[31mApplication not found\e[0m")
         lambda{
           fake_stdin(["yes", "yes", "yes"]) do
-            @main.delete("foo-bar")
+            @main.options = {:cloud => "foo-bar"}
+            @main.delete
           end
         }.should raise_error(SystemExit)
       end
     end
 
-    context "when code_name is nil" do
-      it "should display error when no code_name" do
-        $stdout.should_receive(:puts).with("\e[31mMissing CODE-NAME\e[0m")
-        $stdout.should_receive(:puts).with("\e[31mUse: shelly delete CODE-NAME\e[0m")
-        lambda{ @main.delete }.should raise_error(SystemExit)
+    context "when no cloud option is given" do
+      before do
+        File.open("Cloudfile", 'w') {|f|
+          f.write("foo-staging:\n") }
+      end
+
+      it "should take the cloud from Cloudfile" do
+        $stdout.should_receive(:puts).with("You are about to delete application: foo-staging.")
+        $stdout.should_receive(:puts).with("Press Control-C at any moment to cancel.")
+        $stdout.should_receive(:puts).with("Please confirm each question by typing yes and pressing Enter.")
+        $stdout.should_receive(:puts).with("\n")
+        $stdout.should_receive(:print).with("I want to delete all files stored on Shelly Cloud (yes/no): ")
+        $stdout.should_receive(:print).with("I want to delete all database data stored on Shelly Cloud (yes/no): ")
+        $stdout.should_receive(:print).with("I want to delete the application (yes/no): ")
+        $stdout.should_receive(:puts).with("\n")
+        $stdout.should_receive(:puts).with("Scheduling application delete - done")
+        $stdout.should_receive(:puts).with("Removing git remote - done")
+        fake_stdin(["yes", "yes", "yes"]) do
+          @main.delete
+        end
       end
     end
   end
@@ -839,8 +875,8 @@ OUT
       it "should show logs for the cloud" do
         @client.stub(:application_logs).and_return(["log1"])
         $stdout.should_receive(:puts).with(green "Cloud foo-production:")
-        $stdout.should_receive(:puts).with("Instance 1:")
-        $stdout.should_receive(:puts).with("  log1")
+        $stdout.should_receive(:puts).with(green "Instance 1:")
+        $stdout.should_receive(:puts).with("log1")
         @main.logs
       end
     end
@@ -865,8 +901,8 @@ OUT
         @client.should_receive(:application_logs).with("foo-staging").
           and_return(["log1"])
         $stdout.should_receive(:puts).with(green "Cloud foo-staging:")
-        $stdout.should_receive(:puts).with("Instance 1:")
-        $stdout.should_receive(:puts).with("  log1")
+        $stdout.should_receive(:puts).with(green "Instance 1:")
+        $stdout.should_receive(:puts).with("log1")
         @main.options = {:cloud => "foo-staging"}
         @main.logs
       end
@@ -876,10 +912,10 @@ OUT
       it "should show logs from each instance" do
         @client.stub(:application_logs).and_return(["log1", "log2"])
         $stdout.should_receive(:puts).with(green "Cloud foo-production:")
-        $stdout.should_receive(:puts).with("Instance 1:")
-        $stdout.should_receive(:puts).with("  log1")
-        $stdout.should_receive(:puts).with("Instance 2:")
-        $stdout.should_receive(:puts).with("  log2")
+        $stdout.should_receive(:puts).with(green "Instance 1:")
+        $stdout.should_receive(:puts).with("log1")
+        $stdout.should_receive(:puts).with(green "Instance 2:")
+        $stdout.should_receive(:puts).with("log2")
         @main.logs
       end
     end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: shelly
 version: !ruby/object:Gem::Version 
-  hash: 95
+  hash: 93
   prerelease: 
   segments: 
   - 0
   - 0
-  - 32
-  version: 0.0.32
+  - 33
+  version: 0.0.33
 platform: ruby
 authors: 
 - Shelly Cloud team
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-12-19 00:00:00 Z
+date: 2011-12-26 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec