shelly 0.0.44.pre → 0.0.44.pre2

data/lib/shelly/app.rb

@@ -138,6 +138,19 @@ module Shelly
       shelly.app_delete_config(code_name, path)
     end
 
+    # returns result of execution of given code, or false when app was not
+    # running
+    def run(file_name_or_code)
+      code = if File.exists?(file_name_or_code)
+               File.read(file_name_or_code)
+             else
+               file_name_or_code
+             end
+
+      response = shelly.run(code_name, code)
+      response["result"]
+    end
+
     def attributes
       @attributes ||= shelly.app(code_name)
     end

data/lib/shelly/cli/config.rb

@@ -40,6 +40,7 @@ module Shelly
         end
       end
 
+      # FIXME: Check if path argument is present via Thor (mandatory arguments)
       method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       desc "show PATH", "View configuration file"
       def show(path = nil)
@@ -67,7 +68,9 @@ module Shelly
         output = open_editor(path)
         multiple_clouds(options[:cloud], "create #{path}")
         @app.create_config(path, output)
-        say "File '#{path}' created, it will be used after next code deploy", :green
+        say "File '#{path}' created.", :green
+        say "To make changes to running application redeploy it using:"
+        say "`shelly redeploy --cloud #{@app}`"
       rescue Client::NotFoundException => e
         raise unless e.resource == :cloud
         say_error "You have no access to '#{@app.code_name}' cloud defined in Cloudfile"
@@ -85,7 +88,9 @@ module Shelly
         config = @app.config(path)
         content = open_editor(config["path"], config["content"])
         @app.update_config(path, content)
-        say "File '#{config["path"]}' updated, it will be used after next code deploy", :green
+        say "File '#{config["path"]}' updated.", :green
+        say "To make changes to running application redeploy it using:"
+        say "`shelly redeploy --cloud #{@app}`"
       rescue Client::NotFoundException => e
         case e.resource
         when :cloud
@@ -108,7 +113,9 @@ module Shelly
         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
+          say "File '#{path}' deleted.", :green
+          say "To make changes to running application redeploy it using:"
+          say "`shelly redeploy --cloud #{@app}`"
         else
           say "File not deleted"
         end

data/lib/shelly/cli/main.rb

@@ -16,7 +16,7 @@ module Shelly
       check_unknown_options!
 
       # 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]
+      before_hook :logged_in?, :only => [:add, :list, :start, :stop, :logs, :delete, :ip, :logout, :execute]
       before_hook :inside_git_repository?, :only => [:add]
       before_hook :cloudfile_present?, :only => [:logs, :stop, :start, :ip]
 
@@ -234,9 +234,24 @@ module Shelly
         say "You have been successfully logged out" if user.delete_credentials
       end
 
+      desc "execute [CODE]", "Run code on one of application servers"
+      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]
+        multiple_clouds(cloud, "execute")
+
+        result = @app.run(file_name_or_code)
+        say result
+
+      rescue Client::APIException => e
+        if e[:message] == "App not running"
+          say_error "Cloud #{@app} is not running. Cannot run code."
+        else
+          raise
+        end
+      end
+
       desc "redeploy", "Redeploy application"
-      method_option :cloud, :type => :string, :aliases => "-c",
-        :desc => "Specify which cloud to redeploy application for"
       def redeploy
         multiple_clouds(options[:cloud], "redeploy")
         @app.redeploy

data/lib/shelly/client.rb

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

data/lib/shelly/version.rb

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

data/spec/shelly/app_spec.rb

@@ -288,6 +288,26 @@ config
     end
   end
 
+  describe "#run" do
+    before do
+      @response = {
+        "result" => "4"
+      }
+      @client.stub(:run).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")
+      @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")
+      @app.run("to_run.rb")
+    end
+  end
+
   describe "#to_s" do
     it "should return code_name" do
       @app.to_s.should == "foo-staging"

data/spec/shelly/cli/config_spec.rb

@@ -145,7 +145,9 @@ describe Shelly::CLI::Config do
     it "should create file" do
       @config.should_receive(:system).with(/vim \/tmp\/shelly-edit/).and_return(true)
       @client.should_receive(:app_create_config).with("foo-staging", "path", "\n").and_return({})
-      $stdout.should_receive(:puts).with(green "File 'path' created, it will be used after next code deploy")
+      $stdout.should_receive(:puts).with(green "File 'path' created.")
+      $stdout.should_receive(:puts).with("To make changes to running application redeploy it using:")
+      $stdout.should_receive(:puts).with("`shelly redeploy --cloud foo-staging`")
       invoke(@config, :create, "path")
     end
 
@@ -208,7 +210,9 @@ describe Shelly::CLI::Config do
       @client.should_receive(:app_config).with("foo-staging", "path").and_return({"path" => "test.rb", "content" => "example content"})
       @config.should_receive(:system).with(/vim \/tmp\/shelly-edit/).and_return(true)
       @client.should_receive(:app_update_config).with("foo-staging", "path", "example content\n").and_return({"path" => "test.rb", "content" => "example content"})
-      $stdout.should_receive(:puts).with(green "File 'test.rb' updated, it will be used after next code deploy")
+      $stdout.should_receive(:puts).with(green "File 'test.rb' updated.")
+      $stdout.should_receive(:puts).with("To make changes to running application redeploy it using:")
+      $stdout.should_receive(:puts).with("`shelly redeploy --cloud foo-staging`")
       invoke(@config, :edit, "path")
     end
 
@@ -286,7 +290,9 @@ describe Shelly::CLI::Config do
 
     it "should delete configuration file" do
       @client.should_receive(:app_delete_config).with("foo-staging", "path").and_return({})
-      $stdout.should_receive(:puts).with(green "File deleted, redeploy your cloud to make changes")
+      $stdout.should_receive(:puts).with(green "File 'path' deleted.")
+      $stdout.should_receive(:puts).with("To make changes to running application redeploy it using:")
+      $stdout.should_receive(:puts).with("`shelly redeploy --cloud foo-staging`")
       fake_stdin(["y"]) do
         invoke(@config, :delete, "path")
       end
@@ -313,7 +319,9 @@ describe Shelly::CLI::Config do
 
       it "should use cloud specified by parameter" do
         @client.should_receive(:app_delete_config).with("foo-production", "path").and_return({})
-        $stdout.should_receive(:puts).with(green "File deleted, redeploy your cloud to make changes")
+        $stdout.should_receive(:puts).with(green "File 'path' deleted.")
+        $stdout.should_receive(:puts).with("To make changes to running application redeploy it using:")
+        $stdout.should_receive(:puts).with("`shelly redeploy --cloud foo-production`")
         @config.options = {:cloud => "foo-production"}
         fake_stdin(["y"]) do
           invoke(@config, :delete, "path")

data/spec/shelly/cli/main_spec.rb

@@ -29,6 +29,7 @@ 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 help [TASK]        # Describe available tasks or one specific task
   shelly ip                 # List cloud's IP addresses
   shelly list               # List available clouds
@@ -916,6 +917,81 @@ OUT
     end
   end
 
+  describe "#execute" 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)
+      @client.stub(:apps).and_return([{"code_name" => "foo-production"},
+                                     {"code_name" => "foo-staging"}])
+      @app = Shelly::App.new
+      Shelly::App.stub(:new).and_return(@app)
+      File.open("to_execute.rb", 'w') {|f| f.write("User.count") }
+    end
+
+    it "should ensure user has logged in" do
+      hooks(@main, :execute).should include(:logged_in?)
+    end
+
+    context "single cloud in Cloudfile" do
+      it "should execute code for the cloud" do
+        @client.should_receive(:run).with("foo-production", "User.count").
+          and_return({"result" => "3"})
+        $stdout.should_receive(:puts).with("3")
+        invoke(@main, :execute, "to_execute.rb")
+      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 print logs 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 execute --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, :execute, "to_execute.rb") }.should raise_error(SystemExit)
+      end
+
+      it "should fetch from command line which cloud to start" do
+        @client.should_receive(:run).with("foo-staging", "User.count").
+          and_return({"result" => "3"})
+        $stdout.should_receive(:puts).with("3")
+        @main.options = {:cloud => "foo-staging"}
+        invoke(@main, :execute, "to_execute.rb")
+      end
+
+      it "should run code when no file from parameter is found" do
+        @client.should_receive(:run).with("foo-staging", "2 + 2").
+          and_return({"result" => "4"})
+        $stdout.should_receive(:puts).with("4")
+        @main.options = {:cloud => "foo-staging"}
+        invoke(@main, :execute, "2 + 2")
+      end
+    end
+
+    context "cloud is not running" do
+      it "should print error" do
+        @client.should_receive(:run).with("foo-staging", "2 + 2").
+          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 code.")
+        @main.options = {:cloud => "foo-staging"}
+        lambda { invoke(@main, :execute, "2 + 2") }.should raise_error(SystemExit)
+      end
+    end
+  end
+
   describe "#redeploy" do
     before do
       @user = Shelly::User.new

data/spec/shelly/client_spec.rb

@@ -188,6 +188,15 @@ 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")
+      response.should == {"result" => "4"}
+    end
+  end
+
   describe "#send_invitation" do
     it "should send post with developer's email" do
       FakeWeb.register_uri(:post, api_url("apps/staging-foo/collaborations"), :body => {}.to_json)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.0.44.pre
+  version: 0.0.44.pre2
   prerelease: 7
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-08 00:00:00.000000000 Z
+date: 2012-01-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70206898312780 !ruby/object:Gem::Requirement
+  requirement: &70274550076140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206898312780
+  version_requirements: *70274550076140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70206898266580 !ruby/object:Gem::Requirement
+  requirement: &70274550075720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206898266580
+  version_requirements: *70274550075720
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70206898212380 !ruby/object:Gem::Requirement
+  requirement: &70274550075300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206898212380
+  version_requirements: *70274550075300
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70206898169340 !ruby/object:Gem::Requirement
+  requirement: &70274550074880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206898169340
+  version_requirements: *70274550074880
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70206898115120 !ruby/object:Gem::Requirement
+  requirement: &70274550074460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206898115120
+  version_requirements: *70274550074460
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70206898084560 !ruby/object:Gem::Requirement
+  requirement: &70274550074000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206898084560
+  version_requirements: *70274550074000
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70206898037160 !ruby/object:Gem::Requirement
+  requirement: &70274554592480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206898037160
+  version_requirements: *70274554592480
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70206898006080 !ruby/object:Gem::Requirement
+  requirement: &70274554592060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206898006080
+  version_requirements: *70274554592060
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70206897962100 !ruby/object:Gem::Requirement
+  requirement: &70274554591640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70206897962100
+  version_requirements: *70274554591640
 - !ruby/object:Gem::Dependency
   name: wijet-thor
-  requirement: &70206897912840 !ruby/object:Gem::Requirement
+  requirement: &70274554591140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.14.7
   type: :runtime
   prerelease: false
-  version_requirements: *70206897912840
+  version_requirements: *70274554591140
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70206897862480 !ruby/object:Gem::Requirement
+  requirement: &70274554590720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206897862480
+  version_requirements: *70274554590720
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70206897821420 !ruby/object:Gem::Requirement
+  requirement: &70274554590260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206897821420
+  version_requirements: *70274554590260
 - !ruby/object:Gem::Dependency
   name: wijet-launchy
-  requirement: &70206897777600 !ruby/object:Gem::Requirement
+  requirement: &70274554589840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206897777600
+  version_requirements: *70274554589840
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &70206897756220 !ruby/object:Gem::Requirement
+  requirement: &70274554589400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70206897756220
+  version_requirements: *70274554589400
 description: Tool for managing applications and clouds at shellycloud.com
 email:
 - support@shellycloud.com
@@ -234,6 +234,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 2757033815683066563
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -242,7 +245,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: 1.3.1
 requirements: []
 rubyforge_project: shelly
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: Shelly Cloud command line tool