shelly 0.0.56 → 0.0.57

data/lib/shelly/app.rb

@@ -4,9 +4,10 @@ require "shelly/backup"
 module Shelly
   class App < Model
     DATABASE_KINDS = %w(postgresql mongodb redis none)
+    SERVER_SIZES = %w(small large)
 
     attr_accessor :code_name, :databases, :ruby_version, :environment,
-      :git_url, :domains, :web_server_ip, :mail_server_ip
+      :git_url, :domains, :web_server_ip, :mail_server_ip, :size, :thin
 
     def initialize(code_name = nil)
       self.code_name = code_name
@@ -39,6 +40,7 @@ module Shelly
 
     def generate_cloudfile
       @email = current_user.email
+      thin = (size == "small" ? 2 : 4)
       template = File.read(cloudfile_template_path)
       cloudfile = ERB.new(template, 0, "%<>-")
       cloudfile.result(binding)

data/lib/shelly/cli/main.rb

@@ -74,12 +74,15 @@ module Shelly
       method_option :databases, :type => :array, :aliases => "-d",
         :banner => Shelly::App::DATABASE_KINDS.join(', '),
         :desc => "List of databases of your choice"
+      method_option :size, :type => :string, :aliases => "-s",
+        :desc => "Server size [large, small]"
       desc "add", "Add a new cloud"
       def add
         check_options(options)
         @app = Shelly::App.new
         @app.code_name = options["code-name"] || ask_for_code_name
         @app.databases = options["databases"] || ask_for_databases
+        @app.size = options["size"] || "large"
         @app.create
 
         if overwrite_remote?(@app)
@@ -97,7 +100,7 @@ module Shelly
           say "Billing information", :green
           say "Cloud created with 20 Euro credit."
           say "Remember to provide billing details before trial ends."
-          url = "#{@app.shelly.shellyapp_url}/apps/#{@app.code_name}/billing/edit"
+          url = "#{@app.shelly.shellyapp_url}/apps/#{@app}/billing/edit"
           say url
         end
 
@@ -108,7 +111,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} --databases=#{@app.databases.join(',')}"
+        say_error "shelly add --code-name=#{@app.code_name} --databases=#{@app.databases.join(',')} --size=#{@app.size}"
       end
 
       desc "list", "List available clouds"
@@ -165,7 +168,7 @@ module Shelly
         when "no_code"
           say_error "Not starting: no source code provided", :with_exit => false
           say_error "Push source code using:", :with_exit => false
-          say       "  git push production master"
+          say       "  git push #{@app} master"
         when "deploy_failed", "configuration_failed"
           say_error "Not starting: deployment failed", :with_exit => false
           say_error "Support has been notified", :with_exit => false
@@ -218,22 +221,24 @@ We have been notified about it. We will be adding new resources shortly}
         say "Your application is set up.", :green
       end
 
-      desc "stop", "Stop the cloud"
+      desc "stop", "Shutdown the cloud"
       method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       def stop
         multiple_clouds(options[:cloud], "stop")
+        ask_to_stop_application
         @app.stop
-        say "Cloud '#{@app.code_name}' stopped"
+        say_new_line
+        say "Cloud '#{@app}' stopped"
       rescue Client::NotFoundException => e
         raise unless e.resource == :cloud
-        say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
+        say_error "You have no access to '#{@app}' cloud defined in Cloudfile"
       end
 
       desc "delete", "Delete the cloud"
       method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       def delete
         multiple_clouds(options[:cloud], "delete")
-        say "You are about to delete application: #{@app.code_name}."
+        say "You are about to delete application: #{@app}."
         say "Press Control-C at any moment to cancel."
         say "Please confirm each question by typing yes and pressing Enter."
         say_new_line
@@ -251,7 +256,7 @@ We have been notified about it. We will be adding new resources shortly}
         end
       rescue Client::NotFoundException => e
         raise unless e.resource == :cloud
-        say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
+        say_error "You have no access to '#{@app}' cloud defined in Cloudfile"
       end
 
       desc "logs", "Show latest application logs"
@@ -261,14 +266,14 @@ We have been notified about it. We will be adding new resources shortly}
         multiple_clouds(cloud, "logs")
         begin
           logs = @app.application_logs
-          say "Cloud #{@app.code_name}:", :green
+          say "Cloud #{@app}:", :green
           logs.each_with_index do |log, i|
             say "Instance #{i+1}:", :green
             say log
           end
         rescue Client::NotFoundException => e
           raise unless e.resource == :cloud
-          say_error "You have no access to '#{cloud || @app.code_name}' cloud defined in Cloudfile"
+          say_error "You have no access to '#{cloud || @app}' cloud defined in Cloudfile"
         end
       end
 
@@ -355,15 +360,20 @@ We have been notified about it. We will be adding new resources shortly}
 
         def check_options(options)
           unless options.empty?
-            unless ["code-name", "databases"].all? do |option|
-              options.include?(option.to_s) && options[option.to_s] != option.to_s
-            end && valid_databases?(options["databases"])
+            if !valid_size?(options["size"]) or !valid_databases?(options["databases"])
               say_error "Try `shelly help add` for more information"
             end
           end
         end
 
+        def valid_size?(size)
+          return true unless size.present?
+          sizes = Shelly::App::SERVER_SIZES
+          sizes.include?(size)
+        end
+
         def valid_databases?(databases)
+          return true unless databases.present?
           kinds = Shelly::App::DATABASE_KINDS
           databases.all? { |kind| kinds.include?(kind) }
         end

data/lib/shelly/helpers.rb

@@ -53,6 +53,12 @@ module Shelly
       end
     end
 
+    def ask_to_stop_application
+      stop_question = "Are you sure you want to shut down your application (yes/no):"
+      stop_application = ask(stop_question)
+      exit 1 unless stop_application == "yes"
+    end
+
     def inside_git_repository?
       say_error "Must be run inside your project git repository" unless App.inside_git_repository?
     end

data/lib/shelly/templates/Cloudfile.erb

@@ -8,8 +8,8 @@
     <%- end -%>
   servers:
     app1:
-      size: large
-      thin: 4
+      size: <%= size %>
+      thin: <%= thin %>
       # whenever: on
       # delayed_job: 1
     <%- @databases.each do |kind| -%>

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.56"
+  VERSION = "0.0.57"
 end

data/spec/shelly/app_spec.rb

@@ -157,11 +157,12 @@ describe Shelly::App do
   end
 
   describe "#generate_cloudfile" do
-    it "should return generated cloudfile" do
+    it "should return generated cloudfile for large instance" do
       user = mock(:email => "bob@example.com")
       @app.stub(:current_user).and_return(user)
       @app.databases = %w(postgresql mongodb)
       @app.domains = %w(foo-staging.winniecloud.com foo.example.com)
+      @app.size = "large"
       FakeFS.deactivate!
       expected = <<-config
 foo-staging:
@@ -185,6 +186,39 @@ foo-staging:
       size: large
       databases:
         - mongodb
+config
+      @app.generate_cloudfile.strip.should == expected.strip
+    end
+
+    it "should return generated cloudfile for small instance" do
+      user = mock(:email => "bob@example.com")
+      @app.stub(:current_user).and_return(user)
+      @app.databases = %w(postgresql mongodb)
+      @app.domains = %w(foo-staging.winniecloud.com foo.example.com)
+      @app.size = "small"
+      FakeFS.deactivate!
+      expected = <<-config
+foo-staging:
+  ruby_version: 1.9.3 # 1.9.3, 1.9.2 or ree-1.8.7
+  environment: production # RAILS_ENV
+  monitoring_email: bob@example.com
+  domains:
+    - foo-staging.winniecloud.com
+    - foo.example.com
+  servers:
+    app1:
+      size: small
+      thin: 2
+      # whenever: on
+      # delayed_job: 1
+    postgresql:
+      size: large
+      databases:
+        - postgresql
+    mongodb:
+      size: large
+      databases:
+        - mongodb
 config
       @app.generate_cloudfile.strip.should == expected.strip
     end

data/spec/shelly/cli/main_spec.rb

@@ -41,7 +41,7 @@ Tasks:
   shelly register [EMAIL]   # Register new account
   shelly setup              # Set up clouds
   shelly start              # Start the cloud
-  shelly stop               # Stop the cloud
+  shelly stop               # Shutdown the cloud
   shelly user <command>     # Manage collaborators
   shelly version            # Display shelly version
 
@@ -314,17 +314,17 @@ OUT
 
     context "command line options" do
       context "invalid params" do
-        it "should show help and exit if not all options are passed" do
+        it "should exit if databases are not valid" do
           $stdout.should_receive(:puts).with("\e[31mTry `shelly help add` for more information\e[0m")
-          @main.options = {"code-name" => "foo"}
+          @main.options = {"code-name" => "foo", "databases" => ["not existing"]}
           lambda {
             invoke(@main, :add)
           }.should raise_error(SystemExit)
         end
 
-        it "should exit if databases are not valid" do
+        it "should exit if size is not valid" do
           $stdout.should_receive(:puts).with("\e[31mTry `shelly help add` for more information\e[0m")
-          @main.options = {"code-name" => "foo", "databases" => ["not existing"]}
+          @main.options = {"size" => "wrong_size"}
           lambda {
             invoke(@main, :add)
           }.should raise_error(SystemExit)
@@ -334,7 +334,7 @@ OUT
       context "valid params" do
         it "should create app on shelly cloud" do
           @app.should_receive(:create)
-          @main.options = {"code-name" => "foo", "databases" => ["postgresql"]}
+          @main.options = {"code-name" => "foo", "databases" => ["postgresql"], "size" => "large"}
           invoke(@main, :add)
         end
       end
@@ -428,7 +428,7 @@ OUT
       @app.should_receive(:create).and_raise(exception)
       $stdout.should_receive(:puts).with("\e[31mCode name has been already taken\e[0m")
       $stdout.should_receive(:puts).with("\e[31mFix erros in the below command and type it again to create your cloud\e[0m")
-      $stdout.should_receive(:puts).with("\e[31mshelly add --code-name=foo-staging --databases=postgresql\e[0m")
+      $stdout.should_receive(:puts).with("\e[31mshelly add --code-name=foo-staging --databases=postgresql --size=large\e[0m")
       lambda {
         fake_stdin(["", ""]) do
           invoke(@main, :add)
@@ -630,7 +630,7 @@ OUT
         raise_conflict("state" => "no_code")
         $stdout.should_receive(:puts).with(red "Not starting: no source code provided")
         $stdout.should_receive(:puts).with(red "Push source code using:")
-        $stdout.should_receive(:puts).with("  git push production master")
+        $stdout.should_receive(:puts).with("  git push foo-production master")
         lambda { invoke(@main, :start) }.should raise_error(SystemExit)
       end
 
@@ -699,14 +699,22 @@ We have been notified about it. We will be adding new resources shortly")
     it "should exit if user doesn't have access to clouds in Cloudfile" do
       @client.stub(:stop_cloud).and_raise(Shelly::Client::NotFoundException.new("resource" => "cloud"))
       $stdout.should_receive(:puts).with(red "You have no access to 'foo-production' cloud defined in Cloudfile")
-      lambda { invoke(@main, :stop) }.should raise_error(SystemExit)
+      lambda {
+        fake_stdin(["yes"]) do
+          invoke(@main, :stop)
+        end
+      }.should raise_error(SystemExit)
     end
 
     context "single cloud in Cloudfile" do
-      it "should start the cloud" do
+      it "should stop the cloud" do
         @client.stub(:stop_cloud)
+        $stdout.should_receive(:print).with("Are you sure you want to shut down your application (yes/no): ")
+        $stdout.should_receive(:puts).with("\n")
         $stdout.should_receive(:puts).with("Cloud 'foo-production' stopped")
-        invoke(@main, :stop)
+        fake_stdin(["yes"]) do
+          invoke(@main, :stop)
+        end
       end
     end
 
@@ -715,7 +723,7 @@ We have been notified about it. We will be adding new resources shortly")
         File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\nfoo-production:\n") }
       end
 
-      it "should show information to start specific cloud and exit" do
+      it "should show information to stop specific cloud and exit" do
         $stdout.should_receive(:puts).with(red "You have multiple clouds in Cloudfile.")
         $stdout.should_receive(:puts).with("Select cloud using `shelly stop --cloud foo-production`")
         $stdout.should_receive(:puts).with("Available clouds:")
@@ -724,11 +732,15 @@ We have been notified about it. We will be adding new resources shortly")
         lambda { invoke(@main, :stop) }.should raise_error(SystemExit)
       end
 
-      it "should fetch from command line which cloud to start" do
+      it "should fetch from command line which cloud to stop" do
         @client.should_receive(:stop_cloud).with("foo-staging")
+        $stdout.should_receive(:print).with("Are you sure you want to shut down your application (yes/no): ")
+        $stdout.should_receive(:puts).with("\n")
         $stdout.should_receive(:puts).with("Cloud 'foo-staging' stopped")
         @main.options = {:cloud => "foo-staging"}
-        invoke(@main, :stop)
+        fake_stdin(["yes"]) do
+          invoke(@main, :stop)
+        end
       end
     end
   end

metadata

@@ -1,167 +1,190 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: shelly
-version: !ruby/object:Gem::Version
-  version: 0.0.56
+version: !ruby/object:Gem::Version 
+  hash: 109
   prerelease: 
+  segments: 
+  - 0
+  - 0
+  - 57
+  version: 0.0.57
 platform: ruby
-authors:
+authors: 
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-03-23 00:00:00.000000000Z
-dependencies:
-- !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70229037288560 !ruby/object:Gem::Requirement
+
+date: 2012-03-27 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
+      - !ruby/object:Gem::Version 
+        hash: 47
+        segments: 
+        - 2
+        - 8
+        - 0
         version: 2.8.0
+  requirement: *id001
+  prerelease: false
   type: :development
+  name: rspec
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id002
   prerelease: false
-  version_requirements: *70229037288560
-- !ruby/object:Gem::Dependency
+  type: :development
   name: rake
-  requirement: &70229037288140 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
   prerelease: false
-  version_requirements: *70229037288140
-- !ruby/object:Gem::Dependency
+  type: :development
   name: guard
-  requirement: &70229037287500 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id004
   prerelease: false
-  version_requirements: *70229037287500
-- !ruby/object:Gem::Dependency
+  type: :development
   name: guard-rspec
-  requirement: &70229037286900 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id005
   prerelease: false
-  version_requirements: *70229037286900
-- !ruby/object:Gem::Dependency
-  name: simplecov
-  requirement: &70229037286280 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: *70229037286280
-- !ruby/object:Gem::Dependency
-  name: ruby_gntp
-  requirement: &70229037285560 !ruby/object:Gem::Requirement
+  name: simplecov
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id006
   prerelease: false
-  version_requirements: *70229037285560
-- !ruby/object:Gem::Dependency
-  name: rb-fsevent
-  requirement: &70229037284940 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: *70229037284940
-- !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70229037284480 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id007
   prerelease: false
-  version_requirements: *70229037284480
-- !ruby/object:Gem::Dependency
-  name: fakeweb
-  requirement: &70229037284020 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :development
-  prerelease: false
-  version_requirements: *70229037284020
-- !ruby/object:Gem::Dependency
-  name: wijet-thor
-  requirement: &70229037283500 !ruby/object:Gem::Requirement
+  name: fakeweb
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id008 !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
+  requirement: *id008
+  prerelease: false
   type: :runtime
+  name: wijet-thor
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id009
   prerelease: false
-  version_requirements: *70229037283500
-- !ruby/object:Gem::Dependency
+  type: :runtime
   name: rest-client
-  requirement: &70229037283080 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id010
   prerelease: false
-  version_requirements: *70229037283080
-- !ruby/object:Gem::Dependency
+  type: :runtime
   name: json
-  requirement: &70229037282620 !ruby/object:Gem::Requirement
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id011 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :runtime
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id011
   prerelease: false
-  version_requirements: *70229037282620
-- !ruby/object:Gem::Dependency
-  name: progressbar
-  requirement: &70229037282200 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
   type: :runtime
-  prerelease: false
-  version_requirements: *70229037282200
+  name: progressbar
 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
@@ -213,43 +236,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: []
+