jekyll-gitlab-letsencrypt 0.2.1 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1118d4b7321057dddb6e61f731ddbe2a006cd31e
-  data.tar.gz: df1e23291701da84974b3f568dfc211570062daf
+  metadata.gz: 8077836262a44842ecedb9e2f4d2b9867e762739
+  data.tar.gz: 583f08998de45b2126e9645d470c0ffa2e9c7a46
 SHA512:
-  metadata.gz: 28b0049ba607bd46df91bc17b21f7f57b620cd669b1b6fa26fe2dbe703bb661e337557c1806a706b85f509097dcc979c41a02c53fc411dca2cdffb6b4b807885
-  data.tar.gz: ab2f7fecfb1ab15cdfdecbd401dd35c94bfe73d60a94da14177839ba3285f1821c263619a46ed6ae4fa568fed9b8058ada5bc6b7713164d94c57c59dcb765839
+  metadata.gz: 73d66711574fc5a45b6368f17317f35dc8775757cccebac1717593efe8cdaaf530dcabf35260e6058f110bb46abfddfe9bf1574bd186ec5f502b3026aa6dbea1
+  data.tar.gz: 9d4ef45e01dfba73b32322acba2e81e2cfd06cd12d86c9cf14be938790708fa2499a8cac2ae92bb4867c1c69a2cc6d7b70cb01fc4287f8f6ce71b794bd0789ff

data/CHANGELOG.markdown

@@ -1,3 +1,9 @@
+# 0.3.0
+
+  - #17 - Check for repo id fetch request status
+  - Update to Gitlab API V4
+    - Mostly from #18 - thanks @ethernet-zero !
+
 # 0.2.1
 
 - Add custom GitLab URL setting

data/lib/jekyll/gitlab/letsencrypt/gitlab_client.rb

@@ -32,8 +32,8 @@ module Jekyll
           connection.post do |req|
             req.url  "projects/#{repo_id}/repository/branches"
             req.body = {
-              branch_name:  branch,
-              ref:          'master'
+              branch:  branch,
+              ref:     'master'
             }.to_json
           end
         end
@@ -41,11 +41,10 @@ module Jekyll
         def commit_file!
           Jekyll.logger.info "Commiting challenge file as #{filename}"
           connection.run_request(request_method_for_commit, nil, nil, nil) do |req|
-            req.url        "projects/#{repo_id}/repository/files"
+            req.url        "projects/#{repo_id}/repository/files/#{enc_filename}"
             req.body = {
-              file_path:      filename,
               commit_message: "Automated Let's Encrypt renewal",
-              branch_name:    branch,
+              branch:         branch,
               content:        content
             }.to_json
           end
@@ -60,20 +59,27 @@ module Jekyll
         end
 
         def request_method_for_commit
-          response = connection.get "projects/#{repo_id}/repository/files?ref=#{branch}&file_path=#{filename}"
+          response = connection.get "projects/#{repo_id}/repository/files/#{enc_filename}?ref=#{branch}"
           response.status == 404 ? :post : :put
         end
 
+        def enc_filename
+          filename.gsub "/", "%2f"
+        end
+
         def repo_id
           @repo_id ||= begin
             repo_name = gitlab_repo.gsub "/", "%2f"
             response  = connection.get "projects/#{repo_name}"
+            unless response.success?
+              fail StandardError, "Failed response for projects/#{repo_name}. Please check if personal token and repo name are correct"
+            end
             JSON.parse(response.body)['id']
           end
         end
 
         def connection
-          @connection ||= Faraday.new(url: "#{gitlab_url}/api/v3/") do |faraday|
+          @connection ||= Faraday.new(url: "#{gitlab_url}/api/v4/") do |faraday|
             faraday.adapter Faraday.default_adapter
             faraday.headers['Content-Type']  = 'application/json'
             faraday.headers['PRIVATE-TOKEN'] = personal_access_token

data/lib/jekyll/gitlab/letsencrypt/version.rb

@@ -1,7 +1,7 @@
 module Jekyll
   module Gitlab
     module Letsencrypt
-      VERSION = "0.2.1"
+      VERSION = "0.3.0"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jekyll-gitlab-letsencrypt
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors:
 - Justin Aiken
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-03-09 00:00:00.000000000 Z
+date: 2018-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler