semaphore_client 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8667d0574937ebe6d65ba924beefa38e3137c057
-  data.tar.gz: 3deb2629af0dbe542818a7f86a1c5408d8467f0a
+  metadata.gz: 6d4ea7977e94aa5c80b02123679165c5cc3f6720
+  data.tar.gz: 147e7c0565697549c42bf2b4193e98e8045a525c
 SHA512:
-  metadata.gz: 011b080f1ba2433a40b8245b108ad89c8043c114d9bd2c473eb8215274735db2d5c66d857daec4c8a27aaaec0418a140cd8b2bca7d6d726851e44692cd94638d
-  data.tar.gz: f9d4ba58651191611e064e1eff99d55f5359c71e5610b71258e3e53393c999c5e523c6b79bc7bc5c831a869b7375693e83bc54a525fd3bcb8635e1c3af13c46a
+  metadata.gz: e7c4bf97917f9d10322bf30dddee91be955aff962ce42baa3214c821b80a8b62b94a9a9ce1d95852884822ce225b237b842f1bcdf284ddd4ca480cb2440402d8
+  data.tar.gz: 9b654def04a757c7b531dbbbe85ae4faebb547ff9c545bfbb026d47285178e508e92e3513dfea2ea681dc6b8066c3cd329c8e0cb5e19d17f0231d871404be78b

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    semaphore_client (2.3.1)
+    semaphore_client (2.4.0)
       faraday
 
 GEM

data/lib/semaphore_client.rb

@@ -1,6 +1,7 @@
 require "json"
 require "securerandom"
 require "faraday"
+require "faraday_middleware"
 require "logger"
 
 require "semaphore_client/version"
@@ -28,10 +29,11 @@ class SemaphoreClient
   def initialize(auth_token, options = {})
     @auth_token = auth_token
 
-    @api_url     = options.fetch(:api_url, API_URL)
-    @api_version = options.fetch(:api_version, API_VERSION)
-    @verbose     = options.fetch(:verbose, false)
-    @logger      = options.fetch(:logger, Logger.new(STDOUT))
+    @api_url       = options.fetch(:api_url, API_URL)
+    @api_version   = options.fetch(:api_version, API_VERSION)
+    @verbose       = options.fetch(:verbose, false)
+    @logger        = options.fetch(:logger, Logger.new(STDOUT))
+    @auto_paginate = options.fetch(:auto_paginate, false)
   end
 
   def users
@@ -65,6 +67,6 @@ class SemaphoreClient
   private
 
   def http_client
-    @http_client ||= SemaphoreClient::HttpClient.new(@auth_token, @api_url, @api_version, @verbose, @logger)
+    @http_client ||= SemaphoreClient::HttpClient.new(@auth_token, @api_url, @api_version, @verbose, @logger, @auto_paginate)
   end
 end

data/lib/semaphore_client/api/config_file.rb

@@ -5,135 +5,113 @@ class SemaphoreClient
         @http_client = http_client
       end
 
-      def list_for_project(project_id, query = nil)
-        list_for_project!(project_id, query)
-      rescue SemaphoreClient::Exceptions::RequestFailed
-      end
 
-      def attach_to_project(config_file_id, project_id)
-        attach_to_project!(config_file_id, project_id)
-      rescue SemaphoreClient::Exceptions::RequestFailed
+      def list_for_project(project_id, params = nil, options = {})
+        list_for_project!(project_id, params, options)
+      rescue SemaphoreClient::Exceptions::ResponseError
       end
 
-      def detach_from_project(config_file_id, project_id)
-        detach_from_project!(config_file_id, project_id)
-      rescue SemaphoreClient::Exceptions::RequestFailed
-      end
+      def list_for_project!(project_id, params = nil, options = {})
+        path = "/projects/#{project_id}/config_files"
 
-      def list_for_shared_config(shared_config_id, query = nil)
-        list_for_shared_config!(shared_config_id, query)
-      rescue SemaphoreClient::Exceptions::RequestFailed
+        @http_client.get(path, params, options = {}).body.map { |e| SemaphoreClient::Model::ConfigFile.load(e) }
       end
 
-      def create_for_shared_config(shared_config_id, params)
-        create_for_shared_config!(shared_config_id, params)
-      rescue SemaphoreClient::Exceptions::RequestFailed
-      end
 
-      def get(id)
-        get!(id)
-      rescue SemaphoreClient::Exceptions::RequestFailed
-      end
 
-      def delete(id)
-        delete!(id)
-      rescue SemaphoreClient::Exceptions::RequestFailed
+      def attach_to_project(config_file_id, project_id, params = nil, options = {})
+        attach_to_project!(config_file_id, project_id, params, options)
+      rescue SemaphoreClient::Exceptions::ResponseError
       end
 
-      def update(id, params)
-        update!(id, params)
-      rescue SemaphoreClient::Exceptions::RequestFailed
+      def attach_to_project!(config_file_id, project_id, params = nil, options = {})
+        path = "/projects/#{project_id}/config_files/#{config_file_id}"
+
+        @http_client.post(path, params, options)
       end
 
-      def list_for_project!(project_id, query = nil)
-        query_string =
-          unless query.nil? || query.empty?
-            "?" + query.map { |key, value| "#{key}=#{value}" }.join("&")
-          end
 
-        response = @http_client.get([:projects, project_id, :config_files, query_string].compact)
 
-        assert_response_status(response, 200)
+      def detach_from_project(config_file_id, project_id, params = nil, options = {})
+        detach_from_project!(config_file_id, project_id, params, options)
+      rescue SemaphoreClient::Exceptions::ResponseError
+      end
 
-        content = JSON.parse(response.body)
+      def detach_from_project!(config_file_id, project_id, params = nil, options = {})
+        path = "/projects/#{project_id}/config_files/#{config_file_id}"
 
-        content.map do |entity|
-          SemaphoreClient::Model::ConfigFile.load(entity)
-        end
+        @http_client.delete(path, params, options)
       end
 
-      def attach_to_project!(config_file_id, project_id)
-        response = @http_client.post([:projects, project_id, :config_files, config_file_id])
 
-        assert_response_status(response, 204)
+
+      def list_for_shared_config(shared_config_id, params = nil, options = {})
+        list_for_shared_config!(shared_config_id, params, options)
+      rescue SemaphoreClient::Exceptions::ResponseError
       end
 
-      def detach_from_project!(config_file_id, project_id)
-        response = @http_client.delete([:projects, project_id, :config_files, config_file_id])
+      def list_for_shared_config!(shared_config_id, params = nil, options = {})
+        path = "/shared_configs/#{shared_config_id}/config_files"
 
-        assert_response_status(response, 204)
+        @http_client.get(path, params, options = {}).body.map { |e| SemaphoreClient::Model::ConfigFile.load(e) }
       end
 
-      def list_for_shared_config!(shared_config_id, query = nil)
-        query_string =
-          unless query.nil? || query.empty?
-            "?" + query.map { |key, value| "#{key}=#{value}" }.join("&")
-          end
 
-        response = @http_client.get([:shared_configs, shared_config_id, :config_files, query_string].compact)
 
-        assert_response_status(response, 200)
+      def create_for_shared_config(shared_config_id, params = nil, options = {})
+        create_for_shared_config!(shared_config_id, params, options)
+      rescue SemaphoreClient::Exceptions::ResponseError
+      end
 
-        content = JSON.parse(response.body)
+      def create_for_shared_config!(shared_config_id, params = nil, options = {})
+        path = "/shared_configs/#{shared_config_id}/config_files"
+        response = @http_client.post(path, params, options)
 
-        content.map do |entity|
-          SemaphoreClient::Model::ConfigFile.load(entity)
-        end
+        SemaphoreClient::Model::ConfigFile.load(response.body)
       end
 
-      def create_for_shared_config!(shared_config_id, params)
-        response = @http_client.post([:shared_configs, shared_config_id, :config_files], params.to_json)
 
-        assert_response_status(response, 200)
 
-        content = JSON.parse(response.body)
-
-        SemaphoreClient::Model::ConfigFile.load(content)
+      def get(id, params = nil, options = {})
+        get!(id, params, options)
+      rescue SemaphoreClient::Exceptions::ResponseError
       end
 
-      def get!(id)
-        response = @http_client.get([:config_files, id])
+      def get!(id, params = nil, options = {})
+        path = "/config_files/#{id}"
+        response = @http_client.get(path, params = {})
+
+        SemaphoreClient::Model::ConfigFile.load(response.body)
+      end
 
-        assert_response_status(response, 200)
 
-        content = JSON.parse(response.body)
 
-        SemaphoreClient::Model::ConfigFile.load(content)
+      def delete(id, params = nil, options = {})
+        delete!(id, params, options)
+      rescue SemaphoreClient::Exceptions::ResponseError
       end
 
-      def delete!(id)
-        response = @http_client.delete([:config_files, id])
+      def delete!(id, params = nil, options = {})
+        path = "/config_files/#{id}"
 
-        assert_response_status(response, 200)
+        @http_client.delete(path, params)
       end
 
-      def update!(id, params)
-        response = @http_client.patch([:config_files, id], params.to_json)
-
-        assert_response_status(response, 200)
 
-        content = JSON.parse(response.body)
 
-        SemaphoreClient::Model::ConfigFile.load(content)
+      def update(id, params = nil, options = {})
+        update!(id, params, options)
+      rescue SemaphoreClient::Exceptions::ResponseError
       end
 
-      private
+      def update!(id, params = nil, options = {})
+        path = "/config_files/#{id}"
+        response = @http_client.patch(path, params)
 
-      def assert_response_status(response, expected_status)
-        return if response.status == expected_status
-
-        raise SemaphoreClient::Exceptions::RequestFailed, response.status
+        SemaphoreClient::Model::ConfigFile.load(response.body)
       end
+
+
     end
   end
 end

data/lib/semaphore_client/api/env_var.rb

@@ -5,135 +5,113 @@ class SemaphoreClient
         @http_client = http_client
       end
 
-      def list_for_project(project_id, query = nil)
-        list_for_project!(project_id, query)
-      rescue SemaphoreClient::Exceptions::RequestFailed
-      end
 
-      def attach_to_project(env_var_id, project_id)
-        attach_to_project!(env_var_id, project_id)
-      rescue SemaphoreClient::Exceptions::RequestFailed
+      def list_for_project(project_id, params = nil, options = {})
+        list_for_project!(project_id, params, options)
+      rescue SemaphoreClient::Exceptions::ResponseError
       end
 
-      def detach_from_project(env_var_id, project_id)
-        detach_from_project!(env_var_id, project_id)
-      rescue SemaphoreClient::Exceptions::RequestFailed
-      end
+      def list_for_project!(project_id, params = nil, options = {})
+        path = "/projects/#{project_id}/env_vars"
 
-      def list_for_shared_config(shared_config_id, query = nil)
-        list_for_shared_config!(shared_config_id, query)
-      rescue SemaphoreClient::Exceptions::RequestFailed
+        @http_client.get(path, params, options = {}).body.map { |e| SemaphoreClient::Model::EnvVar.load(e) }
       end
 
-      def create_for_shared_config(shared_config_id, params)
-        create_for_shared_config!(shared_config_id, params)
-      rescue SemaphoreClient::Exceptions::RequestFailed
-      end
 
-      def get(id)
-        get!(id)
-      rescue SemaphoreClient::Exceptions::RequestFailed
-      end
 
-      def delete(id)
-        delete!(id)
-      rescue SemaphoreClient::Exceptions::RequestFailed
+      def attach_to_project(env_var_id, project_id, params = nil, options = {})
+        attach_to_project!(env_var_id, project_id, params, options)
+      rescue SemaphoreClient::Exceptions::ResponseError
       end
 
-      def update(id, params)
-        update!(id, params)
-      rescue SemaphoreClient::Exceptions::RequestFailed
+      def attach_to_project!(env_var_id, project_id, params = nil, options = {})
+        path = "/projects/#{project_id}/env_vars/#{env_var_id}"
+
+        @http_client.post(path, params, options)
       end
 
-      def list_for_project!(project_id, query = nil)
-        query_string =
-          unless query.nil? || query.empty?
-            "?" + query.map { |key, value| "#{key}=#{value}" }.join("&")
-          end
 
-        response = @http_client.get([:projects, project_id, :env_vars, query_string].compact)
 
-        assert_response_status(response, 200)
+      def detach_from_project(env_var_id, project_id, params = nil, options = {})
+        detach_from_project!(env_var_id, project_id, params, options)
+      rescue SemaphoreClient::Exceptions::ResponseError
+      end
 
-        content = JSON.parse(response.body)
+      def detach_from_project!(env_var_id, project_id, params = nil, options = {})
+        path = "/projects/#{project_id}/env_vars/#{env_var_id}"
 
-        content.map do |entity|
-          SemaphoreClient::Model::EnvVar.load(entity)
-        end
+        @http_client.delete(path, params, options)
       end
 
-      def attach_to_project!(env_var_id, project_id)
-        response = @http_client.post([:projects, project_id, :env_vars, env_var_id])
 
-        assert_response_status(response, 204)
+
+      def list_for_shared_config(shared_config_id, params = nil, options = {})
+        list_for_shared_config!(shared_config_id, params, options)
+      rescue SemaphoreClient::Exceptions::ResponseError
       end
 
-      def detach_from_project!(env_var_id, project_id)
-        response = @http_client.delete([:projects, project_id, :env_vars, env_var_id])
+      def list_for_shared_config!(shared_config_id, params = nil, options = {})
+        path = "/shared_configs/#{shared_config_id}/env_vars"
 
-        assert_response_status(response, 204)
+        @http_client.get(path, params, options = {}).body.map { |e| SemaphoreClient::Model::EnvVar.load(e) }
       end
 
-      def list_for_shared_config!(shared_config_id, query = nil)
-        query_string =
-          unless query.nil? || query.empty?
-            "?" + query.map { |key, value| "#{key}=#{value}" }.join("&")
-          end
 
-        response = @http_client.get([:shared_configs, shared_config_id, :env_vars, query_string].compact)
 
-        assert_response_status(response, 200)
+      def create_for_shared_config(shared_config_id, params = nil, options = {})
+        create_for_shared_config!(shared_config_id, params, options)
+      rescue SemaphoreClient::Exceptions::ResponseError
+      end
 
-        content = JSON.parse(response.body)
+      def create_for_shared_config!(shared_config_id, params = nil, options = {})
+        path = "/shared_configs/#{shared_config_id}/env_vars"
+        response = @http_client.post(path, params, options)
 
-        content.map do |entity|
-          SemaphoreClient::Model::EnvVar.load(entity)
-        end
+        SemaphoreClient::Model::EnvVar.load(response.body)
       end
 
-      def create_for_shared_config!(shared_config_id, params)
-        response = @http_client.post([:shared_configs, shared_config_id, :env_vars], params.to_json)
 
-        assert_response_status(response, 200)
 
-        content = JSON.parse(response.body)
-
-        SemaphoreClient::Model::EnvVar.load(content)
+      def get(id, params = nil, options = {})
+        get!(id, params, options)
+      rescue SemaphoreClient::Exceptions::ResponseError
       end
 
-      def get!(id)
-        response = @http_client.get([:env_vars, id])
+      def get!(id, params = nil, options = {})
+        path = "/env_vars/#{id}"
+        response = @http_client.get(path, params = {})
+
+        SemaphoreClient::Model::EnvVar.load(response.body)
+      end
 
-        assert_response_status(response, 200)
 
-        content = JSON.parse(response.body)
 
-        SemaphoreClient::Model::EnvVar.load(content)
+      def delete(id, params = nil, options = {})
+        delete!(id, params, options)
+      rescue SemaphoreClient::Exceptions::ResponseError
       end
 
-      def delete!(id)
-        response = @http_client.delete([:env_vars, id])
+      def delete!(id, params = nil, options = {})
+        path = "/env_vars/#{id}"
 
-        assert_response_status(response, 200)
+        @http_client.delete(path, params)
       end
 
-      def update!(id, params)
-        response = @http_client.patch([:env_vars, id], params.to_json)
-
-        assert_response_status(response, 200)
 
-        content = JSON.parse(response.body)
 
-        SemaphoreClient::Model::EnvVar.load(content)
+      def update(id, params = nil, options = {})
+        update!(id, params, options)
+      rescue SemaphoreClient::Exceptions::ResponseError
       end
 
-      private
+      def update!(id, params = nil, options = {})
+        path = "/env_vars/#{id}"
+        response = @http_client.patch(path, params)
 
-      def assert_response_status(response, expected_status)
-        return if response.status == expected_status
-
-        raise SemaphoreClient::Exceptions::RequestFailed, response.status
+        SemaphoreClient::Model::EnvVar.load(response.body)
       end
+
+
     end
   end
 end

data/lib/semaphore_client/api/org.rb

@@ -5,45 +5,33 @@ class SemaphoreClient
         @http_client = http_client
       end
 
-      def list
-        list!
-      rescue SemaphoreClient::Exceptions::RequestFailed
-      end
 
-      def get(id)
-        get!(id)
-      rescue SemaphoreClient::Exceptions::RequestFailed
+      def list(params = nil, options = {})
+        list!(params, options)
+      rescue SemaphoreClient::Exceptions::ResponseError
       end
 
-      def list!
-        response = @http_client.get([:orgs])
-
-        assert_response_status(response, 200)
+      def list!(params = nil, options = {})
+        path = "/orgs"
 
-        content = JSON.parse(response.body)
-
-        content.map do |entity|
-          SemaphoreClient::Model::Org.load(entity)
-        end
+        @http_client.get(path, params, options).body.map { |e| SemaphoreClient::Model::Org.load(e) }
       end
 
-      def get!(id)
-        response = @http_client.get([:orgs, id])
-
-        assert_response_status(response, 200)
 
-        content = JSON.parse(response.body)
 
-        SemaphoreClient::Model::Org.load(content)
+      def get(id, params = nil, options = {})
+        get!(id, params, options)
+      rescue SemaphoreClient::Exceptions::ResponseError
       end
 
-      private
+      def get!(id, params = nil, options = {})
+        path = "/orgs/#{id}"
+        response = @http_client.get(path, params = {})
 
-      def assert_response_status(response, expected_status)
-        return if response.status == expected_status
-
-        raise SemaphoreClient::Exceptions::RequestFailed, response.status
+        SemaphoreClient::Model::Org.load(response.body)
       end
+
+
     end
   end
 end