Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/add device support #56

Merged
merged 2 commits into from
Jun 28, 2018
Merged

Feature/add device support #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d0fde54
upgrade charm.v3
ycliuhw Jun 28, 2018
ce4f1a9
updated dependencies.tsv
ycliuhw Jun 28, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 2 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,3 +22,5 @@ _testmain.go
*.exe
*.test
bundle.svg

.vscode
10 changes: 6 additions & 4 deletions dependencies.tsv
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,22 @@
github.com/ajstarks/svgo git 89e3ac64b5b3e403a5e7c35ea4f98d45db7b4518 2014-10-04T21:11:59Z
github.com/gabriel-samfira/sys git 9ddc60d56b511544223adecea68da1e4f2153beb 2015-06-08T13:21:19Z
github.com/juju/collections git 90152009b5f349bb218a9bf4a6034dd8437c031b 2018-05-16T02:26:42Z
github.com/juju/errors git 1b5e39b83d1835fa480e0c2ddefb040ee82d58b3 2015-09-16T12:56:42Z
github.com/juju/gojsonpointer git afe8b77aa08f272b49e01b82de78510c11f61500 2015-02-04T19:46:29Z
github.com/juju/gojsonreference git f0d24ac5ee330baa21721cdff56d45e4ee42628e 2015-02-04T19:46:33Z
github.com/juju/gojsonschema git e1ad140384f254c82f89450d9a7c8dd38a632838 2015-03-12T17:00:16Z
github.com/juju/loggo git 8477fc936adf0e382d680310047ca27e128a309a 2015-05-27T03:58:39Z
github.com/juju/schema git 1e25943f8c6fd6815282d6f1ac87091d21e14e19 2016-03-01T11:16:46Z
github.com/juju/testing git 162fafccebf20a4207ab93d63b986c230e3f4d2e 2016-04-04T09:43:17Z
github.com/juju/utils git ffea6ead0c374583e876c8357c9db6e98bc71476 2016-05-26T02:52:51Z
github.com/juju/utils git c746c6e86f4fb2a04bc08d66b7a0f7e900d9cbab 2018-06-19T11:28:06Z
github.com/juju/version git ef897ad7f130870348ce306f61332f5335355063 2015-11-27T20:34:00Z
github.com/juju/xml git eb759a627588d35166bc505fceb51b88500e291e 2015-04-13T13:11:21Z
golang.org/x/crypto git aedad9a179ec1ea11b7064c57cbc6dc30d7724ec 2015-08-30T18:06:42Z
golang.org/x/net git d25186b37f34ebdbbea8f488ef055638dfab272d 2018-03-06T06:01:52Z
golang.org/x/sys git 37707fdb30a5b38865cfb95e5aab41707daec7fd 2018-02-02T13:58:01Z
gopkg.in/check.v1 git 4f90aeace3a26ad7021961c297b22c42160c7b25 2016-01-05T16:49:36Z
gopkg.in/errgo.v1 git 66cb46252b94c1f3d65646f54ee8043ab38d766c 2015-10-07T15:31:57Z
gopkg.in/juju/charm.v6 git e03b52c17fcc23dd3154fdda6cbd357c6ded1f01 2017-11-14T08:45:40Z
gopkg.in/juju/charm.v6 git 6e010c5e06d7a9385229eb22fa92ce836e0f45e5 2018-06-28T06:52:20Z
gopkg.in/juju/names.v2 git e38bc90539f22af61a9c656d35068bd5f0a5b30a 2016-05-25T23:07:23Z
gopkg.in/mgo.v2 git 4d04138ffef2791c479c0c8bbffc30b34081b8d9 2015-10-26T16:34:53Z
gopkg.in/tomb.v1 git dd632973f1e7218eb1089048e0798ec9ae7dceb8 2014-10-24T13:56:13Z
gopkg.in/yaml.v2 git a83829b6f1293c91addabc89d0571c246397bbf4 2016-03-01T20:40:22Z
launchpad.net/tomb bzr gustavo@niemeyer.net-20140529072043-hzcrlnl3ygvg914q 18
6 changes: 3 additions & 3 deletions iconfetcher_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ func (s *IconFetcherSuite) TestLinkFetchIcons(c *gc.C) {
}
b, err := charm.ReadBundleData(strings.NewReader(bundle))
c.Assert(err, gc.IsNil)
err = b.Verify(nil, nil)
err = b.Verify(nil, nil, nil)
c.Assert(err, gc.IsNil)
fetcher := LinkFetcher{
IconURL: iconURL,
Expand All @@ -59,7 +59,7 @@ func (s *IconFetcherSuite) TestHTTPFetchIcons(c *gc.C) {
}
b, err := charm.ReadBundleData(strings.NewReader(bundle))
c.Assert(err, gc.IsNil)
err = b.Verify(nil, nil)
err = b.Verify(nil, nil, nil)
c.Assert(err, gc.IsNil)
// Only one copy of precise/mongodb-21
b.Applications["duplicateApplication"] = &charm.ApplicationSpec{
Expand Down Expand Up @@ -102,7 +102,7 @@ func (s *IconFetcherSuite) TestHTTPBadIconURL(c *gc.C) {

b, err := charm.ReadBundleData(strings.NewReader(bundle))
c.Assert(err, gc.IsNil)
err = b.Verify(nil, nil)
err = b.Verify(nil, nil, nil)
c.Assert(err, gc.IsNil)
fetcher := HTTPFetcher{
Concurrency: 1,
Expand Down
2 changes: 1 addition & 1 deletion jujusvg.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ func NewFromBundle(b *charm.BundleData, iconURL func(*charm.URL) string, fetcher

// Verify the bundle to make sure that all the invariants
// that we depend on below actually hold true.
if err := b.Verify(nil, nil); err != nil {
if err := b.Verify(nil, nil, nil); err != nil {
return nil, errgo.Notef(err, "cannot verify bundle")
}
// Go through all applications in alphabetical order so that
Expand Down
10 changes: 5 additions & 5 deletions jujusvg_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@ func (f *errFetcher) FetchIcons(*charm.BundleData) (map[string][]byte, error) {
func (s *newSuite) TestNewFromBundle(c *gc.C) {
b, err := charm.ReadBundleData(strings.NewReader(bundle))
c.Assert(err, gc.IsNil)
err = b.Verify(nil, nil)
err = b.Verify(nil, nil, nil)
c.Assert(err, gc.IsNil)

cvs, err := NewFromBundle(b, iconURL, nil)
Expand Down Expand Up @@ -149,7 +149,7 @@ func (s *newSuite) TestNewFromBundle(c *gc.C) {
func (s *newSuite) TestNewFromBundleWithUnplacedApplication(c *gc.C) {
b, err := charm.ReadBundleData(strings.NewReader(bundle))
c.Assert(err, gc.IsNil)
err = b.Verify(nil, nil)
err = b.Verify(nil, nil, nil)
c.Assert(err, gc.IsNil)
b.Applications["charmworld"].Annotations["gui-x"] = ""
b.Applications["charmworld"].Annotations["gui-y"] = ""
Expand Down Expand Up @@ -228,7 +228,7 @@ func (s *newSuite) TestNewFromBundleWithUnplacedApplication(c *gc.C) {
func (s *newSuite) TestWithFetcher(c *gc.C) {
b, err := charm.ReadBundleData(strings.NewReader(bundle))
c.Assert(err, gc.IsNil)
err = b.Verify(nil, nil)
err = b.Verify(nil, nil, nil)
c.Assert(err, gc.IsNil)

cvs, err := NewFromBundle(b, iconURL, new(emptyFetcher))
Expand Down Expand Up @@ -308,7 +308,7 @@ func (s *newSuite) TestDefaultHTTPFetcher(c *gc.C) {

b, err := charm.ReadBundleData(strings.NewReader(bundle))
c.Assert(err, gc.IsNil)
err = b.Verify(nil, nil)
err = b.Verify(nil, nil, nil)
c.Assert(err, gc.IsNil)

cvs, err := NewFromBundle(b, tsIconUrl, &HTTPFetcher{IconURL: tsIconUrl})
Expand Down Expand Up @@ -380,7 +380,7 @@ func (s *newSuite) TestDefaultHTTPFetcher(c *gc.C) {
func (s *newSuite) TestFetcherError(c *gc.C) {
b, err := charm.ReadBundleData(strings.NewReader(bundle))
c.Assert(err, gc.IsNil)
err = b.Verify(nil, nil)
err = b.Verify(nil, nil, nil)
c.Assert(err, gc.IsNil)

ef := errFetcher("bad-wolf")
Expand Down