peas-cli 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f22ef195adddaf91d900dfb57ca2fac5b0244586
-  data.tar.gz: 15b42a3e4009b3697a4a71cb484ba6610f1a72fb
+  metadata.gz: c59d042fdf3940b53dedbb2f1fd06669a1f4b918
+  data.tar.gz: 025894d8b31e701527b681d6a6a6ac5da0bc6feb
 SHA512:
-  metadata.gz: 3c6e24d63753037320e8f30672f8c72f0d9fb38ec1c40bfe415b59886b6743991f9a77853b02a74f731e3aead6d005fd65ee770100fe814aedf1927ff6914e7b
-  data.tar.gz: 840321e330c30f9ef42e8ca21730b9769c0595d003cab8cc11109452c9fedeb44d6d096f24cb521c68c20e896352319d199092ecfe297b43847a295db80c13af
+  metadata.gz: 06c07b2f78e215dcee1c1ee0d276912dc53492cf44316143e1119996ce4a3f7ff05ac08d8e882f8f22878d75819ada585b9d6c79f6fde2180863fb6f04daece2
+  data.tar.gz: 76662c09241e651b1217a76b043bde13a63bb4295ef8cd01377aa04cf334f80c8376ed02087920309497d186aee1cc074e860a0ad757e02443d965339e08c770

data/Rakefile

@@ -19,8 +19,8 @@ Jeweler::Tasks.new do |gem|
   gem.homepage = "http://github.com/tombh/peas"
   gem.license = "GPL v2"
   gem.version = Peas::VERSION
-  gem.summary = %Q{CLI client for Peas}
-  gem.description = %Q{Peas is an open source Heroku-style PaaS written in Ruby and using Docker}
+  gem.summary = "CLI client for Peas"
+  gem.description = "Peas is an open source Heroku-style PaaS written in Ruby and using Docker"
   gem.email = "tom@tombh.co.uk"
   gem.authors = ["Tom Buckley-Houston"]
   gem.files.include 'VERSION'

data/VERSION

@@ -1 +1 @@
-0.1.2
+0.1.3

data/bin/peas

@@ -17,7 +17,7 @@ version Peas::VERSION
 # Load all the commands
 Dir["#{root_path}/lib/peas/commands/**/*.rb"].each { |f| load f }
 
-pre do |global, command, options, args|
+pre do |_global, _command, _options, _args|
   # Pre logic here
   # Return true to proceed; false to abort and not call the
   # chosen command
@@ -26,7 +26,7 @@ pre do |global, command, options, args|
   true
 end
 
-post do |global, command, options, args|
+post do |_global, _command, _options, _args|
   # Post logic here
   # Use skips_post before a command to skip this
   # block on that command only
@@ -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.api_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}"
@@ -48,7 +48,7 @@ on_error do |exception|
 end
 
 # Exit 0 if sent SIGINT
-trap('INT'){
+trap('INT') {
   exit!
 }
 

data/lib/peas/api.rb

@@ -13,17 +13,17 @@ class API
   end
 
   # Generic wrapper to the Peas API
-  def request verb, method, params = nil
-    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
       json = {}
     end
     # If there was an HTTP-level error
-    raise json['error'].color(:red) if json.has_key? 'error'
+    raise json['error'].color(:red) if json.key? 'error'
     # Successful responses
-    if json.has_key? 'job'
+    if json.key? 'job'
       # Long-running jobs need to stream from the Switchboard server
       API.stream_job json['job']
     else
@@ -40,8 +40,8 @@ class API
         end
       end
       if version_mismatch
-        Peas.warning_message "Your version of the CLI client is out of date " +
-          "(Client: #{Peas::VERSION}, API: #{json['version']}). " +
+        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
@@ -54,9 +54,9 @@ class API
   end
 
   # Stream the output of a Switchboard job
-  def self.stream_job job
+  def self.stream_job(job)
     API.stream_output "subscribe.job_progress.#{job}" do |line|
-      if line.has_key? 'status'
+      if line.key? 'status'
         if line['status'] == 'failed'
           raise line['body']
         elsif line['status'] == 'complete'
@@ -68,7 +68,7 @@ class API
   end
 
   # Stream data from the Switchboard server
-  def self.stream_output switchboard_command
+  def self.stream_output(switchboard_command)
     socket = API.switchboard_connection
     socket.puts switchboard_command
     begin
@@ -82,5 +82,4 @@ class API
     rescue Interrupt, Errno::ECONNRESET
     end
   end
-
-end
+end

data/lib/peas/commands/admin.rb

@@ -1,11 +1,11 @@
 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|
+         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://'
+      unless options['domain'].start_with? 'http://'
         options['domain'] = "http://#{options['domain']}"
       end
     end
@@ -17,7 +17,7 @@ command :settings do |c|
     end
     # Merge existing settings with current settings
     content = Peas.config.merge(deduped).to_json
-    File.open(Peas.config_file, 'w+'){|f| f.write(content) }
+    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
@@ -26,8 +26,8 @@ command :settings do |c|
   end
   desc 'Display the current settings'
   c.command :display do |c|
-    c.action do |global_options, options, args|
+    c.action do |_global_options, _options, _args|
       puts JSON.pretty_generate(Peas.config)
     end
   end
-end
+end

data/lib/peas/commands/app.rb

@@ -1,15 +1,15 @@
 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
-    }
+  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|
+  c.action do |_global_options, _options, _args|
     @api.request :get, "/app/#{Git.first_sha}/deploy"
   end
 end
@@ -19,7 +19,7 @@ long_desc <<-EOF
 For example: peas scale web=3 worker=2
 EOF
 command :scale do |c|
-  c.action do |global_options, options, args|
+  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
@@ -30,8 +30,8 @@ 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
+end

data/lib/peas/commands/config.rb

@@ -1,22 +1,22 @@
 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|
+  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
-      }
+    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|
+    sc.action do |_global_options, _options, args|
       if args.length == 0
         exit_now! "Please provide config in the form: FOO=BAR ENV=production"
       end
@@ -27,9 +27,9 @@ command :config do |c|
         value = parts[1]
         vars[key] = value
       end
-      @api.request :put, "/app/#{Git.first_sha}/config", {
-        vars: vars.to_json
-      }
+      @api.request :put, "/app/#{Git.first_sha}/config",
+                   vars: vars.to_json
+
     end
   end
 end

data/lib/peas/commands/logs.rb

@@ -1,6 +1,6 @@
 desc 'Show logs for an app'
 command :logs do |c|
-  c.action do |global_options, options, args|
+  c.action do |_global_options, _options, _args|
     API.stream_output "stream_logs.#{Git.first_sha}"
   end
 end

data/lib/peas/config.rb

@@ -1,5 +1,4 @@
 module Peas
-
   # The port for Peas' Switchboard socket server
   SWITCHBOARD_PORT = ENV['SWITCHBOARD_PORT'] || 9345
 
@@ -18,9 +17,9 @@ module Peas
   # Hierarchy of sources for the Peas API domain
   def self.api_domain
     domain = if ENV['PEAS_API_ENDPOINT']
-      ENV['PEAS_API_ENDPOINT']
+               ENV['PEAS_API_ENDPOINT']
     elsif Peas.config['domain']
-      Peas.config['domain']
+               Peas.config['domain']
     else
       'localhost:4000'
     end
@@ -35,12 +34,11 @@ module Peas
     URI.parse(Peas.api_domain).host
   end
 
-  def self.error_message string
+  def self.error_message(string)
     puts string.color(:red)
   end
 
-  def self.warning_message string
+  def self.warning_message(string)
     puts string.color(:magenta)
   end
-
-end
+end

data/lib/peas/git.rb

@@ -1,5 +1,5 @@
 class Git
-  def self.sh cmd
+  def self.sh(cmd)
     `#{cmd}`.strip
   end
 
@@ -14,4 +14,4 @@ class Git
   def self.first_sha
     sh 'git rev-list --max-parents=0 HEAD | head -n1'
   end
-end
+end

data/lib/peas.rb

@@ -6,4 +6,3 @@ require 'peas/git'
 require 'peas/api'
 require 'rainbow'
 require 'rainbow/ext/string'
-

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.2 ruby lib
+# stub: peas-cli 0.1.3 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "peas-cli"
-  s.version = "0.1.2"
+  s.version = "0.1.3"
 
   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-08"
+  s.date = "2014-07-11"
   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

@@ -7,7 +7,7 @@ describe 'Peas CLI' do
     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'
+    File.delete '/tmp/.peas' if File.exist? '/tmp/.peas'
   end
 
   describe 'Settings' do
@@ -17,11 +17,11 @@ describe 'Peas CLI' do
       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"}') }
+      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)

data/spec/spec_helper.rb

@@ -9,7 +9,7 @@ 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
+SWITCHBOARD_TEST_PORT = 79_345
 
 RSpec.configure do |config|
   config.mock_with :rspec
@@ -38,7 +38,7 @@ 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
+def response_mock(response, key = :message)
   {
     'version' => Peas::VERSION,
     key => response
@@ -48,7 +48,7 @@ end
 # Clever little function to simulate CLI requests.
 # Usage: cli(['create', '--flag', '--switch']).
 # Output is suppressed, captured and returned.
-def cli args
+def cli(args)
   stub_const "ARGV", args
   capture_stdout do
     ENV['GLI_DEBUG'] = 'true'

metadata

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