Merge branch 'master' into #468-encourage-stable-version

Author: elliotekj

.buildpacks

@@ -1,4 +1,5 @@
 https://github.com/rcaught/heroku-buildpack-cmake#e4e2c9e
-https://github.com/emk/heroku-buildpack-rust#035823
+https://github.com/mmirate/heroku-buildpack-rust#f1cf6643e
 https://github.com/tonycoco/heroku-buildpack-ember-cli
 https://github.com/ryandotsmith/nginx-buildpack.git#af813ba
+https://github.com/sgrif/heroku-buildpack-diesel#43267f2

.travis.yml

@@ -17,9 +17,10 @@ install:
   - pip install 'travis-cargo<0.2' --user && export PATH=$HOME/.local/bin:$PATH
   - yarn
   - yarn run bower install
+  - cargo install diesel_cli --debug --no-default-features --features postgres && export PATH=$HOME/.cargo/bin:$PATH
 
 before_script:
-  - psql -c 'create database cargo_registry_test;' -U postgres
+  - diesel database setup
 
 script:
   - cargo build
@@ -42,6 +43,7 @@ addons:
 
 env:
   global:
+    - DATABASE_URL=postgres://postgres:@localhost/cargo_registry_test
     - TEST_DATABASE_URL=postgres://postgres:@localhost/cargo_registry_test
     - S3_BUCKET=alexcrichton-test
 

Cargo.lock

@@ -36,6 +36,10 @@ rustc-serialize = "0.3"
 license-exprs = "^1.3"
 dotenv = "0.8.0"
 toml = "0.2"
+diesel = { version = "0.11.0", features = ["postgres", "serde_json"] }
+diesel_codegen = { version = "0.11.0", features = ["postgres"] }
+r2d2-diesel = "0.11.0"
+diesel_full_text_search = "0.11.0"
 
 conduit = "0.8"
 conduit-conditional-get = "0.8"

Cargo.toml

@@ -1,2 +1,2 @@
-web: ./target/release/migrate && bin/start-nginx ./target/release/server
+web: ./target/release/migrate && bin/diesel migration run && bin/start-nginx ./target/release/server
 worker: ./target/release/update-downloads daemon 300

Procfile

@@ -19,7 +19,8 @@ export default Ember.Route.extend({
         };
 
         // Fallback to the crate's last stable version
-        if (!requestedVersion) {
+        // If `max_version` is `0.0.0` then all versions have been yanked
+        if (!requestedVersion && maxVersion !== '0.0.0') {
             if (isUnstableVersion(maxVersion)) {
                 crate.get('versions').then(versions => {
                     const latestStableVersion = versions.find(version => {
@@ -54,7 +55,7 @@ export default Ember.Route.extend({
         return crate.get('versions')
             .then(versions => {
                 const version = versions.find(version => version.get('num') === params.version_num);
-                if (!version) {
+                if (params.version_num && !version) {
                     this.controllerFor('application').set('nextFlashError',
                         `Version '${params.version_num}' of crate '${crate.get('name')}' does not exist`);
                 }

README.md

@@ -65,7 +65,11 @@ body {
     }
 
     .sep { margin: 0 10px; color: darken($html-bg, 10%); }
-    .nav, .menu { @include flex-grow(2); text-align: right; }
+    .nav, .menu {
+        @include flex-grow(2);
+        text-align: right;
+        margin-right: 5px;
+    }
 
     .menu { display: none; }
     .menu ul.dropdown {
@@ -90,7 +94,7 @@ body {
         }
     }
 
-    #current-user-links {
+    .current-user-links {
         display: none;
         left: auto;
         right: 0;
@@ -129,6 +133,8 @@ body {
 #mobile-search {
     display: none;
     margin-bottom: 10px;
+    margin-left: 5px;
+    margin-right: 5px;
     input.search {
         width: 100%;
         margin: 0;

app/routes/crate/version.js

@@ -9,6 +9,7 @@
 
     .info {
         @include display-flex;
+        @include flex-wrap(wrap);
         @include align-items(center);
     }
     h1 {
@@ -240,13 +241,35 @@
             color: white;
             padding: 20px;
         }
-
+        button, button:active {
+            padding: 5px 0;
+            background-color: #FFFFFF;
+            border: none;
+            width: 60px;
+            cursor: pointer;
+        }
+        button:hover {
+            background: #edebdd;
+        }
         @media only screen and (min-width: 500px) {
             .action { @include flex(2); display: block; }
             code { @include flex(8); }
         }
     }
+    .copy-result {
+        text-align: right;
 
+        span {
+            font-size: 80%;
+            font-weight: bold;
+        }
+        .copy-success {
+            color: $link-color;
+        }
+        .copy-failure {
+            color: red;
+        }
+    }
     .last-update {
         color: $main-color-light;
         font-size: 90%;
@@ -316,6 +339,7 @@
     h3 { margin-bottom: 5px; }
     .section {
         @include flex(1);
+        margin-right: 10px;
         li { line-height: 24px; }
         .date { color: $main-color-light; padding-left: 5px; }
     }

app/styles/app.scss

@@ -61,7 +61,7 @@
                     <span class='arrow'></span>
                 {{/rl-dropdown-toggle}}
 
-                {{#rl-dropdown tagName="ul" id="current-user-links" class="dropdown" closeOnChildClick="a:link"}}
+                {{#rl-dropdown tagName="ul" class="dropdown current-user-links" closeOnChildClick="a:link"}}
                     <li>{{#link-to 'dashboard'}}Dashboard{{/link-to}}</li>
                     <li>{{#link-to 'me'}}Account Settings{{/link-to}}</li>
                     <li class='last'>{{#link-to 'logout'}}Sign Out{{/link-to}}</li>
@@ -81,7 +81,7 @@
                 Menu
                 <span class='arrow'></span>
             {{/rl-dropdown-toggle}}
-            {{#rl-dropdown tagName='ul' id='current-user-links' class='dropdown' closeOnChildClick='a:link'}}
+            {{#rl-dropdown tagName='ul' class='dropdown current-user-links' closeOnChildClick='a:link'}}
                 <li>{{#link-to "crates"}}Browse All Crates{{/link-to}}</li>
                 {{#if session.currentUser}}
                     <li>{{#link-to 'dashboard'}}Dashboard{{/link-to}}</li>

app/styles/crate.scss

@@ -57,7 +57,13 @@
         {{/if}}
         <div class='install'>
             <div class='action'>Cargo.toml</div>
-            <code>{{ crate.name }} = "{{ currentVersion.num }}"</code>
+            <code id="crate-toml">{{ crate.name }} = "{{ currentVersion.num }}"</code>
+            <button id="crate-download-button" data-clipboard-action="copy" data-clipboard-target="#crate-toml">
+                <img src="/assets/copy.svg" alt="Copy to clipboard" height="25px" />
+            </button>
+        </div>
+        <div class="copy-result">
+            <span id="copy-notification"></span>
         </div>
     </div>
     <div class='authorship'>
@@ -271,3 +277,40 @@
     </div>
 </div>
 {{/if}}
+
+<script type="text/javascript">
+    if (!Clipboard.isSupported()) {
+        document.getElementById('crate-download-button').classList.add('hidden');
+    }
+
+    var clipboard = new Clipboard('#crate-download-button');
+    var notificationElement = document.getElementById('copy-notification');
+
+    clipboard.on('success', function(e) {
+        var successText = 'Copied !';
+
+        e.clearSelection();
+        notificationElement.classList.add('copy-success')
+        notificationElement.textContent = successText;
+        fadeOffElement(notificationElement, 2000);
+    });
+
+    clipboard.on('error', function(e) {
+        var failureText = 'An error occured. Please use CTRL+C.';
+
+        notificationElement.classList.add('copy-failure')
+        notificationElement.textContent = failureText;
+        fadeOffElement(notificationElement, 2000);
+    });
+
+    function fadeOffElement(element, delay) {
+        setTimeout(function() {
+            resetElement(element);
+        }, delay);
+    }
+
+    function resetElement(element) {
+        element.innerHTML = '';
+        element.className = '';
+    }
+</script>

app/templates/application.hbs

@@ -8,6 +8,7 @@
     "moment": "2.17.1",
     "moment-timezone": "0.5.11",
     "normalize-css": "5.0.0",
-    "pretender": "1.4.2"
+    "pretender": "1.4.2",
+    "clipboard": "1.6.0"
   }
 }

app/templates/crate/version.hbs

@@ -22,6 +22,6 @@ module.exports = function(defaults) {
 
   app.import('bower_components/moment/moment.js');
   app.import('bower_components/normalize-css/normalize.css');
-
+  app.import('bower_components/clipboard/dist/clipboard.js');
   return app.toTree();
 };

bower.json

@@ -0,0 +1 @@
+DROP TABLE users;

ember-cli-build.js

@@ -0,0 +1,6 @@
+CREATE TABLE users (
+            id              SERIAL PRIMARY KEY,
+            email           VARCHAR NOT NULL UNIQUE,
+            gh_access_token VARCHAR NOT NULL,
+            api_token       VARCHAR NOT NULL
+        );

migrations/20140924113530_dumped_migration_1/down.sql

@@ -0,0 +1 @@
+DROP TABLE packages;

migrations/20140924113530_dumped_migration_1/up.sql

@@ -0,0 +1,5 @@
+CREATE TABLE packages (
+            id              SERIAL PRIMARY KEY,
+            name            VARCHAR NOT NULL UNIQUE,
+            user_id         INTEGER NOT NULL
+        );

migrations/20140924114003_dumped_migration_2/down.sql

@@ -0,0 +1 @@
+DROP TABLE versions;

migrations/20140924114003_dumped_migration_2/up.sql

@@ -0,0 +1,5 @@
+CREATE TABLE versions (
+            id              SERIAL PRIMARY KEY,
+            package_id      INTEGER NOT NULL,
+            num             VARCHAR NOT NULL
+        );

migrations/20140924114059_dumped_migration_3/down.sql

@@ -0,0 +1 @@
+ALTER TABLE versions DROP CONSTRAINT unique_num;

migrations/20140924114059_dumped_migration_3/up.sql

@@ -0,0 +1 @@
+ALTER TABLE versions ADD CONSTRAINT unique_num UNIQUE (package_id, num);

migrations/20140924115329_dumped_migration_4/down.sql

@@ -0,0 +1 @@
+DROP TABLE version_dependencies;

migrations/20140924115329_dumped_migration_4/up.sql

@@ -0,0 +1,4 @@
+CREATE TABLE version_dependencies (
+            version_id      INTEGER NOT NULL,
+            depends_on_id   INTEGER NOT NULL
+        );

migrations/20140924120803_dumped_migration_5/down.sql

@@ -0,0 +1 @@
+ALTER TABLE packages DROP COLUMN updated_at;

migrations/20140924120803_dumped_migration_5/up.sql

@@ -0,0 +1 @@
+ALTER TABLE packages ADD COLUMN updated_at TIMESTAMP NOT NULL DEFAULT now();

migrations/20140925132248_dumped_migration_6/down.sql

@@ -0,0 +1 @@
+ALTER TABLE packages DROP COLUMN created_at;

migrations/20140925132248_dumped_migration_6/up.sql

@@ -0,0 +1 @@
+ALTER TABLE packages ADD COLUMN created_at TIMESTAMP NOT NULL DEFAULT now();

migrations/20140925132249_dumped_migration_7/down.sql

@@ -0,0 +1,2 @@
+UPDATE packages SET updated_at = now() WHERE updated_at IS NULL;
+UPDATE packages SET created_at = now() WHERE created_at IS NULL;

migrations/20140925132249_dumped_migration_7/up.sql

@@ -0,0 +1 @@
+ALTER TABLE versions DROP COLUMN updated_at;

migrations/20140925132250_dumped_migration_8/down.sql

@@ -0,0 +1 @@
+ALTER TABLE versions ADD COLUMN updated_at TIMESTAMP NOT NULL DEFAULT now();

migrations/20140925132250_dumped_migration_8/up.sql

@@ -0,0 +1 @@
+ALTER TABLE versions DROP COLUMN created_at;

migrations/20140925132251_dumped_migration_9/down.sql

@@ -0,0 +1 @@
+ALTER TABLE versions ADD COLUMN created_at TIMESTAMP NOT NULL DEFAULT now();

migrations/20140925132251_dumped_migration_9/up.sql

@@ -0,0 +1,2 @@
+UPDATE versions SET updated_at = now() WHERE updated_at IS NULL;
+UPDATE versions SET created_at = now() WHERE created_at IS NULL;

migrations/20140925132252_dumped_migration_10/down.sql

@@ -0,0 +1,4 @@
+ALTER TABLE versions ALTER COLUMN updated_at DROP DEFAULT;
+ALTER TABLE versions ALTER COLUMN created_at DROP DEFAULT;
+ALTER TABLE packages ALTER COLUMN updated_at DROP DEFAULT;
+ALTER TABLE packages ALTER COLUMN created_at DROP DEFAULT;

migrations/20140925132252_dumped_migration_10/up.sql

@@ -0,0 +1 @@
+DROP TABLE metadata;

migrations/20140925132253_dumped_migration_11/down.sql

@@ -0,0 +1,3 @@
+CREATE TABLE metadata (
+            total_downloads        BIGINT NOT NULL
+        );

migrations/20140925132253_dumped_migration_11/up.sql

@@ -0,0 +1 @@
+DELETE FROM metadata;

migrations/20140925132254_dumped_migration_12/down.sql

@@ -0,0 +1 @@
+INSERT INTO metadata (total_downloads) VALUES (0);

migrations/20140925132254_dumped_migration_12/up.sql

@@ -0,0 +1 @@
+ALTER TABLE packages DROP COLUMN downloads;

migrations/20140925153704_dumped_migration_13/down.sql

@@ -0,0 +1 @@
+ALTER TABLE packages ADD COLUMN downloads INTEGER NOT NULL DEFAULT 0;

migrations/20140925153704_dumped_migration_13/up.sql

@@ -0,0 +1 @@
+ALTER TABLE versions DROP COLUMN downloads;

migrations/20140925153705_dumped_migration_14/down.sql

@@ -0,0 +1 @@
+ALTER TABLE versions ADD COLUMN downloads INTEGER NOT NULL DEFAULT 0;

migrations/20140925153705_dumped_migration_14/up.sql

@@ -0,0 +1,2 @@
+ALTER TABLE versions ALTER COLUMN downloads DROP DEFAULT;
+ALTER TABLE packages ALTER COLUMN downloads DROP DEFAULT;

migrations/20140925161623_dumped_migration_15/down.sql

@@ -0,0 +1 @@
+ALTER TABLE packages DROP COLUMN max_version;

migrations/20140925161623_dumped_migration_15/up.sql

@@ -0,0 +1 @@
+ALTER TABLE packages ADD COLUMN max_version VARCHAR;

migrations/20140925161624_dumped_migration_16/down.sql

@@ -0,0 +1 @@
+ALTER TABLE versions ALTER COLUMN downloads DROP NOT NULL;

migrations/20140925161624_dumped_migration_16/up.sql

@@ -0,0 +1 @@
+ALTER TABLE versions ALTER COLUMN downloads SET NOT NULL;

migrations/20140925161625_dumped_migration_17/down.sql

@@ -0,0 +1,2 @@
+ALTER TABLE crates RENAME TO packages;
+ALTER TABLE versions RENAME COLUMN crate_id TO package_id;

migrations/20140925161625_dumped_migration_17/up.sql

@@ -0,0 +1,2 @@
+ALTER TABLE packages RENAME TO crates;
+ALTER TABLE versions RENAME COLUMN package_id TO crate_id;

migrations/20140926130044_dumped_migration_18/down.sql

@@ -0,0 +1 @@
+DROP INDEX index_crate_updated_at;

migrations/20140926130044_dumped_migration_18/up.sql

@@ -0,0 +1 @@
+CREATE INDEX index_crate_updated_at ON crates (updated_at);

migrations/20140926130046_dumped_migration_19/down.sql

@@ -0,0 +1 @@
+DROP INDEX index_crate_created_at;