WIP

Author: Kobzol

Cargo.lock

@@ -3,6 +3,7 @@ version = "0.3.0"
 [workspace]
 
 members = [
+    "rain_client",
     "rain_core",
     "rain_server",
     "rain_task",

Cargo.toml

@@ -0,0 +1,27 @@
+[package]
+name = "rain_client"
+version = "0.3.0"
+
+description = "Distributed computational framework for large-scale task-based pipelines. Client library in Rust."
+# documentation = "https://docs.rs/rain_task/" # default docs.rs
+homepage = "https://github.com/substantic/rain"
+repository = "https://github.com/substantic/rain/"
+readme = "README.md"
+authors = [
+    "Stanislav Bohm <spirali@kreatrix.org>",
+    "Tomas Gavenciak <gavento@ucw.cz>",
+    "Vojtech Cima <cima.vojtech@gmail.com>",
+    ]
+license = "MIT"
+
+exclude = ["testing/**/*"]
+
+[badges]
+travis-ci = { repository = "substantic/rain", branch = "master" }
+maintenance = { status = "actively-developed" }
+
+[dependencies]
+futures="0.1"
+log = "0.4"
+rain_core = "0.3.0"
+tokio-core="0.1"

rain_client/Cargo.toml

@@ -1,9 +1,9 @@
 use std::error::Error;
 use std::net::SocketAddr;
 
-use CLIENT_PROTOCOL_VERSION;
-use super::session::Session;
 use super::communicator::Communicator;
+use super::session::Session;
+use rain_core::CLIENT_PROTOCOL_VERSION;
 use std::rc::Rc;
 
 pub struct Client {

src/client/client.rs rain_client/src/client/client.rssrc/client/client.rs renamed to rain_client/src/client/client.rs

@@ -1,15 +1,15 @@
-use tokio_core::reactor::Core;
+use futures::Future;
+use rain_core::capnp_rpc::rpc_twoparty_capnp;
+use rain_core::comm::new_rpc_system;
+use std::error::Error;
 use std::net::SocketAddr;
 use tokio_core::net::TcpStream;
-use std::error::Error;
-use common::rpc::new_rpc_system;
-use capnp_rpc::rpc_twoparty_capnp;
-use futures::Future;
+use tokio_core::reactor::Core;
 
 use super::task::Task;
-use common::id::{DataObjectId, TaskId};
-use common::convert::{FromCapnp, ToCapnp};
 use client::dataobject::DataObject;
+use rain_core::types::{DataObjectId, TaskId};
+use rain_core::utils::{FromCapnp, ToCapnp};
 use std::cell::RefCell;
 use std::cell::RefMut;
 

src/client/communicator.rs rain_client/src/client/communicator.rssrc/client/communicator.rs renamed to rain_client/src/client/communicator.rs

@@ -1,15 +1,13 @@
-use common::Attributes;
-use common::id::DataObjectId;
-use common::DataType;
+use rain_core::types::{DataObjectId, DataType};
 use std::cell::Cell;
 
 pub struct DataObject {
     pub id: DataObjectId,
     pub label: String,
     pub keep: Cell<bool>,
     pub data: Option<Vec<u8>>,
-    pub attributes: Attributes,
     pub data_type: DataType,
+    pub attributes: Attributes,
 }
 
 impl DataObject {

src/client/dataobject.rs rain_client/src/client/dataobject.rssrc/client/dataobject.rs renamed to rain_client/src/client/dataobject.rs

@@ -1,29 +1,25 @@
 use super::task::Task;
 use client::dataobject::DataObject;
 use client::task::TaskInput;
-use common::convert::ToCapnp;
-use common::id::DataObjectId;
+use rain_core::types::DataObjectId;
+use rain_core::utils::ToCapnp;
 
 macro_rules! to_capnp_list {
-    ($builder:expr, $items:expr, $name:ident) => {
-        {
-            let mut builder = $builder.$name($items.len() as u32);
-            for (i, obj) in $items.iter().enumerate() {
-                obj.to_capnp(&mut builder.reborrow().get(i as u32));
-            }
+    ($builder:expr, $items:expr, $name:ident) => {{
+        let mut builder = $builder.$name($items.len() as u32);
+        for (i, obj) in $items.iter().enumerate() {
+            obj.to_capnp(&mut builder.reborrow().get(i as u32));
         }
-    }
+    }};
 }
 macro_rules! from_capnp_list {
-    ($builder:expr, $items:ident, $obj:ident) => {
-        {
-            $builder
-                .$items()?
-                .iter()
-                .map(|item| $obj::from_capnp(&item))
-                .collect()
-        }
-    }
+    ($builder:expr, $items:ident, $obj:ident) => {{
+        $builder
+            .$items()?
+            .iter()
+            .map(|item| $obj::from_capnp(&item))
+            .collect()
+    }};
 }
 
 impl<'a> ToCapnp<'a> for TaskInput {

src/client/mod.rs rain_client/src/client/mod.rssrc/client/mod.rs renamed to rain_client/src/client/mod.rs

@@ -1,15 +1,12 @@
 use super::communicator::Communicator;
 use client::dataobject::DataObject;
 use client::task::Task;
-use std::collections::HashMap;
-use std::error::Error;
 use client::task::TaskInput;
-use common::Attributes;
-use common::id::TaskId;
-use common::id::DataObjectId;
-use common::id::SId;
-use common::DataType;
+use rain_core::common_capnp;
+use rain_core::types::{DataObjectId, DataType, SId, TaskId};
 use std::cell::Cell;
+use std::collections::HashMap;
+use std::error::Error;
 use std::rc::Rc;
 
 pub type DataObjectPtr = Rc<DataObject>;
@@ -82,7 +79,7 @@ impl Session {
     }
     pub fn wait_all(&mut self) -> Result<(), Box<Error>> {
         self.comm.wait(
-            &vec![TaskId::new(self.id, ::common_capnp::ALL_TASKS_ID)],
+            &vec![TaskId::new(self.id, common_capnp::ALL_TASKS_ID)],
             &vec![],
         )
     }

src/client/rpc.rs rain_client/src/client/rpc.rssrc/client/rpc.rs renamed to rain_client/src/client/rpc.rs

@@ -1,7 +1,6 @@
-use std::error::Error;
-use common::Attributes;
-use common::id::TaskId;
 use super::session::DataObjectPtr;
+use rain_core::types::TaskId;
+use std::error::Error;
 
 pub struct TaskInput {
     pub label: Option<String>,
@@ -13,7 +12,6 @@ pub struct Task {
     pub command: String,
     pub inputs: Vec<TaskInput>,
     pub outputs: Vec<DataObjectPtr>,
-    pub attributes: Attributes,
 }
 
 impl Task {