Update ruby and objective c to use latest images to fix #54

Re-enable acceptance tests for ruby and objective c
docker-exec · Apr 24, 2016 · a506491 · a506491
1 parent d0edddb
commit a506491
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 8 deletions.
diff --git 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
@@ -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/dexec/dexec.go b/dexec/dexec.go
@@ -127,15 +127,15 @@ 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"},
 	"php":    {"PHP", "php", "dexec/lang-php", "1.0.1"},
 	"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
@@ -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},

diff --git a/main.go b/main.go
@@ -155,7 +155,7 @@ func validate(cliParser cli.CLI) bool {
 func validateDocker() error {
 	client, err := docker.NewClientFromEnv()
 	if err != nil {
-		return err
+    	client, err = docker.NewClient("unix:///var/run/docker.sock")
 	}
 
 	ping := make(chan error, 1)
-Original file line number
+Diff line change
@@ Expand Up / @@ -87,7 +87,6 @@ function run_standard_tests() { @@
     }
     @test "objc" {
-      skip
       run_standard_tests $BATS_TEST_DESCRIPTION
     }
@@ Expand All / @@ -112,7 +111,6 @@ function run_standard_tests() { @@
     }
     @test "ruby" {
-      skip
       run_standard_tests $BATS_TEST_DESCRIPTION
     }
@@ Expand Down @@