Fixing #10

bits/conf.go

@@ -15,6 +15,9 @@ type Conf struct {
 	//holds the aws s3 bucket name
 	AWSS3BucketName string `json:"aws_s3_bucket_name"`
 
+	//holds the aws s3 bucket domain
+	AWSDomain string `json:"aws_s3_bucket_domain"`
+
 	//The aws key that has access to the above bucket
 	AWSAccessKeyID string `json:"aws_access_key_id"`
 
@@ -62,6 +65,8 @@ func (conf *Conf) OverwriteFromGit(repo *Repository) (err error) {
 			conf.AWSAccessKeyID = fields[1]
 		case "bits.aws-secret-access-key":
 			conf.AWSSecretAccessKey = fields[1]
+		case "bits.aws-s3-bucket-domain":
+			conf.AWSDomain = fields[1]
 		}
 	}
 

bits/repository.go

@@ -145,6 +145,7 @@ func NewRepository(dir string, output io.Writer) (repo *Repository, err error) {
 			repo.conf.AWSS3BucketName,
 			repo.conf.AWSAccessKeyID,
 			repo.conf.AWSSecretAccessKey,
+			repo.conf.AWSDomain,
 		)
 
 		if err != nil {
@@ -239,6 +240,10 @@ func (repo *Repository) Install(w io.Writer, conf *Conf) (err error) {
 			gconf["bits.aws-s3-bucket-name"] = conf.AWSS3BucketName
 		}
 
+		if conf.AWSDomain != "" {
+			gconf["bits.aws-s3-bucket-domain"] = conf.AWSDomain
+		}
+
 		if conf.AWSAccessKeyID != "" {
 			gconf["bits.aws-access-key-id"] = conf.AWSAccessKeyID
 		}
@@ -261,6 +266,7 @@ func (repo *Repository) Install(w io.Writer, conf *Conf) (err error) {
 			repo.conf.AWSS3BucketName,
 			repo.conf.AWSAccessKeyID,
 			repo.conf.AWSSecretAccessKey,
+			repo.conf.AWSDomain,
 		)
 
 		if err != nil {

bits/repository_test.go

@@ -16,7 +16,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/nerdalize/git-bits/bits"
+	"github.com/jungleai/git-bits/bits"
 )
 
 func GitInitRemote(t *testing.T) (dir string) {

bits/s3.go

@@ -17,13 +17,13 @@ type S3Remote struct {
 	repo      *Repository
 }
 
-func NewS3Remote(repo *Repository, remote, bucket, accessKey, secretKey string) (s3 *S3Remote, err error) {
+func NewS3Remote(repo *Repository, remote, bucket, accessKey, secretKey string, domain string) (s3 *S3Remote, err error) {
 	s3 = &S3Remote{
 		repo:      repo,
 		gitRemote: remote,
 	}
 
-	s3.bucket = s3gof3r.New("", s3gof3r.Keys{
+	s3.bucket = s3gof3r.New(domain, s3gof3r.Keys{
 		AccessKey: accessKey,
 		SecretKey: secretKey,
 	}).Bucket(bucket)

command/combine.go

@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/mitchellh/cli"
-	"github.com/nerdalize/git-bits/bits"
+	"github.com/jungleai/git-bits/bits"
 )
 
 type Combine struct {

command/fetch.go

@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/mitchellh/cli"
-	"github.com/nerdalize/git-bits/bits"
+	"github.com/jungleai/git-bits/bits"
 )
 
 type Fetch struct {

command/install.go

@@ -7,7 +7,7 @@ import (
 
 	"github.com/jessevdk/go-flags"
 	"github.com/mitchellh/cli"
-	"github.com/nerdalize/git-bits/bits"
+	"github.com/jungleai/git-bits/bits"
 )
 
 var InstallOpts struct {
@@ -97,6 +97,12 @@ func (cmd *Install) Run(args []string) int {
 		return 128
 	}
 
+	conf.AWSDomain, err = cmd.ui.Ask("What is the AWS  where domain the bucket is located? (if left empty, defaults to s3.amazonaws.com)\n")
+	if err != nil {
+		cmd.ui.Error(fmt.Sprintf("failed to get input: %v", err))
+		return 128
+	}
+
 	conf.AWSSecretAccessKey, err = cmd.ui.AskSecret("What is your AWS Secret Key that autorizes the above access key? (input will be hidden)\n")
 	if err != nil {
 		cmd.ui.Error(fmt.Sprintf("failed to get input: %v", err))

command/pull.go

@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/mitchellh/cli"
-	"github.com/nerdalize/git-bits/bits"
+	"github.com/jungleai/git-bits/bits"
 )
 
 type Pull struct {

command/push.go

@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/mitchellh/cli"
-	"github.com/nerdalize/git-bits/bits"
+	"github.com/jungleai/git-bits/bits"
 )
 
 type Push struct {

command/scan.go

@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/mitchellh/cli"
-	"github.com/nerdalize/git-bits/bits"
+	"github.com/jungleai/git-bits/bits"
 )
 
 type Scan struct {

command/split.go

@@ -5,7 +5,7 @@ import (
 	"os"
 
 	"github.com/mitchellh/cli"
-	"github.com/nerdalize/git-bits/bits"
+	"github.com/jungleai/git-bits/bits"
 )
 
 type Split struct {

glide.yaml

@@ -1,4 +1,4 @@
-package: github.com/nerdalize/git-bits
+package: github.com/jungleai/git-bits
 import:
 - package: github.com/mitchellh/cli                 #cross-platform command lines
   version: fa17b36f6c61f1ddbbb08c9f6fde94b3c065a09d

main.go

@@ -6,7 +6,7 @@ import (
 
 	"github.com/mitchellh/cli"
 
-	"github.com/nerdalize/git-bits/command"
+	"github.com/jungleai/git-bits/command"
 )
 
 var (