shelly 0.4.28 → 0.4.29.pre

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    NWJiYTdjMjc5ZmQyOTc5Y2E5NGZjMThlZTk2MWE3YzRhYzZmNGM0Ng==
+    MzIyNDQ1M2JiYWFjODQzODI5MDNhNmJjMzVmMDkyMzEwNTJmMzc4MQ==
   data.tar.gz: !binary |-
-    MGI4MzgwMmU0YjdmMjBlY2ZhYzA3MjA5MmQzZTc0MDUyYjM3ZmQ1NA==
+    NDQwN2FjNTRmMTg2Y2JlNDE3YWM0ZjIxMDhmMmM5ODg5ODA2ZjhmYg==
 SHA512:
   metadata.gz: !binary |-
-    OGE1OTZiMmJmMzMwZWExMzhjOTIxMDZjY2Y4MjUzNTZlODYyZTQxZmNjNTgx
-    ZDA5NWI5YTAyMWExNDAwNTk5NjRmNzA3MDBkODAxZWEwZTVjNjgzMTVmNjdi
-    ZjQ4MjBjMjkyNzMyZmMwOGJjZTBhZWUzZDg4N2FlYjVjZjJhYjU=
+    ZDZkZGJjYTY3NTg0MTFjYTI0YmI1NzQxZWNhYjE4OTRkYTNhMmUzNzM4MDk5
+    Mzk3YTExYzM2M2UyYTVlN2Y0ZWNjMzI0YWVmMzI3NzhlNmFlMjJkMTlhNDg4
+    ZTk1MzRkZDkxODNhNDc3YmY0NTFlNGRhMTdjMmM0NDQ1ZDRlMjg=
   data.tar.gz: !binary |-
-    M2IzNTVlMjgwYTdkNDU4ZTRmOTYwZTQwZmNmZjBkZmE4NTgyZTMxMTcyNjQx
-    MGJlMTc3ZjUxNWU0ZjE5MzkxZmQ3MWM0MzMwYTE1NDFlMTVkYTg4YjdmYzAy
-    YjlhNTA0NTdlMzJiMzUwMTRhZWJiYzA4ZWQ0MDZiOWNiNjZiZGE=
+    NjM4ZWZjMmZjZTY5MzIwOTkzOTM0ZmVjODU4OGQ0NWFkZDZmNzc3MDc2NTc1
+    MzBkYTIwY2YwNzgxOTFkYjU5YjZjZDM4Nzk4NjcxMmJkZDc4NmQyN2I0NDNi
+    MmI2OWRiMjE3MjZmYTk4NzNjMmYzMGQzNWNmYTBlYTk2NTNjZmI=

data/CHANGELOG.md

@@ -1,3 +1,8 @@
+## master
+
+* [bugfix] Capture password without echo only if terminal is present
+* [feature] Support for `shelly ssh` command
+
 ## 0.4.28 / 2014-03-25
 
 * [bugfix] Fix password no_echo input on Ruby 1.9

data/lib/shelly/app.rb

@@ -216,15 +216,15 @@ module Shelly
     end
 
     def dbconsole
-      ssh_with_db_server(:command => "dbconsole")
+      ssh_with_db_server(:command => "start_dbconsole")
     end
 
     def mongoconsole
-      ssh_with_db_server(:command => "mongo")
+      ssh_with_db_server(:command => "start_mongodb")
     end
 
     def redis_cli
-      ssh_with_db_server(:command => "redis-cli")
+      ssh_with_db_server(:command => "start_redis")
     end
 
     def attributes
@@ -295,10 +295,14 @@ module Shelly
       Launchy.open("http://#{attributes["domain"]}")
     end
 
-    def console(server = nil)
+    def ssh_console(server = nil)
       ssh(:server => server)
     end
 
+    def console(server = nil)
+      ssh(:command => "start_console", :server => server)
+    end
+
     def list_files(path)
       ssh(:command => "ls -l #{persistent_disk}/#{path}")
     end

data/lib/shelly/cli/main.rb

@@ -32,7 +32,7 @@ module Shelly
       # FIXME: it should be possible to pass single symbol, instead of one element array
       before_hook :logged_in?, :only => [:add, :status, :list, :start, :stop,
         :delete, :info, :ip, :logout, :execute, :rake, :setup, :console,
-        :dbconsole, :mongoconsole, :redis_cli]
+        :dbconsole, :mongoconsole, :redis_cli, :ssh]
       before_hook :inside_git_repository?, :only => [:add, :setup, :check]
 
       map %w(-v --version) => :version
@@ -365,6 +365,20 @@ Wait until cloud is in 'turned off' state and try again.}
         say_error "Virtual server '#{options[:server]}' not found or not configured for running console"
       end
 
+      desc "ssh", "Log into virtual server"
+      method_option :cloud, :type => :string, :aliases => "-c", :desc => "Specify cloud"
+      method_option :server, :type => :string, :aliases => "-s",
+        :desc => "Specify virtual server, it's random by default"
+      def ssh
+        app = multiple_clouds(options[:cloud], "ssh")
+        app.ssh_console(options[:server])
+      rescue Client::ConflictException
+        say_error "Cloud #{app} is not running. Cannot run ssh console."
+      rescue Client::NotFoundException => e
+        raise unless e.resource == :virtual_server
+        say_error "Virtual server '#{options[:server]}' not found or not configured for running ssh console"
+      end
+
       # FIXME: move to helpers
       no_tasks do
         # Returns valid arguments for rake, removes shelly gem arguments
@@ -433,11 +447,11 @@ Wait until cloud is in 'turned off' state and try again.}
           options = {:with_confirmation => true}.merge(options)
           loop do
             say "Password: "
-            password = $stdin.noecho(&:gets).strip
+            password = capture_input_without_echo_if_tty
             say_new_line
             return password unless options[:with_confirmation]
             say "Password confirmation: "
-            password_confirmation = $stdin.noecho(&:gets).strip
+            password_confirmation = capture_input_without_echo_if_tty
             say_new_line
             if password.present?
               return password if password == password_confirmation
@@ -506,6 +520,10 @@ Wait until cloud is in 'turned off' state and try again.}
           user.logout
           exit 1
         end
+
+        def capture_input_without_echo_if_tty
+          $stdin.tty? ? $stdin.noecho(&:gets).strip : $stdin.gets.strip
+        end
       end
     end
   end

data/lib/shelly/version.rb

@@ -1,3 +1,3 @@
 module Shelly
-  VERSION = "0.4.28"
+  VERSION = "0.4.29.pre"
 end

data/spec/input_faker.rb

@@ -14,6 +14,10 @@ class InputFaker
     @strings.shift
   end
 
+  def tty?
+    true
+  end
+
   def self.with_fake_input(strings)
     $stdin = new(strings)
     yield

data/spec/shelly/app_spec.rb

@@ -429,7 +429,7 @@ describe Shelly::App do
     it "should return result of dbconsole" do
       @client.stub(:configured_db_server).and_return(
         {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
-      @app.should_receive(:system).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t -t console.example.com dbconsole")
+      @app.should_receive(:system).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t -t console.example.com start_dbconsole")
       @app.dbconsole
     end
   end
@@ -438,7 +438,7 @@ describe Shelly::App do
     it "should return result of mongoconsole" do
       @client.stub(:configured_db_server).and_return(
         {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
-      @app.should_receive(:system).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t -t console.example.com mongo")
+      @app.should_receive(:system).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t -t console.example.com start_mongodb")
       @app.mongoconsole
     end
   end
@@ -447,7 +447,7 @@ describe Shelly::App do
     it "should return result of redis-cli" do
       @client.stub(:configured_db_server).and_return(
         {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
-      @app.should_receive(:system).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t -t console.example.com redis-cli")
+      @app.should_receive(:system).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t -t console.example.com start_redis")
       @app.redis_cli
     end
   end
@@ -474,11 +474,28 @@ describe Shelly::App do
     end
   end
 
-  describe "#console" do
+  describe "#ssh_console" do
     it "should run ssh with all parameters" do
       @client.stub(:tunnel).and_return(
         {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
       @app.should_receive(:system).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t -t console.example.com ")
+      @app.ssh_console
+    end
+
+    context "when server passed" do
+      it "should request console on given server" do
+        @client.should_receive(:tunnel).with("foo-staging", "ssh", "app1").and_return({})
+        @app.stub(:system)
+        @app.console("app1")
+      end
+    end
+  end
+
+  describe "#console" do
+    it "should run ssh with all parameters" do
+      @client.stub(:tunnel).and_return(
+        {"host" => "console.example.com", "port" => "40010", "user" => "foo"})
+      @app.should_receive(:system).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t -t console.example.com start_console")
       @app.console
     end
 

data/spec/shelly/cli/main_spec.rb

@@ -51,6 +51,7 @@ describe Shelly::CLI::Main do
       out.should include("shelly organization <command>  # View organizations")
       out.should include("shelly rake TASK               # Run rake task")
       out.should include("shelly redeploy                # Redeploy application")
+      out.should include("shelly ssh                     # Log into virtual server")
       out.should include("shelly redis-cli               # Run redis-cli")
       out.should include("shelly register [EMAIL]        # Register new account")
       out.should include("shelly setup                   # Set up git remotes for deployment on Shelly Cloud")
@@ -1626,6 +1627,43 @@ Wait until cloud is in 'turned off' state and try again.")
     end
   end
 
+  describe "#ssh" do
+    before do
+      setup_project
+    end
+
+    it "should ensure user has logged in" do
+      hooks(@main, :ssh).should include(:logged_in?)
+    end
+
+    it "should execute ssh command" do
+      @app.should_receive(:ssh_console)
+      invoke(@main, :ssh)
+    end
+
+    context "virtual servers are not running" do
+      it "should display error" do
+        @client.stub(:tunnel).and_raise(Shelly::Client::ConflictException)
+        $stdout.should_receive(:puts).with(red "Cloud foo-production is not running. Cannot run ssh console.")
+        lambda {
+          invoke(@main, :ssh)
+        }.should raise_error(SystemExit)
+      end
+    end
+
+    context "virtual server not found" do
+      it "should display error" do
+        ex = Shelly::Client::NotFoundException.new("resource" => "virtual_server")
+        @client.stub(:tunnel).and_raise(ex)
+        @main.options = {:server => "foobar"}
+        $stdout.should_receive(:puts).with(red "Virtual server 'foobar' not found or not configured for running ssh console")
+        lambda {
+          invoke(@main, :ssh)
+        }.should raise_error(SystemExit)
+      end
+    end
+  end
+
   describe "#check" do
     before do
       Shelly::App.stub(:inside_git_repository?).and_return(true)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.4.28
+  version: 0.4.29.pre
 platform: ruby
 authors:
 - Shelly Cloud team
@@ -329,9 +329,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: shelly
 rubygems_version: 2.2.2