peas-cli 0.0.2 → 0.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff74c389b73f05511fcb56a51176657987e7ae09
-  data.tar.gz: 04c3d0be0dd5937c4dfa1763802bc38b00891561
+  metadata.gz: 1563acd00068fb352671fc5d5116dda66d42fb15
+  data.tar.gz: e8f6d84f6a545e3d0d6e2b8fd5f8a38a48c44b73
 SHA512:
-  metadata.gz: bae333e4865553e1ae60b250a3320c8a77dce3103dbad72fbcaba58a296fdb4f3769d0847bf0d519419dbaa0eb82d032a44268a58da65bd874208cde6bd35751
-  data.tar.gz: 5cfc06bd6a5d240dcc4e9d7096f904c69d88d6a62870555da1fbaf5ee6cc5c48463edf7f86a188a584ea5f6745c67a14ba354dff12ff1e61e6f534be9ff16ae1
+  metadata.gz: a0fcdcb620bef4ab17b0852c73e17fb464f5b06ccd65a9e2846312febe1fa88fc1f98a340329aa52a13ad820511e3f9dd7189641ecf4abd800bf132a9f757e9b
+  data.tar.gz: f0ec4fdaf8822a33d3dd7cd3c7c4e5467030818b98d93ef18c6bfd6edcd599cfd35a2d6fd3d7f4f3a345d287b15621563eaf643797007829cf459540cb1e05c8

data/Rakefile

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

data/VERSION

@@ -1 +1 @@
-0.0.2
+0.1.0

data/bin/peas

@@ -1,6 +1,9 @@
 #!/usr/bin/env ruby
 require 'gli'
-require 'peas'
+
+root_path = File.join(File.dirname(__FILE__), "../")
+$LOAD_PATH.unshift(root_path)
+require 'lib/peas'
 
 @api = API.new
 
@@ -11,78 +14,8 @@ program_desc 'CLI client for Peas'
 
 version Peas::VERSION
 
-desc 'Create an app'
-command :create do |c|
-  c.action do |global_options, options, args|
-    @api.request :post, :create, {
-      first_sha: Git.first_sha,
-      remote: Git.remote
-    }
-  end
-end
-
-desc 'Deploy an app'
-command :deploy do |c|
-  c.action do |global_options, options, args|
-    @api.request :get, :deploy, {first_sha: Git.first_sha}
-  end
-end
-
-desc 'Scale an app'
-long_desc <<-EOF
-For example: peas scale web=3 worker=2
-EOF
-command :scale do |c|
-  c.action do |global_options, options, args|
-    if args.length == 0
-      exit_now! "Please provide scaling arguments in the form: web=3 worker=2"
-    end
-    scaling_hash = {}
-    args.each do |arg|
-      parts = arg.split('=')
-      process_type = parts[0]
-      quantity = parts[1]
-      scaling_hash[process_type] = quantity
-    end
-    @api.request :put, :scale, {
-      first_sha: Git.first_sha,
-      scaling_hash: scaling_hash.to_json
-    }
-  end
-end
-
-desc 'Set Peas global settings'
-command :settings do |c|
-  c.flag 'domain',
-    type: String,
-    desc: 'The FQDN for the Peas server'
-  c.action do |global_options, options, args|
-    if options['domain']
-      if !options['domain'].start_with? 'http://'
-        options['domain'] = "http://#{options['domain']}"
-      end
-    end
-    # Gli seems to provide a String and Symbol key for every option, so the options hash needs
-    # de-duplicating
-    deduped = {}
-    options.each do |k, v|
-      deduped[k] = v if k.is_a? String
-    end
-    # Merge existing settings with current settings
-    content = Peas.config.merge(deduped).to_json
-    File.open(Peas.config_file, 'w+'){|f| f.write(content) }
-    # Save the settings on the server as well
-    @api.request :put, :settings, options
-    puts "New settings:"
-    puts JSON.pretty_generate(Peas.config)
-  end
-  desc 'Display the current settings'
-  c.command :display do |c|
-    c.action do |global_options, options, args|
-      puts JSON.pretty_generate(Peas.config)
-    end
-  end
-end
+# Load all the commands
+Dir["#{root_path}/lib/peas/commands/**/*.rb"].each { |f| load f }
 
 pre do |global, command, options, args|
   # Pre logic here
@@ -100,8 +33,17 @@ post do |global, command, options, args|
 end
 
 on_error do |exception|
-  # Error logic here
-  # return false to skip default error handling
+  # 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 " +
+        "sure it is up and accessible."
+    else
+      Peas.error_message "Unexpected error: #{exception.class}"
+      Peas.error_message "#{exception.message} @ #{exception.backtrace.last}"
+    end
+  end
+  # GLI needs this to do its default error reporting things
   true
 end
 

data/bin/peas-dev

@@ -0,0 +1,8 @@
+#!/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 $@

data/lib/peas/api.rb

@@ -8,12 +8,12 @@ class API
 
   # This allows base_uri to be dynamically set. Useful for testing
   def initialize
-    self.class.base_uri Peas.config['domain'] || 'localhost:4000'
+    self.class.base_uri Peas.api_domain
   end
 
   # Generic wrapper to the Peas API
-  def request verb, method, params
-    response = self.class.send(verb, "/#{method}", {query: params}).body
+  def request verb, method, params = nil
+    response = self.class.send(verb, "#{method}", {query: params}).body
     if response
       json = JSON.parse(response)
     else
@@ -26,7 +26,24 @@ class API
       # Long-running jobs need to poll a job status endpoint
       long_running_output json['job']
     else
-      # Normal API repsonse
+      # 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
+        if api_version[1] != client_version[1]
+          version_mismatch = true
+        end
+      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
       puts json['message']
     end
   end
@@ -61,9 +78,9 @@ class API
   # 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.length
-    new_count = log_so_far.lines.length
-    diff = log_so_far.lines[old_count..new_count]
+    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
   end

data/lib/peas/commands/admin.rb

@@ -0,0 +1,33 @@
+desc 'Set Peas global settings'
+command :settings do |c|
+  c.flag 'domain',
+    type: String,
+    desc: 'The FQDN for the Peas server'
+  c.action do |global_options, options, args|
+    if options['domain']
+      if !options['domain'].start_with? 'http://'
+        options['domain'] = "http://#{options['domain']}"
+      end
+    end
+    # Gli seems to provide a String and Symbol key for every option, so the options hash needs
+    # de-duplicating
+    deduped = {}
+    options.each do |k, v|
+      deduped[k] = v if k.is_a? String
+    end
+    # Merge existing settings with current settings
+    content = Peas.config.merge(deduped).to_json
+    File.open(Peas.config_file, 'w+'){|f| f.write(content) }
+    # Save the settings on the server as well
+    @api = API.new # Refresh settings from file
+    @api.request :put, '/admin/settings', options
+    puts "New settings:"
+    puts JSON.pretty_generate(Peas.config)
+  end
+  desc 'Display the current settings'
+  c.command :display do |c|
+    c.action do |global_options, options, args|
+      puts JSON.pretty_generate(Peas.config)
+    end
+  end
+end

data/lib/peas/commands/app.rb

@@ -0,0 +1,37 @@
+desc 'Create an app'
+command :create do |c|
+  c.action do |global_options, options, args|
+    @api.request :post, "/app/#{Git.first_sha}", {
+      remote: Git.remote
+    }
+  end
+end
+
+desc 'Deploy an app'
+command :deploy do |c|
+  c.action do |global_options, options, args|
+    @api.request :get, "/app/#{Git.first_sha}/deploy"
+  end
+end
+
+desc 'Scale an app'
+long_desc <<-EOF
+For example: peas scale web=3 worker=2
+EOF
+command :scale do |c|
+  c.action do |global_options, options, args|
+    if args.length == 0
+      exit_now! "Please provide scaling arguments in the form: web=3 worker=2"
+    end
+    scaling_hash = {}
+    args.each do |arg|
+      parts = arg.split('=', 2)
+      process_type = parts[0]
+      quantity = parts[1]
+      scaling_hash[process_type] = quantity
+    end
+    @api.request :put, "/app/#{Git.first_sha}/scale", {
+      scaling_hash: scaling_hash.to_json
+    }
+  end
+end

data/lib/peas/commands/config.rb

@@ -0,0 +1,35 @@
+desc 'Add, remove and list config for an app'
+command :config do |c|
+  c.default_desc 'List all config'
+  c.action do |global_options, options, args|
+    @api.request :get, "/app/#{Git.first_sha}/config"
+  end
+
+  c.desc 'Delete config by keys'
+  c.command :rm do |sc|
+    sc.action do |global_options, options, args|
+      @api.request :delete, "/app/#{Git.first_sha}/config", {
+        keys: args.to_json
+      }
+    end
+  end
+
+  c.desc 'Set config for an app'
+  c.command :set do |sc|
+    sc.action do |global_options, options, args|
+      if args.length == 0
+        exit_now! "Please provide config in the form: FOO=BAR ENV=production"
+      end
+      vars = {}
+      args.each do |arg|
+        parts = arg.split('=', 2)
+        key = parts[0]
+        value = parts[1]
+        vars[key] = value
+      end
+      @api.request :put, "/app/#{Git.first_sha}/config", {
+        vars: vars.to_json
+      }
+    end
+  end
+end

data/lib/peas/config.rb

@@ -1,4 +1,10 @@
 module Peas
+
+  def self.config_file
+    "#{ENV['HOME']}/.peas"
+  end
+
+  # Read JSON config from file
   def self.config
     file = File.open config_file, "a+"
     contents = file.read
@@ -6,7 +12,23 @@ module Peas
     JSON.parse contents
   end
 
-  def self.config_file
-  	"#{ENV['HOME']}/.peas"
+  # Hierarchy of sources for the Peas API domain
+  def self.api_domain
+    if ENV['PEAS_API_ENDPOINT']
+      ENV['PEAS_API_ENDPOINT']
+    elsif Peas.config['domain']
+      Peas.config['domain']
+    else
+      'localhost:4000'
+    end
   end
+
+  def self.error_message string
+    puts string.color(:red)
+  end
+
+  def self.warning_message string
+    puts string.color(:magenta)
+  end
+
 end

data/lib/peas/git.rb

@@ -12,6 +12,6 @@ class Git
   end
 
   def self.first_sha
-    sh 'git rev-list --max-parents=0 HEAD'
+    sh 'git rev-list --max-parents=0 HEAD | head -n1'
   end
 end

data/lib/peas.rb

@@ -1,8 +1,9 @@
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "../lib"))
 require 'json'
-require 'peas/version.rb'
-require 'peas/config.rb'
-require 'peas/git.rb'
-require 'peas/api.rb'
+require 'peas/version'
+require 'peas/config'
+require 'peas/git'
+require 'peas/api'
 require 'rainbow'
 require 'rainbow/ext/string'
 

data/peas-cli.gemspec

@@ -2,17 +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.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "peas-cli"
-  s.version = "0.0.2"
+  s.version = "0.1.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-04-06"
+  s.date = "2014-05-30"
   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"]
+  s.executables = ["peas", "peas-dev"]
   s.extra_rdoc_files = [
     "README.md"
   ]
@@ -26,6 +28,9 @@ Gem::Specification.new do |s|
     "bin/peas",
     "lib/peas.rb",
     "lib/peas/api.rb",
+    "lib/peas/commands/admin.rb",
+    "lib/peas/commands/app.rb",
+    "lib/peas/commands/config.rb",
     "lib/peas/config.rb",
     "lib/peas/git.rb",
     "lib/peas/version.rb",
@@ -35,8 +40,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/tombh/peas"
   s.licenses = ["GPL v2"]
-  s.require_paths = ["lib"]
-  s.rubygems_version = "2.0.14"
+  s.rubygems_version = "2.2.2"
   s.summary = "CLI client for Peas"
 
   if s.respond_to? :specification_version then

data/spec/cli_spec.rb

@@ -7,29 +7,31 @@ describe 'Peas CLI' do
     Git.stub(:first_sha).and_return('fakesha')
     API.any_instance.stub(:sleep).and_return(nil)
     Peas.stub(:config_file).and_return('/tmp/.peas')
+    File.delete '/tmp/.peas' if File.exists? '/tmp/.peas'
   end
 
   describe 'Settings' do
     it 'should set settings' do
-      File.delete '/tmp/.peas' if File.exists? '/tmp/.peas'
-      stub_request(:put, /settings\?domain=new-domain\.com/)
+      stub_request(:put, 'http://new-domain.com:4000/admin/settings?domain=new-domain.com:4000')
+        .to_return(body: response_mock(nil))
       output = cli %w(settings --domain=new-domain.com:4000)
       expect(output).to eq "\nNew settings:\n{\n  \"domain\": \"http://new-domain.com:4000\"\n}\n"
       config = JSON.parse File.open('/tmp/.peas').read
-      expect(config).to eq ({"domain"=>"http://new-domain.com:4000"})
+      expect(config).to eq({"domain"=>"http://new-domain.com:4000"})
     end
 
     it 'should use the domain setting' do
       File.open('/tmp/.peas', 'w'){|f| f.write('{"domain":"test.com"}') }
       stub_request(:get, /test.com/)
+        .to_return(body: response_mock(nil))
       cli %w(deploy)
     end
   end
 
-  describe 'API methods' do
+  describe 'App methods' do
     it 'should create an app' do
-      stub_request(:post, /create\?first_sha=fakesha&remote=git@github\.com:test\/test\.git/)
-        .to_return(body: '{"message": "App \'test\' successfully created\n"}')
+      stub_request(:post, TEST_DOMAIN + '/app/fakesha?remote=git@github.com:test/test.git')
+        .to_return(body: response_mock("App 'test' successfully created"))
       output = cli ['create']
       expect(output).to eq "App 'test' successfully created\n"
     end
@@ -46,7 +48,7 @@ describe 'Peas CLI' do
     it 'should scale an app' do
       stub_request(
         :put,
-        /scale\?first_sha=fakesha&scaling_hash=%7B%22web%22:%223%22,%22worker%22:%222%22%7D/
+        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"}'}
@@ -54,6 +56,29 @@ describe 'Peas CLI' do
       output = cli %w(scale web=3 worker=2)
       expect(output).to eq "scaling\n"
     end
+
+    describe 'Config' 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'}"))
+        output = cli %w(config set FOO=BAR)
+        expect(output).to eq "{'FOO' => 'BAR'}\n"
+      end
+
+      it 'delete config for an app' do
+        stub_request(:delete, TEST_DOMAIN + '/app/fakesha/config?keys=%5B%22FOO%22%5D')
+          .to_return(body: response_mock(nil))
+        output = cli %w(config rm FOO)
+        expect(output).to eq "\n"
+      end
+
+      it 'should list all config for an app' do
+        stub_request(:get, TEST_DOMAIN + '/app/fakesha/config')
+          .to_return(body: response_mock("{'FOO' => 'BAR'}\n{'MOO' => 'CAR'}"))
+        output = cli %w(config)
+        expect(output).to eq "{'FOO' => 'BAR'}\n{'MOO' => 'CAR'}\n"
+      end
+    end
   end
 
   it 'should retrieve and output a long-running command' do
@@ -67,4 +92,11 @@ describe 'Peas CLI' do
     output = cli ['deploy']
     expect(output).to eq "doing\nsomething\ndone\n"
   end
+
+  it 'should show a warning when there is a version mismatch' do
+    stub_request(:get, TEST_DOMAIN + '/app/fakesha/config')
+        .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
 end

data/spec/spec_helper.rb

@@ -1,11 +1,14 @@
 require 'rubygems'
 require 'stringio'
 require 'webmock/rspec'
-require 'peas'
+
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "../"))
+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://localhost:4000'
 
 RSpec.configure do |config|
   config.mock_with :rspec
@@ -22,6 +25,15 @@ ensure
   $stdout = old
 end
 
+# Form a response as the API would. Useful as you only need to provide a string without any JSON
+# formatting
+def response_mock response, key=:message
+  {
+    'version' => Peas::VERSION,
+    key => response
+  }.to_json
+end
+
 # Clever little function to simulate CLI requests.
 # Usage: cli(['create', '--flag', '--switch']).
 # Output is suppressed, captured and returned.

metadata

@@ -1,88 +1,93 @@
 --- !ruby/object:Gem::Specification
 name: peas-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.1.0
 platform: ruby
 authors:
 - Tom Buckley-Houston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-06 00:00:00.000000000 Z
+date: 2014-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: httparty
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rainbow
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: jeweler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 description: Peas is an open source Heroku-style PaaS written in Ruby and using Docker
 email: tom@tombh.co.uk
 executables:
 - peas
+- peas-dev
 extensions: []
 extra_rdoc_files:
 - README.md
 files:
-- .rspec
+- ".rspec"
 - Gemfile
 - Gemfile.lock
 - README.md
 - Rakefile
 - VERSION
 - bin/peas
+- bin/peas-dev
 - lib/peas.rb
 - lib/peas/api.rb
+- lib/peas/commands/admin.rb
+- lib/peas/commands/app.rb
+- lib/peas/commands/config.rb
 - lib/peas/config.rb
 - lib/peas/git.rb
 - lib/peas/version.rb
@@ -99,17 +104,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: CLI client for Peas