peas-cli 0.4.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: faee8809a414a35708ca312da7d0058383c2f16f
-  data.tar.gz: 96f7c1fcdbf0efcc9551c6404ec4031f9d4cba03
+  metadata.gz: ff6bd17390d126df42251a27d4b7cbf3ecee90e9
+  data.tar.gz: d57aad2e837e5aa3eeca287cd631d4cb23c0600c
 SHA512:
-  metadata.gz: b8c95f478440542ac91133997d017a908b6b585a674981e5fe423ab839b506b087e583fbf51b710a2497e0af4c470da6e28e0e6042a87cc42fb0d2a10fffff14
-  data.tar.gz: 7ec91fd22ad6b72f52baf27daeca94949f3996297aeb9c94c617b89e651439a6e681774ed1383f5d3170e0189b1af6a3e073dd140ddb37a99c8640a15dc63b52
+  metadata.gz: 2e13f14149f6ec04c6775781978b705b84b3492b5ba73551c8a2cba4e7a02652a98b012438a3f3bc39fd48682d2e0697d930ba5ea718266e2f719f46dcffdd05
+  data.tar.gz: b6b6557852a4cee0b445071fec9f79f220848123324bded6fe121c112bd2a25b47cfd7baa4c059ff5729b71757805046cb2c5eaa97fd76d6374d0f524a9fbd50

data/Gemfile

@@ -11,5 +11,5 @@ group :test do
 end
 
 group :development do
-	gem 'jeweler'
-end
+  gem 'jeweler'
+end

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.6.0

data/lib/peas/api.rb

@@ -1,8 +1,11 @@
 require 'httparty'
 require 'socket'
+require 'openssl'
 
 class API
   include HTTParty
+  # TODO: Don't want to genuine SSL cert errors, say if there's a CA root cert
+  default_options.update(verify: false) # Ignore self-signed SSL error
 
   LONG_POLL_TIMEOUT = 10 * 60
   LONG_POLL_INTERVAL = 0.5
@@ -51,7 +54,11 @@ class API
   end
 
   def self.switchboard_connection
-    TCPSocket.new Peas.host, Peas::SWITCHBOARD_PORT
+    socket = TCPSocket.new Peas.host, Peas::SWITCHBOARD_PORT
+    ssl = OpenSSL::SSL::SSLSocket.new socket
+    ssl.sync_close = true
+    ssl.connect
+    ssl
   end
 
   # Stream the output of a Switchboard job
@@ -86,7 +93,7 @@ class API
 
   # 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
+  def self.duplex_socket(socket)
     threads = []
 
     # Copy STDIN to socket
@@ -94,7 +101,7 @@ class API
       STDIN.raw do |stdin|
         IO.copy_stream stdin, socket
       end
-      socket.close_write
+      socket.close
     end
 
     # Write response to STDOUT

data/lib/peas/commands/admin.rb

@@ -19,7 +19,7 @@ command :admin do |admin|
       if args.count > 1
         if args.first == 'peas.domain'
           domain = args[1]
-          domain = "http://#{domain}" unless domain.start_with? 'http://'
+          domain = "https://#{domain}" unless domain.start_with? 'https://'
           # Update Git config
           Git.sh "git config peas.domain #{domain}"
           # Update file

data/lib/peas/commands/logs.rb

@@ -5,7 +5,7 @@ command :logs do |c|
   c.switch [:f, :follow]
 
   c.action do |_global_options, options, _args|
-    follow = options[:follow] ? 'follow' : ''
-    API.stream_output "stream_logs.#{Git.name_from_remote} #{follow}"
+    follow = options[:follow] ? ' follow' : ''
+    API.stream_output "stream_logs.#{Git.name_from_remote}#{follow}"
   end
 end

data/lib/peas/config.rb

@@ -28,7 +28,7 @@ module Peas
       'vcap.me:4000'
     end
     unless domain[/\Ahttp:\/\//] || domain[/\Ahttps:\/\//]
-      "http://#{domain}"
+      "https://#{domain}"
     else
       domain
     end

data/lib/peas/git.rb

@@ -25,6 +25,6 @@ class Git
     remote_uri = remote unless remote_uri
     exit_now! "No Peas remote. I can't figure out what app this is.", 1 if remote_uri == ''
     parts = Addressable::URI.parse remote_uri
-    parts.path.split('/').last.gsub('.git', '')
+    parts.path.split('/').last.gsub('.git', '').downcase
   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.4.0 ruby lib
+# stub: peas-cli 0.6.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "peas-cli"
-  s.version = "0.4.0"
+  s.version = "0.6.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-19"
+  s.date = "2015-01-03"
   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"]

data/spec/cli_spec.rb

@@ -18,25 +18,25 @@ describe 'Peas CLI' do
 
   describe 'Settings' do
     it 'should set and use the domain setting' do
-      stub_request(:put, 'http://new-domain.com:4000/admin/settings?peas.domain=new-domain.com:4000')
+      stub_request(:put, 'https://new-domain.com:4000/admin/settings?peas.domain=new-domain.com:4000')
         .to_return(body: response_mock({}))
-      expect(Git).to receive(:sh).with("git config peas.domain http://new-domain.com:4000")
+      expect(Git).to receive(:sh).with("git config peas.domain https://new-domain.com:4000")
       cli %w(admin settings peas.domain new-domain.com:4000)
       config = JSON.parse File.open('/tmp/.peas').read
-      expect(config).to eq("domain" => "http://new-domain.com:4000")
+      expect(config).to eq("domain" => "https://new-domain.com:4000")
     end
 
     it 'should set a normal setting' do
-      stub_request(:put, 'http://vcap.me:4000/admin/settings?mongodb.uri=mongodb://uri')
+      stub_request(:put, 'https://vcap.me:4000/admin/settings?mongodb.uri=mongodb://uri')
         .to_return(body: response_mock(
-          defaults: { 'peas.domain' => 'http://boss.com' },
+          defaults: { 'peas.domain' => 'https://boss.com' },
           services: {
             'mongodb.uri' => 'mongodb://uri',
             'postgres.uri' => 'xsgfd'
           }
         ))
       output = cli %w(admin settings mongodb.uri mongodb://uri)
-      expect(output).to eq("Available settings\n\nDefaults:\n  peas.domain http://boss.com\n\nServices:\n  mongodb.uri mongodb://uri\n  postgres.uri xsgfd\n\n")
+      expect(output).to eq("Available settings\n\nDefaults:\n  peas.domain https://boss.com\n\nServices:\n  mongodb.uri mongodb://uri\n  postgres.uri xsgfd\n\n")
     end
 
   end
@@ -78,6 +78,7 @@ describe 'Peas CLI' do
     end
 
     it 'should scale an app', :with_socket do
+      expect(@socket).to receive(:puts).with('subscribe.job_progress.123')
       stub_request(
         :put,
         TEST_DOMAIN + '/app/test-test/scale?scaling_hash=%7B%22web%22:%223%22,%22worker%22:%222%22%7D'
@@ -95,10 +96,17 @@ describe 'Peas CLI' do
         output = cli %w(run FINAL COMMAND)
         expect(output).to eq "tty.test-test\nFINAL COMMAND\n"
       end
-      it 'should run one-off with input from STDIN' do
-        io = StringIO.new 'FINAL COMMAND'
+      # This one has taken me soooooo long to figure out. This is testing the ability to open up
+      # an SSH-like TTY, that among other things will let you interact with ncurses programs like
+      # VIM. So it's important that the duplex (simultaneous read/write) connections are tested.
+      it 'should run one-off commands with input from STDIN' do
+        # Using a pipe rather than a plain string means that no EOF is sent, which prematurely
+        # closes the connection.
+        read, write = IO.pipe
+        write.write "FINAL COMMAND\n"
+        # Stub the pipe into STDIN.raw to simulate typing
         allow(STDIN).to receive(:raw) do |&block|
-          block.call io
+          block.call read
         end
         output = cli %w(run WITH STDIN)
         expect(output).to eq "tty.test-test\nWITH STDIN\nFINAL COMMAND\n"
@@ -130,21 +138,17 @@ describe 'Peas CLI' do
   end
 
   describe 'Logs' do
-    it 'should stream logs' do
-      socket = double 'TCPSocket'
-      allow(socket).to receive(:puts)
-      allow(socket).to receive(:gets).and_return("Here's ya logs", "MOAR", false)
-      allow(TCPSocket).to receive(:new).and_return(socket)
+    it 'should stream logs', :with_socket do
+      expect(@socket).to receive(:puts).with('stream_logs.test-test')
+      allow(@socket).to receive(:gets).and_return("Here's ya logs", "MOAR", false)
       output = cli %w(logs)
       expect(output).to eq "Here's ya logs\nMOAR\n"
     end
   end
 
-  it 'should retrieve and output a long-running command' do
-    socket = double 'TCPSocket'
-    expect(socket).to receive(:puts).with('subscribe.job_progress.123')
-    allow(socket).to receive(:gets).and_return("doing", "something", "done", false)
-    allow(TCPSocket).to receive(:new).and_return(socket)
+  it 'should retrieve and output a long-running command', :with_socket do
+    expect(@socket).to receive(:puts).with('subscribe.job_progress.123')
+    allow(@socket).to receive(:gets).and_return("doing", "something", "done", false)
     expect(API).to receive(:puts).with "doing"
     expect(API).to receive(:puts).with "something"
     expect(API).to receive(:puts).with "done"
@@ -153,7 +157,7 @@ describe 'Peas CLI' do
 
   it 'should show a warning when there is a version mismatch' do
     stub_request(:get, TEST_DOMAIN + '/app/test-test/config')
-        .to_return(body: '{"version": "100000.1000000.100000"}')
+      .to_return(body: '{"version": "100000.1000000.100000"}')
     output = cli %w(config)
     expect(output).to include 'Your version of the CLI client is out of date'
   end

data/spec/spec_helper.rb

@@ -1,6 +1,7 @@
-require 'rubygems'
 require 'stringio'
+require 'rubygems'
 require 'webmock/rspec'
+require 'openssl'
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "../"))
 require 'lib/peas'
@@ -8,8 +9,12 @@ require 'lib/peas'
 ENV['GLI_ENV'] = 'test'
 ROOT = File.join(File.expand_path(File.dirname(__FILE__)), '..')
 $LOAD_PATH.unshift(File.join(ROOT, 'lib'))
-TEST_DOMAIN = 'http://vcap.me:4000'
+TEST_DOMAIN = 'https://vcap.me:4000'
 SWITCHBOARD_TEST_PORT = 79345
+SSL_KEY_PATH = "#{ROOT}/../contrib/ssl-keys/server.key"
+SSL_KEY = OpenSSL::PKey::RSA.new File.read(SSL_KEY_PATH)
+SSL_CERT_PATH = "#{ROOT}/../contrib/ssl-keys/server.crt"
+SSL_CERT = OpenSSL::X509::Certificate.new File.read(SSL_CERT_PATH)
 
 RSpec.configure do |config|
   config.mock_with :rspec
@@ -20,19 +25,26 @@ RSpec.configure do |config|
   end
 
   config.before(:each, :with_socket) do
-    @socket = double 'TCPSocket'
-    expect(@socket).to receive(:puts).with('subscribe.job_progress.123')
-    allow(TCPSocket).to receive(:new).and_return(@socket)
+    tcp = instance_double TCPSocket
+    allow(TCPSocket).to receive(:new).and_return(tcp)
+    @socket = instance_double OpenSSL::SSL::SSLSocket
+    allow(OpenSSL::SSL::SSLSocket).to receive(:new).and_return(@socket)
+    allow(@socket).to receive(:sync_close=)
+    allow(@socket).to receive(:connect)
   end
 
   config.before(:each, :with_echo_server) do
-    @server = TCPServer.new 'vcap.me', SWITCHBOARD_TEST_PORT
+    tcp_server = TCPServer.new 'vcap.me', SWITCHBOARD_TEST_PORT
+    context = OpenSSL::SSL::SSLContext.new
+    context.key = SSL_KEY
+    context.cert = SSL_CERT
     Thread.new do
+      @server = OpenSSL::SSL::SSLServer.new tcp_server, context
       @connection = @server.accept
       begin
         Timeout.timeout(2) do
           while (line = @connection.gets)
-            @connection.puts line
+            @connection.write line
             @connection.close if line.strip == 'FINAL COMMAND'
           end
         end

metadata

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