peas-cli 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 84c1f06f1534d59fff16068ac6709e3c92e8448d
-  data.tar.gz: c1f74d412a7eed2cbf4c44a8fe40d52f483bb2e6
+  metadata.gz: 620734d8a5713490dbf9b4f79a669ebba23f0147
+  data.tar.gz: f758e5a9bcf974c88c15a48f26839d6bcdd295fe
 SHA512:
-  metadata.gz: e04075dea2bbb31efee01e1f52c7b7f97ed1d980b26fd02f97523d47812ac993953dd44432b41120cdcdfae1b100016f0cc4d6c38472ddc8b18230d8abbf443e
-  data.tar.gz: f48ebe5a3b750face0bb48d4f56d97404647b89a0125218036103481ff146305705b98e1808a9e7ad14e77a989ae5d83d14a099545627e7edf5019ac56c4dcc8
+  metadata.gz: 7fa88458e995231523a05e1c9746956cf84f95901e515514c85478e9c63915bf080e6627f4b5b752e46341ddf93713b8a7864c7b0160d7bc1372d31b5ebeaedc
+  data.tar.gz: 33395d9b38d39c016a244010e537e6eafaadce6084e5cd990920128e6aef47c4f9ee165d9100a221f1c343287f4a3f53099b870e30e205e4c074bb73a83d464c

data/VERSION

@@ -1 +1 @@
-0.2.0
+0.2.1

data/bin/peas

@@ -35,7 +35,7 @@ end
 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
+    if [Errno::ECONNREFUSED, SocketError].include? exception.class
       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

data/lib/peas/commands/admin.rb

@@ -20,9 +20,12 @@ command :admin do |admin|
         if args.first == 'peas.domain'
           domain = args[1]
           domain = "http://#{domain}" unless domain.start_with? 'http://'
+          # Update Git config
+          Git.sh "git config peas.domain #{domain}"
+          # Update file
           content = Peas.config.merge('domain' => domain).to_json
           File.open(Peas.config_file, 'w+') { |f| f.write(content) }
-          @api = API.new # Refresh settings from file because there's a new domain URI
+          @api = API.new # Refresh settings from git/file because there's a new domain URI
         end
         @api.request(:put, '/admin/settings', args[0] => args[1]) { |response| format_settings response }
       else

data/lib/peas/commands/app.rb

@@ -1,9 +1,28 @@
+desc 'List all apps'
+command :apps do |c|
+  c.action do |_global_options, _options, _args|
+    @api.request(:get, "/app")
+  end
+end
+
 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
+    @api.request(
+      :post,
+      "/app/#{Git.first_sha}",
+      remote: Git.remote
+    )
+  end
+end
 
+desc 'Destroy an app'
+command :destroy do |c|
+  c.action do |_global_options, _options, _args|
+    @api.request(
+      :delete,
+      "/app/#{Git.first_sha}"
+    )
   end
 end
 
@@ -30,8 +49,10 @@ command :scale do |c|
       quantity = parts[1]
       scaling_hash[process_type] = quantity
     end
-    @api.request :put, "/app/#{Git.first_sha}/scale",
-                 scaling_hash: scaling_hash.to_json
-
+    @api.request(
+      :put,
+      "/app/#{Git.first_sha}/scale",
+      scaling_hash: scaling_hash.to_json
+    )
   end
 end

data/lib/peas/config.rb

@@ -16,9 +16,12 @@ module Peas
 
   # Hierarchy of sources for the Peas API domain
   def self.api_domain
+    git_domain = Git.sh 'git config peas.domain'
     domain =
     if ENV['PEAS_API_ENDPOINT']
       ENV['PEAS_API_ENDPOINT']
+    elsif !git_domain.nil? && git_domain != ''
+      git_domain
     elsif Peas.config['domain']
       Peas.config['domain']
     else

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.2.0 ruby lib
+# stub: peas-cli 0.2.1 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "peas-cli"
-  s.version = "0.2.0"
+  s.version = "0.2.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-07-23"
+  s.date = "2014-08-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

@@ -14,6 +14,7 @@ describe 'Peas CLI' 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')
         .to_return(body: response_mock({}))
+      expect(Git).to receive(:sh).with("git config peas.domain http://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")
@@ -22,7 +23,7 @@ describe 'Peas CLI' do
     it 'should set a normal setting' do
       stub_request(:put, 'http://vcap.me:4000/admin/settings?mongodb.uri=mongodb://uri')
         .to_return(body: response_mock(
-          defaults: {'peas.domain' => 'http://boss.com'},
+          defaults: { 'peas.domain' => 'http://boss.com' },
           services: {
             'mongodb.uri' => 'mongodb://uri',
             'postgres.uri' => 'xsgfd'
@@ -35,6 +36,13 @@ describe 'Peas CLI' do
   end
 
   describe 'App methods' do
+    it 'should list all apps' do
+      stub_request(:get, TEST_DOMAIN + '/app')
+        .to_return(body: response_mock(["coolapp"]))
+      output = cli ['apps']
+      expect(output).to eq "coolapp\n"
+    end
+
     it 'should create an app' do
       stub_request(:post, TEST_DOMAIN + '/app/fakesha?remote=git@github.com:test/test.git')
         .to_return(body: response_mock("App 'test' successfully created"))
@@ -42,6 +50,13 @@ describe 'Peas CLI' do
       expect(output).to eq "App 'test' successfully created\n"
     end
 
+    it 'should destroy an app' do
+      stub_request(:delete, TEST_DOMAIN + '/app/fakesha')
+        .to_return(body: response_mock("App 'test' successfully destroyed"))
+      output = cli ['destroy']
+      expect(output).to eq "App 'test' successfully destroyed\n"
+    end
+
     it 'should deploy an app', :with_socket do
       stub_request(:get, /deploy/).to_return(body: '{"job": "123"}')
       allow(@socket).to receive(:gets).and_return(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: peas-cli
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Tom Buckley-Houston
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-23 00:00:00.000000000 Z
+date: 2014-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: gli