shelly 0.4.29.pre → 0.4.29

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MzIyNDQ1M2JiYWFjODQzODI5MDNhNmJjMzVmMDkyMzEwNTJmMzc4MQ==
+    NWNiN2MyNmY4ZGU5NDU4YWY0YzM5YTUzNGNmZWRkMjI5MDBjODU5NQ==
   data.tar.gz: !binary |-
-    NDQwN2FjNTRmMTg2Y2JlNDE3YWM0ZjIxMDhmMmM5ODg5ODA2ZjhmYg==
+    OWI4ZDNmNGI0ZWE2NmFkNDQzN2YzMDY3YjQ2ODczYzkzNmMzNGVlZg==
 SHA512:
   metadata.gz: !binary |-
-    ZDZkZGJjYTY3NTg0MTFjYTI0YmI1NzQxZWNhYjE4OTRkYTNhMmUzNzM4MDk5
-    Mzk3YTExYzM2M2UyYTVlN2Y0ZWNjMzI0YWVmMzI3NzhlNmFlMjJkMTlhNDg4
-    ZTk1MzRkZDkxODNhNDc3YmY0NTFlNGRhMTdjMmM0NDQ1ZDRlMjg=
+    ZTRkNGNhZGJjMmFhMzM4MDBlYzY4ZWIzMWM1YTg0MDk2YWQ4ZmQyNTNjZGEx
+    Mjc4MWRhMTRjN2I1ZGQ4OGY0YjVkODFmYjU4ZGY0Mjk2NDkxNjljNjhmZjQ2
+    NjE2YTgzMTI1ZWJkYjEzZmJkNGE1MTEyOTU2YzgzY2IzZmIxZGE=
   data.tar.gz: !binary |-
-    NjM4ZWZjMmZjZTY5MzIwOTkzOTM0ZmVjODU4OGQ0NWFkZDZmNzc3MDc2NTc1
-    MzBkYTIwY2YwNzgxOTFkYjU5YjZjZDM4Nzk4NjcxMmJkZDc4NmQyN2I0NDNi
-    MmI2OWRiMjE3MjZmYTk4NzNjMmYzMGQzNWNmYTBlYTk2NTNjZmI=
+    M2ZkODAzMjBkZmMxOWUxNmE0NjQzM2IyY2QwZmVkMmIyYWYwMmU1ZTEwZTFk
+    OTQyODE4ZjZkYWJhY2QyMmNkM2ZhYzI0NzAyYTg4ZTUwZmQ5ZjFlNDJiYjgx
+    YTI0ZTZkY2Q3ZGJlOTMxMDM4MjZlNWFiMTU2ZTg1ZWZkZTAyNjQ=

data/CHANGELOG.md

@@ -1,5 +1,7 @@
-## master
+## 0.4.29 / 2014-03-27
 
+* [bugfix] Use childprocess to start ssh related commands. Fixes tty issue
+  when using `shelly console` on JRuby
 * [bugfix] Capture password without echo only if terminal is present
 * [feature] Support for `shelly ssh` command
 

data/lib/shelly/app.rb

@@ -1,9 +1,13 @@
 require 'erb'
 require 'launchy'
+require 'childprocess'
+require 'shellwords'
 require 'shelly/backup'
 
 module Shelly
   class App < Model
+    include ::Shellwords
+
     DATABASE_KINDS = %w(postgresql mongodb redis)
     DATABASE_CHOICES = DATABASE_KINDS + %w(none)
     SERVER_SIZES = %w(small large)
@@ -448,12 +452,12 @@ module Shelly
 
     def ssh(options = {})
       conn = tunnel_connection("ssh", options[:server])
-      system "ssh #{ssh_options(conn)} -t -t #{conn['host']} #{options[:command]}"
+      childprocess("ssh #{ssh_options(conn)} -t -t #{conn['host']} #{options[:command]}")
     end
 
     def ssh_with_db_server(options = {})
       conn = configured_db_server_connection(options[:server])
-      system "ssh #{ssh_options(conn)} -t -t #{conn['host']} #{options[:command]}"
+      childprocess("ssh #{ssh_options(conn)} -t -t #{conn['host']} #{options[:command]}")
     end
 
     def ssh_options(conn)
@@ -463,5 +467,13 @@ module Shelly
     def rsync(source, destination, conn, options = "")
       system "rsync --archive --verbose --compress #{options} -e 'ssh #{ssh_options(conn)}' --progress #{source} #{destination}"
     end
+
+    def childprocess(command)
+      ChildProcess.posix_spawn = true
+      process = ::ChildProcess.build(*shellwords(command))
+      process.io.inherit!
+      process.start
+      process.wait
+    end
   end
 end

data/lib/shelly/version.rb

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

data/shelly.gemspec

@@ -30,6 +30,7 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency "progressbar"
   s.add_runtime_dependency "launchy"
   s.add_runtime_dependency "netrc"
+  s.add_runtime_dependency "childprocess"
 
   s.files         = `git ls-files`.split("\n")
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/shelly/app_spec.rb

@@ -420,7 +420,7 @@ describe Shelly::App do
     it "should return result of rake task" 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 rake_runner \"test\"")
+      @app.should_receive(:childprocess).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t -t console.example.com rake_runner \"test\"")
       @app.rake("test")
     end
   end
@@ -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 start_dbconsole")
+      @app.should_receive(:childprocess).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 start_mongodb")
+      @app.should_receive(:childprocess).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 start_redis")
+      @app.should_receive(:childprocess).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t -t console.example.com start_redis")
       @app.redis_cli
     end
   end
@@ -478,14 +478,14 @@ describe Shelly::App 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.should_receive(:childprocess).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.should_receive(:childprocess)
         @app.console("app1")
       end
     end
@@ -495,14 +495,14 @@ describe Shelly::App 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.should_receive(:childprocess).with("ssh -o StrictHostKeyChecking=no -p 40010 -l foo -t -t console.example.com start_console")
       @app.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.should_receive(:childprocess)
         @app.console("app1")
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shelly
 version: !ruby/object:Gem::Version
-  version: 0.4.29.pre
+  version: 0.4.29
 platform: ruby
 authors:
 - Shelly Cloud team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-26 00:00:00.000000000 Z
+date: 2014-03-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -220,6 +220,20 @@ dependencies:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: childprocess
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Tool for managing applications and clouds at shellycloud.com
 email:
 - devs@shellycloud.com
@@ -329,9 +343,9 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>'
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.1
+      version: '0'
 requirements: []
 rubyforge_project: shelly
 rubygems_version: 2.2.2