docker_deploy 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4c3d2b3a9b0a67da7951adfbc01f3db53333e2a9
-  data.tar.gz: 9bc2556b0b346abb57f50b98a37ae0b33d6efb51
+  metadata.gz: 63619a798b6a3fa44aec2d3228cb9750fb96ce8f
+  data.tar.gz: 8c61215138a2d56de1e3e8a0813aa59a12936343
 SHA512:
-  metadata.gz: cb7dac4efc0772bc95e2d32b96b322db9c781662062cd0cefee924d0520f0e7bcf2b5c0b29f835cb9ff78d03eb810b1947263f73f76c776a76a1a6de54363b33
-  data.tar.gz: dc173f9148a3801d46f8389f804367f5e05a31f82aeb96518cf86f90185cc2715d7f9e801275d3e796fc71cf4379e92b98197ec956c1b7a5e4516fbc173cf573
+  metadata.gz: ff17a90efec549e9f1ea391a52a078b74b7c389348c9b993388c5eb3eb0cbaae5d05df8642b698fa8f015726e0cd4f5b0cb27a46c3ce95eaefe15e0bb0812a60
+  data.tar.gz: 4966d4578f640b5530f5c574ed2aabb709aa593ebe52483b86fedf1e2db96508946a430a8f9bde72cb41da1d90325aea99f252e2219b6ffbea356daaf696534a

data/lib/docker_deploy/local_stage.rb

@@ -13,6 +13,6 @@ module DockerDeploy
     def run(cmd)
       sh(cmd)
     end
-    alias_method :run_once, :run
+    alias_method :shell, :run
   end
 end

data/lib/docker_deploy/remote_stage.rb

@@ -15,10 +15,8 @@ module DockerDeploy
       end
     end
 
-    def run_once(cmd)
-      on servers.first do
-        execute(cmd)
-      end
+    def shell(cmd = nil)
+      DockerDeploy.shell(servers.first, cmd)
     end
   end
 end

data/lib/docker_deploy/shell.rb

@@ -0,0 +1,43 @@
+module DockerDeploy
+  def self.shell(server, command = nil)
+    Net::SSH.start('app1.projectpuzzle.com', 'ubuntu') do |ssh|
+      channel = ssh.open_channel do |ch|
+        ch.on_data do |c, data|
+          $stdout.print data
+        end
+
+        ch.on_extended_data do |c, type, data|
+          $stderr.print data
+        end
+
+        ch.request_pty
+
+        if command
+          ch.exec(command)
+        else
+          ch.send_channel_request "shell"
+        end
+      end
+
+      read, write = UNIXSocket.pair
+
+      Thread.new(write) do |write|
+        loop do
+          buf = $stdin.raw { |r| r.readpartial(1) }
+          write.write(buf)
+        end
+      end
+
+      read.extend(Net::SSH::BufferedIo)
+
+      ssh.listen_to(read)
+
+      ssh.loop do
+        buf = read.read_available
+        channel.send_data buf unless buf.empty?
+
+        ssh.busy?
+      end
+    end
+  end
+end

data/lib/docker_deploy/task.rb

@@ -24,11 +24,6 @@ module DockerDeploy
             desc "deploy the application"
             task deploy: stage.deploy
 
-            desc "Pull down code from the docker registry"
-            task :pull do
-              stage.run "docker pull #{context.image}"
-            end
-
             desc "Stop the application and remove its container"
             task :stop do
               stage.run "docker inspect #{stage.container} 2>&1 > /dev/null && docker kill #{stage.container} && docker rm #{stage.container} || true"
@@ -43,30 +38,33 @@ module DockerDeploy
 
             desc "Run migrations in the latest image."
             task :migrate do
-              stage.run_once "docker run #{stage.link_mappings} #{stage.options} -i -t --rm=true #{context.image}:latest bundle exec rake db:create db:migrate"
+              stage.shell "docker run #{stage.link_mappings} #{stage.options} -i -t --rm=true #{context.image}:latest bundle exec rake db:create db:migrate"
             end
 
             desc "Run a Rails console in a container"
             task :console do
-              cmd = "docker run #{stage.options} -i -t --rm=true #{stage.link_mappings} #{context.image}:latest bundle exec rails console"
-              if stage.is_a?(RemoteStage)
-                puts "Console is currently broken :("
-                puts "SSH in and run:\n"
-                puts cmd
-              else
-                stage.run_once(cmd)
-              end
+              stage.shell "docker run #{stage.options} -i -t --rm=true #{stage.link_mappings} #{context.image}:latest bundle exec rails console"
             end
 
             desc "Run a shell in a container"
             task :shell do
-              cmd = "docker run #{stage.options} -i -t --rm=true #{stage.link_mappings} #{context.image}:latest /bin/bash"
-              if stage.is_a?(RemoteStage)
-                puts "Shell is currently broken :("
-                puts "SSH in and run:\n"
-                puts cmd
-              else
-                stage.run_once(cmd)
+              stage.shell "docker run #{stage.options} -i -t --rm=true #{stage.link_mappings} #{context.image}:latest /bin/bash"
+            end
+
+            desc "Tail log files"
+            task :tail do
+              stage.run "docker logs --tail 50 -f #{stage.container}"
+            end
+
+            if stage.is_a?(RemoteStage)
+              desc "Pull down code from the docker registry"
+              task :pull do
+                stage.run "docker pull #{context.image}"
+              end
+
+              desc "SSH into a host server"
+              task :ssh do
+                stage.shell
               end
             end
 

data/lib/docker_deploy/version.rb

@@ -1,3 +1,3 @@
 module DockerDeploy
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

data/lib/docker_deploy.rb

@@ -1,8 +1,10 @@
 require "sshkit"
 require "sshkit/dsl"
 require "shellwords"
+require "io/console"
 
 require "docker_deploy/version"
+require "docker_deploy/shell"
 require "docker_deploy/context"
 require "docker_deploy/stage"
 require "docker_deploy/remote_stage"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docker_deploy
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Jonas Nicklas
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-11 00:00:00.000000000 Z
+date: 2014-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sshkit
@@ -71,6 +71,7 @@ files:
 - lib/docker_deploy/context.rb
 - lib/docker_deploy/local_stage.rb
 - lib/docker_deploy/remote_stage.rb
+- lib/docker_deploy/shell.rb
 - lib/docker_deploy/stage.rb
 - lib/docker_deploy/task.rb
 - lib/docker_deploy/version.rb