shelly 0.0.36 → 0.0.37

data/lib/shelly/app.rb

@@ -75,6 +75,10 @@ module Shelly
       Shelly::Backup.new(attributes.merge("code_name" => code_name))
     end
 
+    def request_backup(kind)
+      shelly.request_backup(code_name, kind)
+    end
+
     def logs
       shelly.cloud_logs(code_name)
     end

data/lib/shelly/cli/backup.rb

@@ -13,7 +13,6 @@ module Shelly
         :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(options[:cloud], "backup list", "Select cloud to view database backups for using:")
         backups = @app.database_backups
@@ -56,6 +55,23 @@ module Shelly
           raise e
         end
       end
+
+      desc "create [KIND]", "Creates current snapshot of given database. Default: all databases."
+      method_option :cloud, :type => :string, :aliases => "-c",
+        :desc => "Specify which cloud to create database snapshot for"
+      def create(kind = nil)
+        logged_in?
+        multiple_clouds(options[:cloud], "backup create", "Select cloud to create snapshot of database")
+        @app.request_backup(kind)
+        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
+      rescue Client::APIError => e
+        if e.unauthorized?
+          say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
+        else
+          say_error e.message
+        end
+      end
     end
   end
 end

data/lib/shelly/client.rb

@@ -136,8 +136,12 @@ module Shelly
       get("/apps/#{code_name}/database_backups/#{handler}")
     end
 
+    def request_backup(code_name, kind = nil)
+      post("/apps/#{code_name}/database_backups", :kind => kind)
+    end
+
     def ssh_key_available?(ssh_key)
-    	get("/users/new", :ssh_key => ssh_key)
+      get("/users/new", :ssh_key => ssh_key)
     end
 
     def app_users(cloud)

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.36"
+  VERSION = "0.0.37"
 end

data/spec/shelly/cli/backup_spec.rb

@@ -14,6 +14,12 @@ describe Shelly::CLI::Backup do
   end
 
   describe "#list" do
+    before do
+      FileUtils.mkdir_p("/projects/foo")
+      Dir.chdir("/projects/foo")
+      File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\n") }
+    end
+
     it "should exit with message if there is no Cloudfile" do
       File.delete("Cloudfile")
       $stdout.should_receive(:puts).with("\e[31mNo Cloudfile found\e[0m")
@@ -55,7 +61,7 @@ describe Shelly::CLI::Backup do
         @backup.list
       end
     end
-    
+
     describe "#get" do
       before do
         @client.stub(:download_backup)
@@ -64,35 +70,35 @@ describe Shelly::CLI::Backup do
         @client.stub(:database_backup).and_return({"filename" => "better.tar.gz", "size" => 12345})
         $stdout.stub(:puts)
       end
-      
+
       it "should make sure that cloud is choosen" do
         @client.should_receive(:database_backup).with("foo-staging", "last")
         @backup.get
-              
+
         @backup.options = {:cloud => "other"}
         @client.should_receive(:database_backup).with("other", "last")
         @backup.get
       end
-      
+
       it "should fetch backup size and initialize download progress bar" do
         @client.stub(:database_backup).and_return({"filename" => "backup.postgres.tar.gz", "size" => 333})
         Shelly::DownloadProgressBar.should_receive(:new).with(333).and_return(@bar)
-        
+
         @backup.get
       end
-      
+
       it "should fetch given backup file itself" do
         @client.should_receive(:download_backup).with("foo-staging", "better.tar.gz", @bar.progress_callback)
         @backup.get("better.tar.gz")
       end
-      
+
       it "should show info where file has been saved" do
         $stdout.should_receive(:puts)
         $stdout.should_receive(:puts).with(green "Backup file saved to better.tar.gz")
         @client.should_receive(:download_backup).with("foo-staging", "better.tar.gz", @bar.progress_callback)
         @backup.get("last")
       end
-      
+
       context "on backup not found" do
         it "it should display error message" do
           exception = Shelly::Client::APIError.new({}.to_json, 404)
@@ -102,18 +108,49 @@ describe Shelly::CLI::Backup do
           @backup.get("better.tar.gz")
         end
       end
-      
+
       context "on unsupported exception" do
         it "should re-raise it" do
           exception = Shelly::Client::APIError.new({}.to_json, 500)
           @client.stub(:database_backup).and_raise(exception)
           $stdout.should_not_receive(:puts).with(red "Backup not found")
           $stdout.should_not_receive(:puts).with("You can list available backups with 'shelly backup list' command")
-          lambda { 
-            @backup.get("better.tar.gz") 
+          lambda {
+            @backup.get("better.tar.gz")
           }.should raise_error(Shelly::Client::APIError)
         end
       end
     end
   end
+
+  describe "create" do
+    before do
+      FileUtils.mkdir_p("/projects/foo")
+      Dir.chdir("/projects/foo")
+      File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\n") }
+    end
+
+    it "should exit if user doesn't have access to cloud in Cloudfile" do
+      response = {"message" => "Cloud foo-staging not found"}
+      exception = Shelly::Client::APIError.new(response.to_json, 404)
+      @client.stub(:request_backup).and_raise(exception)
+      $stdout.should_receive(:puts).with(red "You have no access to 'foo-staging' cloud defined in Cloudfile")
+      lambda { @backup.create }.should raise_error(SystemExit)
+    end
+
+    it "should display errors and exit 1 when kind is not valid" do
+      response = {"message" => "Wrong KIND argument. User one of following: postgresql, mongodb, redis"}
+      exception = Shelly::Client::APIError.new(response.to_json, 404)
+      @client.should_receive(:request_backup).and_raise(exception)
+      $stdout.should_receive(:puts).with(red response["message"])
+      lambda { @backup.create }.should raise_error(SystemExit)
+    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.")
+      @backup.create
+    end
+  end
 end

metadata

@@ -1,167 +1,188 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: shelly
-version: !ruby/object:Gem::Version
-  version: 0.0.36
+version: !ruby/object:Gem::Version 
+  hash: 85
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 37
+  version: 0.0.37
 platform: ruby
-authors:
+authors: 
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-27 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-12-27 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: rspec
-  requirement: &70232388827320 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: *70232388827320
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: &70232388826900 !ruby/object:Gem::Requirement
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
-  prerelease: false
-  version_requirements: *70232388826900
-- !ruby/object:Gem::Dependency
-  name: guard
-  requirement: &70232388826480 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
+  name: rake
   prerelease: false
-  version_requirements: *70232388826480
-- !ruby/object:Gem::Dependency
-  name: guard-rspec
-  requirement: &70232388826060 !ruby/object:Gem::Requirement
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: guard
   prerelease: false
-  version_requirements: *70232388826060
-- !ruby/object:Gem::Dependency
-  name: growl_notify
-  requirement: &70232388825540 !ruby/object:Gem::Requirement
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: guard-rspec
   prerelease: false
-  version_requirements: *70232388825540
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: &70232388825120 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70232388825120
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: fakefs
-  requirement: &70232388824600 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70232388824600
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: fakeweb
-  requirement: &70232388824140 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70232388824140
-- !ruby/object:Gem::Dependency
+  version_requirements: *id006
+- !ruby/object:Gem::Dependency 
   name: wijet-thor
-  requirement: &70232388823400 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 41
+        segments: 
+        - 0
+        - 14
+        - 7
         version: 0.14.7
   type: :runtime
-  prerelease: false
-  version_requirements: *70232388823400
-- !ruby/object:Gem::Dependency
+  version_requirements: *id007
+- !ruby/object:Gem::Dependency 
   name: rest-client
-  requirement: &70232388821260 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70232388821260
-- !ruby/object:Gem::Dependency
+  version_requirements: *id008
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &70232388820800 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id009 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70232388820800
-- !ruby/object:Gem::Dependency
+  version_requirements: *id009
+- !ruby/object:Gem::Dependency 
   name: wijet-launchy
-  requirement: &70232388820380 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70232388820380
-- !ruby/object:Gem::Dependency
+  version_requirements: *id010
+- !ruby/object:Gem::Dependency 
   name: progressbar
-  requirement: &70232388808000 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :runtime
-  prerelease: false
-  version_requirements: *70232388808000
+  version_requirements: *id011
 description: Tool for managing applications and clouds at shellycloud.com
-email:
+email: 
 - support@shellycloud.com
-executables:
+executables: 
 - shelly
 extensions: []
+
 extra_rdoc_files: []
-files:
+
+files: 
 - .gitignore
 - .travis.yml
 - Gemfile
@@ -212,43 +233,36 @@ files:
 - spec/thor/options_spec.rb
 homepage: http://shellycloud.com
 licenses: []
+
 post_install_message: 
 rdoc_options: []
-require_paths:
+
+require_paths: 
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement
+required_ruby_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
-required_rubygems_version: !ruby/object:Gem::Requirement
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
+required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
-  requirements:
-  - - ! '>='
-    - !ruby/object:Gem::Version
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: shelly
 rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: Shelly Cloud command line tool
-test_files:
-- spec/helpers.rb
-- spec/input_faker.rb
-- spec/shelly/app_spec.rb
-- spec/shelly/backup_spec.rb
-- spec/shelly/cli/backup_spec.rb
-- spec/shelly/cli/config_spec.rb
-- spec/shelly/cli/deploys_spec.rb
-- spec/shelly/cli/main_spec.rb
-- spec/shelly/cli/runner_spec.rb
-- spec/shelly/cli/user_spec.rb
-- spec/shelly/client_spec.rb
-- spec/shelly/cloudfile_spec.rb
-- spec/shelly/download_progress_bar_spec.rb
-- spec/shelly/model_spec.rb
-- spec/shelly/user_spec.rb
-- spec/spec_helper.rb
-- spec/thor/options_spec.rb
+test_files: []
+