Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion glide.yaml
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/cmd/satis-go/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down
2 changes: 1 addition & 1 deletion src/satis/client/client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/satis/satis_resource.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/satis/satisphp/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
68 changes: 63 additions & 5 deletions src/satis/satisphp/db/satis_db.go
Original file line number Diff line number Diff line change
@@ -1,15 +1,73 @@
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
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"`
}
2 changes: 1 addition & 1 deletion src/satis/satisphp/job/delete_repo_job.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/satis/satisphp/job/find_all_job.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/satis/satisphp/job/save_repo_job.go
Original file line number Diff line number Diff line change
@@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/satis/satisphp/satis_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
4 changes: 2 additions & 2 deletions src/satis/satisphp/satis_job_processor.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 1 addition & 1 deletion src/satis/satisphp/static_generator.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/satis/server.go
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
6 changes: 3 additions & 3 deletions src/satis/server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
)

Expand Down