diff --git a/glide.yaml b/glide.yaml index d3434a8..b39eab2 100644 --- a/glide.yaml +++ b/glide.yaml @@ -1,4 +1,4 @@ -package: github.com/koshatul/satis-go +package: github.com/AlchemicA/satis-go import: - package: github.com/goji/httpauth - package: github.com/gorilla/mux diff --git a/src/cmd/satis-go/main.go b/src/cmd/satis-go/main.go index ae8b20e..6e42cba 100644 --- a/src/cmd/satis-go/main.go +++ b/src/cmd/satis-go/main.go @@ -8,7 +8,7 @@ import ( "log" "os" - "github.com/koshatul/satis-go/src/satis" + "github.com/AlchemicA/satis-go/src/satis" "gopkg.in/yaml.v2" ) diff --git a/src/satis/client/client.go b/src/satis/client/client.go index 68117b8..5c8563d 100644 --- a/src/satis/client/client.go +++ b/src/satis/client/client.go @@ -4,7 +4,7 @@ import ( "log" "net/http" - "github.com/koshatul/satis-go/src/satis/satisphp/api" + "github.com/AlchemicA/satis-go/src/satis/satisphp/api" ) var _ = log.Print diff --git a/src/satis/satis_resource.go b/src/satis/satis_resource.go index d8f9bd8..80b2478 100644 --- a/src/satis/satis_resource.go +++ b/src/satis/satis_resource.go @@ -7,8 +7,8 @@ import ( "net/http" "github.com/gorilla/mux" - "github.com/koshatul/satis-go/src/satis/satisphp" - "github.com/koshatul/satis-go/src/satis/satisphp/api" + "github.com/AlchemicA/satis-go/src/satis/satisphp" + "github.com/AlchemicA/satis-go/src/satis/satisphp/api" ) // SatisResource needs a comment diff --git a/src/satis/satisphp/client_test.go b/src/satis/satisphp/client_test.go index c1d8db7..ba07a7b 100644 --- a/src/satis/satisphp/client_test.go +++ b/src/satis/satisphp/client_test.go @@ -8,9 +8,9 @@ import ( "testing" "time" - "github.com/koshatul/satis-go/src/satis/satisphp/api" - "github.com/koshatul/satis-go/src/satis/satisphp/db" - "github.com/koshatul/satis-go/src/satis/satisphp/job" + "github.com/AlchemicA/satis-go/src/satis/satisphp/api" + "github.com/AlchemicA/satis-go/src/satis/satisphp/db" + "github.com/AlchemicA/satis-go/src/satis/satisphp/job" ) var _ = fmt.Print diff --git a/src/satis/satisphp/db/satis_db.go b/src/satis/satisphp/db/satis_db.go index 41dbd57..6ee1eca 100644 --- a/src/satis/satisphp/db/satis_db.go +++ b/src/satis/satisphp/db/satis_db.go @@ -1,11 +1,26 @@ package db // SatisDB needs a comment -type SatisDB struct { - Name string `json:"name"` - Homepage string `json:"homepage"` - Repositories []SatisRepository `json:"repositories"` - RequireAll bool `json:"require-all"` +type SatisDb struct { + Abandoned map[string]string `json:"abandoned,omitempty"` + Archive SatisArchive `json:"archive,omitempty"` + Comment string `json:"_comment,omitempty"` + Config SatisConfig `json:"config,omitempty"` + Description string `json:"description,omitempty"` + Homepage string `json:"homepage"` + IncludeFilename string `json:"include-filename,omitempty"` + MinimumStability string `json:"minimum-stability,omitempty"` + Name string `json:"name"` + NotifyBatch string `json:"notify-batch,omitempty"` + OutputDir string `json:"output-dir,omitempty"` + OutputHTML bool `json:"output-html,omitempty"` + Providers bool `json:"providers,omitempty"` + Repositories []SatisRepository `json:"repositories,omitempty"` + Require map[string]string `json:"require,omitempty"` + RequireAll bool `json:"require-all,omitempty"` + RequireDependencies bool `json:"require-dependencies,omitempty"` + RequireDevDependencies bool `json:"require-dev-dependencies,omitempty"` + TwigTemplate string `json:"twig-template,omitempty"` } // SatisRepository needs a comment @@ -13,3 +28,46 @@ type SatisRepository struct { Type string `json:"type"` URL string `json:"url"` } + +// SatisArchive needs a comment +type SatisArchive struct { + AbsoluteDirectory string `json:"absolute-directory,omitempty"` + Blacklist []string `json:"blacklist,omitempty"` + Checksum bool `json:"checksum,omitempty"` + Directory string `json:"directory"` + Format string `json:"format,omitempty"` + IgnoreFilters bool `json:"ignore-filters,omitempty"` + PrefixURL string `json:"prefix-url,omitempty"` + SkipDev bool `json:"skip-dev,omitempty"` + Whitelist []string `json:"whitelist,omitempty"` +} + +// SatisConfig needs a comment +type SatisConfig struct { + AutoloaderSuffix string `json:"autoloader-suffix,omitempty"` + BinCompat string `json:"bin-compat,omitempty"` + BinDir string `json:"bin-dir,omitempty"` + CacheDir string `json:"cache-dir,omitempty"` + CacheFilesDir string `json:"cache-files-dir,omitempty"` + CacheFilesMaxsize string `json:"cache-files-maxsize,omitempty"` + CacheFilesTTL int `json:"cache-files-ttl,omitempty"` + CacheRepoDir string `json:"cache-repo-dir,omitempty"` + CacheTTL int `json:"cache-ttl,omitempty"` + CacheVcsDir string `json:"cache-vcs-dir,omitempty"` + ClassmapAuthoritative bool `json:"classmap-authoritative,omitempty"` + DiscardChanges bool `json:"discard-changes,omitempty"` + GithubDomains []string `json:"github-domains,omitempty"` + GithubExposeHostname bool `json:"github-expose-hostname,omitempty"` + GithubOauth map[string]interface{} `json:"github-oauth,omitempty"` + GithubProtocols []string `json:"github-protocols,omitempty"` + HTTPBasic map[string]interface{} `json:"http-basic,omitempty"` + NotifyOnInstall bool `json:"notify-on-install,omitempty"` + OptimizeAutoloader bool `json:"optimize-autoloader,omitempty"` + Platform map[string]interface{} `json:"platform,omitempty"` + PreferredInstall string `json:"preferred-install,omitempty"` + PrependAutoloader bool `json:"prepend-autoloader,omitempty"` + ProcessTimeout int `json:"process-timeout,omitempty"` + StoreAuths bool `json:"store-auths,omitempty"` + UseIncludePath bool `json:"use-include-path,omitempty"` + VendorDir string `json:"vendor-dir,omitempty"` +} diff --git a/src/satis/satisphp/job/delete_repo_job.go b/src/satis/satisphp/job/delete_repo_job.go index af62401..8b5dc4f 100644 --- a/src/satis/satisphp/job/delete_repo_job.go +++ b/src/satis/satisphp/job/delete_repo_job.go @@ -1,7 +1,7 @@ package job import ( - "github.com/koshatul/satis-go/src/satis/satisphp/db" + "github.com/AlchemicA/satis-go/src/satis/satisphp/db" ) // NewDeleteRepoJob removes a repo from the repo collection diff --git a/src/satis/satisphp/job/find_all_job.go b/src/satis/satisphp/job/find_all_job.go index 13088b3..28c34f0 100644 --- a/src/satis/satisphp/job/find_all_job.go +++ b/src/satis/satisphp/job/find_all_job.go @@ -1,7 +1,7 @@ package job import ( - "github.com/koshatul/satis-go/src/satis/satisphp/db" + "github.com/AlchemicA/satis-go/src/satis/satisphp/db" ) // Get all repos in the repo collection diff --git a/src/satis/satisphp/job/save_repo_job.go b/src/satis/satisphp/job/save_repo_job.go index 04f0eca..1f01339 100644 --- a/src/satis/satisphp/job/save_repo_job.go +++ b/src/satis/satisphp/job/save_repo_job.go @@ -1,8 +1,8 @@ package job import ( - "github.com/koshatul/satis-go/src/satis/satisphp/api" - "github.com/koshatul/satis-go/src/satis/satisphp/db" + "github.com/AlchemicA/satis-go/src/satis/satisphp/api" + "github.com/AlchemicA/satis-go/src/satis/satisphp/db" ) // NewSaveRepoJob adds or saves a repo tp the repo collection diff --git a/src/satis/satisphp/satis_client.go b/src/satis/satisphp/satis_client.go index 6914704..b1da980 100644 --- a/src/satis/satisphp/satis_client.go +++ b/src/satis/satisphp/satis_client.go @@ -4,8 +4,8 @@ import ( "errors" "log" - "github.com/koshatul/satis-go/src/satis/satisphp/api" - "github.com/koshatul/satis-go/src/satis/satisphp/job" + "github.com/AlchemicA/satis-go/src/satis/satisphp/api" + "github.com/AlchemicA/satis-go/src/satis/satisphp/job" ) var _ = log.Print diff --git a/src/satis/satisphp/satis_job_processor.go b/src/satis/satisphp/satis_job_processor.go index 79ce37a..aa2a2d4 100644 --- a/src/satis/satisphp/satis_job_processor.go +++ b/src/satis/satisphp/satis_job_processor.go @@ -3,8 +3,8 @@ package satisphp import ( "log" - "github.com/koshatul/satis-go/src/satis/satisphp/db" - "github.com/koshatul/satis-go/src/satis/satisphp/job" + "github.com/AlchemicA/satis-go/src/satis/satisphp/db" + "github.com/AlchemicA/satis-go/src/satis/satisphp/job" ) var _ = log.Printf diff --git a/src/satis/satisphp/static_generator.go b/src/satis/satisphp/static_generator.go index 8683ebf..f4c4535 100644 --- a/src/satis/satisphp/static_generator.go +++ b/src/satis/satisphp/static_generator.go @@ -4,7 +4,7 @@ import ( "log" "os/exec" - "github.com/koshatul/satis-go/src/satis/satisphp/db" + "github.com/AlchemicA/satis-go/src/satis/satisphp/db" ) var _ = log.Print diff --git a/src/satis/server.go b/src/satis/server.go index aeec3af..c5f9241 100644 --- a/src/satis/server.go +++ b/src/satis/server.go @@ -7,9 +7,9 @@ import ( "github.com/goji/httpauth" "github.com/gorilla/mux" - "github.com/koshatul/satis-go/src/satis/satisphp" - "github.com/koshatul/satis-go/src/satis/satisphp/db" - "github.com/koshatul/satis-go/src/satis/satisphp/job" + "github.com/AlchemicA/satis-go/src/satis/satisphp" + "github.com/AlchemicA/satis-go/src/satis/satisphp/db" + "github.com/AlchemicA/satis-go/src/satis/satisphp/job" ) var _ = log.Printf diff --git a/src/satis/server_test.go b/src/satis/server_test.go index 17603d7..b846736 100644 --- a/src/satis/server_test.go +++ b/src/satis/server_test.go @@ -12,9 +12,9 @@ import ( "testing" "time" - "github.com/koshatul/satis-go/src/satis/client" - "github.com/koshatul/satis-go/src/satis/satisphp/api" - "github.com/koshatul/satis-go/src/satis/satisphp/db" + "github.com/AlchemicA/satis-go/src/satis/client" + "github.com/AlchemicA/satis-go/src/satis/satisphp/api" + "github.com/AlchemicA/satis-go/src/satis/satisphp/db" . "gopkg.in/check.v1" )