Merge pull request #282 from spk/show-dev-deps

Show dev/build dependencies info on menu and detail

Author: QuietMisdreavus

src/db/add_package.rs

@@ -10,6 +10,7 @@ use std::path::{Path, PathBuf};
 use std::fs;
 
 use cargo::core::{Package, TargetKind};
+use cargo::core::dependency::Kind;
 use rustc_serialize::json::{Json, ToJson};
 use slug::slugify;
 use reqwest::Client;
@@ -208,13 +209,18 @@ fn initialize_package_in_database(conn: &Connection, pkg: &Package) -> Result<i3
 
 
 
-/// Convert dependencies into Vec<(String, String)>
-fn convert_dependencies(pkg: &Package) -> Vec<(String, String)> {
-    let mut dependencies: Vec<(String, String)> = Vec::new();
+/// Convert dependencies into Vec<(String, String, String)>
+fn convert_dependencies(pkg: &Package) -> Vec<(String, String, String)> {
+    let mut dependencies: Vec<(String, String, String)> = Vec::new();
     for dependency in pkg.manifest().dependencies() {
         let name = dependency.package_name().to_string();
         let version = format!("{}", dependency.version_req());
-        dependencies.push((name, version));
+        let kind = match dependency.kind() {
+            Kind::Normal => "normal",
+            Kind::Development => "dev",
+            Kind::Build => "build",
+        };
+        dependencies.push((name, version, kind.to_string()));
     }
     dependencies
 }

templates/crate_details.hbs

@@ -27,7 +27,13 @@
             <div class="pure-menu pure-menu-scrollable sub-menu">
               <ul class="pure-menu-list">
                 {{#each dependencies}}
-                <li class="pure-menu-item"><a href="/crate/{{this.[0]}}/{{this.[1]}}" class="pure-menu-link">{{this.[0]}} {{this.[1]}}</a></li>
+                  <li class="pure-menu-item">
+                    <a href="/crate/{{this.[0]}}/{{this.[1]}}"
+                       class="pure-menu-link">
+                      {{this.[0]}} {{this.[1]}}
+                      <i class="dependencies {{this.[2]}}">{{this.[2]}}</i>
+                    </a>
+                  </li>
                 {{/each}}
               </ul>
             </div>

templates/navigation_rustdoc.hbs

@@ -54,7 +54,13 @@
                         <div class="pure-menu pure-menu-scrollable sub-menu">
                           <ul class="pure-menu-list">
                             {{#each dependencies}}
-                            <li class="pure-menu-item"><a href="/{{this.[0]}}/{{this.[1]}}" class="pure-menu-link">{{this.[0]}} {{this.[1]}}</a></li>
+                              <li class="pure-menu-item">
+                                <a href="/{{this.[0]}}/{{this.[1]}}"
+                                   class="pure-menu-link">
+                                  {{this.[0]}} {{this.[1]}}
+                                  <i class="dependencies this.[2]">{{this.[2]}}</i>
+                                </a>
+                              </li>
                             {{/each}}
                           </ul>
                         </div>

templates/style.scss

@@ -726,3 +726,8 @@ footer {
         background-color: inherit;
     }
 }
+
+i.dependencies.normal {
+  visibility: hidden;
+  display: none;
+}