peas-cli 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c59d042fdf3940b53dedbb2f1fd06669a1f4b918
-  data.tar.gz: 025894d8b31e701527b681d6a6a6ac5da0bc6feb
+  metadata.gz: 84c1f06f1534d59fff16068ac6709e3c92e8448d
+  data.tar.gz: c1f74d412a7eed2cbf4c44a8fe40d52f483bb2e6
 SHA512:
-  metadata.gz: 06c07b2f78e215dcee1c1ee0d276912dc53492cf44316143e1119996ce4a3f7ff05ac08d8e882f8f22878d75819ada585b9d6c79f6fde2180863fb6f04daece2
-  data.tar.gz: 76662c09241e651b1217a76b043bde13a63bb4295ef8cd01377aa04cf334f80c8376ed02087920309497d186aee1cc074e860a0ad757e02443d965339e08c770
+  metadata.gz: e04075dea2bbb31efee01e1f52c7b7f97ed1d980b26fd02f97523d47812ac993953dd44432b41120cdcdfae1b100016f0cc4d6c38472ddc8b18230d8abbf443e
+  data.tar.gz: f48ebe5a3b750face0bb48d4f56d97404647b89a0125218036103481ff146305705b98e1808a9e7ad14e77a989ae5d83d14a099545627e7edf5019ac56c4dcc8

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.2.0

data/lib/peas/api.rb

@@ -35,9 +35,7 @@ class API
       if api_version[0] != client_version[0]
         version_mismatch = true
       else
-        if api_version[1] != client_version[1]
-          version_mismatch = true
-        end
+        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 " \
@@ -45,7 +43,11 @@ class API
           "Please update using `gem install peas-cli`."
       end
       # Normal API response
-      puts json['message']
+      if block_given?
+        yield json['message']
+      else
+        puts json['message']
+      end
     end
   end
 

data/lib/peas/commands/admin.rb

@@ -1,33 +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']
-      unless 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
+def format_settings(hash)
+  puts "Available settings"
+  puts ''
+  hash.each do |type, settings|
+    puts "#{type.capitalize}:"
+    settings.each do |setting, value|
+      value = '[unset]' if value == ''
+      puts "  #{setting} #{value}"
     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)
+    puts ''
   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
+
+desc "Admin commands"
+command :admin do |admin|
+  admin.desc 'Set Peas global system settings'
+  admin.command :settings do |settings|
+    settings.action do |_global_options, _options, args|
+      if args.count > 1
+        if args.first == 'peas.domain'
+          domain = args[1]
+          domain = "http://#{domain}" unless domain.start_with? 'http://'
+          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
+        end
+        @api.request(:put, '/admin/settings', args[0] => args[1]) { |response| format_settings response }
+      else
+        @api.request(:get, '/admin/settings') { |response| format_settings response }
+      end
     end
   end
 end

data/lib/peas/config.rb

@@ -16,15 +16,16 @@ module Peas
 
   # Hierarchy of sources for the Peas API domain
   def self.api_domain
-    domain = if ENV['PEAS_API_ENDPOINT']
-               ENV['PEAS_API_ENDPOINT']
+    domain =
+    if ENV['PEAS_API_ENDPOINT']
+      ENV['PEAS_API_ENDPOINT']
     elsif Peas.config['domain']
-               Peas.config['domain']
+      Peas.config['domain']
     else
-      'localhost:4000'
+      'vcap.me:4000'
     end
     unless domain[/\Ahttp:\/\//] || domain[/\Ahttps:\/\//]
-      domain = "http://#{domain}"
+      "http://#{domain}"
     else
       domain
     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.1.3 ruby lib
+# stub: peas-cli 0.2.0 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "peas-cli"
-  s.version = "0.1.3"
+  s.version = "0.2.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-07-11"
+  s.date = "2014-07-23"
   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

@@ -11,21 +11,27 @@ describe 'Peas CLI' do
   end
 
   describe 'Settings' do
-    it 'should set settings' do
-      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"
+    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({}))
+      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")
     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)
+    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'},
+          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")
     end
+
   end
 
   describe 'App methods' do

data/spec/spec_helper.rb

@@ -8,7 +8,7 @@ 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'
+TEST_DOMAIN = 'http://vcap.me:4000'
 SWITCHBOARD_TEST_PORT = 79_345
 
 RSpec.configure do |config|

metadata

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