Merge branch 'rust-1.15'

Author: nbigaouette

Cargo.toml

@@ -1,25 +1,17 @@
 [package]
 name = "gitlab-api"
-version = "0.5.2"
+version = "0.6.0"
 authors = ["Nicolas Bigaouette <nbigaouette@gmail.com>"]
 description = "Wrapper for GitLab API v3"
 license = "MIT/Apache-2.0"
 repository = "https://github.com/nbigaouette/gitlab-api-rs"
 readme = "README.md"
 keywords = ["gitlab", "git"]
 categories = ["api-bindings"]
-build = "build.rs"
 
 [badges]
 travis-ci = { repository = "nbigaouette/gitlab-api-rs" }
 
-[features]
-default = ["serde_codegen"]
-unstable = ["serde_derive"]
-
-[build-dependencies]
-serde_codegen = { version = "0.9", optional = true }
-
 [dev-dependencies]
 env_logger = "0.4"
 clap = "2.20.1"
@@ -30,7 +22,7 @@ error-chain = "0.8"
 regex = "0.2.1"
 url = "1.4"
 serde = "0.9"
-serde_derive = { version = "0.9", optional = true }
+serde_derive = "0.9"
 serde_json = "0.9"
 serde_urlencoded = "0.4"
 

README.md

@@ -10,7 +10,7 @@ Rust wrapper to the GitLab API.
 [![Codecov](https://img.shields.io/codecov/c/github/nbigaouette/gitlab-api-rs/master.svg?style=flat)](https://codecov.io/github/nbigaouette/gitlab-api-rs?branch=master)
 
 
-
+**NOTE**: Requires Rust 1.15 (stable) since this crate is using custom derive for Serde.
 
 ## Synopsis
 
@@ -56,7 +56,7 @@ The (v3) API is quite long, so the parts I need will be implemented first.
 
 ```
 [dependencies]
-gitlab-api = "0.5.2"
+gitlab-api = "0.6"
 ```
 
 This crate uses a builder pattern to add filters to a query. Once the query is built, `list()` will commit it by contacting the GitLab server and performing the request.

build.rs

@@ -390,7 +390,6 @@ fn remove_gitlab_token_from_url(url: &str) -> String {
 mod tests {
     use std::fmt;
     use gitlab::*;
-    use errors::*;
 
     fn verify_ok<T>(result: &Result<T>) {
         if let &Err(ref e) = result {

src/gitlab.rs

@@ -40,11 +40,51 @@ pub mod details;
 use ::errors::*;
 
 
-#[cfg(feature = "serde_derive")]
-include!("serde_types.in.rs");
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+pub enum ListingOrderBy {
+    #[serde(rename = "name")]
+    Name,
+    #[serde(rename = "path")]
+    Path,
+}
+
+
+#[derive(Debug, Clone, Serialize, Deserialize)]
+pub enum ListingId {
+    Id(i64),
+    NamespaceProject(String),
+}
+
+#[derive(Default, Debug, Clone, Serialize, Deserialize)]
+struct GroupsListerInternal {
+    /// Skip the group IDs passes
+    skip_groups: Option<Vec<i64>>,
+    /// Show all the groups you have access to
+    all_available: Option<bool>,
+    /// Return list of authorized groups matching the search criteria
+    search: Option<String>,
+    /// Order groups by `name` or `path`. Default is `name`
+    order_by: Option<ListingOrderBy>,
+    /// Order groups in `asc` or `desc` order. Default is `asc`
+    sort: Option<::ListingSort>,
+}
+
+#[derive(Default, Debug, Clone, Serialize, Deserialize)]
+struct ProjectsListerInternal {
+    /// Limit by archived status.
+    archived: Option<bool>,
+    /// Limit by visibility
+    visibility: Option<::ListingVisibility>,
+    /// Return requests ordered by. Default is `ListingOrderBy::CreatedAt`.
+    order_by: Option<::projects::ListingOrderBy>,
+    /// Return requests sorted. Default is `::ListingSort::Desc`.
+    sort: Option<::ListingSort>,
+    /// Return list of authorized projects according to a search criteria.
+    search: Option<String>,
+    /// Return projects ordered by `ci_enabled` flag. Projects with enabled GitLab CI go first.
+    ci_enabled_first: Option<bool>,
+}
 
-#[cfg(feature = "serde_codegen")]
-include!(concat!(env!("OUT_DIR"), "/groups/serde_types.rs"));
 
 
 #[derive(Debug, Clone)]

src/groups/mod.rs

@@ -21,13 +21,6 @@
 
 // use serde_urlencoded;
 
-
-#[cfg(feature = "serde_derive")]
-include!("serde_types.in.rs");
-
-#[cfg(feature = "serde_codegen")]
-include!(concat!(env!("OUT_DIR"), "/issues/serde_types.rs"));
-
 use BuildQuery;
 use Lister;
 
@@ -38,6 +31,106 @@ pub mod single;
 use ::errors::*;
 
 
+#[derive(Debug, Copy, Clone, Serialize, Deserialize)]
+pub enum State {
+    #[serde(rename = "opened")]
+    Opened,
+    #[serde(rename = "closed")]
+    Closed,
+}
+
+
+#[derive(Debug, Clone, Copy, Serialize, Deserialize)]
+pub enum ListingOrderBy {
+    #[serde(rename = "created_at")]
+    CreatedAt,
+    #[serde(rename = "updated_at")]
+    UpdatedAt,
+}
+
+
+#[derive(Default, Debug, Clone, Serialize, Deserialize)]
+struct IssuesListerInternal {
+    /// State of issues to return.
+    state: Option<State>,
+    /// Labels of issues to return.
+    labels: Option<Vec<String>>,
+    /// Return requests ordered by. Default is `ListingOrderBy::CreatedAt`.
+    order_by: Option<ListingOrderBy>,
+    /// Return requests sorted. Default is `::ListingSort::Desc`.
+    sort: Option<::ListingSort>,
+}
+
+
+#[derive(Default, Debug, Clone, Serialize, Deserialize)]
+struct GroupIssuesListerInternal {
+    /// State of issues to return.
+    state: Option<State>,
+    /// Labels of issues to return.
+    labels: Option<Vec<String>>,
+    /// The milestone title
+    milestone: Option<String>,
+    /// Return requests ordered by. Default is `ListingOrderBy::CreatedAt`.
+    order_by: Option<ListingOrderBy>,
+    /// Return requests sorted. Default is `::ListingSort::Desc`.
+    sort: Option<::ListingSort>,
+}
+
+
+#[derive(Default, Debug, Clone, Serialize, Deserialize)]
+struct ProjectsIssuesListerInternal {
+    iid: Option<i64>,
+    /// State of issues to return.
+    state: Option<State>,
+    /// Labels of issues to return.
+    labels: Option<Vec<String>>,
+    /// The milestone title
+    milestone: Option<String>,
+    /// Return requests ordered by. Default is `ListingOrderBy::CreatedAt`.
+    order_by: Option<ListingOrderBy>,
+    /// Return requests sorted. Default is `::ListingSort::Desc`.
+    sort: Option<::ListingSort>,
+}
+
+
+#[derive(Debug, Serialize, Deserialize)]
+pub enum IssueState {
+    #[serde(rename = "opened")]
+    Opened,
+    #[serde(rename = "closed")]
+    Closed,
+    #[serde(rename = "reopened")]
+    Reopened,
+}
+
+
+#[derive(Debug, Serialize, Deserialize)]
+pub struct Issue {
+    pub id: i64,
+    pub iid: i64,
+    pub project_id: i64,
+    pub title: String,
+    pub description: String,
+    pub state: IssueState,
+    pub created_at: String,  // FIXME: Use date type?
+    pub updated_at: String,  // FIXME: Use date type?
+    pub labels: Vec<String>,
+    pub milestone: Option<::Milestone>,
+    pub assignee: Option<::User>,
+    pub author: ::User,
+    pub subscribed: bool,
+    pub user_notes_count: i64,
+    pub upvotes: i64,
+    pub downvotes: i64,
+    pub due_date: Option<String>,  // FIXME: Use date type?
+    pub confidential: bool,
+    pub web_url: Option<String>
+}
+
+
+pub type Issues = Vec<Issue>;
+
+
 #[derive(Debug, Clone)]
 pub struct IssuesLister<'a> {
     gl: &'a ::GitLab,