diff --git a/.goxc.json b/.goxc.json index 2c376b0..4a055ce 100644 --- a/.goxc.json +++ b/.goxc.json @@ -1,6 +1,6 @@ { "BuildConstraints": "windows,linux,darwin,openbsd", - "PackageVersion": "1.0.5", + "PackageVersion": "1.0.6", "TaskSettings": { "bintray": { "downloadspage": "bintray.md", diff --git a/.test/acceptance-tests.sh b/.test/acceptance-tests.sh index b361c5c..bb6ab4c 100755 --- a/.test/acceptance-tests.sh +++ b/.test/acceptance-tests.sh @@ -7,7 +7,6 @@ function get_cwd() { echo "${script_path}" } - function get_snapshot_plugin() { if ! grep -q vagrant-vbox-snapshot <(vagrant plugin list); then vagrant plugin install vagrant-vbox-snapshot diff --git a/.test/bats/dexec.bats b/.test/bats/dexec.bats index 2d073d5..1ee441b 100644 --- a/.test/bats/dexec.bats +++ b/.test/bats/dexec.bats @@ -87,7 +87,6 @@ function run_standard_tests() { } @test "objc" { - skip run_standard_tests $BATS_TEST_DESCRIPTION } @@ -112,7 +111,6 @@ function run_standard_tests() { } @test "ruby" { - skip run_standard_tests $BATS_TEST_DESCRIPTION } diff --git a/CHANGELOG.md b/CHANGELOG.md index 8dfc455..54ed499 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,9 +3,15 @@ All notable changes to this project will be documented in this file. This project adheres to [Semantic Versioning](http://semver.org/). ## [Unreleased][unreleased] + +## [1.0.6] - 2016-04-24 ### Fixed - Shebang support for Java files now works. -- Re-enabled Java in acceptance tests. +- Ruby and Objective C no longer output 'stdin: not a tty' before program output. +- Regex for extracting source filenames no longer ignores single character filenames e.g. 'a.cpp'. + +### Changed +- Re-enabled Java, Ruby and Objective C in acceptance tests. ## [1.0.5] - 2016-04-23 ### Fixed diff --git a/README.md b/README.md index 728fe97..e457463 100644 --- a/README.md +++ b/README.md @@ -12,9 +12,9 @@ Download the appropriate binary for your OS and architecture, then unzip or unta | OS | 64-bit | 32-bit | | ------- | ------ | ------ | -| Linux | [64-bit](https://bintray.com/artifact/download/dexec/release/dexec_1.0.5_linux_amd64.tar.gz) | [32-bit](https://bintray.com/artifact/download/dexec/release/dexec_1.0.5_linux_386.tar.gz) | -| Mac | [64-bit](https://bintray.com/artifact/download/dexec/release/dexec_1.0.5_darwin_amd64.zip) | [32-bit](https://bintray.com/artifact/download/dexec/release/dexec_1.0.5_darwin_386.zip) | -| Windows | [64-bit](https://bintray.com/artifact/download/dexec/release/dexec_1.0.5_windows_amd64.zip) | [32-bit](https://bintray.com/artifact/download/dexec/release/dexec_1.0.5_windows_386.zip) | +| Linux | [64-bit](https://bintray.com/artifact/download/dexec/release/dexec_1.0.6_linux_amd64.tar.gz) | [32-bit](https://bintray.com/artifact/download/dexec/release/dexec_1.0.6_linux_386.tar.gz) | +| Mac | [64-bit](https://bintray.com/artifact/download/dexec/release/dexec_1.0.6_darwin_amd64.zip) | [32-bit](https://bintray.com/artifact/download/dexec/release/dexec_1.0.6_darwin_386.zip) | +| Windows | [64-bit](https://bintray.com/artifact/download/dexec/release/dexec_1.0.6_windows_amd64.zip) | [32-bit](https://bintray.com/artifact/download/dexec/release/dexec_1.0.6_windows_386.zip) | Binaries for other distributions are available on [Bintray](https://bintray.com/dexec/release/dexec/_latestVersion). diff --git a/cli/cli.go b/cli/cli.go index e219bce..47397a0 100644 --- a/cli/cli.go +++ b/cli/cli.go @@ -76,7 +76,7 @@ func ArgToOption(opt string, next string) (OptionType, string, int, error) { patternCombinationI := regexp.MustCompile(`^--include=(.+)$`) patternCombinationM := regexp.MustCompile(`^--image=(.+)$`) patternCombinationE := regexp.MustCompile(`^--extension=(.+)$`) - patternSource := regexp.MustCompile(`^[^-_].+\..+`) + patternSource := regexp.MustCompile(`^[^-_].*\..+`) patternUpdateFlag := regexp.MustCompile(`^-(-update|u)$`) patternHelpFlag := regexp.MustCompile(`^-(-help|h)$`) patternVersionFlag := regexp.MustCompile(`^-(-version|v)$`) @@ -177,5 +177,5 @@ func DisplayHelp(filename string) { // DisplayVersion prints the version information for the program. func DisplayVersion(filename string) { - fmt.Printf("%s 1.0.6-SNAPSHOT\n", filename) + fmt.Printf("%s 1.0.6\n", filename) } diff --git a/cli/cli_test.go b/cli/cli_test.go index a7e3cb9..6c99ee8 100644 --- a/cli/cli_test.go +++ b/cli/cli_test.go @@ -183,6 +183,10 @@ func TestSources(t *testing.T) { []string{"filename", "foo.cpp", "bar.java", "foo.bar.scala", "bar-foo.groovy"}, []string{"foo.cpp", "bar.java", "foo.bar.scala", "bar-foo.groovy"}, }, + { + []string{"filename", "a.cpp"}, + []string{"a.cpp"}, + }, } for _, c := range cases { got := ParseOsArgs(c.osArgs) diff --git a/dexec/dexec.go b/dexec/dexec.go index 4e29417..217b0d5 100644 --- a/dexec/dexec.go +++ b/dexec/dexec.go @@ -127,7 +127,7 @@ var innerMap = map[string]*Image{ "lua": {"Lua", "lua", "dexec/lang-lua", "1.0.1"}, "js": {"JavaScript", "js", "dexec/lang-node", "1.0.2"}, "nim": {"Nim", "nim", "dexec/lang-nim", "1.0.1"}, - "m": {"Objective C", "m", "dexec/lang-objc", "1.0.1"}, + "m": {"Objective C", "m", "dexec/lang-objc", "1.0.2"}, "ml": {"OCaml", "ml", "dexec/lang-ocaml", "1.0.1"}, "p6": {"Perl 6", "p6", "dexec/lang-perl6", "1.0.1"}, "pl": {"Perl", "pl", "dexec/lang-perl", "1.0.2"}, @@ -135,7 +135,7 @@ var innerMap = map[string]*Image{ "py": {"Python", "py", "dexec/lang-python", "1.0.2"}, "r": {"R", "r", "dexec/lang-r", "1.0.1"}, "rkt": {"Racket", "rkt", "dexec/lang-racket", "1.0.1"}, - "rb": {"Ruby", "rb", "dexec/lang-ruby", "1.0.1"}, + "rb": {"Ruby", "rb", "dexec/lang-ruby", "1.0.2"}, "rs": {"Rust", "rs", "dexec/lang-rust", "1.0.1"}, "scala": {"Scala", "scala", "dexec/lang-scala", "1.0.1"}, "sh": {"Bash", "sh", "dexec/lang-bash", "1.0.1"}, diff --git a/dexec/dexec_test.go b/dexec/dexec_test.go index 263277c..fa7a741 100644 --- a/dexec/dexec_test.go +++ b/dexec/dexec_test.go @@ -71,7 +71,7 @@ func TestLookupImageByExtension(t *testing.T) { {"lisp", "lisp", "dexec/lang-lisp", "1.0.1", nil}, {"lua", "lua", "dexec/lang-lua", "1.0.1", nil}, {"js", "js", "dexec/lang-node", "1.0.2", nil}, - {"m", "m", "dexec/lang-objc", "1.0.1", nil}, + {"m", "m", "dexec/lang-objc", "1.0.2", nil}, {"ml", "ml", "dexec/lang-ocaml", "1.0.1", nil}, {"nim", "nim", "dexec/lang-nim", "1.0.1", nil}, {"p6", "p6", "dexec/lang-perl6", "1.0.1", nil}, @@ -80,7 +80,7 @@ func TestLookupImageByExtension(t *testing.T) { {"py", "py", "dexec/lang-python", "1.0.2", nil}, {"r", "r", "dexec/lang-r", "1.0.1", nil}, {"rkt", "rkt", "dexec/lang-racket", "1.0.1", nil}, - {"rb", "rb", "dexec/lang-ruby", "1.0.1", nil}, + {"rb", "rb", "dexec/lang-ruby", "1.0.2", nil}, {"rs", "rs", "dexec/lang-rust", "1.0.1", nil}, {"scala", "scala", "dexec/lang-scala", "1.0.1", nil}, {"sh", "sh", "dexec/lang-bash", "1.0.1", nil},