shelly 0.0.46.pre2 → 0.0.46.pre3

data/lib/shelly/app.rb

@@ -147,12 +147,7 @@ module Shelly
                file_name_or_code
              end
 
-      response = shelly.command(code_name, code, :ruby)
-      response["result"]
-    end
-
-    def rake(task)
-      response = shelly.command(code_name, task, :rake)
+      response = shelly.run(code_name, code)
       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!(:except => :rake)
+      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, :execute, :rake]
+      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, :execute, :rake]
+      before_hook :cloudfile_present?, :only => [:logs, :stop, :start, :ip]
 
       map %w(-v --version) => :version
       desc "version", "Display shelly version"
@@ -29,26 +29,21 @@ module Shelly
       desc "register [EMAIL]", "Register new account"
       def register(email = nil)
         user = Shelly::User.new
-        user.ssh_key_registered?
         say "Registering with email: #{email}" if email
         user.email = (email || ask_for_email)
         user.password = ask_for_password
         user.register
         if user.ssh_key_exists?
           say "Uploading your public SSH key from #{user.ssh_key_path}"
+        else
+          say_error "No such file or directory - #{user.ssh_key_path}", :with_exit => false
+          say_error "Use ssh-keygen to generate ssh key pair, after that use: `shelly login`", :with_exit => false
         end
         say "Successfully registered!"
         say "Check you mailbox for email address confirmation"
       rescue Client::ValidationException => e
         e.each_error { |error| say_error "#{error}", :with_exit => false }
         exit 1
-      rescue Client::ConflictException
-        say_error "User with your ssh key already exists.", :with_exit => false
-        say_error "You can login using: shelly login [EMAIL]", :with_exit => false
-        exit 1
-      rescue Errno::ENOENT => e
-        say_error e, :with_exit => false
-        say_error "Use ssh-keygen to generate ssh key pair"
       end
 
       desc "login [EMAIL]", "Log into Shelly Cloud"
@@ -236,8 +231,9 @@ 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 cloud"
+      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"
       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]
@@ -254,18 +250,6 @@ 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"
@@ -290,23 +274,6 @@ 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 command(cloud, body, type)
-      post("/apps/#{cloud}/command", {:body => body, :type => type})
+    def run(cloud, code)
+      post("/apps/#{cloud}/run", :body => code)
     end
 
     def deploy_logs(cloud)
@@ -147,10 +147,6 @@ module Shelly
       post("/apps/#{code_name}/database_backups", :kind => kind)
     end
 
-    def ssh_key_available?(ssh_key)
-      get("/users/new", :ssh_key => ssh_key)
-    end
-
     def app_users(cloud)
       get("/apps/#{cloud}/users")
     end

data/lib/shelly/user.rb

@@ -60,11 +60,6 @@ module Shelly
       File.expand_path("~/.ssh/id_rsa.pub")
     end
 
-    def ssh_key_registered?
-      ssh_key = File.read(ssh_key_path).strip
-      shelly.ssh_key_available?(ssh_key)
-    end
-
     def self.guess_email
       @@guess_email ||= IO.popen("git config --get user.email").read.strip
     end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.0.46.pre2"
+  VERSION = "0.0.46.pre3"
 end

data/spec/shelly/app_spec.rb

@@ -293,28 +293,21 @@ config
       @response = {
         "result" => "4"
       }
-      @client.stub(:command).and_return(@response)
+      @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(:command).with("foo-staging", "2 + 2", :ruby)
+      @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(:command).with("foo-staging", "User.count\n", :ruby)
+      @client.should_receive(:run).with("foo-staging", "User.count\n")
       @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,14 +29,13 @@ 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
@@ -78,23 +77,14 @@ OUT
       Shelly::User.stub(:new).and_return(@user)
     end
 
-    it "should return false if ssh key don't exist on local hard drive" do
+    it "should register user without local SSH Key and show message to create SSH Key" do
       FileUtils.rm_rf(@key_path)
       File.exists?(@key_path).should be_false
-      $stdout.should_receive(:puts).with("\e[31mNo such file or directory - " + @key_path + "\e[0m")
-      $stdout.should_receive(:puts).with("\e[31mUse ssh-keygen to generate ssh key pair\e[0m")
-      lambda {
-        invoke(@main, :register)
-      }.should raise_error(SystemExit)
-    end
-
-    it "should check ssh key in database" do
-      @user.stub(:ssh_key_registered?).and_raise(Shelly::Client::ConflictException.new)
-      $stdout.should_receive(:puts).with("\e[31mUser with your ssh key already exists.\e[0m")
-      $stdout.should_receive(:puts).with("\e[31mYou can login using: shelly login [EMAIL]\e[0m")
-      lambda {
+      $stdout.should_receive(:puts).with(red "No such file or directory - #{@key_path}")
+      $stdout.should_receive(:puts).with(red "Use ssh-keygen to generate ssh key pair, after that use: `shelly login`")
+      fake_stdin(["better@example.com", "secret", "secret"]) do
         invoke(@main, :register)
-      }.should raise_error(SystemExit)
+      end
     end
 
     it "should ask for email, password and password confirmation" do
@@ -943,13 +933,9 @@ 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(:command).with("foo-production", "User.count", :ruby).
+        @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")
@@ -974,7 +960,7 @@ OUT
       end
 
       it "should fetch from command line which cloud to start" do
-        @client.should_receive(:command).with("foo-staging", "User.count", :ruby).
+        @client.should_receive(:run).with("foo-staging", "User.count").
           and_return({"result" => "3"})
         $stdout.should_receive(:puts).with("3")
         @main.options = {:cloud => "foo-staging"}
@@ -982,7 +968,7 @@ OUT
       end
 
       it "should run code when no file from parameter is found" do
-        @client.should_receive(:command).with("foo-staging", "2 + 2", :ruby).
+        @client.should_receive(:run).with("foo-staging", "2 + 2").
           and_return({"result" => "4"})
         $stdout.should_receive(:puts).with("4")
         @main.options = {:cloud => "foo-staging"}
@@ -990,9 +976,9 @@ OUT
       end
     end
 
-    context "cloud is not in running state" do
+    context "cloud is not running" do
       it "should print error" do
-        @client.should_receive(:command).with("foo-staging", "2 + 2", :ruby).
+        @client.should_receive(:run).with("foo-staging", "2 + 2").
           and_raise(Shelly::Client::APIException.new(
             {"message" => "App not running"}, 504))
         $stdout.should_receive(:puts).
@@ -1000,92 +986,12 @@ OUT
         @main.options = {:cloud => "foo-staging"}
         lambda { invoke(@main, :execute, "2 + 2") }.should raise_error(SystemExit)
       end
-    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")
+      it "should re-raise other exceptions" do
+        @client.should_receive(:run).with("foo-staging", "2 + 2").
+          and_raise(Exception)
         @main.options = {:cloud => "foo-staging"}
-        invoke(@main, :rake, "db:migrate")
+        lambda { invoke(@main, :execute, "2 + 2") }.should raise_error(Exception)
       end
     end
   end

data/spec/shelly/client_spec.rb

@@ -188,11 +188,11 @@ describe Shelly::Client do
     end
   end
 
-  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)
+  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
@@ -244,13 +244,6 @@ describe Shelly::Client do
     end
   end
 
-  describe "#ssh_key_available?" do
-    it "should send get request with ssh key" do
-      @client.should_receive(:get).with("/users/new", {:ssh_key => "ssh-key Abb"})
-      @client.ssh_key_available?("ssh-key Abb")
-    end
-  end
-
   describe "#database_backup" do
     it "should fetch backup description from API" do
       expected = {

data/spec/shelly/user_spec.rb

@@ -123,13 +123,6 @@ describe Shelly::User do
     end
   end
 
-  describe "#ssh_key_registered?" do
-    it "should read and check if ssh key exists in database" do
-      @client.should_receive(:ssh_key_available?).with('ssh-key AAbbcc')
-      @user.ssh_key_registered?
-    end
-  end
-
   describe "#delete_ssh_key" do
     it "should invoke logout when ssh key exists" do
       @client.should_receive(:logout).with('ssh-key AAbbcc')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.0.46.pre2
+  version: 0.0.46.pre3
   prerelease: 7
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-16 00:00:00.000000000Z
+date: 2012-01-19 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70195901742100 !ruby/object:Gem::Requirement
+  requirement: &70197902930340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70195901742100
+  version_requirements: *70197902930340
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70195901741680 !ruby/object:Gem::Requirement
+  requirement: &70197902929860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70195901741680
+  version_requirements: *70197902929860
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70195901741260 !ruby/object:Gem::Requirement
+  requirement: &70197902929420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70195901741260
+  version_requirements: *70197902929420
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70195901740840 !ruby/object:Gem::Requirement
+  requirement: &70197902929000 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70195901740840
+  version_requirements: *70197902929000
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70195901740420 !ruby/object:Gem::Requirement
+  requirement: &70197902928580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70195901740420
+  version_requirements: *70197902928580
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70195901739940 !ruby/object:Gem::Requirement
+  requirement: &70197902928120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70195901739940
+  version_requirements: *70197902928120
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70195901739480 !ruby/object:Gem::Requirement
+  requirement: &70197902927700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70195901739480
+  version_requirements: *70197902927700
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70195901738980 !ruby/object:Gem::Requirement
+  requirement: &70197902927280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70195901738980
+  version_requirements: *70197902927280
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70195901738520 !ruby/object:Gem::Requirement
+  requirement: &70197902926860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70195901738520
+  version_requirements: *70197902926860
 - !ruby/object:Gem::Dependency
   name: wijet-thor
-  requirement: &70195901737780 !ruby/object:Gem::Requirement
+  requirement: &70197902912840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 0.14.7
   type: :runtime
   prerelease: false
-  version_requirements: *70195901737780
+  version_requirements: *70197902912840
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70195901735720 !ruby/object:Gem::Requirement
+  requirement: &70197902912420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +131,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70195901735720
+  version_requirements: *70197902912420
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70195901735160 !ruby/object:Gem::Requirement
+  requirement: &70197902911960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70195901735160
+  version_requirements: *70197902911960
 - !ruby/object:Gem::Dependency
   name: wijet-launchy
-  requirement: &70195901711180 !ruby/object:Gem::Requirement
+  requirement: &70197902911500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70195901711180
+  version_requirements: *70197902911500
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &70195901710760 !ruby/object:Gem::Requirement
+  requirement: &70197902911060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,7 +164,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70195901710760
+  version_requirements: *70197902911060
 description: Tool for managing applications and clouds at shellycloud.com
 email:
 - support@shellycloud.com