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

ignore bower for now #896

Closed
wants to merge 4 commits into from
Closed

ignore bower for now #896

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
59d6338
ignore bower for now
RustyToms Oct 12, 2016
f234665
update tests
RustyToms Oct 12, 2016
78cc2e8
restore snapshots
RustyToms Oct 12, 2016
7bbf855
update snapshot properly
RustyToms Oct 12, 2016
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
1 change: 0 additions & 1 deletion __tests__/__snapshots__/fetchers.js.snap
View file
Open in desktop

This file was deleted.

110 changes: 55 additions & 55 deletions __tests__/fetchers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
/* @flow */
/* eslint max-len: 0 */

import TarballFetcher, {LocalTarballFetcher} from '../src/fetchers/tarball-fetcher.js';
// import TarballFetcher, {LocalTarballFetcher} from '../src/fetchers/tarball-fetcher.js';
import BaseFetcher from '../src/fetchers/base-fetcher.js';
import CopyFetcher from '../src/fetchers/copy-fetcher.js';
import GitFetcher from '../src/fetchers/git-fetcher.js';
// import GitFetcher from '../src/fetchers/git-fetcher.js';
import {NoopReporter} from '../src/reporters/index.js';
import Config from '../src/config.js';
import mkdir from './_temp.js';
Expand Down Expand Up @@ -53,60 +53,60 @@ test('CopyFetcher.fetch', async () => {
expect(contentFoo).toBe('bar');
});

test('GitFetcher.fetch', async () => {
const dir = await mkdir('git-fetcher');
const fetcher = new GitFetcher(dir, {
type: 'git',
reference: 'https://github.com/PolymerElements/font-roboto',
hash: '2fd5c7bd715a24fb5b250298a140a3ba1b71fe46',
registry: 'bower',
}, await createConfig());
await fetcher.fetch();
const name = (await fs.readJson(path.join(dir, 'bower.json'))).name;
expect(name).toBe('font-roboto');
});
// test('GitFetcher.fetch', async () => {
// const dir = await mkdir('git-fetcher');
// const fetcher = new GitFetcher(dir, {
// type: 'git',
// reference: 'https://github.com/PolymerElements/font-roboto',
// hash: '2fd5c7bd715a24fb5b250298a140a3ba1b71fe46',
// registry: 'bower',
// }, await createConfig());
// await fetcher.fetch();
// const name = (await fs.readJson(path.join(dir, 'bower.json'))).name;
// expect(name).toBe('font-roboto');
// });

test('TarballFetcher.fetch', async () => {
const dir = await mkdir('tarball-fetcher');
const fetcher = new TarballFetcher(dir, {
type: 'tarball',
hash: '9689b3b48d63ff70f170a192bec3c01b04f58f45',
reference: 'https://github.com/PolymerElements/font-roboto/archive/2fd5c7bd715a24fb5b250298a140a3ba1b71fe46.tar.gz',
registry: 'bower',
}, await createConfig());
// test('TarballFetcher.fetch', async () => {
// const dir = await mkdir('tarball-fetcher');
// const fetcher = new TarballFetcher(dir, {
// type: 'tarball',
// hash: '9689b3b48d63ff70f170a192bec3c01b04f58f45',
// reference: 'https://github.com/PolymerElements/font-roboto/archive/2fd5c7bd715a24fb5b250298a140a3ba1b71fe46.tar.gz',
// registry: 'bower',
// }, await createConfig());

await fetcher.fetch();
const name = (await fs.readJson(path.join(dir, 'bower.json'))).name;
expect(name).toBe('font-roboto');
});
// await fetcher.fetch();
// const name = (await fs.readJson(path.join(dir, 'bower.json'))).name;
// expect(name).toBe('font-roboto');
// });

test('TarballFetcher.fetch throws', async () => {
const dir = await mkdir('tarball-fetcher');
const url = 'https://github.com/PolymerElements/font-roboto/archive/2fd5c7bd715a24fb5b250298a140a3ba1b71fe46.tar.gz';
const fetcher = new TarballFetcher(dir, {
type: 'tarball',
hash: 'foo',
reference: url,
registry: 'bower',
}, await createConfig());
let error;
try {
await fetcher.fetch();
} catch (e) {
error = e;
}
expect(error && error.message).toMatchSnapshot();
});
// test('TarballFetcher.fetch throws', async () => {
// const dir = await mkdir('tarball-fetcher');
// const url = 'https://github.com/PolymerElements/font-roboto/archive/2fd5c7bd715a24fb5b250298a140a3ba1b71fe46.tar.gz';
// const fetcher = new TarballFetcher(dir, {
// type: 'tarball',
// hash: 'foo',
// reference: url,
// registry: 'bower',
// }, await createConfig());
// let error;
// try {
// await fetcher.fetch();
// } catch (e) {
// error = e;
// }
// expect(error && error.message).toMatchSnapshot();
// });

test('TarballFetcher.fetch supports local ungzipped tarball', async () => {
const dir = await mkdir('tarball-fetcher');
const fetcher = new LocalTarballFetcher(dir, {
type: 'tarball',
hash: '76d4316a3965259f7074f167f44a7a7a393884be',
reference: path.join(__dirname, 'fixtures', 'fetchers', 'tarball', 'ungzipped.tar'),
registry: 'bower',
}, await createConfig());
await fetcher.fetch();
const name = (await fs.readJson(path.join(dir, 'bower.json'))).name;
expect(name).toBe('font-roboto');
});
// test('TarballFetcher.fetch supports local ungzipped tarball', async () => {
// const dir = await mkdir('tarball-fetcher');
// const fetcher = new LocalTarballFetcher(dir, {
// type: 'tarball',
// hash: '76d4316a3965259f7074f167f44a7a7a393884be',
// reference: path.join(__dirname, 'fixtures', 'fetchers', 'tarball', 'ungzipped.tar'),
// registry: 'bower',
// }, await createConfig());
// await fetcher.fetch();
// const name = (await fs.readJson(path.join(dir, 'bower.json'))).name;
// expect(name).toBe('font-roboto');
// });
6 changes: 3 additions & 3 deletions __tests__/package-resolver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,11 +34,11 @@ function addTest(pattern, registry = 'npm') {
});
}

addTest('github:PolymerElements/paper-elements', 'bower'); // github url
addTest('https://github.com/PolymerElements/font-roboto.git', 'bower'); // hosted git url
// addTest('github:PolymerElements/paper-elements', 'bower'); // github url
// addTest('https://github.com/PolymerElements/font-roboto.git', 'bower'); // hosted git url
addTest('https://github.com/npm-ml/re'); // git url with no .git
addTest('https://bitbucket.org/hgarcia/node-bitbucket-api.git'); // hosted git url
addTest('https://github.com/PolymerElements/font-roboto/archive/2fd5c7bd715a24fb5b250298a140a3ba1b71fe46.tar.gz'); // tarball
// addTest('https://github.com/PolymerElements/font-roboto/archive/2fd5c7bd715a24fb5b250298a140a3ba1b71fe46.tar.gz'); // tarball
addTest('https://github.com/npm-ml/ocaml.git#npm-4.02.3'); // hash
addTest('gitlab:leanlabsio/kanban'); // gitlab
addTest('gist:d59975ac23e26ad4e25b'); // gist url
Expand Down
4 changes: 2 additions & 2 deletions src/registries/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,12 @@

import YarnRegistry from './yarn-registry.js';
import NpmRegistry from './npm-registry.js';
import BowerRegistry from './bower-registry.js';
// import BowerRegistry from './bower-registry.js';

export const registries = {
npm: NpmRegistry,
yarn: YarnRegistry,
bower: BowerRegistry,
// bower: BowerRegistry,
};

export const registryNames = Object.keys(registries);
Expand Down
4 changes: 2 additions & 2 deletions src/resolvers/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
/* @flow */

import RegistryNpm from './registries/npm-resolver.js';
import RegistryBower from './registries/bower-resolver.js';
// import RegistryBower from './registries/bower-resolver.js';
import RegistryYarn from './registries/yarn-resolver.js';

export const registries = {
bower: RegistryBower,
// bower: RegistryBower,
npm: RegistryNpm,
yarn: RegistryYarn,
};
Expand Down
44 changes: 22 additions & 22 deletions src/resolvers/registries/bower-resolver.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,28 +1,28 @@
/* @flow */

import type {Manifest} from '../../types.js';
import {MessageError} from '../../errors.js';
import RegistryResolver from './registry-resolver.js';
import GitResolver from '../exotics/git-resolver.js';
// import type {Manifest} from '../../types.js';
// import {MessageError} from '../../errors.js';
// import RegistryResolver from './registry-resolver.js';
// import GitResolver from '../exotics/git-resolver.js';

export default class BowerResolver extends RegistryResolver {
static registry = 'bower';
// export default class BowerResolver extends RegistryResolver {
// static registry = 'bower';

resolveRequest(): Promise<?{url: string}> {
return this.config.requestManager.request({
url: `${this.registryConfig.registry}/packages/${this.name}`,
json: true,
queue: this.resolver.fetchingQueue,
});
}
// resolveRequest(): Promise<?{url: string}> {
// return this.config.requestManager.request({
// url: `${this.registryConfig.registry}/packages/${this.name}`,
// json: true,
// queue: this.resolver.fetchingQueue,
// });
// }

async resolve(): Promise<Manifest> {
const body = await this.resolveRequest();
// async resolve(): Promise<Manifest> {
// const body = await this.resolveRequest();

if (body != null) {
return this.fork(GitResolver, false, `${body.url}#${this.range}`);
} else {
throw new MessageError(this.reporter.lang('packageNotFoundRegistry', this.name, 'bower'));
}
}
}
// if (body != null) {
// return this.fork(GitResolver, false, `${body.url}#${this.range}`);
// } else {
// throw new MessageError(this.reporter.lang('packageNotFoundRegistry', this.name, 'bower'));
// }
// }
// }