shelly 0.0.45 → 0.0.46.pre

data/lib/shelly/app.rb

@@ -147,7 +147,12 @@ module Shelly
                file_name_or_code
              end
 
-      response = shelly.run(code_name, code)
+      response = shelly.command(code_name, code, :ruby)
+      response["result"]
+    end
+
+    def rake(task)
+      response = shelly.command(code_name, task, :rake)
       response["result"]
     end
 

data/lib/shelly/cli/main.rb

@@ -13,12 +13,12 @@ module Shelly
       register(Backup, "backup", "backup <command>", "Manage database backups")
       register(Deploys, "deploys", "deploys <command>", "View deploy logs")
       register(Config, "config", "config <command>", "Manage application configuration files")
-      check_unknown_options!
+      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, :list, :start, :stop, :logs, :delete, :ip, :logout, :execute]
+      before_hook :logged_in?, :only => [:add, :list, :start, :stop, :logs, :delete, :ip, :logout, :execute, :rake]
       before_hook :inside_git_repository?, :only => [:add]
-      before_hook :cloudfile_present?, :only => [:logs, :stop, :start, :ip]
+      before_hook :cloudfile_present?, :only => [:logs, :stop, :start, :ip, :execute, :rake]
 
       map %w(-v --version) => :version
       desc "version", "Display shelly version"
@@ -234,9 +234,8 @@ module Shelly
         say "You have been successfully logged out" if user.delete_credentials
       end
 
-      desc "execute [CODE]", "Run code on one of application servers"
-      method_option :cloud, :type => :string, :aliases => "-c",
-        :desc => "Specify which cloud to run code for"
+      desc "execute CODE", "Run code on one of application servers"
+      method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       long_desc "Run code given in parameter on one of application servers. If a file name is given, run contents of that file."
       def execute(file_name_or_code)
         cloud = options[:cloud]
@@ -253,6 +252,18 @@ module Shelly
         end
       end
 
+      desc "rake TASK", "Run rake task"
+      method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
+      def rake(task = nil)
+        task = rake_args.join(" ")
+        multiple_clouds(options[:cloud], "rake #{task}")
+        result = @app.rake(task)
+        say result
+      rescue Client::APIException => e
+        raise unless e[:message] == "App not running"
+        say_error "Cloud #{@app} is not running. Cannot run rake task."
+      end
+
       desc "redeploy", "Redeploy application"
       method_option :cloud, :type => :string, :aliases => "-c",
         :desc => "Specify which cloud to redeploy application for"
@@ -277,6 +288,23 @@ module Shelly
 
       # FIXME: move to helpers
       no_tasks do
+        # Returns valid arguments for rake, removes shelly gem arguments
+        def rake_args(args = ARGV)
+          skip_next = false
+          [].tap do |out|
+            args.each do |arg|
+              case arg
+              when "rake", "--debug"
+              when "--cloud", "-c"
+                skip_next = true
+              else
+                out << arg unless skip_next
+                skip_next = false
+              end
+            end
+          end
+        end
+
         def check_options(options)
           unless options.empty?
             unless ["code-name", "databases", "domains"].all? do |option|

data/lib/shelly/client.rb

@@ -115,8 +115,8 @@ module Shelly
       get("/apps/#{code_name}")
     end
 
-    def run(cloud, code)
-      post("/apps/#{cloud}/run", :body => code)
+    def command(cloud, body, type)
+      post("/apps/#{cloud}/command", {:body => body, :type => type})
     end
 
     def deploy_logs(cloud)

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.45"
+  VERSION = "0.0.46.pre"
 end

data/spec/shelly/app_spec.rb

@@ -293,21 +293,28 @@ config
       @response = {
         "result" => "4"
       }
-      @client.stub(:run).and_return(@response)
+      @client.stub(:command).and_return(@response)
       File.open("to_run.rb", 'w') {|f| f.write("User.count\n") }
     end
 
     it "should return result of executed code" do
-      @client.should_receive(:run).with("foo-staging", "2 + 2")
+      @client.should_receive(:command).with("foo-staging", "2 + 2", :ruby)
       @app.run("2 + 2").should == "4"
     end
 
     it "should send contents of file when file exists" do
-      @client.should_receive(:run).with("foo-staging", "User.count\n")
+      @client.should_receive(:command).with("foo-staging", "User.count\n", :ruby)
       @app.run("to_run.rb")
     end
   end
 
+  describe "#rake" do
+    it "should return result of rake task" do
+      @client.should_receive(:command).with("foo-staging", "db:create", :rake).and_return({"result" => "OK"})
+      @app.rake("db:create").should == "OK"
+    end
+  end
+
   describe "#to_s" do
     it "should return code_name" do
       @app.to_s.should == "foo-staging"

data/spec/shelly/cli/main_spec.rb

@@ -29,13 +29,14 @@ Tasks:
   shelly config <command>   # Manage application configuration files
   shelly delete             # Delete the cloud
   shelly deploys <command>  # View deploy logs
-  shelly execute [CODE]     # Run code on one of application servers
+  shelly execute CODE       # Run code on one of application servers
   shelly help [TASK]        # Describe available tasks or one specific task
   shelly ip                 # List cloud's IP addresses
   shelly list               # List available clouds
   shelly login [EMAIL]      # Log into Shelly Cloud
   shelly logout             # Logout from Shelly Cloud
   shelly logs               # Show latest application logs
+  shelly rake TASK          # Run rake task
   shelly redeploy           # Redeploy application
   shelly register [EMAIL]   # Register new account
   shelly start              # Start the cloud
@@ -936,9 +937,13 @@ OUT
       hooks(@main, :execute).should include(:logged_in?)
     end
 
+    it "should ensure cloudfile present" do
+      hooks(@main, :execute).should include(:cloudfile_present?)
+    end
+
     context "single cloud in Cloudfile" do
       it "should execute code for the cloud" do
-        @client.should_receive(:run).with("foo-production", "User.count").
+        @client.should_receive(:command).with("foo-production", "User.count", :ruby).
           and_return({"result" => "3"})
         $stdout.should_receive(:puts).with("3")
         invoke(@main, :execute, "to_execute.rb")
@@ -963,7 +968,7 @@ OUT
       end
 
       it "should fetch from command line which cloud to start" do
-        @client.should_receive(:run).with("foo-staging", "User.count").
+        @client.should_receive(:command).with("foo-staging", "User.count", :ruby).
           and_return({"result" => "3"})
         $stdout.should_receive(:puts).with("3")
         @main.options = {:cloud => "foo-staging"}
@@ -971,7 +976,7 @@ OUT
       end
 
       it "should run code when no file from parameter is found" do
-        @client.should_receive(:run).with("foo-staging", "2 + 2").
+        @client.should_receive(:command).with("foo-staging", "2 + 2", :ruby).
           and_return({"result" => "4"})
         $stdout.should_receive(:puts).with("4")
         @main.options = {:cloud => "foo-staging"}
@@ -979,9 +984,9 @@ OUT
       end
     end
 
-    context "cloud is not running" do
+    context "cloud is not in running state" do
       it "should print error" do
-        @client.should_receive(:run).with("foo-staging", "2 + 2").
+        @client.should_receive(:command).with("foo-staging", "2 + 2", :ruby).
           and_raise(Shelly::Client::APIException.new(
             {"message" => "App not running"}, 504))
         $stdout.should_receive(:puts).
@@ -992,6 +997,93 @@ OUT
     end
   end
 
+  describe "#rake" do
+    before do
+      FileUtils.mkdir_p("/projects/foo")
+      Dir.chdir("/projects/foo")
+      File.open("Cloudfile", 'w') {|f| f.write("foo-production:\n") }
+      @user = Shelly::User.new
+      @user.stub(:token)
+      Shelly::User.stub(:new).and_return(@user)
+      @app = Shelly::App.new
+      Shelly::App.stub(:new).and_return(@app)
+      @main.stub(:rake_args).and_return(%w(db:migrate))
+    end
+
+    it "should ensure user has logged in" do
+      hooks(@main, :rake).should include(:logged_in?)
+    end
+
+    it "should ensure cloudfile present" do
+      hooks(@main, :execute).should include(:cloudfile_present?)
+    end
+
+    it "should invoke :command on app with rake task" do
+      @client.should_receive(:command).with("foo-production", "db:migrate", :rake).and_return("result" => "OK")
+      $stdout.should_receive(:puts).with("OK")
+      invoke(@main, :rake, "db:migrate")
+    end
+
+    it "should pass rake arguments to the client" do
+      @main.stub(:rake_args).and_return(%w(-T db:schema))
+      @client.should_receive(:command).with("foo-production", "-T db:schema", :rake).and_return("result" => "OK")
+      $stdout.should_receive(:puts).with("OK")
+      invoke(@main, :rake, nil)
+    end
+
+    describe "#rake_args" do
+      before { @main.unstub!(:rake_args) }
+
+      it "should return Array of rake arguments (skipping shelly gem arguments)" do
+        argv = %w(rake -T db --cloud foo-production --debug)
+        @main.rake_args(argv).should == %w(-T db)
+      end
+
+      it "should take ARGV as default default argument" do
+        # Rather poor, I test if method without args returns the same as method with ARGV
+        @main.rake_args.should == @main.rake_args(ARGV)
+      end
+    end
+
+    context "cloud is not in running state" do
+      it "should print error" do
+        @client.should_receive(:command).with("foo-staging", "db:migrate", :rake).
+          and_raise(Shelly::Client::APIException.new(
+            {"message" => "App not running"}, 504))
+        $stdout.should_receive(:puts).
+          with(red "Cloud foo-staging is not running. Cannot run rake task.")
+        @main.options = {:cloud => "foo-staging"}
+        lambda { invoke(@main, :rake, "db:migrate") }.should raise_error(SystemExit)
+      end
+    end
+
+    context "multiple clouds in Cloudfile" do
+      before do
+        File.open("Cloudfile", 'w') {|f|
+          f.write("foo-staging:\nfoo-production:\n") }
+      end
+
+      it "should show information to run rake task for 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 rake db:migrate --cloud foo-production`")
+        $stdout.should_receive(:puts).with("Available clouds:")
+        $stdout.should_receive(:puts).with(" * foo-production")
+        $stdout.should_receive(:puts).with(" * foo-staging")
+        lambda { invoke(@main, :rake, "db:migrate") }.should raise_error(SystemExit)
+      end
+
+      it "should fetch from command line for which cloud run rake task" do
+        @client.should_receive(:command).with("foo-staging", "db:migrate", :rake).
+          and_return({"result" => "3"})
+        $stdout.should_receive(:puts).with("3")
+        @main.options = {:cloud => "foo-staging"}
+        invoke(@main, :rake, "db:migrate")
+      end
+    end
+  end
+
   describe "#redeploy" do
     before do
       @user = Shelly::User.new

data/spec/shelly/client_spec.rb

@@ -188,11 +188,11 @@ describe Shelly::Client do
     end
   end
 
-  describe "#run" do
-    it "should send post request with app code_name and code" do
-      FakeWeb.register_uri(:post, api_url("apps/staging-foo/run"),
-                           :body => {:result => "4"}.to_json)
-      response = @client.run("staging-foo", "2 + 2")
+  describe "#command" do
+    it "should send post request with app code_name, body and type" do
+      @client.should_receive(:post).with("/apps/staging-foo/command",
+        {:body => "2 + 2", :type => :ruby}).and_return({"result" => "4"})
+      response = @client.command("staging-foo", "2 + 2", :ruby)
       response.should == {"result" => "4"}
     end
   end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.0.45
-  prerelease: 
+  version: 0.0.46.pre
+  prerelease: 7
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-10 00:00:00.000000000 Z
+date: 2012-01-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70242679918440 !ruby/object:Gem::Requirement
+  requirement: &70183697675760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242679918440
+  version_requirements: *70183697675760
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70242679920240 !ruby/object:Gem::Requirement
+  requirement: &70183697629560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242679920240
+  version_requirements: *70183697629560
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70242679876100 !ruby/object:Gem::Requirement
+  requirement: &70183697575360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242679876100
+  version_requirements: *70183697575360
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70242679792880 !ruby/object:Gem::Requirement
+  requirement: &70183697532320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242679792880
+  version_requirements: *70183697532320
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70242679772100 !ruby/object:Gem::Requirement
+  requirement: &70183697478100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242679772100
+  version_requirements: *70183697478100
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70242679713860 !ruby/object:Gem::Requirement
+  requirement: &70183697447560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242679713860
+  version_requirements: *70183697447560
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70242679679780 !ruby/object:Gem::Requirement
+  requirement: &70183697400160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242679679780
+  version_requirements: *70183697400160
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70242679649600 !ruby/object:Gem::Requirement
+  requirement: &70183697369060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242679649600
+  version_requirements: *70183697369060
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70242679605320 !ruby/object:Gem::Requirement
+  requirement: &70183697325100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70242679605320
+  version_requirements: *70183697325100
 - !ruby/object:Gem::Dependency
   name: wijet-thor
-  requirement: &70242679548560 !ruby/object:Gem::Requirement
+  requirement: &70183697275820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.14.7
   type: :runtime
   prerelease: false
-  version_requirements: *70242679548560
+  version_requirements: *70183697275820
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70242679511680 !ruby/object:Gem::Requirement
+  requirement: &70183697225460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70242679511680
+  version_requirements: *70183697225460
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70242679459460 !ruby/object:Gem::Requirement
+  requirement: &70183697184400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70242679459460
+  version_requirements: *70183697184400
 - !ruby/object:Gem::Dependency
   name: wijet-launchy
-  requirement: &70242679417320 !ruby/object:Gem::Requirement
+  requirement: &70183697140580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70242679417320
+  version_requirements: *70183697140580
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &70242679388380 !ruby/object:Gem::Requirement
+  requirement: &70183697119220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70242679388380
+  version_requirements: *70183697119220
 description: Tool for managing applications and clouds at shellycloud.com
 email:
 - support@shellycloud.com
@@ -237,9 +237,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: shelly
 rubygems_version: 1.8.10