Skip to content

Commit 765f68b

Browse files
committed
Update ruby and objective c to use latest images to fix #54
Re-enable acceptance tests for ruby and objective c Correct regex to fix #58 and add unit test
1 parent d0edddb commit 765f68b

File tree

9 files changed

+21
-14
lines changed

9 files changed

+21
-14
lines changed

.goxc.json

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
{
22
"BuildConstraints": "windows,linux,darwin,openbsd",
3-
"PackageVersion": "1.0.5",
3+
"PackageVersion": "1.0.6",
44
"TaskSettings": {
55
"bintray": {
66
"downloadspage": "bintray.md",

.test/acceptance-tests.sh

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@ function get_cwd() {
77
echo "${script_path}"
88
}
99

10-
1110
function get_snapshot_plugin() {
1211
if ! grep -q vagrant-vbox-snapshot <(vagrant plugin list); then
1312
vagrant plugin install vagrant-vbox-snapshot

.test/bats/dexec.bats

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ function run_standard_tests() {
8787
}
8888

8989
@test "objc" {
90-
skip
9190
run_standard_tests $BATS_TEST_DESCRIPTION
9291
}
9392

@@ -112,7 +111,6 @@ function run_standard_tests() {
112111
}
113112

114113
@test "ruby" {
115-
skip
116114
run_standard_tests $BATS_TEST_DESCRIPTION
117115
}
118116

CHANGELOG.md

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,15 @@ All notable changes to this project will be documented in this file.
33
This project adheres to [Semantic Versioning](http://semver.org/).
44

55
## [Unreleased][unreleased]
6+
7+
## [1.0.6] - 2016-04-24
68
### Fixed
79
- Shebang support for Java files now works.
8-
- Re-enabled Java in acceptance tests.
10+
- Ruby and Objective C no longer output 'stdin: not a tty' before program output.
11+
- Regex for extracting source filenames no longer ignores single character filenames e.g. 'a.cpp'.
12+
13+
### Changed
14+
- Re-enabled Java, Ruby and Objective C in acceptance tests.
915

1016
## [1.0.5] - 2016-04-23
1117
### Fixed

README.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,9 @@ Download the appropriate binary for your OS and architecture, then unzip or unta
1212

1313
| OS | 64-bit | 32-bit |
1414
| ------- | ------ | ------ |
15-
| 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) |
16-
| 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) |
17-
| 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) |
15+
| 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) |
16+
| 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) |
17+
| 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) |
1818

1919
Binaries for other distributions are available on [Bintray](https://bintray.com/dexec/release/dexec/_latestVersion).
2020

cli/cli.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ func ArgToOption(opt string, next string) (OptionType, string, int, error) {
7676
patternCombinationI := regexp.MustCompile(`^--include=(.+)$`)
7777
patternCombinationM := regexp.MustCompile(`^--image=(.+)$`)
7878
patternCombinationE := regexp.MustCompile(`^--extension=(.+)$`)
79-
patternSource := regexp.MustCompile(`^[^-_].+\..+`)
79+
patternSource := regexp.MustCompile(`^[^-_].*\..+`)
8080
patternUpdateFlag := regexp.MustCompile(`^-(-update|u)$`)
8181
patternHelpFlag := regexp.MustCompile(`^-(-help|h)$`)
8282
patternVersionFlag := regexp.MustCompile(`^-(-version|v)$`)
@@ -177,5 +177,5 @@ func DisplayHelp(filename string) {
177177

178178
// DisplayVersion prints the version information for the program.
179179
func DisplayVersion(filename string) {
180-
fmt.Printf("%s 1.0.6-SNAPSHOT\n", filename)
180+
fmt.Printf("%s 1.0.6\n", filename)
181181
}

cli/cli_test.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,10 @@ func TestSources(t *testing.T) {
183183
[]string{"filename", "foo.cpp", "bar.java", "foo.bar.scala", "bar-foo.groovy"},
184184
[]string{"foo.cpp", "bar.java", "foo.bar.scala", "bar-foo.groovy"},
185185
},
186+
{
187+
[]string{"filename", "a.cpp"},
188+
[]string{"a.cpp"},
189+
},
186190
}
187191
for _, c := range cases {
188192
got := ParseOsArgs(c.osArgs)

dexec/dexec.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -127,15 +127,15 @@ var innerMap = map[string]*Image{
127127
"lua": {"Lua", "lua", "dexec/lang-lua", "1.0.1"},
128128
"js": {"JavaScript", "js", "dexec/lang-node", "1.0.2"},
129129
"nim": {"Nim", "nim", "dexec/lang-nim", "1.0.1"},
130-
"m": {"Objective C", "m", "dexec/lang-objc", "1.0.1"},
130+
"m": {"Objective C", "m", "dexec/lang-objc", "1.0.2"},
131131
"ml": {"OCaml", "ml", "dexec/lang-ocaml", "1.0.1"},
132132
"p6": {"Perl 6", "p6", "dexec/lang-perl6", "1.0.1"},
133133
"pl": {"Perl", "pl", "dexec/lang-perl", "1.0.2"},
134134
"php": {"PHP", "php", "dexec/lang-php", "1.0.1"},
135135
"py": {"Python", "py", "dexec/lang-python", "1.0.2"},
136136
"r": {"R", "r", "dexec/lang-r", "1.0.1"},
137137
"rkt": {"Racket", "rkt", "dexec/lang-racket", "1.0.1"},
138-
"rb": {"Ruby", "rb", "dexec/lang-ruby", "1.0.1"},
138+
"rb": {"Ruby", "rb", "dexec/lang-ruby", "1.0.2"},
139139
"rs": {"Rust", "rs", "dexec/lang-rust", "1.0.1"},
140140
"scala": {"Scala", "scala", "dexec/lang-scala", "1.0.1"},
141141
"sh": {"Bash", "sh", "dexec/lang-bash", "1.0.1"},

dexec/dexec_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func TestLookupImageByExtension(t *testing.T) {
7171
{"lisp", "lisp", "dexec/lang-lisp", "1.0.1", nil},
7272
{"lua", "lua", "dexec/lang-lua", "1.0.1", nil},
7373
{"js", "js", "dexec/lang-node", "1.0.2", nil},
74-
{"m", "m", "dexec/lang-objc", "1.0.1", nil},
74+
{"m", "m", "dexec/lang-objc", "1.0.2", nil},
7575
{"ml", "ml", "dexec/lang-ocaml", "1.0.1", nil},
7676
{"nim", "nim", "dexec/lang-nim", "1.0.1", nil},
7777
{"p6", "p6", "dexec/lang-perl6", "1.0.1", nil},
@@ -80,7 +80,7 @@ func TestLookupImageByExtension(t *testing.T) {
8080
{"py", "py", "dexec/lang-python", "1.0.2", nil},
8181
{"r", "r", "dexec/lang-r", "1.0.1", nil},
8282
{"rkt", "rkt", "dexec/lang-racket", "1.0.1", nil},
83-
{"rb", "rb", "dexec/lang-ruby", "1.0.1", nil},
83+
{"rb", "rb", "dexec/lang-ruby", "1.0.2", nil},
8484
{"rs", "rs", "dexec/lang-rust", "1.0.1", nil},
8585
{"scala", "scala", "dexec/lang-scala", "1.0.1", nil},
8686
{"sh", "sh", "dexec/lang-bash", "1.0.1", nil},

0 commit comments

Comments
 (0)