shelly 0.1.3 → 0.1.4.pre

data/lib/shelly/app.rb

@@ -177,22 +177,8 @@ 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.command(code_name, code, :ruby)
-      response["result"]
-    end
-
     def rake(task)
-      response = shelly.command(code_name, task, :rake)
-      response["result"]
+      ssh("rake_runner \"#{task}\"")
     end
 
     def attributes
@@ -236,8 +222,12 @@ module Shelly
     end
 
     def console
+      ssh
+    end
+
+    def ssh(command = "")
       params = node_and_port
-      exec "ssh -o StrictHostKeyChecking=no -p #{params['port']} -l #{params['user']} #{params['node_ip']}"
+      exec "ssh -o StrictHostKeyChecking=no -p #{params['port']} -l #{params['user']} #{params['node_ip']} #{command}"
     end
 
     def upload(path)

data/lib/shelly/cli/main.rb

@@ -112,6 +112,7 @@ module Shelly
         say_error "shelly add --code-name=#{app.code_name} --databases=#{app.databases.join(',')} --size=#{app.size}"
       end
 
+      map "status" => :list
       desc "list", "List available clouds"
       def list
         user = Shelly::User.new
@@ -131,7 +132,6 @@ module Shelly
         end
       end
 
-      map "status" => :list
       map "ip" => :info
       method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       desc "info", "Show basic information about cloud"
@@ -282,35 +282,16 @@ We have been notified about it. We will be adding new resources shortly}
         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"
-      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)
-        app = multiple_clouds(options[:cloud], "execute #{file_name_or_code}")
-
-        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 "rake TASK", "Run rake task"
       method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       def rake(task = nil)
         task = rake_args.join(" ")
         app = multiple_clouds(options[:cloud], "rake #{task}")
-        result = app.rake(task)
-        say result
-      rescue Client::APIException => e
-        raise unless e[:message] == "App not running"
+        app.rake(task)
+      rescue Client::NotFoundException => e
+        raise unless e.resource == :cloud
+        say_error "You have no access to '#{app}' cloud defined in Cloudfile"
+      rescue Client::ConflictException
         say_error "Cloud #{app} is not running. Cannot run rake task."
       end
 
@@ -343,6 +324,12 @@ We have been notified about it. We will be adding new resources shortly}
         app.open
       end
 
+      desc "execute CODE", "Run code on one of application servers"
+      method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
+      def execute(file)
+        say_error "`shelly execute` is deprecated and will be removed in a future release of shelly gem, please use `shelly console`"
+      end
+
       desc "console", "Open application console"
       method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       def console
@@ -351,19 +338,22 @@ We have been notified about it. We will be adding new resources shortly}
       rescue Client::NotFoundException => e
         raise unless e.resource == :cloud
         say_error "You have no access to '#{app}' cloud defined in Cloudfile"
-      rescue Client::APIException => e
+      rescue Client::ConflictException
         say_error "Cloud #{app} is not running. Cannot run console."
       end
 
       desc "upload PATH", "Upload files to persisted data storage"
       method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
       def upload(path)
+        unless command_exists?("rsync")
+          say_error "You need to install rsync in order to use `shelly upload`"
+        end
         app = multiple_clouds(options[:cloud], "upload #{path}")
         app.upload(path)
       rescue Client::NotFoundException => e
         raise unless e.resource == :cloud
         say_error "You have no access to '#{app}' cloud defined in Cloudfile"
-      rescue Client::APIException => e
+      rescue Client::ConflictException
         say_error "Cloud #{app} is not running. Cannot upload files."
       end
 

data/lib/shelly/helpers.rb

@@ -81,6 +81,17 @@ module Shelly
       say_error "You are not logged in. To log in use: `shelly login`"
     end
 
+    def command_exists?(cmd)
+      exts = ENV['PATHEXT'] ? ENV['PATHEXT'].split(';') : ['']
+      ENV['PATH'].split(File::PATH_SEPARATOR).each do |path|
+        exts.each { |ext|
+          exe = "#{path}/#{cmd}#{ext}"
+          return exe if File.executable? exe
+        }
+      end
+      return false
+    end
+
     def multiple_clouds(cloud, action)
       clouds = Cloudfile.new.clouds
       if clouds && clouds.count > 1 && cloud.nil?

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.1.3"
+  VERSION = "0.1.4.pre"
 end

data/lib/thor/thor.rb

@@ -28,5 +28,11 @@ class Thor
       ENV["THOR_DEBUG"] == "1" ? (raise e) : config[:shell].error(e.message)
       exit(1) if exit_on_failure?
     end
+
+    # We overwrite this method so namespace is show
+    # shelly *backup* restore FILENAME
+    def handle_argument_error(task, error)
+      raise InvocationError, "#{task.name.inspect} was called incorrectly. Call as #{self.banner(task, nil, self != 'Shelly::CLI::Main').inspect}."
+    end
   end
 end

data/spec/shelly/app_spec.rb

@@ -358,30 +358,12 @@ config
     end
   end
 
-  describe "#run" do
-    before do
-      @response = {
-        "result" => "4"
-      }
-      @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(: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(: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"
+      @client.stub(:node_and_port).and_return(
+        {"node_ip" => "10.0.0.1", "port" => "40010", "user" => "foo"})
+      @app.should_receive(:exec).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo 10.0.0.1 rake_runner \"test\"")
+      @app.rake("test")
     end
   end
 
@@ -417,7 +399,7 @@ config
     it "should run ssh with all parameters" do
       @client.stub(:node_and_port).and_return(
         {"node_ip" => "10.0.0.1", "port" => "40010", "user" => "foo"})
-      @app.should_receive(:exec).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo 10.0.0.1")
+      @app.should_receive(:exec).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo 10.0.0.1 ")
       @app.console
     end
   end

data/spec/shelly/cli/backup_spec.rb

@@ -1,6 +1,7 @@
 require "spec_helper"
 require "shelly/cli/backup"
 require "shelly/download_progress_bar"
+require "open3"
 
 describe Shelly::CLI::Backup do
   before do
@@ -192,7 +193,7 @@ describe Shelly::CLI::Backup do
       end
     end
 
-    context "on type no" do
+    context "when answering no" do
       it "should cancel restore database" do
         $stdout.should_receive(:puts).with("You are about restore database postgre for cloud foo-staging to state from better.tar.gz")
         $stdout.should_receive(:print).with("I want to restore the database (yes/no): ")

data/spec/shelly/cli/main_spec.rb

@@ -1112,67 +1112,6 @@ We have been notified about it. We will be adding new resources shortly")
     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("foo-production")
-      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
-
-    # multiple_clouds is tested in main_spec.rb in describe "#start" block
-    it "should ensure multiple_clouds check" do
-      @client.should_receive(:command).with("foo-production", "User.count", :ruby).
-        and_return({"result" => "3"})
-      @main.should_receive(:multiple_clouds).and_return(@app)
-      invoke(@main, :execute, "to_execute.rb")
-    end
-
-    it "should execute code for the cloud" do
-      @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")
-    end
-
-    it "should run code when no file from parameter is found" do
-      @client.should_receive(:command).with("foo-production", "2 + 2", :ruby).
-        and_return({"result" => "4"})
-      $stdout.should_receive(:puts).with("4")
-      invoke(@main, :execute, "2 + 2")
-    end
-
-    context "cloud is not in running state" do
-      it "should print error" do
-        @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).
-          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
-
-      it "should re-raise other exceptions" do
-        @client.should_receive(:command).with("foo-staging", "2 + 2", :ruby).
-          and_raise(Exception)
-        @main.options = {:cloud => "foo-staging"}
-        lambda { invoke(@main, :execute, "2 + 2") }.should raise_error(Exception)
-      end
-    end
-  end
-
   describe "#rake" do
     before do
       FileUtils.mkdir_p("/projects/foo")
@@ -1192,25 +1131,16 @@ We have been notified about it. We will be adding new resources shortly")
 
     # multiple_clouds is tested in main_spec.rb in describe "#start" block
     it "should ensure multiple_clouds check" do
-      @client.should_receive(:command).with("foo-production", "db:migrate", :rake).
-        and_return({"result" => "OK"})
+      @app.stub(:rake)
       @main.should_receive(:multiple_clouds).and_return(@app)
       invoke(@main, :rake, "db:migrate")
     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")
+    it "should invoke rake task" do
+      @app.should_receive(:rake).with("db:migrate")
       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) }
 
@@ -1227,13 +1157,11 @@ We have been notified about it. We will be adding new resources shortly")
 
     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)
+        @client.stub(:node_and_port).and_raise(Shelly::Client::ConflictException)
+        $stdout.should_receive(:puts).with(red "Cloud foo-production is not running. Cannot upload files.")
+        lambda {
+          invoke(@main, :upload, "some/path")
+        }.should raise_error(SystemExit)
       end
     end
   end
@@ -1355,7 +1283,7 @@ We have been notified about it. We will be adding new resources shortly")
 
     context "Instances are not running" do
       it "should display error" do
-        @client.stub(:node_and_port).and_raise(Shelly::Client::APIException)
+        @client.stub(:node_and_port).and_raise(Shelly::Client::ConflictException)
         $stdout.should_receive(:puts).with(red "Cloud foo-production is not running. Cannot run console.")
         lambda {
           invoke(@main, :console)
@@ -1392,9 +1320,15 @@ We have been notified about it. We will be adding new resources shortly")
       lambda { invoke(@main, :upload, "some/path") }.should raise_error(SystemExit)
     end
 
+    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 use `shelly upload`")
+      lambda { invoke(@main, :upload, "some/path") }.should raise_error(SystemExit)
+    end
+
     context "Instances are not running" do
       it "should display error" do
-        @client.stub(:node_and_port).and_raise(Shelly::Client::APIException)
+        @client.stub(:node_and_port).and_raise(Shelly::Client::ConflictException)
         $stdout.should_receive(:puts).with(red "Cloud foo-production is not running. Cannot upload files.")
         lambda {
           invoke(@main, :upload, "some/path")

data/spec/spec_helper.rb

@@ -17,3 +17,10 @@ RSpec.configure do |config|
   config.include RSpec::Helpers
   config.include FakeFS::SpecHelpers
 end
+
+# FakeFS doesn't support executable? class method
+class FakeFS::File
+  def self.executable?(file)
+    true
+  end
+end

metadata

@@ -1,19 +1,19 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.1.3
-  prerelease: 
+  version: 0.1.4.pre
+  prerelease: 6
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-08 00:00:00.000000000Z
+date: 2012-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70166625336460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,15 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70166625336460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70166625335360 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166625335360
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard
-  requirement: &70166625333800 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166625333800
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70166625332400 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +69,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166625332400
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70166625331700 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +85,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166625331700
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: ruby_gntp
-  requirement: &70166625330460 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +101,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166625330460
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rb-fsevent
-  requirement: &70166625329420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +117,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166625329420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakefs
-  requirement: &70166625328280 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +133,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166625328280
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70166625327580 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +149,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70166625327580
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: wijet-thor
-  requirement: &70166625326740 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +165,15 @@ dependencies:
         version: 0.14.7
   type: :runtime
   prerelease: false
-  version_requirements: *70166625326740
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.14.7
 - !ruby/object:Gem::Dependency
   name: rest-client
-  requirement: &70166625326020 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -131,10 +181,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70166625326020
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70166625325160 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +197,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70166625325160
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: progressbar
-  requirement: &70166625324480 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +213,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70166625324480
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: launchy
-  requirement: &70166625323720 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +229,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70166625323720
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: shelly-dependencies
-  requirement: &70166625322940 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -175,7 +245,12 @@ dependencies:
         version: 0.1.1
   type: :runtime
   prerelease: false
-  version_requirements: *70166625322940
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.1.1
 description: Tool for managing applications and clouds at shellycloud.com
 email:
 - support@shellycloud.com
@@ -249,12 +324,12 @@ 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
+rubygems_version: 1.8.24
 signing_key: 
 specification_version: 3
 summary: Shelly Cloud command line tool