---

yaml
---
r: 64298
b: refs/heads/snap-stage3
c: 3b02589
h: refs/heads/master
v: v3

Author: lilyball

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 563172a73be64aa2b0f528346095aba566753d14
+refs/heads/snap-stage3: 3b0258916d28a1215acf9a0c78f6760cc67f935c
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/librustpkg/conditions.rs

@@ -32,7 +32,3 @@ condition! {
 condition! {
     bad_pkg_id: (super::Path, ~str) -> super::PkgId;
 }
-
-condition! {
-    no_rust_path: (~str) -> super::Path;
-}

branches/snap-stage3/src/librustpkg/installed_packages.rs

@@ -30,15 +30,6 @@ pub struct PkgId {
     version: Version
 }
 
-impl Eq for PkgId {
-    fn eq(&self, p: &PkgId) -> bool {
-        *p.local_path == *self.local_path && p.version == self.version
-    }
-    fn ne(&self, p: &PkgId) -> bool {
-        !(self.eq(p))
-    }
-}
-
 impl PkgId {
     pub fn new(s: &str) -> PkgId {
         use conditions::bad_pkg_id::cond;

branches/snap-stage3/src/librustpkg/package_id.rs

@@ -33,18 +33,13 @@ static PATH_ENTRY_SEPARATOR: &'static str = ";";
 #[cfg(not(windows))]
 static PATH_ENTRY_SEPARATOR: &'static str = ":";
 
-/// Returns RUST_PATH as a string, without default paths added
-pub fn get_rust_path() -> Option<~str> {
-    os::getenv("RUST_PATH")
-}
-
 /// Returns the value of RUST_PATH, as a list
 /// of Paths. Includes default entries for, if they exist:
 /// $HOME/.rust
 /// DIR/.rust for any DIR that's the current working directory
 /// or an ancestor of it
 pub fn rust_path() -> ~[Path] {
-    let mut env_rust_path: ~[Path] = match get_rust_path() {
+    let mut env_rust_path: ~[Path] = match os::getenv("RUST_PATH") {
         Some(env_path) => {
             let env_path_components: ~[&str] =
                 env_path.split_str_iter(PATH_ENTRY_SEPARATOR).collect();
@@ -383,23 +378,3 @@ pub fn mk_output_path(what: OutputType, where: Target,
     debug!("mk_output_path: returning %s", output_path.to_str());
     output_path
 }
-
-/// Removes files for the package `pkgid`, assuming it's installed in workspace `workspace`
-pub fn uninstall_package_from(workspace: &Path, pkgid: &PkgId) {
-    let mut did_something = false;
-    let installed_bin = target_executable_in_workspace(pkgid, workspace);
-    if os::path_exists(&installed_bin) {
-        os::remove_file(&installed_bin);
-        did_something = true;
-    }
-    let installed_lib = target_library_in_workspace(pkgid, workspace);
-    if os::path_exists(&installed_lib) {
-        os::remove_file(&installed_lib);
-        did_something = true;
-    }
-    if !did_something {
-        warn(fmt!("Warning: there don't seem to be any files for %s installed in %s",
-             pkgid.to_str(), workspace.to_str()));
-    }
-
-}

branches/snap-stage3/src/librustpkg/path_util.rs

@@ -50,7 +50,6 @@ pub mod api;
 mod conditions;
 mod context;
 mod crate;
-mod installed_packages;
 mod messages;
 mod package_id;
 mod package_path;
@@ -249,14 +248,6 @@ impl CtxMethods for Ctx {
                     }
                 }
             }
-            "list" => {
-                io::println("Installed packages:");
-                for installed_packages::list_installed_packages |pkg_id| {
-                    io::println(fmt!("%s-%s",
-                                     pkg_id.local_path.to_str(),
-                                     pkg_id.version.to_str()));
-                }
-            }
             "prefer" => {
                 if args.len() < 1 {
                     return usage::uninstall();
@@ -272,24 +263,11 @@ impl CtxMethods for Ctx {
                     return usage::uninstall();
                 }
 
-                let pkgid = PkgId::new(args[0]);
-                if !installed_packages::package_is_installed(&pkgid) {
-                    warn(fmt!("Package %s doesn't seem to be installed! Doing nothing.", args[0]));
-                    return;
-                }
-                else {
-                    let rp = rust_path();
-                    assert!(!rp.is_empty());
-                    for each_pkg_parent_workspace(&pkgid) |workspace| {
-                        path_util::uninstall_package_from(workspace, &pkgid);
-                        note(fmt!("Uninstalled package %s (was installed in %s)",
-                                  pkgid.to_str(), workspace.to_str()));
-                    }
-                }
+                self.uninstall(args[0], None);
             }
             "unprefer" => {
                 if args.len() < 1 {
-                    return usage::unprefer();
+                    return usage::uninstall();
                 }
 
                 self.unprefer(args[0], None);
@@ -469,7 +447,6 @@ pub fn main() {
             ~"do" => usage::do_cmd(),
             ~"info" => usage::info(),
             ~"install" => usage::install(),
-            ~"list"    => usage::list(),
             ~"prefer" => usage::prefer(),
             ~"test" => usage::test(),
             ~"uninstall" => usage::uninstall(),

branches/snap-stage3/src/librustpkg/rustpkg.rs

@@ -12,10 +12,9 @@
 
 use context::Ctx;
 use std::hashmap::HashMap;
-use std::{io, libc, os, result, run, str};
+use std::{io, libc, os, result, run, str, vec};
 use extra::tempfile::mkdtemp;
 use std::run::ProcessOutput;
-use installed_packages::list_installed_packages;
 use package_path::*;
 use package_id::{PkgId};
 use package_source::*;
@@ -129,27 +128,20 @@ fn test_sysroot() -> Path {
     self_path.pop()
 }
 
-fn command_line_test(args: &[~str], cwd: &Path) -> ProcessOutput {
-    command_line_test_with_env(args, cwd, None)
-}
-
 /// Runs `rustpkg` (based on the directory that this executable was
 /// invoked from) with the given arguments, in the given working directory.
 /// Returns the process's output.
-fn command_line_test_with_env(args: &[~str], cwd: &Path, env: Option<~[(~str, ~str)]>)
-    -> ProcessOutput {
+fn command_line_test(args: &[~str], cwd: &Path) -> ProcessOutput {
     let cmd = test_sysroot().push("bin").push("rustpkg").to_str();
     let cwd = normalize(RemotePath(copy *cwd));
     debug!("About to run command: %? %? in %s", cmd, args, cwd.to_str());
     assert!(os::path_is_dir(&*cwd));
-    let cwd = cwd.clone();
-    let mut prog = run::Process::new(cmd, args, run::ProcessOptions {
-        env: env.map(|v| v.slice(0, v.len())),
-        dir: Some(&cwd),
-        in_fd: None,
-        out_fd: None,
-        err_fd: None
-    });
+    let mut prog = run::Process::new(cmd, args, run::ProcessOptions { env: None,
+                                                           dir: Some(&*cwd),
+                                                           in_fd: None,
+                                                           out_fd: None,
+                                                           err_fd: None
+                                                          });
     let output = prog.finish_with_output();
     debug!("Output from command %s with args %? was %s {%s}[%?]",
                     cmd, args, str::from_bytes(output.output),
@@ -260,16 +252,6 @@ fn command_line_test_output(args: &[~str]) -> ~[~str] {
     result
 }
 
-fn command_line_test_output_with_env(args: &[~str], env: ~[(~str, ~str)]) -> ~[~str] {
-    let mut result = ~[];
-    let p_output = command_line_test_with_env(args, &os::getcwd(), Some(env));
-    let test_output = str::from_bytes(p_output.output);
-    for test_output.split_iter('\n').advance |s| {
-        result.push(s.to_owned());
-    }
-    result
-}
-
 // assumes short_name and local_path are one and the same -- I should fix
 fn lib_output_file_name(workspace: &Path, parent: &str, short_name: &str) -> Path {
     debug!("lib_output_file_name: given %s and parent %s and short name %s",
@@ -494,9 +476,8 @@ fn test_package_version() {
                     push("test_pkg_version")));
 }
 
-// FIXME #7006: Fails on linux for some reason
-#[test]
-#[ignore]
+// FIXME #7006: Fails on linux/mac for some reason
+#[test] #[ignore]
 fn test_package_request_version() {
     let temp_pkg_id = PkgId::new("github.com/catamorphism/test_pkg_version#0.3");
     let temp = mk_empty_workspace(&LocalPath(Path("test_pkg_version")), &ExactRevision(~"0.3"));
@@ -632,33 +613,7 @@ fn rust_path_parse() {
 }
 
 #[test]
-fn test_list() {
-    let foo = PkgId::new("foo");
-    let dir = mkdtemp(&os::tmpdir(), "test_list").expect("test_list failed");
-    create_local_package_in(&foo, &dir);
-    let bar = PkgId::new("bar");
-    create_local_package_in(&bar, &dir);
-    let quux = PkgId::new("quux");
-    create_local_package_in(&quux, &dir);
-
-    command_line_test([~"install", ~"foo"], &dir);
-    let env_arg = ~[(~"RUST_PATH", dir.to_str())];
-    let list_output = command_line_test_output_with_env([~"list"], env_arg.clone());
-    assert!(list_output.iter().any(|x| x.starts_with("foo-")));
-
-    command_line_test([~"install", ~"bar"], &dir);
-    let list_output = command_line_test_output_with_env([~"list"], env_arg.clone());
-    assert!(list_output.iter().any(|x| x.starts_with("foo-")));
-    assert!(list_output.iter().any(|x| x.starts_with("bar-")));
-
-    command_line_test([~"install", ~"quux"], &dir);
-    let list_output = command_line_test_output_with_env([~"list"], env_arg);
-    assert!(list_output.iter().any(|x| x.starts_with("foo-")));
-    assert!(list_output.iter().any(|x| x.starts_with("bar-")));
-    assert!(list_output.iter().any(|x| x.starts_with("quux-")));
-}
-
-#[test]
+#[ignore(reason = "Package database not yet implemented")]
 fn install_remove() {
     let foo = PkgId::new("foo");
     let bar = PkgId::new("bar");
@@ -667,43 +622,18 @@ fn install_remove() {
     create_local_package_in(&foo, &dir);
     create_local_package_in(&bar, &dir);
     create_local_package_in(&quux, &dir);
-    let rust_path_to_use = ~[(~"RUST_PATH", dir.to_str())];
     command_line_test([~"install", ~"foo"], &dir);
     command_line_test([~"install", ~"bar"], &dir);
     command_line_test([~"install", ~"quux"], &dir);
-    let list_output = command_line_test_output_with_env([~"list"], rust_path_to_use.clone());
-    assert!(list_output.iter().any(|x| x.starts_with("foo")));
-    assert!(list_output.iter().any(|x| x.starts_with("bar")));
-    assert!(list_output.iter().any(|x| x.starts_with("quux")));
-    command_line_test([~"uninstall", ~"foo"], &dir);
-    let list_output = command_line_test_output_with_env([~"list"], rust_path_to_use.clone());
-    assert!(!list_output.iter().any(|x| x.starts_with("foo")));
-    assert!(list_output.iter().any(|x| x.starts_with("bar")));
-    assert!(list_output.iter().any(|x| x.starts_with("quux")));
-}
-
-#[test]
-fn install_check_duplicates() {
-    // should check that we don't install two packages with the same full name *and* version
-    // ("Is already installed -- doing nothing")
-    // check invariant that there are no dups in the pkg database
-    let dir = mkdtemp(&os::tmpdir(), "install_remove").expect("install_remove");
-    let foo = PkgId::new("foo");
-    create_local_package_in(&foo, &dir);
-
-    command_line_test([~"install", ~"foo"], &dir);
-    command_line_test([~"install", ~"foo"], &dir);
-    let mut contents = ~[];
-    let check_dups = |p: &PkgId| {
-        if contents.contains(p) {
-            fail!("package database contains duplicate ID");
-        }
-        else {
-            contents.push(copy *p);
-        }
-        false
-    };
-    list_installed_packages(check_dups);
+    let list_output = command_line_test_output([~"list"]);
+    assert!(list_output.iter().any(|x| x == &~"foo"));
+    assert!(list_output.iter().any(|x| x == &~"bar"));
+    assert!(list_output.iter().any(|x| x == &~"quux"));
+    command_line_test([~"remove", ~"foo"], &dir);
+    let list_output = command_line_test_output([~"list"]);
+    assert!(!list_output.iter().any(|x| x == &~"foo"));
+    assert!(list_output.iter().any(|x| x == &~"bar"));
+    assert!(list_output.iter().any(|x| x == &~"quux"));
 }
 
 #[test]

branches/snap-stage3/src/librustpkg/tests.rs

@@ -8,4 +8,4 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-pub fn f() -> int { 42 }
+fn f() -> int { 42 }

branches/snap-stage3/src/librustpkg/testsuite/pass/src/install-paths/lib.rs

@@ -19,10 +19,4 @@ The test runner should check that, after `rustpkg install install-paths`
    * install-paths/build/install_pathsbench exists and is an executable
 */
 
-use lib::f;
-
-mod lib;
-
-fn main() {
-    f();
-}
+fn main() {}

branches/snap-stage3/src/librustpkg/testsuite/pass/src/install-paths/main.rs

@@ -14,7 +14,7 @@ pub fn general() {
     io::println("Usage: rustpkg [options] <cmd> [args..]
 
 Where <cmd> is one of:
-    build, clean, do, info, install, list, prefer, test, uninstall, unprefer
+    build, clean, do, info, install, prefer, test, uninstall, unprefer
 
 Options:
 
@@ -55,12 +55,6 @@ Options:
     -j, --json      Output the result as JSON");
 }
 
-pub fn list() {
-    io::println("rustpkg list
-
-List all installed packages.");
-}
-
 pub fn install() {
     io::println("rustpkg [options..] install [url] [target]