shelly 0.1.6 → 0.1.7

data/lib/shelly.rb

@@ -14,6 +14,7 @@ module Shelly
   autoload :App, "shelly/app"
   autoload :Cloudfile, "shelly/cloudfile"
   autoload :Client, "shelly/client"
+  autoload :StructureValidator, "shelly/structure_validator"
   autoload :User, "shelly/user"
   autoload :VERSION, "shelly/version"
 end

data/lib/shelly/app.rb

@@ -4,7 +4,8 @@ require 'shelly/backup'
 
 module Shelly
   class App < Model
-    DATABASE_KINDS = %w(postgresql mongodb redis none)
+    DATABASE_KINDS = %w(postgresql mongodb redis)
+    DATABASE_CHOICES = DATABASE_KINDS + %w(none)
     SERVER_SIZES = %w(small large)
 
     attr_accessor :code_name, :databases, :ruby_version, :environment,
@@ -39,18 +40,6 @@ module Shelly
       system("git remote rm #{code_name} > /dev/null 2>&1")
     end
 
-    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)
-    end
-
-    def cloudfile_template_path
-      File.join(File.dirname(__FILE__), "templates", "Cloudfile.erb")
-    end
-
     def create
       attributes = {:code_name => code_name}
       response = shelly.create_app(attributes)
@@ -60,13 +49,19 @@ module Shelly
       self.environment = response["environment"]
     end
 
-    def delete
-      shelly.delete_app(code_name)
+    def create_cloudfile
+      cloudfile = Cloudfile.new
+      cloudfile.code_name = code_name
+      cloudfile.ruby_version = ruby_version
+      cloudfile.environment = environment
+      cloudfile.domains = domains
+      cloudfile.size = size
+      cloudfile.databases = databases
+      cloudfile.create
     end
 
-    def create_cloudfile
-      content = generate_cloudfile
-      File.open(cloudfile_path, "a+") { |f| f << content }
+    def delete
+      shelly.delete_app(code_name)
     end
 
     def deploy_logs
@@ -116,14 +111,11 @@ module Shelly
       shelly.redeploy(code_name)
     end
 
-    def cloudfile_path
-      File.join(Dir.pwd, "Cloudfile")
-    end
-
     def self.guess_code_name
       guessed = nil
-      if Cloudfile.present?
-        clouds = Cloudfile.new.clouds
+      cloudfile = Cloudfile.new
+      if cloudfile.present?
+        clouds = cloudfile.clouds
         if clouds.grep(/staging/).present?
           guessed = "production"
           production_clouds = clouds.grep(/production/)
@@ -185,6 +177,10 @@ module Shelly
       @attributes ||= shelly.app(code_name)
     end
 
+    def statistics
+      @stats ||= shelly.statistics(code_name)
+    end
+
     def web_server_ip
       attributes["web_server_ip"]
     end

data/lib/shelly/cli/main.rb

@@ -17,7 +17,7 @@ module Shelly
 
       # 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, :upload]
-      before_hook :inside_git_repository?, :only => [:add, :setup]
+      before_hook :inside_git_repository?, :only => [:add, :setup, :check]
 
       map %w(-v --version) => :version
       desc "version", "Display shelly version"
@@ -71,7 +71,7 @@ module Shelly
       method_option "code-name", :type => :string, :aliases => "-c",
         :desc => "Unique code-name of your cloud"
       method_option :databases, :type => :array, :aliases => "-d",
-        :banner => Shelly::App::DATABASE_KINDS.join(', '),
+        :banner => Shelly::App::DATABASE_CHOICES.join(', '),
         :desc => "List of databases of your choice"
       method_option :size, :type => :string, :aliases => "-s",
         :desc => "Server size [large, small]"
@@ -150,9 +150,20 @@ module Shelly
         print_wrapped "Repository URL: #{app.git_info["repository_url"]}", :ident => 2
         print_wrapped "Web server IP: #{app.web_server_ip}", :ident => 2
         print_wrapped "Mail server IP: #{app.mail_server_ip}", :ident => 2
+        say_new_line
+        if app.statistics.present?
+          print_wrapped "Statistics:", :ident => 2
+          app.statistics.each do |stat|
+            print_wrapped "#{stat['name']}:", :ident => 4
+            print_wrapped "Load average: 1m: #{stat['load']['avg01']}, 5m: #{stat['load']['avg05']}, 15m: #{stat['load']['avg15']}", :ident => 6
+            print_wrapped "CPU: #{stat['cpu']['wait']}%, MEM: #{stat['memory']['percent']}%, SWAP: #{stat['swap']['percent']}%", :ident => 6
+          end
+        end
       rescue Client::NotFoundException => e
         raise unless e.resource == :cloud
         say_error "You have no access to '#{app}' cloud defined in Cloudfile"
+      rescue Client::GatewayTimeoutException
+        say_error "Server statistics temporarily unavailable"
       end
 
       desc "start", "Start the cloud"
@@ -371,6 +382,22 @@ We have been notified about it. We will be adding new resources shortly}
         say_error "Cloud #{app} is not running. Cannot upload files."
       end
 
+      require 'bundler'
+      desc "check", "List all requirements and check which are fulfilled"
+      def check
+        s = Shelly::StructureValidator.new
+        say "Checking dependencies:", :green
+        print_check s.gemfile_exists?, "Gemfile exists"
+        print_check s.gems.include?("thin"), "gem 'thin' present in Gemfile"
+        print_check s.config_ru_exists?, "config.ru exists"
+        print_check !(s.gems.include?("mysql2") or s.gems.include?("mysql")),
+          "application doesn't use mysql database"
+      rescue Bundler::BundlerError => e
+        say_new_line
+        say_error e.message, :with_exit => false
+        say_error "Try to run `bundle install`"
+      end
+
       # FIXME: move to helpers
       no_tasks do
         # Returns valid arguments for rake, removes shelly gem arguments
@@ -406,7 +433,7 @@ We have been notified about it. We will be adding new resources shortly}
 
         def valid_databases?(databases)
           return true unless databases.present?
-          kinds = Shelly::App::DATABASE_KINDS
+          kinds = Shelly::App::DATABASE_CHOICES
           databases.all? { |kind| kinds.include?(kind) }
         end
 
@@ -441,7 +468,7 @@ We have been notified about it. We will be adding new resources shortly}
         end
 
         def ask_for_databases
-          kinds = Shelly::App::DATABASE_KINDS
+          kinds = Shelly::App::DATABASE_CHOICES
           databases = ask("Which database do you want to use #{kinds.join(", ")} (postgresql - default):")
           begin
             databases = databases.split(/[\s,]/).reject(&:blank?)

data/lib/shelly/client.rb

@@ -21,6 +21,7 @@ module Shelly
     class UnauthorizedException < APIException; end
     class ConflictException < APIException; end
     class GemVersionException < APIException; end
+    class GatewayTimeoutException < APIException; end
     class ValidationException < APIException
       def errors
         self[:errors]
@@ -121,6 +122,10 @@ module Shelly
       get("/apps/#{code_name}")
     end
 
+    def statistics(code_name)
+      get("/apps/#{code_name}/statistics")
+    end
+
     def command(cloud, body, type)
       post("/apps/#{cloud}/command", {:body => body, :type => type})
     end
@@ -235,6 +240,7 @@ module Shelly
         when 409; ConflictException
         when 412; GemVersionException
         when 422; ValidationException
+        when 504; GatewayTimeoutException
         else; APIException
         end
         raise exception_class.new(body, code, response.headers[:x_request_id])

data/lib/shelly/cloudfile.rb

@@ -3,38 +3,56 @@ require "yaml"
 module Shelly
   class Cloudfile < Model
     attr_accessor :content
+    # Cloudfile attributes used for generating Cloudfile from a template
+    attr_accessor :code_name, :ruby_version, :environment, :domains,
+      :databases, :size
 
-    def self.present?
-      File.exists?(File.join(Dir.pwd, "Cloudfile"))
+    # Public: Return true if Cloudfile is present in current directory
+    def present?
+      File.exists?(path)
     end
 
-    def initialize
-      open if File.exists?(path)
+    # Public: Clouds in Cloudfile
+    # Returns Array of clouds names from Cloudfile
+    # nil if there is no cloudfile
+    def clouds
+      content.keys.sort if content
     end
 
-    def path
-      File.join(Dir.pwd, "Cloudfile")
+    # Public: Generate example Cloudfile based on object attributes
+    # Returns the generated Cloudfile as String
+    def generate
+      @email = current_user.email
+      @thin = @size == "small" ? 2 : 4
+      template = File.read(template_path)
+      cloudfile = ERB.new(template, 0, "%<>-")
+      cloudfile.result(binding)
     end
 
-    def open
-      @content = YAML.load(File.open(path))
+    # Public: Create Cloudfile in current path (or append if exists)
+    # File is created based on assigned attributes
+    def create
+      File.open(path, "a+") { |f| f << generate }
     end
 
-    def write(hash)
-      @content = hash
-      File.open(path, "w") do |f|
-        f.write(yaml(hash))
-      end
+    private
+
+    # Internal: Load and parse Cloudfile
+    def content
+      return unless present?
+      @content ||= YAML.load(File.open(path))
     end
 
-    def clouds
-      @content.keys.sort if @content
+    # Internal: Path to Cloudfile in current directory
+    # Returns path as String
+    def path
+      File.join(Dir.pwd, "Cloudfile")
     end
 
-    def yaml(hash)
-      string = hash.deep_stringify_keys.to_yaml
-      # FIXME: check if it possible to remove sub("---", "") by passing options to_yaml
-      string.sub("---","").split("\n").map(&:rstrip).join("\n").strip
+    # Internal: Return path to Cloudfile template
+    # Returns path as String
+    def template_path
+      File.join(File.dirname(__FILE__), "templates", "Cloudfile.erb")
     end
   end
 end

data/lib/shelly/helpers.rb

@@ -64,7 +64,7 @@ module Shelly
     end
 
     def cloudfile_present?
-      say_error "No Cloudfile found" unless Cloudfile.present?
+      say_error "No Cloudfile found" unless Cloudfile.new.present?
     end
 
     def ask_to_restore_database
@@ -103,7 +103,7 @@ module Shelly
         end
         exit 1
       end
-      unless Cloudfile.present? || cloud
+      unless Cloudfile.new.present? || cloud
         say_error "You have to specify cloud.", :with_exit => false
         say "Select cloud using `shelly #{action} --cloud CLOUD_NAME`"
         Shelly::CLI::Main.new.list
@@ -120,5 +120,17 @@ module Shelly
         say "%8.8s | %s\n" % entry
       end
     end
+
+    def green(string)
+      "\e[32m#{string}\e[0m"
+    end
+
+    def red(string)
+      "\e[31m#{string}\e[0m"
+    end
+
+    def print_check(checked, string, options = {})
+      print_wrapped (checked ? green("+") : red("-")) + " #{string}", :ident => 2
+    end
   end
 end

data/lib/shelly/structure_validator.rb

@@ -0,0 +1,27 @@
+require 'grit'
+
+module Shelly
+  class StructureValidator
+    attr_reader :gemfile_path, :gemfile_lock_path
+
+    def initialize(options = {})
+      @gemfile_path = options[:gemfile] || "Gemfile"
+      @gemfile_lock_path = options[:gemfile_lock] || "Gemfile.lock"
+    end
+
+    def gemfile_exists?
+      File.exists?(@gemfile_path)
+    end
+
+    def config_ru_exists?
+      repo = Grit::Repo.new(".")
+      repo.status.map(&:path).include?("config.ru")
+    end
+
+    def gems
+      return [] unless gemfile_exists?
+      @d = Bundler::Definition.build(@gemfile_path, @gemfile_lock_path, nil)
+      @gems = @d.specs.map(&:name)
+    end
+  end
+end

data/lib/shelly/templates/Cloudfile.erb

@@ -1,6 +1,6 @@
 <%= @code_name %>:
-  ruby_version: 1.9.3 # 1.9.3, 1.9.2 or ree-1.8.7
-  environment: production # RAILS_ENV
+  ruby_version: <%= @ruby_version %> # 1.9.3, 1.9.2 or ree-1.8.7
+  environment: <%= @environment %> # RAILS_ENV
   monitoring_email: <%= @email %>
   domains:
     <%- @domains.each do |domain| -%>
@@ -8,14 +8,16 @@
     <%- end -%>
   servers:
     app1:
-      size: <%= size %>
-      thin: <%= thin %>
+      size: <%= @size %>
+      thin: <%= @thin %>
       # whenever: on
       # delayed_job: 1
-    <%- @databases.each do |kind| -%>
-    <%= kind %>:
-      size: <%= size %>
       databases:
+        <%- if @databases.present? -%>
+        <%- @databases.each do |kind| -%>
         - <%= kind %>
-    <%- end -%>
-
+        <%- end -%>
+        <%- end -%>
+        <%- (Shelly::App::DATABASE_KINDS - @databases).each do |kind| -%>
+        # - <%= kind %>
+        <%- end -%>

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.1.6"
+  VERSION = "0.1.7"
 end

data/shelly.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "rest-client"
   s.add_runtime_dependency "json"
   s.add_runtime_dependency "progressbar"
+  s.add_runtime_dependency "grit"
   s.add_runtime_dependency "launchy"
   s.add_runtime_dependency "shelly-dependencies", "~> 0.1.1"
 

data/spec/shelly/app_spec.rb

@@ -179,95 +179,19 @@ describe Shelly::App do
     end
   end
 
-  describe "#generate_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:
-  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: large
-      thin: 4
-      # whenever: on
-      # delayed_job: 1
-    postgresql:
-      size: large
-      databases:
-        - postgresql
-    mongodb:
-      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: small
-      databases:
-        - postgresql
-    mongodb:
-      size: small
-      databases:
-        - mongodb
-config
-      @app.generate_cloudfile.strip.should == expected.strip
-    end
-  end
-
-  describe "#create_cloudfile" do
+  describe "#statistics" do
     before do
-      @app.stub(:generate_cloudfile).and_return("foo-staging:")
-    end
-
-    it "should create file if Cloudfile doesn't exist" do
-      File.exists?("/projects/foo/Cloudfile").should be_false
-      @app.create_cloudfile
-      File.exists?("/projects/foo/Cloudfile").should be_true
-    end
-
-    it "should append content if Cloudfile exists" do
-      File.open("/projects/foo/Cloudfile", "w") { |f| f << "foo-production:\n" }
-      @app.create_cloudfile
-      File.read("/projects/foo/Cloudfile").strip.should == "foo-production:\nfoo-staging:"
+      @response = [{"name"=>"app1",
+                    "memory" => {"kilobyte"=>"276756", "percent" => "74.1"},
+                    "swap" => {"kilobyte" => "44332", "percent" => "2.8"},
+                    "cpu" => {"wait" => "0.8", "system" => "0.0", "user" => "0.1"},
+                    "load" => {"avg15" => "0.13", "avg05" => "0.15", "avg01" => "0.04"}}]
+      @client.stub(:statistics).and_return(@response)
     end
-  end
 
-  describe "#cloudfile_path" do
-    it "should return path to Cloudfile" do
-      @app.cloudfile_path.should == "/projects/foo/Cloudfile"
+    it "should fetch app statistics from API and cache them" do
+      @client.should_receive(:statistics).with("foo-staging").exactly(:once).and_return(@response)
+      2.times { @app.statistics }
     end
   end
 
@@ -412,4 +336,24 @@ config
       @app.upload("/path")
     end
   end
+
+  describe "#create_cloudfile" do
+    it "should create cloudfile with app attributes" do
+      @app.ruby_version = "1.9.3"
+      @app.environment = "production"
+      @app.domains = ["example.com", "another.example.com"]
+      @app.size = "large"
+      @app.databases = []
+      cloudfile = mock
+      cloudfile.should_receive(:code_name=).with("foo-staging")
+      cloudfile.should_receive(:ruby_version=).with("1.9.3")
+      cloudfile.should_receive(:environment=).with("production")
+      cloudfile.should_receive(:domains=).with(["example.com", "another.example.com"])
+      cloudfile.should_receive(:size=).with("large")
+      cloudfile.should_receive(:databases=).with([])
+      cloudfile.should_receive(:create)
+      Shelly::Cloudfile.should_receive(:new).and_return(cloudfile)
+      @app.create_cloudfile
+    end
+  end
 end