shelly 0.1.24 → 0.1.25

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 0.1.25 / 2012-09-11
+
+* [feature] `shelly check` checks gems based on Cloudfile
+* [bug] Show 10 recent backups in `backup list` command, instead of the oldest
+
 ## 0.1.24 / 2012-09-10
 
 * [feature] Support for the extended deploys API

data/lib/shelly/app.rb

@@ -9,10 +9,12 @@ module Shelly
     SERVER_SIZES = %w(small large)
 
     attr_accessor :code_name, :databases, :ruby_version, :environment,
-      :git_url, :domains, :web_server_ip, :size, :thin, :redeem_code
+      :git_url, :domains, :web_server_ip, :size, :thin, :redeem_code,
+      :content
 
-    def initialize(code_name = nil)
+    def initialize(code_name = nil, content = nil)
       self.code_name = code_name
+      self.content = content
     end
 
     def databases=(dbs)
@@ -117,7 +119,7 @@ module Shelly
       guessed = nil
       cloudfile = Cloudfile.new
       if cloudfile.present?
-        clouds = cloudfile.clouds
+        clouds = cloudfile.clouds.map(&:code_name)
         if clouds.grep(/staging/).present?
           guessed = "production"
           production_clouds = clouds.grep(/production/)
@@ -236,8 +238,39 @@ module Shelly
       rsync(source, destination)
     end
 
+    # Public: Return databases for given Cloud in Cloudfile
+    # Returns Array of databases
+    def cloud_databases
+      content["servers"].map do |server, settings|
+        settings["databases"]
+      end.flatten.uniq
+    end
+
+    # Public: Delayed job enabled?
+    # Returns true if delayed job is present
+    def delayed_job?
+      option?("delayed_job")
+    end
+
+    # Public: Whenever enabled?
+    # Returns true if whenever is present
+    def whenever?
+      option?("whenever")
+    end
+
+    # Public: Return databases to backup for given Cloud in Cloudfile
+    # Returns Array of databases, except redis db
+    def backup_databases
+      cloud_databases - ['redis']
+    end
+
     private
 
+    # Internal: Checks if specified option is present in Cloudfile
+    def option?(option)
+      content["servers"].any? {|_, settings| settings.has_key?(option)}
+    end
+
     def ssh
       @ssh ||= shelly.console(code_name)
     end

data/lib/shelly/cli/backup.rb

@@ -1,6 +1,7 @@
 require "shelly/cli/command"
 require "shelly/backup"
 require "shelly/download_progress_bar"
+require 'launchy'
 
 module Shelly
   module CLI
@@ -19,14 +20,14 @@ module Shelly
         app = multiple_clouds(options[:cloud], "backup list")
         backups = app.database_backups
         if backups.present?
-          limit = -1
+          limit = 0
           unless options[:all] || backups.count < (Shelly::Backup::LIMIT + 1)
             limit = Shelly::Backup::LIMIT - 1
             say "Limiting the number of backups to #{Shelly::Backup::LIMIT}."
             say "Use --all or -a option to list all backups."
           end
           to_display = [["Filename", "|  Size", "|  State"]]
-          backups[0..limit].each do |backup|
+          backups[-limit..-1].each do |backup|
             to_display << [backup.filename, "|  #{backup.human_size}", "|  #{backup.state.humanize}"]
           end
 
@@ -70,7 +71,7 @@ module Shelly
           say_error "Cloudfile must be present in current working directory or specify database kind with:", :with_exit => false
           say_error "`shelly backup create DB_KIND`"
         end
-        app.request_backup(kind || cloudfile.backup_databases(app))
+        app.request_backup(kind || app.backup_databases)
         say "Backup requested. It can take up to several minutes for " +
           "the backup process to finish.", :green
       rescue Client::ValidationException => e

data/lib/shelly/cli/main.rb

@@ -384,6 +384,10 @@ We have been notified about it. We will be adding new resources shortly}
           "Gemfile.lock is missing in git repository",
           :show_fulfilled => verbose)
 
+        print_check(structure.config_ru?, "File config.ru is present",
+          "File config.ru is missing",
+          :show_fulfilled => verbose)
+
         print_check(structure.gem?("shelly-dependencies"),
           "Gem 'shelly-dependencies' is present",
           "Gem 'shelly-dependencies' is missing, we recommend to install it\n    See more at https://shellycloud.com/documentation/requirements#shelly-dependencies",
@@ -395,9 +399,35 @@ We have been notified about it. We will be adding new resources shortly}
         print_check(structure.gem?("rake"), "Gem 'rake' is present",
           "Gem 'rake' is missing in the Gemfile", :show_fulfilled => verbose)
 
-        print_check(structure.config_ru?, "File config.ru is present",
-          "File config.ru is missing",
-          :show_fulfilled => verbose)
+
+        print_check(structure.gem?("rake"), "Gem 'rake' is present",
+          "Gem 'rake' is missing in the Gemfile", :show_fulfilled => verbose)
+
+        cloudfile = Cloudfile.new
+        if cloudfile.present?
+          cloudfile.clouds.each do |cloud|
+            if cloud.databases.include?('postgresql')
+              print_check(structure.gem?("pg") || structure.gem?("postgres"),
+                "Postgresql driver is present for '#{cloud}' cloud",
+                "Postgresql driver is missing in the Gemfile for '#{cloud}' cloud,\n    we recommend adding 'pg' gem to Gemfile",
+                :show_fulfilled => verbose)
+            end
+
+            if cloud.delayed_job?
+              print_check(structure.gem?("delayed_job"),
+                "Gem 'delayed_job' is present for '#{cloud}' cloud",
+                "Gem 'delayed_job' is missing in the Gemfile for '#{cloud}' cloud",
+                :show_fulfilled => verbose)
+            end
+
+            if cloud.whenever?
+              print_check(structure.gem?("whenever"),
+                "Gem 'whenever' is present for '#{cloud}' cloud",
+                "Gem 'whenever' is missing in the Gemfile for '#{cloud}' cloud",
+                :show_fulfilled => verbose)
+            end
+          end
+        end
 
         print_check(!structure.gem?("mysql") && !structure.gem?("mysql2"),"",
           "mysql driver present in the Gemfile (not supported on Shelly Cloud)",

data/lib/shelly/cli/runner.rb

@@ -23,7 +23,7 @@ module Shelly
         say_error "You are not logged in. To log in use: `shelly login`"
       rescue Client::NotFoundException => e
         raise if debug? or e.resource != :cloud
-        say_error "You have no access to '#{e.id}' cloud defined in Cloudfile"
+        say_error "You have no access to '#{e.id}' cloud"
       rescue Client::GemVersionException => e
         raise if debug?
         say "Required shelly gem version: #{e.body["required_version"]}"

data/lib/shelly/cloudfile.rb

@@ -16,7 +16,9 @@ module Shelly
     # Returns Array of clouds names from Cloudfile
     # nil if there is no cloudfile
     def clouds
-      content.keys.sort if content
+      content.keys.sort.map do |code_name|
+        Shelly::App.new(code_name, content[code_name.to_s])
+      end if content
     end
 
     # Public: Generate example Cloudfile based on object attributes
@@ -35,22 +37,6 @@ module Shelly
       File.open(path, "a+") { |f| f << generate }
     end
 
-    # Public: Return databases for given Cloud in Cloudfile
-    # Returns Array of databases
-    def databases(cloud)
-      content[cloud.to_s]["servers"].map do |server, settings|
-        settings["databases"]
-      end.flatten.uniq
-    end
-
-    # Public: Return databases to backup for given Cloud in Cloudfile
-    # Returns Array of databases, except redis db
-    def backup_databases(cloud)
-      databases(cloud) - ['redis']
-    end
-
-    private
-
     # Internal: Load and parse Cloudfile
     def content
       return unless present?

data/lib/shelly/helpers.rb

@@ -115,9 +115,7 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository}
         exit 1
       end
 
-      app = Shelly::App.new
-      app.code_name = cloud || clouds.first
-      app
+      cloud ? Shelly::App.new(cloud) : clouds.first
     end
 
     def print_logs(logs)

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.1.24"
+  VERSION = "0.1.25"
 end

data/spec/shelly/app_spec.rb

@@ -7,8 +7,7 @@ describe Shelly::App do
     Dir.chdir("/projects/foo")
     @client = mock(:api_url => "https://api.example.com", :shellyapp_url => "http://shellyapp.example.com")
     Shelly::Client.stub(:new).and_return(@client)
-    @app = Shelly::App.new
-    @app.code_name = "foo-staging"
+    @app = Shelly::App.new('foo-staging')
   end
 
   describe ".guess_code_name" do
@@ -394,4 +393,48 @@ describe Shelly::App do
       @app.create_cloudfile
     end
   end
+
+  describe "#databases" do
+    before do
+      content = {"servers" => {"app1" => {"databases" => ["postgresql", "redis"]},
+                               "app2" => {"databases" => ["mongodb"]}}}
+      @app.stub(:content).and_return(content)
+    end
+
+    it "should return databases in cloudfile" do
+      @app.cloud_databases.should =~ ['redis', 'mongodb', 'postgresql']
+    end
+
+    it "should return databases except for redis" do
+      @app.backup_databases.should =~ ['postgresql', 'mongodb']
+    end
+  end
+
+  describe "#delayed_job?" do
+    it "should return true if present" do
+      content = {"servers" => {"app1" => {"delayed_job" => 1}}}
+      @app.stub(:content).and_return(content)
+      @app.delayed_job?.should be_true
+    end
+
+    it "should retrun false if not present" do
+      content = {"servers" => {"app1" => {"size" => "small"}}}
+      @app.stub(:content).and_return(content)
+      @app.delayed_job?.should be_false
+    end
+  end
+
+  describe "#whenever?" do
+    it "should return true if present" do
+      content = {"servers" => {"app1" => {"whenever" => true}}}
+      @app.stub(:content).and_return(content)
+      @app.whenever?.should be_true
+    end
+
+    it "should return false if not present" do
+      content = {"servers" => {"app1" => {"size" => "small"}}}
+      @app.stub(:content).and_return(content)
+      @app.whenever?.should be_false
+    end
+  end
 end

data/spec/shelly/cli/backup_spec.rb

@@ -135,7 +135,9 @@ describe Shelly::CLI::Backup do
       FileUtils.mkdir_p("/projects/foo")
       Dir.chdir("/projects/foo")
       $stdout.stub(:puts)
-      @cloudfile = mock(:backup_databases => ['postgresql', 'mongodb'], :clouds => ['foo-staging'])
+      @app = mock(:backup_databases => ['postgresql', 'mongodb'], :code_name => "foo-staging")
+      Shelly::App.stub(:new).and_return(@app)
+      @cloudfile = mock(:present? => true, :clouds => [@app])
       Shelly::Cloudfile.stub(:new).and_return(@cloudfile)
     end
 
@@ -145,7 +147,7 @@ describe Shelly::CLI::Backup do
 
     # multiple_clouds is tested in main_spec.rb in describe "#start" block
     it "should ensure multiple_clouds check" do
-      @client.stub(:request_backup)
+      @app.stub(:request_backup)
       @backup.should_receive(:multiple_clouds).and_return(@app)
       invoke(@backup, :create)
     end
@@ -153,7 +155,7 @@ describe Shelly::CLI::Backup do
     it "should display errors and exit 1 when kind is not valid" do
       response = {"errors" => [["kind", "is invalid"]]}
       exception = Shelly::Client::ValidationException.new(response)
-      @client.should_receive(:request_backup).and_raise(exception)
+      @app.should_receive(:request_backup).and_raise(exception)
       $stdout.should_receive(:puts).with(red "Kind is invalid")
       lambda { invoke(@backup, :create) }.should raise_error(SystemExit)
     end
@@ -169,7 +171,7 @@ describe Shelly::CLI::Backup do
     end
 
     it "should display information about request backup" do
-      @client.stub(:request_backup)
+      @app.stub(:request_backup)
       $stdout.should_receive(:puts).with(green "Backup requested. It can take up to several minutes for " +
           "the backup process to finish.")
       invoke(@backup, :create)

data/spec/shelly/cli/files_spec.rb

@@ -10,7 +10,7 @@ describe Shelly::CLI::Files do
     @client.stub(:token).and_return("abc")
     FileUtils.mkdir_p("/projects/foo")
     Dir.chdir("/projects/foo")
-    @app = Shelly::App.new("foo-staging")
+    @app = Shelly::App.new("foo-production")
     Shelly::App.stub(:new).and_return(@app)
     File.open("Cloudfile", 'w') { |f| f.write("foo-production:\n") }
   end

data/spec/shelly/cli/main_spec.rb

@@ -615,7 +615,9 @@ More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m
     # this tests multiple_clouds method used in majority of tasks
     context "multiple clouds in Cloudfile" do
       before do
-        File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\nfoo-production:\n") }
+        Shelly::App.unstub(:new)
+        File.open("Cloudfile", 'w') {|f|
+          f.write("foo-staging:\nfoo-production:\n") }
       end
 
       it "should show information to start specific cloud and exit" do
@@ -709,7 +711,7 @@ We have been notified about it. We will be adding new resources shortly")
       File.open("Cloudfile", 'w') {|f| f.write("foo-production:\n") }
       Shelly::User.stub(:new).and_return(@user)
       @client.stub(:apps).and_return([{"code_name" => "foo-production"}, {"code_name" => "foo-staging"}])
-      @app = Shelly::App.new
+      @app = Shelly::App.new("foo-production")
       Shelly::App.stub(:new).and_return(@app)
     end
 
@@ -942,7 +944,7 @@ We have been notified about it. We will be adding new resources shortly")
     before  do
       Shelly::App.stub(:inside_git_repository?).and_return(true)
       @user = Shelly::User.new
-      @app = Shelly::App.new
+      @app = Shelly::App.new('foo-staging')
       @client.stub(:token).and_return("abc")
       @app.stub(:delete)
       Shelly::User.stub(:new).and_return(@user)
@@ -1275,7 +1277,7 @@ We have been notified about it. We will be adding new resources shortly")
     before do
       Shelly::App.stub(:inside_git_repository?).and_return(true)
       Bundler::Definition.stub_chain(:build, :specs, :map) \
-        .and_return(["thin"])
+        .and_return(["thin", "pg", "delayed_job", "whenever"])
       Shelly::StructureValidator.any_instance.stub(:repo_paths) \
         .and_return(["config.ru", "Gemfile", "Gemfile.lock"])
     end
@@ -1344,6 +1346,62 @@ We have been notified about it. We will be adding new resources shortly")
       end
     end
 
+    context "cloudfile" do
+      before do
+        cloud = mock(:code_name => "foo-staging", :databases => ["postgresql"],
+          :whenever? => true, :delayed_job? => true, :to_s => "foo-staging")
+        cloudfile = mock(:clouds => [cloud])
+
+        Shelly::Cloudfile.stub(:new).and_return(cloudfile)
+      end
+
+      context "whenever is enabled" do
+        it "should show that necessary gem doesn't exist" do
+          Bundler::Definition.stub_chain(:build, :specs, :map).and_return([])
+          $stdout.should_receive(:puts).with("  #{red("✗")} Gem 'whenever' is missing in the Gemfile for 'foo-staging' cloud")
+          invoke(@main, :check)
+        end
+
+        it "should show that necessary gem exists" do
+          $stdout.should_receive(:puts).with("  #{green("✓")} Gem 'whenever' is present for 'foo-staging' cloud")
+          invoke(@main, :check)
+        end
+      end
+
+      context "delayed_job is enabled" do
+        it "should show that necessary gem doesn't exist" do
+          Bundler::Definition.stub_chain(:build, :specs, :map).and_return([])
+          $stdout.should_receive(:puts).with("  #{red("✗")} Gem 'delayed_job' is missing in the Gemfile for 'foo-staging' cloud")
+          invoke(@main, :check)
+        end
+
+        it "should show that necessary gem exists" do
+          $stdout.should_receive(:puts).with("  #{green("✓")} Gem 'delayed_job' is present for 'foo-staging' cloud")
+          invoke(@main, :check)
+        end
+      end
+
+      context "postgresql is enabled" do
+        it "should show that necessary gem doesn't exist" do
+          Bundler::Definition.stub_chain(:build, :specs, :map).and_return([])
+          $stdout.should_receive(:puts).with("  #{red("✗")} Postgresql driver is missing in the Gemfile for 'foo-staging' cloud,\n    we recommend adding 'pg' gem to Gemfile")
+          invoke(@main, :check)
+        end
+
+        it "should show that necessary gem exists - postgres" do
+          Bundler::Definition.stub_chain(:build, :specs, :map).and_return(["postgres"])
+          $stdout.should_receive(:puts).with("  #{green("✓")} Postgresql driver is present for 'foo-staging' cloud")
+          invoke(@main, :check)
+        end
+
+        it "should show that necessary gem exists - pg" do
+          Bundler::Definition.stub_chain(:build, :specs, :map).and_return(["pg"])
+          $stdout.should_receive(:puts).with("  #{green("✓")} Postgresql driver is present for 'foo-staging' cloud")
+          invoke(@main, :check)
+        end
+      end
+    end
+
     context "when mysql gem exists" do
       it "should show that mysql gem is not supported by Shelly Cloud" do
         Bundler::Definition.stub_chain(:build, :specs, :map).and_return(["mysql"])

data/spec/shelly/cli/runner_spec.rb

@@ -84,7 +84,7 @@ describe Shelly::CLI::Runner do
       it "should rescue not found exception for cloud" do
         exception = Shelly::Client::NotFoundException.new({"resource" => "cloud", "id" => "foooo"}, 404)
         @client.stub(:apps).and_raise(exception)
-        $stdout.should_receive(:puts).with("You have no access to 'foooo' cloud defined in Cloudfile")
+        $stdout.should_receive(:puts).with("You have no access to 'foooo' cloud")
         lambda {
           @runner.start
         }.should raise_error(SystemExit)

data/spec/shelly/cli/user_spec.rb

@@ -8,7 +8,6 @@ describe Shelly::CLI::User do
     Shelly::CLI::User.stub(:new).and_return(@cli_user)
     @client = mock
     Shelly::Client.stub(:new).and_return(@client)
-    Shelly::User.stub(:guess_email).and_return("")
     $stdout.stub(:puts)
     $stdout.stub(:print)
     @client.stub(:token).and_return("abc")

data/spec/shelly/cloudfile_spec.rb

@@ -5,7 +5,6 @@ describe Shelly::Cloudfile do
   before do
     FileUtils.mkdir_p("/projects/foo")
     Dir.chdir("/projects/foo")
-    @hash = {:code_name => {:code => "test"}}
     @client = mock
     Shelly::Client.stub(:new).and_return(@client)
     @cloudfile = Shelly::Cloudfile.new
@@ -22,6 +21,68 @@ describe Shelly::Cloudfile do
     yaml.should == {"domains" => ["*.example.com", "example.com"]}
   end
 
+  describe "#content" do
+    it "should fetch and parse file content" do
+      content = <<-config
+foo-staging:
+  ruby_version: 1.9.3
+  environment: production
+  monitoring_email: bob@example.com
+  domains:
+    - foo-staging.winniecloud.com
+  servers:
+    app1:
+      size: small
+      thin: 2
+      whenever: on
+      delayed_job: 1
+      databases:
+        - postgresql
+config
+      File.open("/projects/foo/Cloudfile", "w") { |f| f << content }
+      @cloudfile.content.should == {"foo-staging" => {
+        "ruby_version" => "1.9.3",
+        "environment" => "production",
+        "monitoring_email" => "bob@example.com",
+        "domains" => ["foo-staging.winniecloud.com"],
+        "servers" => { "app1" =>
+            {"size" => "small",
+             "thin" => 2,
+             "whenever" => true,
+             "delayed_job" => 1,
+             "databases" => ["postgresql"]}
+             }
+           }
+         }
+    end
+  end
+
+  describe "#clouds" do
+    it "should create Cloud objects" do
+      content = <<-config
+foo-staging:
+  ruby_version: 1.9.3
+  servers:
+    app1:
+      size: small
+foo-production:
+  environment: production
+  servers:
+    app1:
+      thin: 2
+config
+      File.open("/projects/foo/Cloudfile", "w") { |f| f << content }
+      cloud1 = Shelly::App.should_receive(:new).with("foo-staging",
+         {"ruby_version"=>"1.9.3",
+           "servers"=>{"app1"=>{"size"=>"small"}}})
+      cloud2 = Shelly::App.should_receive(:new).with("foo-production",
+         {"environment"=>"production",
+           "servers"=>{"app1"=>{"thin"=>2}}})
+
+      @cloudfile.clouds
+    end
+  end
+
   describe "#generate" do
     before do
       @cloudfile.code_name = "foo-staging"
@@ -88,31 +149,6 @@ config
     end
   end
 
-  describe "#databases" do
-    before do
-      content = <<-config
-foo-staging:
-  servers:
-    app1:
-      databases:
-        - postgresql
-        - redis
-    app2:
-      databases:
-        - mongodb
-config
-      File.open("Cloudfile", 'w') {|f| f.write(content) }
-    end
-
-    it "should return databases in cloudfile" do
-      @cloudfile.databases("foo-staging").should =~ ['redis', 'mongodb', 'postgresql']
-    end
-
-    it "should return databases except for redis" do
-      @cloudfile.backup_databases("foo-staging").should =~ ['postgresql', 'mongodb']
-    end
-  end
-
   describe "#create" do
     before do
       @cloudfile.stub(:generate).and_return("foo-staging:")

data/spec/spec_helper.rb

@@ -9,6 +9,7 @@ require "helpers"
 require "input_faker"
 require "fakefs/spec_helpers"
 require "fakeweb"
+require "launchy"
 
 ENV['THOR_COLUMNS'] = "180"
 FakeWeb.allow_net_connect = false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.1.24
+  version: 0.1.25
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-10 00:00:00.000000000 Z
+date: 2012-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -59,6 +59,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: ruby_gntp
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rb-fsevent
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
   requirement: !ruby/object:Gem::Requirement
@@ -289,4 +321,23 @@ rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Shelly Cloud command line tool
-test_files: []
+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/files_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/structure_validator_spec.rb
+- spec/shelly/user_spec.rb
+- spec/spec_helper.rb
+- spec/thor/options_spec.rb