Merge branch 'jney-master' into new-api

This commit is contained in:
Glavin Wiechert 2015-05-02 20:54:20 -03:00
commit 4a5bcc192b
7 changed files with 48 additions and 23 deletions

View File

@ -28,7 +28,8 @@ before_install:
- brew tap homebrew/dupes
- brew tap homebrew/versions
# Ruby language support
- gem install ruby-beautify --verbose
# - gem install ruby-beautify --verbose
- gem install rubocop
# Python language support
- brew install python
- pip install --upgrade autopep8

View File

@ -1,25 +1,24 @@
#!/usr/bin/env ruby
conn_hash = { :hosts => [
conn_hash = { hosts: [
{:login => login, :passcode => passcode, :host => host, :port => port},
],
:reliable => false, # Override default
:connect_headers => conn_hdrs,
{ login: login, passcode: passcode, host: host, port: port }
],
reliable: false, # Override default
connect_headers: conn_hdrs
}
}
hash = { hosts: [
hash = { :hosts => [
{ login: user, passcode: password, host: 'noonehome', port: 2525 },
{:login => user, :passcode => password, :host => 'noonehome', :port => 2525},
{ login: user, passcode: password, host: host, port: port }
{:login => user, :passcode => password, :host => host, :port => port},
],
],
logger: mylog, # This enables callback logging!
:logger => mylog, # This enables callback logging!
max_reconnect_attempts: 5
:max_reconnect_attempts => 5,
}
}

View File

@ -40,10 +40,9 @@ module.exports = class Beautifier
###
Show deprecation warning to user.
TODO: implement this
###
deprecate: (warning) ->
atom.notifications?.addWarning(warning)
###
Create temporary file
@ -158,14 +157,15 @@ module.exports = class Beautifier
cmd.stderr.on('data', (data) -> stderr += data )
# when the spawn child process exits, check if there were any errors and close the writeable stream
cmd.on('exit', (code) ->
# console.log('spawn done', code, stderr, stdout)
console.log('spawn done', code, stderr, stdout)
# If return code is not 0 then error occured
if code isnt 0
reject(stderr)
else
resolve(stdout)
# if code isnt 0
# reject(stderr)
# else
resolve(stdout)
)
cmd.on('error', (err) ->
console.log('error', err)
reject(err)
)
)

View File

@ -39,6 +39,7 @@ module.exports = class Beautifiers
'perltidy'
'php-cs-fixer'
'prettydiff'
'rubocop'
'ruby-beautify'
'sqlformat'
'tidy-markdown'

View File

@ -0,0 +1,23 @@
###
Requires https://github.com/bbatsov/rubocop
###
"use strict"
Beautifier = require('./beautifier')
module.exports = class Rubocop extends Beautifier
name: "Rubocop"
options: {
Ruby: true
}
beautify: (text, language, options) ->
@run("rubocop", [
"--auto-correct"
tempFile = @tempFile("temp", text)
])
.then(=>
console.log('rubocop', arguments, tempFile)
@readFile(tempFile)
)

View File

@ -7,12 +7,13 @@ Beautifier = require('./beautifier')
module.exports = class RubyBeautify extends Beautifier
name: "Ruby Beautify"
options: {
Ruby: true
}
beautify: (text, language, options) ->
@deprecate("Ruby-Beautify has been deprecated in favour of Rubocop beautifier.")
@run("rbeautify", [
@tempFile("input", text)
])