Merge pull request #57 from ryokat3/id54

Changed subcommand name from purge to prune

Author: ryokat3

qiita_sync/qiita_sync.py

@@ -1010,7 +1010,7 @@ def qsync_do_sync(qsync: QiitaSync, status: SyncStatus, g_atcl: GitHubArticle, l
         raise ApplicationError(f"{g_atcl.filepath}: Unknown status")
 
 
-def qsync_do_purge(qsync: QiitaSync, status: SyncStatus, g_atcl: GitHubArticle, lq_atcl: Optional[GitHubArticle]):
+def qsync_do_prune(qsync: QiitaSync, status: SyncStatus, g_atcl: GitHubArticle, lq_atcl: Optional[GitHubArticle]):
     if g_atcl.data.private:
         qsync.delete(g_atcl)
         if g_atcl.filepath is not None:
@@ -1071,8 +1071,8 @@ def qsync_subcommand_sync(qsync: QiitaSync, target: Path, _: Any):
     qsync_traverse(qsync, target, qsync_do_sync)
 
 
-def qsync_subcommand_purge(qsync: QiitaSync, target: Path, _: Any):
-    qsync_traverse(qsync, target, qsync_do_purge)
+def qsync_subcommand_prune(qsync: QiitaSync, target: Path, _: Any):
+    qsync_traverse(qsync, target, qsync_do_prune)
 
 
 def qsync_argparse() -> ArgumentParser:
@@ -1094,7 +1094,7 @@ def common_arg(parser: ArgumentParser) -> ArgumentParser:
     common_arg(subparsers.add_parser("check", help="check help")).set_defaults(func=qsync_subcommand_check)
     common_arg(subparsers.add_parser("delete", help="delete help")).set_defaults(func=qsync_subcommand_delete)
     common_arg(subparsers.add_parser("sync", help="sync help")).set_defaults(func=qsync_subcommand_sync)
-    common_arg(subparsers.add_parser("purge", help="purge help")).set_defaults(func=qsync_subcommand_purge)
+    common_arg(subparsers.add_parser("prune", help="prune help")).set_defaults(func=qsync_subcommand_prune)
 
     return parser
 

tests/cassettes/test_qiita_create_caller.yaml

@@ -26,15 +26,15 @@ interactions:
       Content-Type:
       - application/json; charset=utf-8
       Date:
-      - Sun, 16 Jan 2022 14:29:36 GMT
+      - Wed, 19 Jan 2022 01:45:28 GMT
       ETag:
       - W/"2aaf04820679c58d926153e93c3c317f"
       Rate-Limit:
       - '1000'
       Rate-Remaining:
-      - '915'
+      - '972'
       Rate-Reset:
-      - '1642344297'
+      - '1642559772'
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Server:
@@ -54,9 +54,9 @@ interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Request-Id:
-      - 4d77dcb7-9de1-4b95-b732-8ebb8bfd4a87
+      - d21ea347-9dc9-4d29-8620-eefceab08f27
       X-Runtime:
-      - '0.093739'
+      - '0.249712'
       X-XSS-Protection:
       - 1; mode=block
     status:

tests/cassettes/test_subcommand_check.yaml

@@ -23,13 +23,13 @@ interactions:
       Content-Type:
       - application/json
       Date:
-      - Sun, 16 Jan 2022 14:33:42 GMT
+      - Wed, 19 Jan 2022 01:45:27 GMT
       Rate-Limit:
       - '1000'
       Rate-Remaining:
-      - '901'
+      - '973'
       Rate-Reset:
-      - '1642344296'
+      - '1642559772'
       Server:
       - nginx
       Strict-Transport-Security:
@@ -39,9 +39,9 @@ interactions:
       Vary:
       - Origin
       X-Request-Id:
-      - 929cfe73-9358-49e5-bd0c-770dbcd1ef21
+      - 79b37e5e-e2ac-4310-9fec-7ed3edc120c8
       X-Runtime:
-      - '0.221728'
+      - '0.231783'
     status:
       code: 404
       message: Not Found

tests/cassettes/test_subcommand_purge.yaml renamed to tests/cassettes/test_subcommand_prune.yaml

@@ -23,7 +23,7 @@ interactions:
     body:
       string: '{"rendered_body":"\u003cp\u003e\u003ca href=\"https://camo.qiitausercontent.com/d42dfcd6e60ca82bd25818138a4adf6a51e83e2f/68747470733a2f2f7261772e67697468756275736572636f6e74656e742e636f6d2f6769746875622d69642f6769746875622d7265706f2f6d61737465722f696d67312e706e67\"
         target=\"_blank\" rel=\"nofollow noopener\"\u003e\u003cimg src=\"https://camo.qiitausercontent.com/d42dfcd6e60ca82bd25818138a4adf6a51e83e2f/68747470733a2f2f7261772e67697468756275736572636f6e74656e742e636f6d2f6769746875622d69642f6769746875622d7265706f2f6d61737465722f696d67312e706e67\"
-        alt=\"img1\" data-canonical-src=\"https://raw.githubusercontent.com/github-id/github-repo/master/img1.png\"\u003e\u003c/a\u003e\u003c/p\u003e\n","body":"![img1](https://raw.githubusercontent.com/github-id/github-repo/master/img1.png)\n","coediting":false,"comments_count":0,"created_at":"2022-01-16T23:33:40+09:00","group":null,"id":"74f0120f486b3ad86390","likes_count":0,"private":true,"reactions_count":0,"tags":[{"name":"test","versions":[]}],"title":"md3","updated_at":"2022-01-16T23:33:40+09:00","url":"https://qiita.com/ryokat3/private/74f0120f486b3ad86390","user":{"description":"Programmer","facebook_id":"","followees_count":2,"followers_count":1,"github_login_name":"ryokat3","id":"ryokat3","items_count":9,"linkedin_id":"","location":"Japan","name":"Ryoji
+        alt=\"img1\" data-canonical-src=\"https://raw.githubusercontent.com/github-id/github-repo/master/img1.png\"\u003e\u003c/a\u003e\u003c/p\u003e\n","body":"![img1](https://raw.githubusercontent.com/github-id/github-repo/master/img1.png)\n","coediting":false,"comments_count":0,"created_at":"2022-01-19T10:45:25+09:00","group":null,"id":"43f84c5209394386851b","likes_count":0,"private":true,"reactions_count":0,"tags":[{"name":"test","versions":[]}],"title":"md3","updated_at":"2022-01-19T10:45:25+09:00","url":"https://qiita.com/ryokat3/private/43f84c5209394386851b","user":{"description":"Programmer","facebook_id":"","followees_count":2,"followers_count":1,"github_login_name":"ryokat3","id":"ryokat3","items_count":9,"linkedin_id":"","location":"Japan","name":"Ryoji
         Kato","organization":"","permanent_id":115148,"profile_image_url":"https://qiita-image-store.s3.ap-northeast-1.amazonaws.com/0/115148/profile-images/1641617983","team_only":false,"twitter_screen_name":null,"website_url":""},"page_views_count":null,"team_membership":null}'
     headers:
       Cache-Control:
@@ -33,15 +33,15 @@ interactions:
       Content-Type:
       - application/json; charset=utf-8
       Date:
-      - Sun, 16 Jan 2022 14:33:40 GMT
+      - Wed, 19 Jan 2022 01:45:25 GMT
       ETag:
-      - W/"587fd07f34a3268eff76294b588093ea"
+      - W/"1f1c5c7f927af2a8af42a711edd0a582"
       Rate-Limit:
       - '1000'
       Rate-Remaining:
-      - '907'
+      - '979'
       Rate-Reset:
-      - '1642344296'
+      - '1642559773'
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Server:
@@ -61,9 +61,9 @@ interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Request-Id:
-      - 325b6c22-1d2e-4e5d-9dc5-e6638dc0a20a
+      - 5a05cac8-f169-4bd4-b6cc-f9cd4c320b61
       X-Runtime:
-      - '0.261906'
+      - '0.373759'
       X-XSS-Protection:
       - 1; mode=block
     status:
@@ -83,7 +83,7 @@ interactions:
       User-Agent:
       - Python-urllib/3.10
     method: DELETE
-    uri: https://qiita.com/api/v2/items/74f0120f486b3ad86390
+    uri: https://qiita.com/api/v2/items/43f84c5209394386851b
   response:
     body:
       string: ''
@@ -93,13 +93,13 @@ interactions:
       Connection:
       - close
       Date:
-      - Sun, 16 Jan 2022 14:33:40 GMT
+      - Wed, 19 Jan 2022 01:45:25 GMT
       Rate-Limit:
       - '1000'
       Rate-Remaining:
-      - '906'
+      - '978'
       Rate-Reset:
-      - '1642344296'
+      - '1642559772'
       Referrer-Policy:
       - strict-origin-when-cross-origin
       Server:
@@ -117,9 +117,9 @@ interactions:
       X-Permitted-Cross-Domain-Policies:
       - none
       X-Request-Id:
-      - 20b9cfd8-611d-42fe-81e1-fee5223dc470
+      - 7db05eb0-653b-4b63-b1da-656f9cf77481
       X-Runtime:
-      - '0.214891'
+      - '0.555126'
       X-XSS-Protection:
       - 1; mode=block
     status:

tests/cassettes/test_subcommand_show_diff.yaml

@@ -209,6 +209,7 @@ def update_test_file(fp: Path):
 # CLI Test
 ########################################################################
 
+
 @pytest.mark.vcr()
 def test_subcommand_download(topdir_fx: Path, mocker: MockerFixture):
     get_qsync([MarkdownAsset("md2.md", gen_md2), MarkdownAsset("md3.md", gen_md3), Asset("img1.png")])
@@ -279,13 +280,13 @@ def test_subcommand_sync(topdir_fx: Path, mocker: MockerFixture, capsys: Capture
 
 
 @pytest.mark.vcr()
-def test_subcommand_purge(topdir_fx: Path, mocker: MockerFixture, capsys: CaptureFixture):
+def test_subcommand_prune(topdir_fx: Path, mocker: MockerFixture, capsys: CaptureFixture):
     get_qsync([MarkdownAsset("md2.md", gen_md2), MarkdownAsset("md3.md", gen_md3), Asset("img1.png")])
     target = topdir_fx.joinpath("md2.md")
 
     assert target.is_file()
 
-    mocker.patch('sys.argv', ['qiita_sync.py', 'purge', str(target)])
+    mocker.patch('sys.argv', ['qiita_sync.py', 'prune', str(target)])
     qsync_main()
 
     assert not target.is_file()
@@ -347,7 +348,7 @@ def test_url_add_path(url, subpath, expected):
     assert url_add_path(url, Path(subpath)) == expected
 
 
-def test_get_utc():    
+def test_get_utc():
     assert get_utc('2021-12-27T00:40:01+09:00') == get_utc('2021-12-26T15:40:01+00:00')
     assert get_utc('2022-01-18T02:35:19+00:00') > get_utc('2022-01-18T10:01:07+09:00')
     assert str(get_utc('2021-12-27T00:40:01+09:00')).endswith("+00:00")