peas-cli 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e21b1eaec8ee7ce0d7a7b76dbf2a0912c6eaa3c
-  data.tar.gz: 13c9d9ce95cfbebcea8cfb787ca9e0661f3c444a
+  metadata.gz: f22ef195adddaf91d900dfb57ca2fac5b0244586
+  data.tar.gz: 15b42a3e4009b3697a4a71cb484ba6610f1a72fb
 SHA512:
-  metadata.gz: 7405ef69c589de7140e5c463356b77d06f3836bd3788eca36401c74465ab6ced6ddc534f8bf362e69f26be829976d3d03466bb3511aa3c9a03ed491cd98064df
-  data.tar.gz: e377db4f59cc014a5cd10363d83d2235d11c55ea25c1cca358b8e833f68202d29283ba38b514acb75141239ded9f5f2f24cc311eb2f623a61699a3e8f755cf7f
+  metadata.gz: 3c6e24d63753037320e8f30672f8c72f0d9fb38ec1c40bfe415b59886b6743991f9a77853b02a74f731e3aead6d005fd65ee770100fe814aedf1927ff6914e7b
+  data.tar.gz: 840321e330c30f9ef42e8ca21730b9769c0595d003cab8cc11109452c9fedeb44d6d096f24cb521c68c20e896352319d199092ecfe297b43847a295db80c13af

data/Gemfile.lock

@@ -1,7 +1,7 @@
 GEM
   remote: https://rubygems.org/
   specs:
-    addressable (2.3.5)
+    addressable (2.3.6)
     builder (3.2.2)
     crack (0.4.2)
       safe_yaml (~> 1.0.0)
@@ -10,7 +10,7 @@ GEM
     diff-lcs (1.2.5)
     faraday (0.9.0)
       multipart-post (>= 1.2, < 3)
-    git (1.2.6)
+    git (1.2.7)
     github_api (0.11.3)
       addressable (~> 2.3)
       descendants_tracker (~> 0.0.1)
@@ -19,10 +19,10 @@ GEM
       multi_json (>= 1.7.5, < 2.0)
       nokogiri (~> 1.6.0)
       oauth2
-    gli (2.9.0)
-    hashie (2.0.5)
+    gli (2.11.0)
+    hashie (3.1.0)
     highline (1.6.21)
-    httparty (0.12.0)
+    httparty (0.13.1)
       json (~> 1.8)
       multi_xml (>= 0.5.2)
     jeweler (2.0.1)
@@ -35,37 +35,40 @@ GEM
       rake
       rdoc
     json (1.8.1)
-    jwt (0.1.11)
-      multi_json (>= 1.5)
-    mini_portile (0.5.3)
-    multi_json (1.9.2)
+    jwt (1.0.0)
+    mini_portile (0.6.0)
+    multi_json (1.10.1)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    nokogiri (1.6.1)
-      mini_portile (~> 0.5.0)
-    oauth2 (0.9.3)
+    nokogiri (1.6.2.1)
+      mini_portile (= 0.6.0)
+    oauth2 (0.9.4)
       faraday (>= 0.8, < 0.10)
-      jwt (~> 0.1.8)
+      jwt (~> 1.0)
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
     rack (1.5.2)
     rainbow (2.0.0)
-    rake (10.2.2)
+    rake (10.3.2)
     rdoc (4.1.1)
       json (~> 1.4)
-    rspec (2.14.1)
-      rspec-core (~> 2.14.0)
-      rspec-expectations (~> 2.14.0)
-      rspec-mocks (~> 2.14.0)
-    rspec-core (2.14.8)
-    rspec-expectations (2.14.5)
-      diff-lcs (>= 1.1.3, < 2.0)
-    rspec-mocks (2.14.6)
-    safe_yaml (1.0.1)
-    thread_safe (0.3.2)
-    webmock (1.17.4)
-      addressable (>= 2.2.7)
+    rspec (3.0.0)
+      rspec-core (~> 3.0.0)
+      rspec-expectations (~> 3.0.0)
+      rspec-mocks (~> 3.0.0)
+    rspec-core (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-expectations (3.0.2)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.0.0)
+    rspec-mocks (3.0.2)
+      rspec-support (~> 3.0.0)
+    rspec-support (3.0.2)
+    safe_yaml (1.0.3)
+    thread_safe (0.3.4)
+    webmock (1.18.0)
+      addressable (>= 2.3.6)
       crack (>= 0.3.2)
 
 PLATFORMS

data/Rakefile

@@ -24,6 +24,8 @@ Jeweler::Tasks.new do |gem|
   gem.email = "tom@tombh.co.uk"
   gem.authors = ["Tom Buckley-Houston"]
   gem.files.include 'VERSION'
+  # Don't include peas-dev
+  gem.executables = ['peas']
   gem.files.exclude 'bin/peas-dev'
   # dependencies defined in Gemfile
 end

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/bin/peas

@@ -36,7 +36,7 @@ on_error do |exception|
   # Show a custom error message with backtrace if it's not a GLI error
   if exception.class.to_s.split('::').first != 'GLI'
     if exception.class == Errno::ECONNREFUSED
-      Peas.error_message "Couldn't connect to the Peas API. The current endpoint is '#{Peas.config['domain']}', make " +
+      Peas.error_message "Couldn't connect to the Peas API. The current endpoint is '#{Peas.api_domain}', make " +
         "sure it is up and accessible."
     else
       Peas.error_message "Unexpected error: #{exception.class}"

data/lib/peas/api.rb

@@ -24,8 +24,8 @@ class API
     raise json['error'].color(:red) if json.has_key? 'error'
     # Successful responses
     if json.has_key? 'job'
-      # Long-running jobs need to poll a job status endpoint
-      long_running_output json['job']
+      # Long-running jobs need to stream from the Switchboard server
+      API.stream_job json['job']
     else
       # Check CLI client is up to date.
       # Only check major and minor versions
@@ -49,45 +49,38 @@ class API
     end
   end
 
-  # Rudimentary long-polling to stream the status of a job.
-  def long_running_output job
-    count = 0
-    begin
-      sleep LONG_POLL_INTERVAL
-      # API request to the /status endpoint
-      status = JSON.parse self.class.send(:get, '/status', {query: {job: job}}).body
-      if status['status'] != 'failed'
-        if status['output']
-          # Don't output the accumulated progress log every time. Just output the difference
-          output_diff status['output']
-        end
-        # Theoretically all worker errors should be caught and handled gracefully
-        if status['error']
-          puts
-          raise status['error'].color(:red)
-        end
-      else
-        # Uncaught error or production environment error
-        raise "Long-running job failed. See worker logs for details.".color(:red)
-      end
-      count += 1
-    end while status['status'] == 'working' && (count * LONG_POLL_INTERVAL) < LONG_POLL_TIMEOUT
+  def self.switchboard_connection
+    TCPSocket.new Peas.host, Peas::SWITCHBOARD_PORT
   end
 
-  # The Sidekiq status gem allows you to set custom variables associated with a job. So the worker
-  # appends to an 'output' variable that accumulates the total log data. So we don't want to output
-  # the 'total' output on every long-polled request. We just want to output any *new* log lines.
-  def output_diff log_so_far
-    @accumulated_output ||= ''
-    old_count = @accumulated_output.lines.count
-    new_count = log_so_far.lines.count
-    diff = log_so_far.lines.to_a[old_count..new_count]
-    @accumulated_output = log_so_far
-    puts diff.join if diff.length > 0
+  # Stream the output of a Switchboard job
+  def self.stream_job job
+    API.stream_output "subscribe.job_progress.#{job}" do |line|
+      if line.has_key? 'status'
+        if line['status'] == 'failed'
+          raise line['body']
+        elsif line['status'] == 'complete'
+          break
+        end
+      end
+      puts line['body'] if line['body']
+    end
   end
 
-  def self.switchboard_connection
-    TCPSocket.new Peas.host, Peas::SWITCHBOARD_PORT
+  # Stream data from the Switchboard server
+  def self.stream_output switchboard_command
+    socket = API.switchboard_connection
+    socket.puts switchboard_command
+    begin
+      while line = socket.gets
+        if block_given?
+          yield JSON.parse line
+        else
+          puts line
+        end
+      end
+    rescue Interrupt, Errno::ECONNRESET
+    end
   end
 
 end

data/lib/peas/commands/logs.rb

@@ -1,13 +1,6 @@
 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
+    API.stream_output "stream_logs.#{Git.first_sha}"
   end
 end

data/peas-cli.gemspec

@@ -2,19 +2,19 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: peas-cli 0.1.1 ruby lib
+# stub: peas-cli 0.1.2 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "peas-cli"
-  s.version = "0.1.1"
+  s.version = "0.1.2"
 
   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-06-14"
+  s.date = "2014-07-08"
   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"]
+  s.executables = ["peas"]
   s.extra_rdoc_files = [
     "README.md"
   ]

data/spec/cli_spec.rb

@@ -2,11 +2,11 @@ require 'spec_helper'
 
 describe 'Peas CLI' do
   before :each do
-    Git.stub(:sh).and_return(nil)
-    Git.stub(:remote).and_return('git@github.com:test/test.git')
-    Git.stub(:first_sha).and_return('fakesha')
-    API.any_instance.stub(:sleep).and_return(nil)
-    Peas.stub(:config_file).and_return('/tmp/.peas')
+    allow(Git).to receive(:sh).and_return(nil)
+    allow(Git).to receive(:remote).and_return('git@github.com:test/test.git')
+    allow(Git).to receive(:first_sha).and_return('fakesha')
+    allow_any_instance_of(API).to receive(:sleep).and_return(nil)
+    allow(Peas).to receive(:config_file).and_return('/tmp/.peas')
     File.delete '/tmp/.peas' if File.exists? '/tmp/.peas'
   end
 
@@ -36,22 +36,26 @@ describe 'Peas CLI' do
       expect(output).to eq "App 'test' successfully created\n"
     end
 
-    it 'should deploy an app' do
+    it 'should deploy an app', :with_socket do
       stub_request(:get, /deploy/).to_return(body: '{"job": "123"}')
-      stub_request(:get, /status/).to_return(
-        {body: '{"status": "working", "output": "deploying\n"}'}
+      allow(@socket).to receive(:gets).and_return(
+        '{"body":"doing"}',
+        '{"body":"something"}',
+        '{"body":"done"}',
+        '{"status":"complete"}'
       )
-      output = cli ['deploy']
-      expect(output).to eq "deploying\n"
+      output = cli %w(deploy)
+      expect(output).to eq "doing\nsomething\ndone\n"
     end
 
-    it 'should scale an app' do
+    it 'should scale an app', :with_socket do
       stub_request(
         :put,
         TEST_DOMAIN + '/app/fakesha/scale?scaling_hash=%7B%22web%22:%223%22,%22worker%22:%222%22%7D'
       ).to_return(body: '{"job": "123"}')
-      stub_request(:get, /status/).to_return(
-        {body: '{"status": "working", "output": "scaling\n"}'}
+      allow(@socket).to receive(:gets).and_return(
+        '{"body":"scaling"}',
+        '{"status":"complete"}'
       )
       output = cli %w(scale web=3 worker=2)
       expect(output).to eq "scaling\n"
@@ -83,31 +87,24 @@ describe 'Peas CLI' do
 
   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
+      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)
       output = cli %w(logs)
-      expect(output).to eq "Here's ya logs\nMOAR logs\n"
+      expect(output).to eq "Here's ya logs\nMOAR\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(
-      {body: '{"status": "working", "output": "doing\n"}'},
-      {body: '{"status": "working", "output": "doing\nsomething\n"}'},
-      {body: '{"status": "working", "output": "doing\nsomething\n"}'},
-      {body: '{"status": "complete", "output": "doing\nsomething\ndone\n"}'}
-    )
-    output = cli ['deploy']
-    expect(output).to eq "doing\nsomething\ndone\n"
+    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)
+    expect(API).to receive(:puts).with "doing"
+    expect(API).to receive(:puts).with "something"
+    expect(API).to receive(:puts).with "done"
+    API.stream_output "subscribe.job_progress.123"
   end
 
   it 'should show a warning when there is a version mismatch' do

data/spec/spec_helper.rb

@@ -9,10 +9,21 @@ ENV['GLI_ENV'] = 'test'
 ROOT = File.join(File.expand_path(File.dirname(__FILE__)), '..')
 $LOAD_PATH.unshift(File.join(ROOT, 'lib'))
 TEST_DOMAIN = 'http://localhost:4000'
+SWITCHBOARD_TEST_PORT = 79345
 
 RSpec.configure do |config|
   config.mock_with :rspec
   config.expect_with :rspec
+
+  config.before(:each) do
+    stub_const('Peas::SWITCHBOARD_PORT', SWITCHBOARD_TEST_PORT)
+  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)
+  end
 end
 
 # Execute a block that triggers STDOUT and test output

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peas-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Tom Buckley-Houston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-14 00:00:00.000000000 Z
+date: 2014-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
@@ -70,7 +70,6 @@ description: Peas is an open source Heroku-style PaaS written in Ruby and using
 email: tom@tombh.co.uk
 executables:
 - peas
-- peas-dev
 extensions: []
 extra_rdoc_files:
 - README.md
@@ -82,7 +81,6 @@ files:
 - Rakefile
 - VERSION
 - bin/peas
-- bin/peas-dev
 - lib/peas.rb
 - lib/peas/api.rb
 - lib/peas/commands/admin.rb

data/bin/peas-dev

@@ -1,8 +0,0 @@
-#!/bin/bash
-# This script lets you use the development version of the Peas CLI rather than the Rubygems version
-# installed via `gem install peas-cli`.
-# Install by symlinking this file into your executbales path, eg;
-# `sudo ln -s $(pwd)/peas-dev /usr/local/bin/peas-dev'
-set -e
-PEAS_ROOT="$(dirname "$(test -L "$0" && readlink "$0" || echo "$0")")/../.."
-BUNDLE_GEMFILE=$PEAS_ROOT/cli/Gemfile GLI_DEBUG=true bundle exec $PEAS_ROOT/cli/bin/peas $@