shelly 0.0.37 → 0.0.38

data/lib/shelly.rb

@@ -1,6 +1,10 @@
 require "rubygems"
 require "core_ext/object"
 require "core_ext/hash"
+
+require "yaml"
+YAML::ENGINE.yamler = "syck"
+
 require "shelly/helpers"
 require "shelly/model"
 

data/lib/shelly/app.rb

@@ -1,14 +1,13 @@
 require 'erb'
 require 'launchy'
+require "shelly/backup"
 
 module Shelly
   class App < Model
     DATABASE_KINDS = %w(postgresql mongodb redis none)
 
     attr_accessor :code_name, :databases, :ruby_version, :environment,
-      :git_url, :domains
-
-    autoload :Backup, "shelly/backup"
+      :git_url, :domains, :web_server_ip, :mail_server_ip
 
     def initialize(code_name = nil)
       self.code_name = code_name
@@ -99,10 +98,6 @@ module Shelly
       File.basename(Dir.pwd)
     end
 
-    def ips
-      shelly.app_ips(code_name)
-    end
-
     def users
       shelly.app_users(code_name)
     end
@@ -135,6 +130,18 @@ module Shelly
       shelly.app_delete_config(code_name, path)
     end
 
+    def attributes
+      @attributes ||= shelly.app(code_name)
+    end
+
+    def web_server_ip
+      attributes["web_server_ip"]
+    end
+
+    def mail_server_ip
+      attributes["mail_server_ip"]
+    end
+
     def open_billing_page
       url = "#{shelly.shellyapp_url}/login?api_key=#{current_user.token}&return_to=/apps/#{code_name}/edit_billing"
       Launchy.open(url)

data/lib/shelly/cli/backup.rb

@@ -8,12 +8,13 @@ module Shelly
       namespace :backup
       include Helpers
 
+      before_hook :logged_in?, :only => [:list, :get, :create]
+      before_hook :cloudfile_present?, :only => [:list]
+
       desc "list", "List database backups"
       method_option :cloud, :type => :string, :aliases => "-c",
         :desc => "Specify which cloud to list backups for"
       def list
-        logged_in?
-        say_error "No Cloudfile found" unless Cloudfile.present?
         multiple_clouds(options[:cloud], "backup list", "Select cloud to view database backups for using:")
         backups = @app.database_backups
         if backups.present?
@@ -60,7 +61,6 @@ module Shelly
       method_option :cloud, :type => :string, :aliases => "-c",
         :desc => "Specify which cloud to create database snapshot for"
       def create(kind = nil)
-        logged_in?
         multiple_clouds(options[:cloud], "backup create", "Select cloud to create snapshot of database")
         @app.request_backup(kind)
         say "Backup requested. It can take up to several minutes for" +

data/lib/shelly/cli/command.rb

@@ -1,5 +1,6 @@
 require "shelly"
 require "thor"
+require "thor/thor"
 require "thor/group"
 require "thor/options"
 require "thor/arguments"
@@ -8,6 +9,7 @@ require "thor/basic"
 module Shelly
   module CLI
     class Command < Thor
+      include Helpers
       class_option :debug, :type => :boolean, :desc => "Show debug information"
     end
   end

data/lib/shelly/cli/config.rb

@@ -6,10 +6,11 @@ module Shelly
       include Thor::Actions
       include Helpers
 
+      before_hook :logged_in?, :only => [:list, :show, :create, :edit, :delete]
+      before_hook :cloudfile_present?, :only => [:list, :show, :create, :edit, :delete]
+
       desc "list", "List configuration files"
       def list
-        logged_in?
-        say_error "No Cloudfile found" unless Cloudfile.present?
         cloudfile = Cloudfile.new
         cloudfile.clouds.each do |cloud|
           @app = App.new(cloud)
@@ -46,8 +47,6 @@ module Shelly
         :desc => "Specify which cloud to show configuration file for"
       desc "show PATH", "View configuration file"
       def show(path = nil)
-        logged_in?
-        say_error "No Cloudfile found" unless Cloudfile.present?
         say_error "No configuration file specified" unless path
         multiple_clouds(options[:cloud], "show #{path}", "Specify cloud using:")
         config = @app.config(path)
@@ -61,11 +60,9 @@ module Shelly
 
       map "new" => :create
       method_option :cloud, :type => :string, :aliases => "-c",
-        :desc => "Specify for which cloud create configuration file"
+        :desc => "Specify which cloud to create configuration file for"
       desc "create PATH", "Create configuration file"
       def create(path = nil)
-        logged_in?
-        say_error "No Cloudfile found" unless Cloudfile.present?
         say_error "No path specified" unless path
         output = open_editor(path)
         multiple_clouds(options[:cloud], "create #{path}", "Specify cloud using:")
@@ -84,11 +81,9 @@ module Shelly
 
       map "update" => :edit
       method_option :cloud, :type => :string, :aliases => "-c",
-        :desc => "Specify for which cloud edit configuration file"
+        :desc => "Specify which cloud to edit configuration file for"
       desc "edit PATH", "Edit configuration file"
       def edit(path = nil)
-        logged_in?
-        say_error "No Cloudfile found" unless Cloudfile.present?
         say_error "No configuration file specified" unless path
         multiple_clouds(options[:cloud], "edit #{path}", "Specify cloud using:")
         config = @app.config(path)
@@ -107,15 +102,13 @@ module Shelly
       end
 
       method_option :cloud, :type => :string, :aliases => "-c",
-        :desc => "Specify for which cloud delete configuration file"
+        :desc => "Specify for which cloud to delete configuration file for"
       desc "delete PATH", "Delete configuration file"
       def delete(path = nil)
-        logged_in?
-        say_error "No Cloudfile found" unless Cloudfile.present?
         say_error "No configuration file specified" unless path
         multiple_clouds(options[:cloud], "delete #{path}", "Specify cloud using:")
-        answer = ask("Are you sure you want to delete 'path' [y/n]: ")
-        if answer =~ /yes|YES|y|Y/
+        answer = yes?("Are you sure you want to delete 'path' (yes/no): ")
+        if answer
           @app.delete_config(path)
           say "File deleted, redeploy your cloud to make changes", :green
         else

data/lib/shelly/cli/deploys.rb

@@ -7,12 +7,13 @@ module Shelly
       namespace :deploys
       include Helpers
 
+      before_hook :logged_in?, :only => [:list, :show]
+      before_hook :cloudfile_present?, :only => [:list, :show]
+
       desc "list", "Lists deploy logs"
       method_option :cloud, :type => :string, :aliases => "-c",
         :desc => "Specify which cloud to show deploy logs for"
       def list
-        logged_in?
-        say_error "No Cloudfile found" unless Cloudfile.present?
         multiple_clouds(options[:cloud], "deploys list", "Select cloud to view deploy logs using:")
         logs = @app.deploy_logs
         unless logs.empty?
@@ -35,7 +36,6 @@ module Shelly
       method_option :cloud, :type => :string, :aliases => "-c",
         :desc => "Specify which cloud to show deploy logs for"
       def show(log = nil)
-        say_error "No Cloudfile found" unless Cloudfile.present?
         specify_log(log)
         multiple_clouds(options[:cloud], "deploys show #{log}", "Select log and cloud to view deploy logs using:")
         content = @app.deploy_log(log)

data/lib/shelly/cli/main.rb

@@ -8,13 +8,17 @@ module Shelly
   module CLI
     class Main < Command
       include Thor::Actions
-      include Helpers
+
       register(User, "user", "user <command>", "Manages users using this cloud")
       register(Backup, "backup", "backup <command>", "Manages database backups from this cloud")
       register(Deploys, "deploys", "deploys <command>", "View cloud deploy logs")
       register(Config, "config", "config <command>", "Manages cloud configuration files")
       check_unknown_options!
 
+      before_hook :logged_in?, :only => [:add, :list, :start, :stop, :logs, :delete]
+      before_hook :inside_git_repository?, :only => [:add, :ip]
+      before_hook :cloudfile_present?, :only => [:logs, :stop, :start, :ip]
+
       map %w(-v --version) => :version
       desc "version", "Displays shelly version"
       def version
@@ -89,7 +93,6 @@ module Shelly
         :desc => "Array of your domains"
       desc "add", "Adds new cloud to Shelly Cloud"
       def add
-        say_error "Must be run inside your project git repository" unless App.inside_git_repository?
         check_options(options)
         @app = Shelly::App.new
         @app.code_name = options["code-name"] || ask_for_code_name
@@ -121,7 +124,6 @@ module Shelly
       desc "list", "Lists all your clouds"
       def list
         user = Shelly::User.new
-        user.token
         apps = user.apps
         unless apps.empty?
           say "You have following clouds available:", :green
@@ -141,16 +143,14 @@ module Shelly
 
       desc "ip", "Lists clouds IP's"
       def ip
-        say_error "Must be run inside your project git repository" unless App.inside_git_repository?
         say_error "No Cloudfile found" unless Cloudfile.present?
         @cloudfile = Cloudfile.new
         @cloudfile.clouds.each do |cloud|
           begin
             @app = App.new(cloud)
             say "Cloud #{cloud}:", :green
-            ips = @app.ips
-            print_wrapped "Web server IP: #{ips['web_server_ip']}", :ident => 2
-            print_wrapped "Mail server IP: #{ips['mail_server_ip']}", :ident => 2
+            print_wrapped "Web server IP: #{@app.web_server_ip}", :ident => 2
+            print_wrapped "Mail server IP: #{@app.mail_server_ip}", :ident => 2
           rescue Client::APIError => e
             if e.unauthorized?
               say_error "You have no access to '#{cloud}' cloud defined in Cloudfile", :with_exit => false
@@ -165,8 +165,6 @@ module Shelly
       method_option :cloud, :type => :string, :aliases => "-c",
         :desc => "Specify which cloud to start"
       def start
-        logged_in?
-        say_error "No Cloudfile found" unless Cloudfile.present?
         multiple_clouds(options[:cloud], "start", "Select cloud to start using:")
         @app.start
         say "Starting cloud #{@app.code_name}. Check status with:", :green
@@ -201,8 +199,6 @@ module Shelly
       method_option :cloud, :type => :string, :aliases => "-c",
         :desc => "Specify which cloud to stop"
       def stop
-        logged_in?
-        say_error "No Cloudfile found" unless Cloudfile.present?
         multiple_clouds(options[:cloud], "stop", "Select cloud to stop using:")
         @app.stop
         say "Cloud '#{@app.code_name}' stopped"
@@ -216,8 +212,6 @@ module Shelly
       method_option :cloud, :type => :string, :aliases => "-c",
         :desc => "Specify which cloud to delete"
       def delete
-        user = Shelly::User.new
-        user.token
         multiple_clouds(options[:cloud], "delete", "Select cloud to delete using:")
         say "You are about to delete application: #{@app.code_name}."
         say "Press Control-C at any moment to cancel."
@@ -244,8 +238,6 @@ module Shelly
         :desc => "Specify which cloud to show logs for"
       def logs
         cloud = options[:cloud]
-        logged_in?
-        say_error "No Cloudfile found" unless Cloudfile.present?
         multiple_clouds(cloud, "logs", "Select which to show logs for using:")
         begin
           logs = @app.application_logs

data/lib/shelly/cli/runner.rb

@@ -6,13 +6,13 @@ module Shelly
       include Helpers
       attr_accessor :args
 
-      def initialize(args)
+      def initialize(args = [])
         super()
         @args = args
       end
 
       def debug?
-        args.include?("--debug")
+        args.include?("--debug") || ENV['SHELLY_DEBUG'] == "true"
       end
 
       def start

data/lib/shelly/cli/user.rb

@@ -6,10 +6,12 @@ module Shelly
       namespace :user
       include Helpers
 
+      before_hook :logged_in?, :only => [:list, :add]
+      before_hook :inside_git_repository?, :only => [:list, :add]
+      before_hook :cloudfile_present?, :only => [:list, :add]
+
       desc "list", "List users with access to clouds defined in Cloudfile"
       def list
-        say_error "Must be run inside your project git repository" unless App.inside_git_repository?
-        say_error "No Cloudfile found" unless Cloudfile.present?
         @cloudfile = Cloudfile.new
         @cloudfile.clouds.each do |cloud|
           begin
@@ -28,8 +30,6 @@ module Shelly
 
       desc "add [EMAIL]", "Add new developer to clouds defined in Cloudfile"
       def add(email = nil)
-        say_error "Must be run inside your project git repository" unless App.inside_git_repository?
-        say_error "No Cloudfile found" unless Cloudfile.present?
         @cloudfile = Cloudfile.new
         @user = Shelly::User.new
         user_email = email || ask_for_email({:guess_email => false})
@@ -59,4 +59,4 @@ module Shelly
       end
     end
   end
-end
+end

data/lib/shelly/client.rb

@@ -115,6 +115,10 @@ module Shelly
     def apps
       get("/apps")
     end
+    
+    def app(code_name)
+      get("/apps/#{code_name}")
+    end
 
     def deploy_logs(cloud)
       get("/apps/#{cloud}/deploys")
@@ -148,10 +152,6 @@ module Shelly
       get("/apps/#{cloud}/users")
     end
 
-    def app_ips(cloud)
-      get("/apps/#{cloud}/ips")
-    end
-
     def post(path, params = {})
       request(path, :post, params)
     end

data/lib/shelly/helpers.rb

@@ -45,6 +45,14 @@ module Shelly
       exit 1 unless delete_application == "yes"
     end
 
+    def inside_git_repository?
+      say_error "Must be run inside your project git repository" unless App.inside_git_repository?
+    end
+
+    def cloudfile_present?
+      say_error "No Cloudfile found" unless Cloudfile.present?
+    end
+
     def logged_in?
       user = Shelly::User.new
       user.token
@@ -74,4 +82,3 @@ module Shelly
 
   end
 end
-

data/lib/shelly/version.rb

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

data/lib/thor/thor.rb

@@ -0,0 +1,28 @@
+class Thor
+  class << self
+    def before_hook(method, options = {})
+      @hook = {} unless @hook
+      @hook[method] = options
+    end
+
+    def send(*args)
+      if args.first == :dispatch
+        running_task = args[2].first
+        @hook.each do |method, options|
+          if options[:only].include?(running_task.to_sym)
+            new.send(method)
+          end
+        end
+      end
+      super
+    end
+
+    def start(given_args=ARGV, config={})
+      config[:shell] ||= Thor::Base.shell.new
+      send(:dispatch, nil, given_args.dup, nil, config)
+    rescue Thor::Error => e
+      ENV["THOR_DEBUG"] == "1" ? (raise e) : config[:shell].error(e.message)
+      exit(1) if exit_on_failure?
+    end
+  end
+end

data/spec/helpers.rb

@@ -4,6 +4,10 @@ module RSpec
       InputFaker.with_fake_input(strings) { yield }
     end
 
+    def invoke(object, *args)
+      object.class.send(:start, args.map { |arg| arg.to_s })
+    end
+
     def green(string)
       "\e[32m#{string}\e[0m"
     end

data/spec/shelly/app_spec.rb

@@ -24,13 +24,6 @@ describe Shelly::App do
     end
   end
 
-  describe "#ips" do
-    it "should get app's ips" do
-      @client.should_receive(:app_ips).with("foo-staging")
-      @app.ips
-    end
-  end
-
   describe "#add_git_remote" do
     before do
       @app.stub(:git_url).and_return("git@git.shellycloud.com:foo-staging.git")
@@ -64,6 +57,30 @@ describe Shelly::App do
       @app.shelly_generated_configs
     end
   end
+  
+  describe "#attributes" do
+    before do
+      @response = {"web_server_ip" => "192.0.2.1", "mail_server_ip" => "192.0.2.3"}
+      @client.stub(:app).and_return(@response)
+    end
+    
+    it "should fetch app attributes from API and cache them" do
+      @client.should_receive(:app).with("foo-staging").exactly(:once).and_return(@response)
+      2.times { @app.attributes }
+    end
+    
+    describe "#web_server_ip" do
+      it "should return web server ip address" do
+        @app.web_server_ip.should == "192.0.2.1"
+      end
+    end
+    
+    describe "#mail_server_ip" do
+      it "should return mail server ip address" do
+        @app.mail_server_ip.should == "192.0.2.3"
+      end
+    end
+  end
 
   describe "#generate_cloudfile" do
     it "should return generated cloudfile" do