peas-cli 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1563acd00068fb352671fc5d5116dda66d42fb15
-  data.tar.gz: e8f6d84f6a545e3d0d6e2b8fd5f8a38a48c44b73
+  metadata.gz: 7e21b1eaec8ee7ce0d7a7b76dbf2a0912c6eaa3c
+  data.tar.gz: 13c9d9ce95cfbebcea8cfb787ca9e0661f3c444a
 SHA512:
-  metadata.gz: a0fcdcb620bef4ab17b0852c73e17fb464f5b06ccd65a9e2846312febe1fa88fc1f98a340329aa52a13ad820511e3f9dd7189641ecf4abd800bf132a9f757e9b
-  data.tar.gz: f0ec4fdaf8822a33d3dd7cd3c7c4e5467030818b98d93ef18c6bfd6edcd599cfd35a2d6fd3d7f4f3a345d287b15621563eaf643797007829cf459540cb1e05c8
+  metadata.gz: 7405ef69c589de7140e5c463356b77d06f3836bd3788eca36401c74465ab6ced6ddc534f8bf362e69f26be829976d3d03466bb3511aa3c9a03ed491cd98064df
+  data.tar.gz: e377db4f59cc014a5cd10363d83d2235d11c55ea25c1cca358b8e833f68202d29283ba38b514acb75141239ded9f5f2f24cc311eb2f623a61699a3e8f755cf7f

data/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

data/bin/peas

@@ -47,5 +47,10 @@ on_error do |exception|
   true
 end
 
+# Exit 0 if sent SIGINT
+trap('INT'){
+  exit!
+}
+
 exit_status = run(ARGV)
 exit exit_status if ENV['GLI_ENV'] != 'test'

data/lib/peas/api.rb

@@ -1,4 +1,5 @@
 require 'httparty'
+require 'socket'
 
 class API
   include HTTParty
@@ -85,4 +86,8 @@ class API
     puts diff.join if diff.length > 0
   end
 
+  def self.switchboard_connection
+    TCPSocket.new Peas.host, Peas::SWITCHBOARD_PORT
+  end
+
 end

data/lib/peas/commands/logs.rb

@@ -0,0 +1,13 @@
+desc 'Show logs for an app'
+command :logs do |c|
+  c.action do |global_options, options, args|
+    socket = API.switchboard_connection
+    socket.puts "stream_logs.#{Git.first_sha}"
+    begin
+      while line = socket.gets
+        puts line
+      end
+    rescue Interrupt, Errno::ECONNRESET
+    end
+  end
+end

data/lib/peas/config.rb

@@ -1,5 +1,8 @@
 module Peas
 
+  # The port for Peas' Switchboard socket server
+  SWITCHBOARD_PORT = ENV['SWITCHBOARD_PORT'] || 9345
+
   def self.config_file
     "#{ENV['HOME']}/.peas"
   end
@@ -14,13 +17,22 @@ module Peas
 
   # Hierarchy of sources for the Peas API domain
   def self.api_domain
-    if ENV['PEAS_API_ENDPOINT']
+    domain = if ENV['PEAS_API_ENDPOINT']
       ENV['PEAS_API_ENDPOINT']
     elsif Peas.config['domain']
       Peas.config['domain']
     else
       'localhost:4000'
     end
+    unless domain[/\Ahttp:\/\//] || domain[/\Ahttps:\/\//]
+      domain = "http://#{domain}"
+    else
+      domain
+    end
+  end
+
+  def self.host
+    URI.parse(Peas.api_domain).host
   end
 
   def self.error_message string

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.1.0 ruby lib
+# stub: peas-cli 0.1.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "peas-cli"
-  s.version = "0.1.0"
+  s.version = "0.1.1"
 
   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-05-30"
+  s.date = "2014-06-14"
   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", "peas-dev"]
@@ -31,6 +31,7 @@ Gem::Specification.new do |s|
     "lib/peas/commands/admin.rb",
     "lib/peas/commands/app.rb",
     "lib/peas/commands/config.rb",
+    "lib/peas/commands/logs.rb",
     "lib/peas/config.rb",
     "lib/peas/git.rb",
     "lib/peas/version.rb",

data/spec/cli_spec.rb

@@ -57,7 +57,7 @@ describe 'Peas CLI' do
       expect(output).to eq "scaling\n"
     end
 
-    describe 'Config' do
+    describe 'Config ENV vars' do
       it 'should set config for an app' do
         stub_request(:put, TEST_DOMAIN + '/app/fakesha/config?vars=%7B%22FOO%22:%22BAR%22%7D')
           .to_return(body: response_mock("{'FOO' => 'BAR'}"))
@@ -81,6 +81,23 @@ describe 'Peas CLI' do
     end
   end
 
+  describe 'Logs' do
+    it 'should stream logs' do
+      stub_const 'Peas::SWITCHBOARD_PORT', 79345
+      Thread.new do
+        server = TCPServer.new Peas.host, Peas::SWITCHBOARD_PORT
+        if peer = server.accept
+          peer.puts "Here's ya logs"
+          peer.puts "MOAR logs"
+          peer.close
+        end
+      end
+      sleep 0.3
+      output = cli %w(logs)
+      expect(output).to eq "Here's ya logs\nMOAR logs\n"
+    end
+  end
+
   it 'should retrieve and output a long-running command' do
     stub_request(:get, /deploy/).to_return(body: '{"job": "123"}')
     stub_request(:get, /status/).to_return(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peas-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Tom Buckley-Houston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -88,6 +88,7 @@ files:
 - lib/peas/commands/admin.rb
 - lib/peas/commands/app.rb
 - lib/peas/commands/config.rb
+- lib/peas/commands/logs.rb
 - lib/peas/config.rb
 - lib/peas/git.rb
 - lib/peas/version.rb