@@ -5,12 +5,13 @@ import (

 	"fmt"

 	"io"

 	"io/ioutil"

-	"os"

 	"path/filepath"

 	"strings"

 	docker "github.com/fsouza/go-dockerclient"

-	stitar "github.com/openshift/source-to-image/pkg/tar"

+

+	s2itar "github.com/openshift/source-to-image/pkg/tar"

+	s2iutil "github.com/openshift/source-to-image/pkg/util"

 )

 // removeLeadingDirectoryAdapter wraps a tar.Reader and strips the first leading

@@ -18,7 +19,7 @@ import (

 // the case that files with differing first leading directory names are

 // encountered.

 type removeLeadingDirectoryAdapter struct {

-	stitar.Reader

+	s2itar.Reader

 	leadingDir    string

 	setLeadingDir bool

 }

@@ -116,7 +117,7 @@ func DownloadDirFromContainer(client *docker.Client, container, src, dst string)

 	defer downloader.Close()

 	tarReader := &removeLeadingDirectoryAdapter{Reader: tar.NewReader(downloader)}

-	t := stitar.New()

+	t := s2itar.New(s2iutil.NewFileSystem())

 	return t.ExtractTarStreamFromTarReader(dst, tarReader, nil)

 }

@@ -124,10 +125,13 @@ func DownloadDirFromContainer(client *docker.Client, container, src, dst string)

 func UploadFileToContainer(client *docker.Client, container, src, dest string) error {

 	uploader, errch := newContainerUploader(client, container, filepath.Dir(dest))

-	nullWalkFunc := func(path string, info os.FileInfo, err error) error { return err }

+	t := s2itar.New(s2iutil.NewFileSystem())

+	tarWriter := s2itar.RenameAdapter{Writer: tar.NewWriter(uploader), Old: filepath.Base(src), New: filepath.Base(dest)}

-	t := stitar.New()

-	err := t.StreamFileAsTarWithCallback(src, filepath.Base(dest), uploader, nullWalkFunc, false)

+	err := t.CreateTarStreamToTarWriter(src, true, tarWriter, nil)

+	if err == nil {

+		err = tarWriter.Close()

+	}

 	uploader.Close()

 	if err != nil {

 		return err

@@ -19,6 +19,7 @@ import (

 	s2iapi "github.com/openshift/source-to-image/pkg/api"

 	"github.com/openshift/source-to-image/pkg/tar"

 	"github.com/openshift/source-to-image/pkg/util"

+	s2iutil "github.com/openshift/source-to-image/pkg/util"

 	"github.com/openshift/origin/pkg/build/api"

 	"github.com/openshift/origin/pkg/build/builder/cmd/dockercfg"

@@ -49,7 +50,7 @@ func NewDockerBuilder(dockerClient DockerClient, buildsClient client.BuildInterf

 		dockerClient: dockerClient,

 		build:        build,

 		gitClient:    gitClient,

-		tar:          tar.New(),

+		tar:          tar.New(s2iutil.NewFileSystem()),

 		urlTimeout:   initialURLCheckTimeout,

 		client:       buildsClient,

 		cgLimits:     cgLimits,

@@ -12,11 +12,13 @@ import (

 	"github.com/fsouza/go-dockerclient"

 	kapi "k8s.io/kubernetes/pkg/api"

+	"github.com/openshift/source-to-image/pkg/tar"

+	s2iutil "github.com/openshift/source-to-image/pkg/util"

+

 	"github.com/openshift/origin/pkg/build/api"

 	"github.com/openshift/origin/pkg/generate/git"

 	"github.com/openshift/origin/pkg/util/docker/dockerfile"

 	"github.com/openshift/origin/test/util"

-	"github.com/openshift/source-to-image/pkg/tar"

 )

 func TestInsertEnvAfterFrom(t *testing.T) {

@@ -226,7 +228,7 @@ func TestDockerfilePath(t *testing.T) {

 			dockerClient: dockerClient,

 			build:        build,

 			gitClient:    git.NewRepository(),

-			tar:          tar.New(),

+			tar:          tar.New(s2iutil.NewFileSystem()),

 		}

 		// this will validate that the Dockerfile is readable

@@ -13,6 +13,7 @@ import (

 	docker "github.com/fsouza/go-dockerclient"

 	s2igit "github.com/openshift/source-to-image/pkg/scm/git"

+	s2iutil "github.com/openshift/source-to-image/pkg/util"

 	"github.com/openshift/origin/pkg/build/api"

 	"github.com/openshift/origin/pkg/build/builder/cmd/dockercfg"

@@ -151,7 +152,7 @@ func checkRemoteGit(gitClient GitClient, url string, initialTimeout time.Duratio

 // checkSourceURI performs a check on the URI associated with the build

 // to make sure that it is valid.

 func checkSourceURI(gitClient GitClient, rawurl string, timeout time.Duration) error {

-	ok, err := s2igit.New().ValidCloneSpec(rawurl)

+	ok, err := s2igit.New(s2iutil.NewFileSystem()).ValidCloneSpec(rawurl)

 	if err != nil {

 		return fmt.Errorf("Invalid git source url %q: %v", rawurl, err)

 	}

@@ -366,7 +367,7 @@ func extractSourceFromImage(dockerClient DockerClient, image, buildDir string, i

 	}

 	defer dockerClient.RemoveContainer(docker.RemoveContainerOptions{ID: container.ID})

-	tarHelper := tar.New()

+	tarHelper := tar.New(s2iutil.NewFileSystem())

 	tarHelper.SetExclusionPattern(nil)

 	for _, path := range paths {

@@ -16,6 +16,8 @@ import (

 	"github.com/spf13/cobra"

 	kerrors "k8s.io/kubernetes/pkg/util/errors"

+	s2iutil "github.com/openshift/source-to-image/pkg/util"

+

 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

 )

@@ -35,7 +37,7 @@ type tarStrategy struct {

 func newTarStrategy(f *clientcmd.Factory, c *cobra.Command, o *RsyncOptions) (copyStrategy, error) {

-	tarHelper := tar.New()

+	tarHelper := tar.New(s2iutil.NewFileSystem())

 	tarHelper.SetExclusionPattern(nil)

 	ignoredFlags := rsyncSpecificFlags(o)

@@ -18,6 +18,9 @@ import (

 	"github.com/golang/glog"

 	"github.com/spf13/cobra"

+	"github.com/openshift/source-to-image/pkg/tar"

+	s2iutil "github.com/openshift/source-to-image/pkg/util"

+

 	kapi "k8s.io/kubernetes/pkg/api"

 	kerrors "k8s.io/kubernetes/pkg/api/errors"

 	"k8s.io/kubernetes/pkg/api/meta"

@@ -35,7 +38,6 @@ import (

 	"github.com/openshift/origin/pkg/cmd/util/clientcmd"

 	"github.com/openshift/origin/pkg/generate/git"

 	oerrors "github.com/openshift/origin/pkg/util/errors"

-	"github.com/openshift/source-to-image/pkg/tar"

 )

 var (

@@ -567,7 +569,7 @@ func streamPathToBuild(repo git.Repository, in io.Reader, out io.Writer, client

 			pr, pw := io.Pipe()

 			go func() {

 				w := gzip.NewWriter(pw)

-				if err := tar.New().CreateTarStream(path, false, w); err != nil {

+				if err := tar.New(s2iutil.NewFileSystem()).CreateTarStream(path, false, w); err != nil {

 					pw.CloseWithError(err)

 				} else {

 					w.Close()

@@ -10,11 +10,13 @@ import (

 	"regexp"

 	"strconv"

+	"github.com/openshift/source-to-image/pkg/tar"

+	s2iutil "github.com/openshift/source-to-image/pkg/util"

+

 	kapi "k8s.io/kubernetes/pkg/api"

 	kerrs "k8s.io/kubernetes/pkg/util/errors"

 	"github.com/openshift/origin/pkg/diagnostics/networkpod/util"

-	"github.com/openshift/source-to-image/pkg/tar"

 )

 func (d *NetworkDiagnostic) CollectNetworkPodLogs() error {

@@ -91,7 +93,7 @@ func (d *NetworkDiagnostic) copyNetworkPodInfo(pod *kapi.Pod) error {

 	}

 	defer tmp.Close()

-	tarHelper := tar.New()

+	tarHelper := tar.New(s2iutil.NewFileSystem())

 	tarHelper.SetExclusionPattern(nil)

 	logdir := filepath.Join(d.LogDir, util.NetworkDiagNodeLogDirPrefix, pod.Spec.NodeName)

 	err = tarHelper.ExtractTarStream(logdir, tmp)

@@ -13,14 +13,17 @@ import (

 	"github.com/docker/docker/builder/dockerfile/parser"

 	"github.com/golang/glog"

-	buildapi "github.com/openshift/origin/pkg/build/api"

-	"github.com/openshift/origin/pkg/generate"

-	"github.com/openshift/origin/pkg/generate/git"

-	"github.com/openshift/origin/pkg/generate/source"

 	s2iapi "github.com/openshift/source-to-image/pkg/api"

 	s2igit "github.com/openshift/source-to-image/pkg/scm/git"

+	s2iutil "github.com/openshift/source-to-image/pkg/util"

+

 	kapi "k8s.io/kubernetes/pkg/api"

 	"k8s.io/kubernetes/pkg/api/validation"

+

+	buildapi "github.com/openshift/origin/pkg/build/api"

+	"github.com/openshift/origin/pkg/generate"

+	"github.com/openshift/origin/pkg/generate/git"

+	"github.com/openshift/origin/pkg/generate/source"

 )

 type Dockerfile interface {

@@ -70,7 +73,7 @@ func IsPossibleSourceRepository(s string) bool {

 // IsRemoteRepository checks whether the provided string is a remote repository or not

 func IsRemoteRepository(s string) bool {

-	if !s2igit.New().ValidCloneSpecRemoteOnly(s) {

+	if !s2igit.New(s2iutil.NewFileSystem()).ValidCloneSpecRemoteOnly(s) {

 		return false

 	}

 	url, err := url.Parse(s)

@@ -8,6 +8,7 @@ import (

 	"strings"

 	s2igit "github.com/openshift/source-to-image/pkg/scm/git"

+	s2iutil "github.com/openshift/source-to-image/pkg/util"

 )

 // ParseRepository parses a string that may be in the Git format (git@) or URL format

@@ -27,7 +28,7 @@ func ParseRepository(s string) (*url.URL, error) {

 	// There are some shortcomings with url.Parse when it comes to GIT, namely wrt

 	// the GIT local/file and ssh protocols - it does not handle implied schema (i.e. no <proto>:// prefix)well;

 	// We handle those caveats here

-	err = s2igit.New().MungeNoProtocolURL(s, uri)

+	err = s2igit.New(s2iutil.NewFileSystem()).MungeNoProtocolURL(s, uri)

 	if err != nil {

 		return nil, err

 	}