peas-cli 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce1aa06662fc854dd4a33701bc818feb65fbb628
-  data.tar.gz: 7b31388468f79007654454249a62048977af84d8
+  metadata.gz: 4b404da416dc6ebddcb8f1f8c73a637dcbdfb760
+  data.tar.gz: 0810ed5cc0f6344fa4bad08d270dc9e3013cb3b3
 SHA512:
-  metadata.gz: f8b5831ae013078332b0ec19d28d829b16936108d8b929b5082f2be7a1dcd1480a27b86abf6f2438c1afb6da26d867c431ed5d0a86a8b5f63d00f47764254b16
-  data.tar.gz: 4ebd57e18fcc038e098d26e36bc6fbc189f15df0093fa77b3958af764e4b7296929f6656213ac0d24102356b7aac602ed7e2d1642d605b9d7103ead0bf26ff9e
+  metadata.gz: 3fcfbebaa21f1c45765a97cb7a5527838a7256353d3f5143b0946f3190305ad109f473e72343f3eb41c24dbd19c78652c97a7cb02199938eb4ba512a5608fb46
+  data.tar.gz: e99598b4321a28294efc9dc6e27eee3ffefd472432c58ca22ac160c62a66d80fd23aa79f1c15312dc302af9576f1bf8be9555f99a2ae4b10cbd707af1e389526

data/VERSION

@@ -1 +1 @@
-0.3.0
+0.3.1

data/lib/peas/api.rb

@@ -15,11 +15,7 @@ class API
   # Generic wrapper to the Peas API
   def request(verb, method, params = nil)
     response = self.class.send(verb, "#{method}", query: params).body
-    if response
-      json = JSON.parse(response)
-    else
-      json = {}
-    end
+    json = response ? JSON.parse(response) : {}
     # If there was an HTTP-level error
     raise json['error'].color(:red) if json.key? 'error'
     # Successful responses
@@ -27,22 +23,7 @@ class API
       # 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
-      version_mismatch = false
-      api_version = json['version'].split('.')
-      client_version = Peas::VERSION.split('.')
-      if api_version[0] != client_version[0]
-        version_mismatch = true
-      else
-        version_mismatch = true if api_version[1] != client_version[1]
-      end
-      if version_mismatch
-        Peas.warning_message "Your version of the CLI client is out of date " \
-          "(Client: #{Peas::VERSION}, API: #{json['version']}). " \
-          "Please update using `gem install peas-cli`."
-      end
-      # Normal API response
+      check_versions(json)
       if block_given?
         yield json['message']
       else
@@ -52,6 +33,23 @@ class API
     end
   end
 
+  # Check CLI client is up to date.
+  def check_versions(json)
+    # Only check major and minor versions
+    version_mismatch = false
+    api_version = json['version'].split('.')
+    client_version = Peas::VERSION.split('.')
+    if api_version[0] != client_version[0]
+      version_mismatch = true
+    else
+      version_mismatch = true if api_version[1] != client_version[1]
+    end
+    return unless version_mismatch
+    Peas.warning_message "Your version of the CLI client is out of date " \
+      "(Client: #{Peas::VERSION}, API: #{json['version']}). " \
+      "Please update using `gem install peas-cli`."
+  end
+
   def self.switchboard_connection
     TCPSocket.new Peas.host, Peas::SWITCHBOARD_PORT
   end
@@ -75,7 +73,7 @@ class API
     socket = API.switchboard_connection
     socket.puts switchboard_command
     begin
-      while line = socket.gets
+      while (line = socket.gets)
         if block_given?
           yield JSON.parse line
         else

data/lib/peas/commands/app.rb

@@ -59,3 +59,40 @@ command :scale do |c|
     )
   end
 end
+
+desc 'Run one-off commands'
+long_desc <<-EOF
+For example: peas run rake db:migrate
+EOF
+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 "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)
+  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.0 ruby lib
+# stub: peas-cli 0.3.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "peas-cli"
-  s.version = "0.3.0"
+  s.version = "0.3.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-08-23"
+  s.date = "2014-11-01"
   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

@@ -90,6 +90,21 @@ describe 'Peas CLI' do
       expect(output).to eq "scaling\n"
     end
 
+    describe 'Running one-off commands', :with_echo_server do
+      it 'should run one-off commands direct from the 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'
+        allow(STDIN).to receive(:raw) do |&block|
+          block.call io
+        end
+        output = cli %w(run WITH STDIN)
+        expect(output).to eq "tty.test-test\nWITH STDIN\nFINAL COMMAND\n"
+      end
+    end
+
     describe 'Config ENV vars' do
       it 'should set config for an app' do
         stub_request(:put, TEST_DOMAIN + '/app/test-test/config?vars=%7B%22FOO%22:%22BAR%22%7D')

data/spec/spec_helper.rb

@@ -24,6 +24,29 @@ RSpec.configure do |config|
     expect(@socket).to receive(:puts).with('subscribe.job_progress.123')
     allow(TCPSocket).to receive(:new).and_return(@socket)
   end
+
+  config.before(:each, :with_echo_server) do
+    @server = TCPServer.new 'vcap.me', SWITCHBOARD_TEST_PORT
+    Thread.new do
+      @connection = @server.accept
+      begin
+        Timeout.timeout(2) do
+          while (line = @connection.gets)
+            @connection.puts line
+            @connection.close if line.strip == 'FINAL COMMAND'
+          end
+        end
+      rescue Timeout::Error
+      ensure
+        @connection.close
+      end
+    end
+  end
+
+  config.after(:each, :with_echo_server) do
+    @server.close rescue nil
+  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.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Tom Buckley-Houston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-23 00:00:00.000000000 Z
+date: 2014-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli