peas-cli 0.3.2 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e147ed7b913c7320594016bb5de72c4020c44381
-  data.tar.gz: f50bad03497e2f8121cb2edcb6d672eea45282ae
+  metadata.gz: faee8809a414a35708ca312da7d0058383c2f16f
+  data.tar.gz: 96f7c1fcdbf0efcc9551c6404ec4031f9d4cba03
 SHA512:
-  metadata.gz: 9d939bc70c47442ffabb2fdc4c1b4f3d3cd0f6534efa4c61075b9f76f36e1225f29bee4ab01f7a8e45693272f8ee4532f1d9ae3be6dd95d1c0607a17862f4491
-  data.tar.gz: 11338f348ddfd662d5824fc6ebdb6cb41f1a1688c97fad36aefc85504db8b122e40157c799db46dfa062a7ea4079cc7820bcc1e943a7b89a0f3a111c3fa79f11
+  metadata.gz: b8c95f478440542ac91133997d017a908b6b585a674981e5fe423ab839b506b087e583fbf51b710a2497e0af4c470da6e28e0e6042a87cc42fb0d2a10fffff14
+  data.tar.gz: 7ec91fd22ad6b72f52baf27daeca94949f3996297aeb9c94c617b89e651439a6e681774ed1383f5d3170e0189b1af6a3e073dd140ddb37a99c8640a15dc63b52

data/VERSION

@@ -1 +1 @@
-0.3.2
+0.4.0

data/lib/peas/api.rb

@@ -83,4 +83,31 @@ class API
     rescue Interrupt, Errno::ECONNRESET
     end
   end
+
+  # Create 2 threads to allow raw TTY to be sent at the same time as outputting
+  # data from the socket.
+  def self.duplex_socket socket
+    threads = []
+
+    # Copy STDIN to socket
+    threads << Thread.start do
+      STDIN.raw do |stdin|
+        IO.copy_stream stdin, socket
+      end
+      socket.close_write
+    end
+
+    # Write response to STDOUT
+    threads << Thread.start do
+      begin
+        while (chunk = socket.readpartial(512))
+          print chunk
+        end
+      rescue EOFError
+      end
+      threads.first.kill
+    end
+
+    threads.each(&:join)
+  end
 end

data/lib/peas/commands/admin.rb

@@ -33,4 +33,19 @@ command :admin do |admin|
       end
     end
   end
+
+  admin.desc 'Run commands on the Peas Controller'
+  admin.long_desc <<-EOF
+  For example: peas admin run rake console
+  EOF
+  admin.command :run do |c|
+    c.action do |_global_options, _options, args|
+      exit_now!("Please provide a command to run", 1) if args.length == 0
+      socket = API.switchboard_connection
+      socket.puts "admin_tty"
+      tty_command = args.join ' '
+      socket.puts tty_command
+      API.duplex_socket socket
+    end
+  end
 end

data/lib/peas/commands/app.rb

@@ -71,28 +71,6 @@ command :run do |c|
     socket.puts "tty.#{Git.name_from_remote}"
     tty_command = args.join ' '
     socket.puts tty_command
-
-    threads = []
-
-    # Copy STDIN to socket
-    threads << Thread.start do
-      STDIN.raw do |stdin|
-        IO.copy_stream stdin, socket
-      end
-      socket.close_write
-    end
-
-    # Write response to STDOUT
-    threads << Thread.start do
-      begin
-        while (chunk = socket.readpartial(512))
-          print chunk
-        end
-      rescue EOFError
-      end
-      threads.first.kill
-    end
-
-    threads.each(&:join)
+    API.duplex_socket socket
   end
 end

data/peas-cli.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: peas-cli 0.3.2 ruby lib
+# stub: peas-cli 0.4.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "peas-cli"
-  s.version = "0.3.2"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Tom Buckley-Houston"]
-  s.date = "2014-11-05"
+  s.date = "2014-11-19"
   s.description = "Peas is an open source Heroku-style PaaS written in Ruby and using Docker"
   s.email = "tom@tombh.co.uk"
   s.executables = ["peas"]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peas-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.4.0
 platform: ruby
 authors:
 - Tom Buckley-Houston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-11-05 00:00:00.000000000 Z
+date: 2014-11-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli