Merge remote-tracking branch 'upstream/master' into sunjay-master

Author: carols10cents

.rustfmt.toml

@@ -1,11 +1,4 @@
-fn_args_layout = "Block"
-array_layout = "Block"
-control_style = "Rfc"
-where_style = "Rfc"
-generics_indent = "Block"
-fn_call_style = "Block"
 combine_control_expr = true
-fn_args_paren_newline = false
 max_width = 100
 error_on_line_overflow = false
 write_mode = "Overwrite"

.travis.yml

@@ -21,9 +21,7 @@ before_install:
   - nvm install 8
 
 install:
-  - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
-  - npm install
-  - cargo install --force diesel_cli --vers 0.16.0 --debug --no-default-features --features postgres && export PATH=$HOME/.cargo/bin:$PATH
+  - cargo install --force diesel_cli --vers 1.0.0 --no-default-features --features postgres && export PATH=$HOME/.cargo/bin:$PATH
 
 before_script:
   - diesel database setup
@@ -44,16 +42,17 @@ matrix:
   allow_failures:
     - rust: nightly
   include:
-  - rust: nightly-2017-11-07
+  - rust: nightly-2018-02-13
     script:
-    - cargo install --force rustfmt-nightly --vers 0.2.15
-    - cargo install --force clippy --vers 0.0.169
+    - cargo install --force rustfmt-nightly --vers 0.3.6
     - cargo fmt -- --write-mode=diff
+    - cargo install --force clippy --vers 0.0.186
     - cargo clippy
   - rust: stable
     script:
     - cargo build
     - cargo test
+    - npm install
     - npm test
   - rust: beta
     script:
@@ -68,6 +67,7 @@ env:
   global:
     - DATABASE_URL=postgres://postgres:@localhost/cargo_registry_test
     - TEST_DATABASE_URL=postgres://postgres:@localhost/cargo_registry_test
+    - CARGO_TARGET_DIR=target
 
 notifications:
   email:

Cargo.lock

@@ -2,7 +2,7 @@
 name = "cargo-registry"
 authors = ["Alex Crichton <[email protected]>"]
 version = "0.2.2"
-license = "MIT/Apache-2.0"
+license = "MIT OR Apache-2.0"
 repository = "https://github.com/rust-lang/crates.io"
 description = "Backend of crates.io"
 
@@ -28,37 +28,38 @@ rustdoc-args = [
 
 [dependencies]
 cargo-registry-s3 = { path = "src/s3", version = "0.2.0" }
-rand = "0.3"
+rand = "0.4"
 git2 = "0.6.4"
-flate2 = "0.2"
+flate2 = "1.0"
 semver = "0.5"
-url = "1.2.1"
+url = "1.2"
 tar = "0.4.13"
 
-r2d2 = "0.8.0"
-openssl = "0.9.14"
+openssl = "0.10.0"
 curl = "0.4"
 oauth2 = "0.3"
 log = "0.3"
-env_logger = "0.4"
-hex = "0.2"
+env_logger = "0.5"
+hex = "0.3"
 htmlescape = "0.3.1"
 license-exprs = "^1.3"
-dotenv = "0.10.0"
+dotenv = "0.11.0"
 toml = "0.4"
-diesel = { version = "0.99.0", features = ["postgres", "serde_json", "chrono"] }
-r2d2-diesel = "0.99.0"
-diesel_full_text_search = "0.99.0"
+diesel = { version = "1.1.0", features = ["postgres", "serde_json", "chrono", "r2d2"] }
+diesel_full_text_search = "1.0.0"
 serde_json = "1.0.0"
 serde_derive = "1.0.0"
 serde = "1.0.0"
 chrono = { version = "0.4.0", features = ["serde"] }
 comrak = { version = "0.2.3", default-features = false }
 ammonia = "1.0.0"
 docopt = "0.8.1"
-itertools = "0.6.0"
-lettre = "0.6"
+itertools = "0.7.0"
 scheduled-thread-pool = "0.2.0"
+derive_deref = "1.0.0"
+
+lettre = "0.7"
+lettre_email = "0.7"
 
 conduit = "0.8"
 conduit-conditional-get = "0.8"
@@ -81,6 +82,10 @@ tokio-core = "0.1"
 tokio-service = "0.1"
 
 [build-dependencies]
-dotenv = "0.10"
-diesel = { version = "0.99.0", features = ["postgres"] }
-diesel_migrations = { version = "0.99.0", features = ["postgres"] }
+dotenv = "0.11"
+diesel = { version = "1.1.0", features = ["postgres"] }
+diesel_migrations = { version = "1.1.0", features = ["postgres"] }
+
+# Remove once cookie depends on ring >= 0.13.0
+[patch.crates-io]
+ring = { git = "https://github.com/SergioBenitez/ring", branch = "v0.11" }

Cargo.toml

@@ -57,3 +57,12 @@ categories will be synced from this file.
 ## Running a mirror
 
 Please see [docs/MIRROR.md](https://github.com/rust-lang/crates.io/blob/master/docs/MIRROR.md) for instructions on setting up a mirror of crates.io.
+
+## License
+
+Licensed under either of these:
+
+ * Apache License, Version 2.0, ([LICENSE-APACHE](LICENSE-APACHE) or
+   https://www.apache.org/licenses/LICENSE-2.0)
+ * MIT license ([LICENSE-MIT](LICENSE-MIT) or
+   https://opensource.org/licenses/MIT)

README.md

@@ -28,7 +28,7 @@ export default Component.extend({
 
     projectName: computed('badge.attributes.project_name', function() {
         return this.get('badge.attributes.project_name') ||
-            this.get('badge.attributes.repository').replace(/_/g, '-');
+            this.get('badge.attributes.repository').replace(/[_.]/g, '-');
     }),
 
     service: computed('badge.attributes.service', function() {

app/components/badge-appveyor.js

@@ -5,7 +5,7 @@ import { computed } from '@ember/object';
 export default Component.extend({
     size: 'small',
     user: null,
-    attributeBindings: ['src', 'width', 'height'],
+    attributeBindings: ['src', 'width', 'height', 'alt'],
     tagName: 'img',
 
     width: computed('size', function() {
@@ -20,6 +20,10 @@ export default Component.extend({
 
     height: readOnly('width'),
 
+    alt: computed('user', function() {
+        return `${this.get('user.name')} (${this.get('user.login')})`;
+    }),
+
     src: computed('size', 'user', function() {
         return `${this.get('user.avatar')}&s=${this.get('width') * 2}`;
     })

app/components/user-avatar.js

@@ -21,11 +21,7 @@ export default Controller.extend(EKMixin, {
     }),
 
     actions: {
-        search(q) {
-            if (q !== undefined) {
-                this.set('searchQuery', q);
-            }
-
+        search() {
             this.transitionToRoute('search', {
                 queryParams: {
                     q: this.get('searchQuery'),

app/controllers/application.js

@@ -15,6 +15,12 @@ export default Controller.extend(PaginationMixin, {
     totalItems: readOnly('model.meta.total'),
 
     currentSortBy: computed('sort', function() {
-        return (this.get('sort') === 'downloads') ? 'Downloads' : 'Alphabetical';
+        if (this.get('sort') === 'downloads') {
+            return 'All-Time Downloads';
+        } else if (this.get('sort') === 'recent-downloads') {
+            return 'Recent Downloads';
+        } else {
+            return 'Alphabetical';
+        }
     }),
 });

app/controllers/me/crates.js

@@ -3,12 +3,10 @@ import { computed } from '@ember/object';
 import { alias, bool, readOnly } from '@ember/object/computed';
 import { inject as service } from '@ember/service';
 
-import { task, timeout } from 'ember-concurrency';
+import { task } from 'ember-concurrency';
 
 import PaginationMixin from '../mixins/pagination';
 
-const DEBOUNCE_MS = 250;
-
 export default Controller.extend(PaginationMixin, {
     search: service(),
     queryParams: ['q', 'page', 'per_page', 'sort'],
@@ -42,13 +40,10 @@ export default Controller.extend(PaginationMixin, {
     hasItems: bool('totalItems'),
 
     dataTask: task(function* (params) {
-        // debounce the search query
-        yield timeout(DEBOUNCE_MS);
-
         if (params.q !== null) {
             params.q = params.q.trim();
         }
 
         return yield this.store.query('crate', params);
-    }).restartable(),
+    }).drop(),
 });

app/controllers/search.js

@@ -84,7 +84,6 @@ body {
 
     button {
         background: none;
-        outline: 0;
         border: 0;
         padding: 10px 0;
 
@@ -130,7 +129,6 @@ body {
     font-size: 90%;
     border: none;
     color: black;
-    outline: 0;
     margin-left: 30px;
     padding: 5px 5px 5px 25px;
     background-color: white;
@@ -141,6 +139,15 @@ body {
     @include border-radius(15px);
 }
 
+form.search label {
+    position: absolute;
+    left: -10000px;
+    top: auto;
+    width: 1px;
+    height: 1px;
+    overflow: hidden;
+}
+
 #header input.search {
     width: 100%;
     margin-left: 16px;

app/styles/app.scss

@@ -190,6 +190,12 @@
     font-size: 90%;
     margin-bottom: 20px;
 
+    ol {
+        list-style: none;
+        padding: 0;
+    }
+    ol, li { display: inline; }
+
     a {
         color: $main-color-light;
         text-decoration: none;
@@ -206,7 +212,7 @@
     border-bottom: 5px solid $gray-border;
     margin-bottom: 20px;
 
-    @media only screen and (min-width: 820px) {
+    @media only screen and (min-width: 890px) {
         @include flex-direction(row);
 
         .docs {
@@ -363,6 +369,10 @@
             font-size: 160%;
             font-weight: bold;
             margin-bottom: 4px;
+            &__align {
+                position: relative;
+                bottom: 0.4rem;
+            }
         }
     }
 

app/styles/crate.scss

@@ -20,7 +20,7 @@
         margin-right: 10px;
     }
 
-    &:hover { @include vertical-gradient($start_dark, $end_dark); outline: 0; }
+    &:hover, &:focus { @include vertical-gradient($start_dark, $end_dark); outline: 0; }
     &.active { @include vertical-gradient($start_dark, $end_dark); outline: 0; }
     &[disabled] {
         @include vertical-gradient($start_light, $end_light);
@@ -96,7 +96,10 @@ button.small {
 
     @media only screen and (max-width: 530px) {
         @include flex-direction(column);
-        #stats { border: none; }
+        #stats {
+            border: none;
+            margin: auto;
+        }
         .crates, .downloads {
             @include justify-content(center);
         }
@@ -111,9 +114,17 @@ button.small {
         line-height: 20px;
     }
 
-    > div { margin: 0 15px; }
+    > section { margin: 0 15px; }
+
+    > section[aria-busy="true"] > h2::after {
+        content: '';
+        background-image: url('/assets/ajax-loader.gif');
+        display: inline-block;
+        height: 16px;
+        width: 16px;
+    }
 
-    ul { list-style: none; padding: 0; }
+    ul, ol { list-style: none; padding: 0; }
     li { margin: 8px 0; }
 
     li a {
@@ -143,7 +154,7 @@ button.small {
     @include flex-wrap(wrap);
     @include justify-content(left);
 
-    > div {
+    > section {
       margin: 0;
       padding: 0 15px;
       width: 33.33%;

app/styles/home.scss

@@ -177,7 +177,7 @@
         margin-bottom: 20px;
         background-color: $bg;
         color: white;
-        &:hover { background-color: darken($bg, 10%); }
+        &:hover, &:focus { background-color: darken($bg, 10%); }
     }
 }