Merge branch 'cleanups'

Author: nbigaouette

Cargo.lock

@@ -19,6 +19,7 @@ log = "0.3"
 serde = "0.8"
 serde_derive = { version = "0.8", optional = true }
 serde_json = "0.8"
+serde_urlencoded = "0.3"
 
 
 hyper = "0.9"

Cargo.toml

@@ -12,7 +12,12 @@ fn main() {
 
     let src = Path::new("src/serde_types.in.rs");
     let dst = Path::new(&out_dir).join("serde_types.rs");
+    serde_codegen::expand(&src, &dst).unwrap();
 
+    let src = Path::new("src/merge_requests/serde_types.in.rs");
+    let dst = Path::new(&out_dir).join("merge_requests");
+    std::fs::create_dir_all(&dst).expect(&format!("Cannot create directory {:?}!", dst));
+    let dst = dst.join("serde_types.rs");
     serde_codegen::expand(&src, &dst).unwrap();
 }
 

build.rs

@@ -29,7 +29,7 @@ fn main() {
                    hostname);
         }
     };
-    let mut gl = gitlab::GitLab::new_https(&hostname, &token);
+    let mut gl = gitlab::GitLab::new(&hostname, &token);
     gl.set_pagination(gitlab::Pagination {
         page: 1,
         per_page: 100,

examples/list_groups.rs

@@ -34,7 +34,7 @@ fn main() {
         }
     };
 
-    let gl = GitLab::new_https(&hostname, &token);
+    let gl = GitLab::new(&hostname, &token);
 
     let issues = gl.issues(issues::Listing::new()).unwrap();
     println!("issues: {:?}", issues);

examples/list_issues.rs

@@ -33,7 +33,7 @@ fn main() {
         }
     };
 
-    let gl = GitLab::new_https(&hostname, &token);
+    let gl = GitLab::new(&hostname, &token);
 
     let merge_request = gl.merge_request(merge_requests::single::Listing::new(142, 418)).unwrap();
     println!("merge_request: {:?}", merge_request);

examples/list_merge_requests.rs

@@ -34,7 +34,7 @@ fn main() {
         }
     };
 
-    let gl = GitLab::new_https(&hostname, &token);
+    let gl = GitLab::new(&hostname, &token);
     // for i in 1..82 {
     //     gl.set_pagination(Pagination{page: i, per_page: 1});
     //     println!("projects: {:?}", gl.projects().unwrap());

examples/list_projects.rs

@@ -49,7 +49,7 @@ impl fmt::Debug for GitLab {
 
 
 impl GitLab {
-    pub fn new(scheme: &str, domain: &str, port: u16, private_token: &str) -> GitLab {
+    pub fn _new(scheme: &str, domain: &str, port: u16, private_token: &str) -> GitLab {
         GitLab {
             scheme: scheme.to_string(),
             domain: domain.to_string(),
@@ -69,12 +69,13 @@ impl GitLab {
         }
     }
 
-    pub fn new_http(domain: &str, private_token: &str) -> GitLab {
-        GitLab::new("http", domain, 80, private_token)
+    pub fn new_insecure(domain: &str, private_token: &str) -> GitLab {
+        warn!("Using insecure http:// protocol: Token will be sent in clear!");
+        GitLab::_new("http", domain, 80, private_token)
     }
 
-    pub fn new_https(domain: &str, private_token: &str) -> GitLab {
-        GitLab::new("https", domain, 443, private_token)
+    pub fn new(domain: &str, private_token: &str) -> GitLab {
+        GitLab::_new("https", domain, 443, private_token)
     }
 
     /// Build a URL used to access GitLab instance, including some parameters.
@@ -89,7 +90,7 @@ impl GitLab {
     /// let expected_url = "https://gitlab.example.com:\
     ///                     443/api/v3/groups?order_by=path&private_token=XXXXXXXXXXXXX";
     ///
-    /// let gl = GitLab::new_https("gitlab.example.com", "XXXXXXXXXXXXX");
+    /// let gl = GitLab::new("gitlab.example.com", "XXXXXXXXXXXXX");
     ///
     /// assert_eq!(gl.build_url("groups?order_by=path"), expected_url);
     /// ```

src/gitlab.rs

@@ -48,13 +48,6 @@ pub enum ListingOrderBy {
 }
 
 
-#[derive(Debug, Copy, Clone)]
-pub enum ListingSort {
-    Asc,
-    Desc,
-}
-
-
 fn append_group_lister_options_order_by(order_by: ListingOrderBy, s: &mut String) {
     s.push_str(match order_by {
         ListingOrderBy::Name => "name",
@@ -63,10 +56,10 @@ fn append_group_lister_options_order_by(order_by: ListingOrderBy, s: &mut String
 }
 
 
-fn append_group_lister_options_sort(order_by: ListingSort, s: &mut String) {
+fn append_group_lister_options_sort(order_by: ::ListingSort, s: &mut String) {
     s.push_str(match order_by {
-        ListingSort::Asc => "asc",
-        ListingSort::Desc => "desc",
+        ::ListingSort::Asc => "asc",
+        ::ListingSort::Desc => "desc",
     });
 }
 
@@ -83,7 +76,7 @@ pub struct Listing {
     /// 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>,
+    sort: Option<::ListingSort>,
 }
 
 
@@ -108,7 +101,7 @@ impl Listing {
         self.order_by = Some(order_by);
         self
     }
-    fn sort(&mut self, sort: ListingSort) -> &mut Listing {
+    fn sort(&mut self, sort: ::ListingSort) -> &mut Listing {
         self.sort = Some(sort);
         self
     }
@@ -254,11 +247,11 @@ mod tests {
     #[test]
     fn groups_build_query_sort() {
         let expected_string = "groups?sort=asc";
-        let query = Listing::new().sort(ListingSort::Asc).build_query();
+        let query = Listing::new().sort(::ListingSort::Asc).build_query();
         assert_eq!(query, expected_string);
 
         let expected_string = "groups?sort=desc";
-        let query = Listing::new().sort(ListingSort::Desc).build_query();
+        let query = Listing::new().sort(::ListingSort::Desc).build_query();
         assert_eq!(query, expected_string);
     }
 

src/groups/mod.rs

@@ -29,13 +29,6 @@ use BuildQuery;
 
 // FIXME: Use a type for the project id.
 
-#[derive(Debug, Copy, Clone)]
-pub enum ListingVisibility {
-    Public,
-    Internal,
-    Private,
-}
-
 
 #[derive(Debug, Copy, Clone)]
 pub enum ListingOrderBy {
@@ -48,25 +41,18 @@ pub enum ListingOrderBy {
 }
 
 
-#[derive(Debug, Copy, Clone)]
-pub enum ListingSort {
-    Asc,
-    Desc,
-}
-
-
 #[derive(Default, Debug, Clone)]
 pub struct Listing {
     /// Group Id.
     id: i64,
     /// Limit by archived status.
     archived: Option<bool>,
     /// Limit by visibility
-    visibility: Option<ListingVisibility>,
+    visibility: Option<::ListingVisibility>,
     /// Return requests ordered by. Default is `ListingOrderBy::CreatedAt`.
     order_by: Option<ListingOrderBy>,
-    /// Return requests sorted. Default is `ListingSort::Desc`.
-    sort: Option<ListingSort>,
+    /// Return requests sorted. Default is `::ListingSort::Desc`.
+    sort: Option<::ListingSort>,
     /// Return list of authorized projects according to a search criteria.
     search: String,
     /// Return projects ordered by `ci_enabled` flag. Projects with enabled GitLab CI go first.
@@ -82,15 +68,15 @@ impl Listing {
         self.archived = Some(archived);
         self
     }
-    pub fn visibility(&mut self, visibility: ListingVisibility) -> &mut Listing {
+    pub fn visibility(&mut self, visibility: ::ListingVisibility) -> &mut Listing {
         self.visibility = Some(visibility);
         self
     }
     pub fn order_by(&mut self, order_by: ListingOrderBy) -> &mut Listing {
         self.order_by = Some(order_by);
         self
     }
-    pub fn sort(&mut self, sort: ListingSort) -> &mut Listing {
+    pub fn sort(&mut self, sort: ::ListingSort) -> &mut Listing {
         self.sort = Some(sort);
         self
     }
@@ -141,9 +127,9 @@ impl BuildQuery for Listing {
 
             query.push_str("visibility=");
             query.push_str(match visibility {
-                ListingVisibility::Public => "public",
-                ListingVisibility::Internal => "internal",
-                ListingVisibility::Private => "private",
+                ::ListingVisibility::Public => "public",
+                ::ListingVisibility::Internal => "internal",
+                ::ListingVisibility::Private => "private",
             });
         });
 
@@ -168,8 +154,8 @@ impl BuildQuery for Listing {
 
             query.push_str("sort=");
             query.push_str(match sort {
-                ListingSort::Asc => "asc",
-                ListingSort::Desc => "desc",
+                ::ListingSort::Asc => "asc",
+                ::ListingSort::Desc => "desc",
             });
         });
 
@@ -232,19 +218,19 @@ mod tests {
     fn groups_build_query_visibility() {
         let expected_string = format!("groups/{}/projects?visibility=public", TEST_PROJECT_ID);
         let query = Listing::new(TEST_PROJECT_ID.clone())
-            .visibility(ListingVisibility::Public)
+            .visibility(::ListingVisibility::Public)
             .build_query();
         assert_eq!(query, expected_string);
 
         let expected_string = format!("groups/{}/projects?visibility=internal", TEST_PROJECT_ID);
         let query = Listing::new(TEST_PROJECT_ID.clone())
-            .visibility(ListingVisibility::Internal)
+            .visibility(::ListingVisibility::Internal)
             .build_query();
         assert_eq!(query, expected_string);
 
         let expected_string = format!("groups/{}/projects?visibility=private", TEST_PROJECT_ID);
         let query = Listing::new(TEST_PROJECT_ID.clone())
-            .visibility(ListingVisibility::Private)
+            .visibility(::ListingVisibility::Private)
             .build_query();
         assert_eq!(query, expected_string);
     }
@@ -289,11 +275,11 @@ mod tests {
     #[test]
     fn groups_build_query_sort() {
         let expected_string = format!("groups/{}/projects?sort=asc", TEST_PROJECT_ID);
-        let query = Listing::new(TEST_PROJECT_ID.clone()).sort(ListingSort::Asc).build_query();
+        let query = Listing::new(TEST_PROJECT_ID.clone()).sort(::ListingSort::Asc).build_query();
         assert_eq!(query, expected_string);
 
         let expected_string = format!("groups/{}/projects?sort=desc", TEST_PROJECT_ID);
-        let query = Listing::new(TEST_PROJECT_ID.clone()).sort(ListingSort::Desc).build_query();
+        let query = Listing::new(TEST_PROJECT_ID.clone()).sort(::ListingSort::Desc).build_query();
         assert_eq!(query, expected_string);
     }