diff --git a/.travis.yml b/.travis.yml index 7dc233b..0b2e4ca 100644 --- a/.travis.yml +++ b/.travis.yml @@ -97,7 +97,7 @@ before_install: - brew tap homebrew/versions # Ruby language support # - gem install ruby-beautify --verbose - - gem install rubocop + # - gem install rubocop - gem install htmlbeautifier - gem install puppet-lint # Sass language support @@ -191,4 +191,4 @@ before_install: brew install terraform; else docker pull hashicorp/terraform; - fi \ No newline at end of file + fi diff --git a/CHANGELOG.md b/CHANGELOG.md index 3bf9b53..f5941e6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # Next - See [#645](https://github.com/Glavin001/atom-beautify/issues/645). Add support for Terraform fmt. - See [#881](https://github.com/Glavin001/atom-beautify/issues/881). Update to Prettydiff version 2! +- Fix for [#1888](https://github.com/Glavin001/atom-beautify/issues/1888). Allow 0 for minor and patch versions of Docker +- Add Settings to atom-beautify in Packages menu [#1869](https://github.com/Glavin001/atom-beautify/issues/1869) - ... # v0.30.5 (2017-08-11) diff --git a/menus/atom-beautify.cson b/menus/atom-beautify.cson index fdfd781..a0d2d54 100644 --- a/menus/atom-beautify.cson +++ b/menus/atom-beautify.cson @@ -25,6 +25,10 @@ 'label': 'Debug' 'command': 'atom-beautify:help-debug-editor' } + { + 'label': 'Settings' + 'command': 'atom-beautify:open-settings' + } ] ] } diff --git a/package.json b/package.json index 53c3507..9e6aff3 100644 --- a/package.json +++ b/package.json @@ -146,6 +146,10 @@ { "name": "Kamontat Chantrachirathumrong", "url": "https://github.com/kamontat" + }, + { + "name": "Steven Zeck", + "url": "https://github.com/szeck87" } ], "engines": { @@ -204,6 +208,7 @@ "atom-workspace": [ "atom-beautify:help-debug-editor", "atom-beautify:beautify-editor", + "atom-beautify:open-settings", "atom-beautify:migrate-settings", "core:save", "core:save-as", diff --git a/src/beautifiers/executable.coffee b/src/beautifiers/executable.coffee index ef57a35..d2f876b 100644 --- a/src/beautifiers/executable.coffee +++ b/src/beautifiers/executable.coffee @@ -379,7 +379,7 @@ class HybridExecutable extends Executable homepage: "https://www.docker.com/" installation: "https://www.docker.com/get-docker" version: { - parse: (text) -> text.match(/version [0]*([1-9]\d*).[0]*([1-9]\d*).[0]*([1-9]\d*)/).slice(1).join('.') + parse: (text) -> text.match(/version [0]*([1-9]\d*).[0]*([0-9]\d*).[0]*([0-9]\d*)/).slice(1).join('.') } }) return @docker diff --git a/src/beautify.coffee b/src/beautify.coffee index 55f568f..3a850a4 100644 --- a/src/beautify.coffee +++ b/src/beautify.coffee @@ -556,6 +556,9 @@ handleSaveEvent = -> ) plugin.subscriptions.add disposable +openSettings = -> + atom.workspace.open('atom://config/packages/atom-beautify') + getUnsupportedOptions = -> settings = atom.config.get('atom-beautify') schema = atom.config.getSchema('atom-beautify') @@ -622,6 +625,7 @@ plugin.activate = -> @subscriptions.add handleSaveEvent() @subscriptions.add atom.commands.add "atom-workspace", "atom-beautify:beautify-editor", beautify @subscriptions.add atom.commands.add "atom-workspace", "atom-beautify:help-debug-editor", debug + @subscriptions.add atom.commands.add "atom-workspace", "atom-beautify:open-settings", openSettings @subscriptions.add atom.commands.add ".tree-view .file .name", "atom-beautify:beautify-file", beautifyFile @subscriptions.add atom.commands.add ".tree-view .directory .name", "atom-beautify:beautify-directory", beautifyDirectory @subscriptions.add atom.commands.add "atom-workspace", "atom-beautify:migrate-settings", plugin.migrateSettings