shelly 0.1.24.pre → 0.1.24.pre2

data/CHANGELOG.md

@@ -1,3 +1,4 @@
+* [feature] `shelly check` checks gems based on Cloudfile
 * [feature] Option --help [-h] added to all tasks
 
 ## 0.1.23 / 2012-08-08

data/Guardfile

@@ -0,0 +1,6 @@
+guard 'rspec', :cli => '--color --format doc' do
+  watch(%r{^spec/.+_spec\.rb$})
+  watch('lib/shelly/helpers.rb') { "spec" }
+  watch(%r{^lib/shelly/(.+)\.rb$})     { |m| "spec/shelly/#{m[1]}_spec.rb" }
+  watch('spec/spec_helper.rb')  { "spec" }
+end

data/README.md

@@ -13,3 +13,7 @@
 ## Running tests
 
     bundle exec rake
+
+or
+
+    guard

data/lib/shelly.rb

@@ -14,6 +14,7 @@ require "shelly/model"
 module Shelly
   autoload :App, "shelly/app"
   autoload :Cloudfile, "shelly/cloudfile"
+  autoload :Cloud, "shelly/cloud"
   autoload :Client, "shelly/client"
   autoload :StructureValidator, "shelly/structure_validator"
   autoload :User, "shelly/user"

data/lib/shelly/app.rb

@@ -117,7 +117,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/)

data/lib/shelly/cli/backup.rb

@@ -32,7 +32,7 @@ module Shelly
 
           say "Available backups:", :green
           say_new_line
-          print_table(to_display, :indent => 2)
+          print_table(to_display, :ident => 2)
         else
           say "No database backups available"
         end
@@ -70,7 +70,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 || cloudfile.clouds.find { |c| c.code_name == app.to_s }.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/command.rb

@@ -4,6 +4,7 @@ require "thor/thor"
 require "thor/group"
 require "thor/options"
 require "thor/arguments"
+require "thor/basic"
 
 module Shelly
   module CLI

data/lib/shelly/cli/config.rb

@@ -79,7 +79,8 @@ module Shelly
       end
 
       desc "delete PATH", "Delete configuration file"
-      def delete(path)
+      def delete(path = nil)
+        say_error "No configuration file specified" unless path
         app = multiple_clouds(options[:cloud], "delete #{path}")
         answer = yes?("Are you sure you want to delete 'path' (yes/no): ")
         if answer

data/lib/shelly/cli/main.rb

@@ -19,6 +19,7 @@ module Shelly
 
       check_unknown_options!(:except => :rake)
 
+      # 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, :dbconsole]
       before_hook :inside_git_repository?, :only => [:add, :setup, :check]
 
@@ -133,7 +134,7 @@ module Shelly
             end
             [app["code_name"], "|  #{state.humanize}#{msg}"]
           end
-          print_table(apps_table, :indent => 2)
+          print_table(apps_table, :ident => 2)
         else
           say "You have no clouds yet", :green
         end
@@ -148,21 +149,21 @@ module Shelly
           " (deployment log: `shelly deploys show last -c #{app}`)"
         end
         say "Cloud #{app}:", msg.present? ? :red : :green
-        print_wrapped "State: #{app.state}#{msg}", :indent => 2
+        print_wrapped "State: #{app.state}#{msg}", :ident => 2
         say_new_line
-        print_wrapped "Deployed commit sha: #{app.git_info["deployed_commit_sha"]}", :indent => 2
-        print_wrapped "Deployed commit message: #{app.git_info["deployed_commit_message"]}", :indent => 2
-        print_wrapped "Deployed by: #{app.git_info["deployed_push_author"]}", :indent => 2
+        print_wrapped "Deployed commit sha: #{app.git_info["deployed_commit_sha"]}", :ident => 2
+        print_wrapped "Deployed commit message: #{app.git_info["deployed_commit_message"]}", :ident => 2
+        print_wrapped "Deployed by: #{app.git_info["deployed_push_author"]}", :ident => 2
         say_new_line
-        print_wrapped "Repository URL: #{app.git_info["repository_url"]}", :indent => 2
-        print_wrapped "Web server IP: #{app.web_server_ip}", :indent => 2
+        print_wrapped "Repository URL: #{app.git_info["repository_url"]}", :ident => 2
+        print_wrapped "Web server IP: #{app.web_server_ip}", :ident => 2
         say_new_line
         if app.statistics.present?
-          print_wrapped "Statistics:", :indent => 2
+          print_wrapped "Statistics:", :ident => 2
           app.statistics.each do |stat|
-            print_wrapped "#{stat['name']}:", :indent => 4
-            print_wrapped "Load average: 1m: #{stat['load']['avg01']}, 5m: #{stat['load']['avg05']}, 15m: #{stat['load']['avg15']}", :indent => 6
-            print_wrapped "CPU: #{stat['cpu']['wait']}%, MEM: #{stat['memory']['percent']}%, SWAP: #{stat['swap']['percent']}%", :indent => 6
+            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::GatewayTimeoutException
@@ -384,6 +385,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 +400,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/cloud.rb

@@ -0,0 +1,49 @@
+require "yaml"
+
+module Shelly
+  class Cloud < Model
+    attr_accessor :code_name, :content
+
+    def initialize(attributes = {})
+      @code_name = attributes["code_name"]
+      @content   = attributes["content"]
+    end
+
+    # Public: Return databases for given Cloud in Cloudfile
+    # Returns Array of databases
+    def 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
+      databases - ['redis']
+    end
+
+    def to_s
+      code_name
+    end
+
+    private
+
+    # Internal: Checks if specified option is present
+    def option?(option)
+      content["servers"].any? {|_, settings| settings.has_key?(option)}
+    end
+  end
+end

data/lib/shelly/cloudfile.rb

@@ -16,7 +16,10 @@ 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::Cloud.new("code_name" => code_name,
+                          "content" => content[code_name.to_s])
+      end if content
     end
 
     # Public: Generate example Cloudfile based on object attributes
@@ -35,22 +38,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

@@ -61,7 +61,11 @@ module Shelly
     end
 
     def inside_git_repository?
-      say_error "Must be run inside your project git repository" unless App.inside_git_repository?
+      unless App.inside_git_repository?
+        say_error %q{Current directory is not a git repository.
+You need to initialize repository with `git init`.
+More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository}
+      end
     end
 
     def cloudfile_present?
@@ -112,7 +116,7 @@ module Shelly
       end
 
       app = Shelly::App.new
-      app.code_name = cloud || clouds.first
+      app.code_name = cloud || clouds.first.code_name
       app
     end
 

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.1.24.pre"
+  VERSION = "0.1.24.pre2"
 end

data/lib/thor/basic.rb

@@ -0,0 +1,9 @@
+class Thor
+  module Shell
+
+    def print_wrapped(*args)
+      shell.print_wrapped(*args)
+    end
+
+  end
+end

data/lib/thor/options.rb

@@ -1,10 +1,11 @@
 class Thor
   class Options < Arguments
+
     def check_unknown!
-      unknown = @extra.select { |str| str =~ /^--?(?:(?!--).)*$/ }
       raise UnknownArgumentError, "shelly: unrecognized option '#{@unknown.join(', ')}'\n" +
         "Usage: shelly [COMMAND]... [OPTIONS]\n" +
-        "Try 'shelly --help' for more information" unless unknown.empty?
+        "Try 'shelly --help' for more information" unless @unknown.empty?
     end
+
   end
 end

data/lib/thor/thor.rb

@@ -2,7 +2,7 @@ class Thor
   class << self
     def before_hook(method, options = {})
       @hook = {} unless @hook
-      @hook[method] = {:only => Array(options[:only])}
+      @hook[method] = options
     end
 
     def hooks
@@ -28,46 +28,12 @@ class Thor
     rescue Thor::Error => e
       ENV["THOR_DEBUG"] == "1" ? (raise e) : config[:shell].error(e.message)
       exit(1) if exit_on_failure?
-    rescue Errno::EPIPE
-      # This happens if a thor task is piped to something like `head`,
-      # which closes the pipe when it's done reading. This will also
-      # mean that if the pipe is closed, further unnecessary
-      # computation will not occur.
-      exit(0)
     end
 
-    # We overwrite this method so namespace is shown
+    # We overwrite this method so namespace is show
     # shelly *backup* restore FILENAME
-    def handle_argument_error(task, error, arity = nil)
-      banner = self.banner(task, nil, self.to_s != 'Shelly::CLI::Main')
-      raise InvocationError, "#{task.name.inspect} was called incorrectly. Call as `#{banner}`"
-    end
-
-    protected
-    # this has to overwritten so that in tests args are passed correctly
-    # only change is the commented line
-    # its for some edge cases when boolean options are passed in some
-    # strange order
-    def dispatch(meth, given_args, given_opts, config) #:nodoc:
-      meth ||= retrieve_task_name(given_args)
-      task = all_tasks[normalize_task_name(meth)]
-
-      if task
-        args, opts = Thor::Options.split(given_args)
-      else
-        args, opts = given_args, nil
-        task = Thor::DynamicTask.new(meth)
-      end
-
-      opts = given_opts || opts || []
-      config.merge!(:current_task => task, :task_options => task.options)
-
-      instance = new(args, opts, config)
-      yield instance if block_given?
-      # args = instance.args
-      trailing = args[Range.new(arguments.size, -1)]
-
-      instance.invoke_task(task, trailing || [])
+    def handle_argument_error(task, error)
+      raise InvocationError, "#{task.name.inspect} was called incorrectly. Call as #{self.banner(task, nil, self.to_s != 'Shelly::CLI::Main').inspect}."
     end
   end
 end

data/shelly.gemspec

@@ -14,6 +14,8 @@ Gem::Specification.new do |s|
   s.rubyforge_project = "shelly"
   s.add_development_dependency "rspec", "~> 2.11.0"
   s.add_development_dependency "rake"
+  s.add_development_dependency "guard"
+  s.add_development_dependency "guard-rspec"
   s.add_development_dependency "simplecov"
   if RUBY_PLATFORM =~ /darwin/
     s.add_development_dependency "ruby_gntp"
@@ -21,7 +23,7 @@ Gem::Specification.new do |s|
   end
   s.add_development_dependency "fakefs"
   s.add_development_dependency "fakeweb"
-  s.add_runtime_dependency "thor", "~> 0.15.4"
+  s.add_runtime_dependency "wijet-thor", "~> 0.14.7"
   s.add_runtime_dependency "rest-client"
   s.add_runtime_dependency "json"
   s.add_runtime_dependency "progressbar"

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'])
+      @cloud = mock(:backup_databases => ['postgresql', 'mongodb'], :code_name => "foo-staging")
+      Shelly::Cloud.stub(:new).and_return(@cloud)
+      @cloudfile = mock(:present? => true, :clouds => [@cloud])
       Shelly::Cloudfile.stub(:new).and_return(@cloudfile)
     end
 

data/spec/shelly/cli/files_spec.rb

@@ -29,6 +29,7 @@ describe Shelly::CLI::Files do
 
     it "should exit if rsync isn't installed" do
       FakeFS::File.stub(:executable?).and_return(false)
+
       $stdout.should_receive(:puts).with(red "You need to install rsync in order to upload and download files")
       lambda { invoke(@cli_files, :upload, "some/path") }.should raise_error(SystemExit)
     end

data/spec/shelly/cli/main_spec.rb

@@ -299,7 +299,9 @@ describe Shelly::CLI::Main do
     # This spec tests inside_git_repository? hook
     it "should exit with message if command run outside git repository" do
       Shelly::App.stub(:inside_git_repository?).and_return(false)
-      $stdout.should_receive(:puts).with("\e[31mMust be run inside your project git repository\e[0m")
+      $stdout.should_receive(:puts).with("\e[31mCurrent directory is not a git repository.
+You need to initialize repository with `git init`.
+More info at http://git-scm.com/book/en/Git-Basics-Getting-a-Git-Repository\e[0m")
       lambda {
         fake_stdin(["", ""]) do
           invoke(@main, :add)
@@ -1273,7 +1275,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
@@ -1342,6 +1344,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/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")
@@ -16,6 +15,8 @@ describe Shelly::CLI::User do
     Dir.chdir("/projects/foo")
     @app = Shelly::App.new("foo-staging")
     File.open("Cloudfile", 'w') {|f| f.write("foo-staging:\n") }
+    @cloud = Shelly::Cloud.new("code_name" => 'foo-staging')
+    Shelly::Cloud.stub(:new).and_return(@cloud)
   end
 
   describe "#help" do
@@ -47,7 +48,7 @@ describe Shelly::CLI::User do
     context "on success" do
       it "should display clouds and users" do
         @client.stub(:collaborations).and_return(response)
-        $stdout.should_receive(:puts).with("Cloud foo-staging:")
+        $stdout.should_receive(:puts).with("Cloud #{@cloud}:")
         $stdout.should_receive(:puts).with("  user@example.com")
         $stdout.should_receive(:puts).with("  auser2@example2.com (invited)")
         invoke(@cli_user, :list)

data/spec/shelly/cloud_spec.rb

@@ -0,0 +1,57 @@
+require "spec_helper"
+require "shelly/cloudfile"
+require "shelly/cloud"
+
+describe Shelly::Cloud do
+  before do
+    FileUtils.mkdir_p("/projects/foo")
+    Dir.chdir("/projects/foo")
+    @client = mock
+    Shelly::Client.stub(:new).and_return(@client)
+    @cloud = Shelly::Cloud.new("code_name" => "foo-staging", "content" => {})
+  end
+
+  describe "#databases" do
+    before do
+      content = {"servers" => {"app1" => {"databases" => ["postgresql", "redis"]},
+                               "app2" => {"databases" => ["mongodb"]}}}
+      @cloud.stub(:content).and_return(content)
+    end
+
+    it "should return databases in cloudfile" do
+      @cloud.databases.should =~ ['redis', 'mongodb', 'postgresql']
+    end
+
+    it "should return databases except for redis" do
+      @cloud.backup_databases.should =~ ['postgresql', 'mongodb']
+    end
+  end
+
+  describe "#delayed_job?" do
+    it "should return true if present" do
+      content = {"servers" => {"app1" => {"delayed_job" => 1}}}
+      @cloud.stub(:content).and_return(content)
+      @cloud.delayed_job?.should be_true
+    end
+
+    it "should retrun false if not present" do
+      content = {"servers" => {"app1" => {"size" => "small"}}}
+      @cloud.stub(:content).and_return(content)
+      @cloud.delayed_job?.should be_false
+    end
+  end
+
+  describe "#whenever?" do
+    it "should return true if present" do
+      content = {"servers" => {"app1" => {"whenever" => true}}}
+      @cloud.stub(:content).and_return(content)
+      @cloud.whenever?.should be_true
+    end
+
+    it "should return false if not present" do
+      content = {"servers" => {"app1" => {"size" => "small"}}}
+      @cloud.stub(:content).and_return(content)
+      @cloud.whenever?.should be_false
+    end
+  end
+end

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::Cloud.should_receive(:new).with({"code_name"=>"foo-staging",
+         "content"=>{"ruby_version"=>"1.9.3",
+           "servers"=>{"app1"=>{"size"=>"small"}}}})
+      cloud2 = Shelly::Cloud.should_receive(:new).with({"code_name"=>"foo-production",
+         "content"=>{"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.pre
+  version: 0.1.24.pre2
   prerelease: 7
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-14 00:00:00.000000000 Z
+date: 2012-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -43,6 +43,38 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: guard
+  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: guard-rspec
+  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: simplecov
   requirement: !ruby/object:Gem::Requirement
@@ -124,13 +156,13 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: thor
+  name: wijet-thor
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.4
+        version: 0.14.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -138,7 +170,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.15.4
+        version: 0.14.7
 - !ruby/object:Gem::Dependency
   name: rest-client
   requirement: !ruby/object:Gem::Requirement
@@ -247,6 +279,7 @@ files:
 - .travis.yml
 - CHANGELOG.md
 - Gemfile
+- Guardfile
 - README.md
 - Rakefile
 - bin/shelly
@@ -265,6 +298,7 @@ files:
 - lib/shelly/cli/runner.rb
 - lib/shelly/cli/user.rb
 - lib/shelly/client.rb
+- lib/shelly/cloud.rb
 - lib/shelly/cloudfile.rb
 - lib/shelly/download_progress_bar.rb
 - lib/shelly/helpers.rb
@@ -274,6 +308,7 @@ files:
 - lib/shelly/user.rb
 - lib/shelly/version.rb
 - lib/thor/arguments.rb
+- lib/thor/basic.rb
 - lib/thor/options.rb
 - lib/thor/thor.rb
 - scrolls/shellycloud.rb
@@ -290,6 +325,7 @@ files:
 - spec/shelly/cli/runner_spec.rb
 - spec/shelly/cli/user_spec.rb
 - spec/shelly/client_spec.rb
+- spec/shelly/cloud_spec.rb
 - spec/shelly/cloudfile_spec.rb
 - spec/shelly/download_progress_bar_spec.rb
 - spec/shelly/model_spec.rb
@@ -334,6 +370,7 @@ test_files:
 - spec/shelly/cli/runner_spec.rb
 - spec/shelly/cli/user_spec.rb
 - spec/shelly/client_spec.rb
+- spec/shelly/cloud_spec.rb
 - spec/shelly/cloudfile_spec.rb
 - spec/shelly/download_progress_bar_spec.rb
 - spec/shelly/model_spec.rb