crowbar-client 2.4.3 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b8c037979c770924039812786201ace63f048b39
-  data.tar.gz: 5f57c075fede83f6e74a926b16f8cd94a7bed7dc
+  metadata.gz: 6b731c1c97fffa975e7984c69201175b40747a6c
+  data.tar.gz: eb713da64767ffbd8a11a419b00af7a80ca40fb1
 SHA512:
-  metadata.gz: 3701cc65c24bdab44af17b2d0f486b71a84ff83e3d6cb99e32ab6fbbc86dad758b1d1dd14fec914b994ac589fbfc7394c37dbdc28bee24bb035745949d44ff01
-  data.tar.gz: f72e6174212ea6302e41b453112fb758402d3109380b614c0e29795bcc75e70fab4176e3d4c79aa5e8002198441282e0b72b44f19aaf6fd106a52090ed6722c4
+  metadata.gz: d85ccb27fa7428c469d3718205ba2e3012e31461dabc16384545c65ad614f24eab9a478b514a674458cf308fdb67dfb141839fe3f57b9ad1aa8ccedf0a8dc00a
+  data.tar.gz: 515d9f42654a8f0cb62b42444d91b1da56760bf6c54df92706ee740f03e5fea51fefd346c08d6c900d84b1fa32d4ff48196661b443d3d0fbca3e71d5ceaabdc3

data/CHANGELOG.md

@@ -1,5 +1,16 @@
 # Changelog
 
+## [3.0.0](https://github.com/crowbar/crowbar-client/releases/tag/v3.0.0) - 2016-08-16
+
+* BREAKING
+  * Adapt backups subcommand to the new api 2.0 (@MaximilianMeister)
+* BUGFIX
+  * Fix repository handling (bsc#993445) (@MaximilianMeister)
+* ENHANCEMENT
+  * Added lgtm config (@rsalevsky)
+  * Clarify command role show (@itxaka)
+  * Replace httparty/httmultiparty with rest-client (@MaximilianMeister)
+
 ## [2.4.3](https://github.com/crowbar/crowbar-client/releases/tag/v2.4.3) - 2016-07-06
 
 * BUGFIX

data/lib/crowbar/client/app/repository.rb

@@ -77,18 +77,19 @@ module Crowbar
           catch_errors(e)
         end
 
-        desc "activate PLATFORM REPO",
-          "Activate a repository for a platform"
+        desc "activate PLATFORM ARCH REPO",
+          "Activate a repository for a platform on a specific architecture"
 
         long_desc <<-LONGDESC
-          `activate PLATFORM REPO` will try to activate the
-          specified repository for the specified platform.
+          `activate PLATFORM ARCH REPO` will try to activate the
+          specified repository for the specified platform and architecture.
         LONGDESC
 
-        def activate(platform, repo)
+        def activate(platform, arch, repo)
           Command::Repository::Activate.new(
             *command_params(
               platform: platform,
+              arch: arch,
               repo: repo
             )
           ).execute
@@ -112,18 +113,19 @@ module Crowbar
           catch_errors(e)
         end
 
-        desc "deactivate PLATFORM REPO",
-          "Deactivate a repository for a platform"
+        desc "deactivate PLATFORM ARCH REPO",
+          "Deactivate a repository for a platform on a specific architecture"
 
         long_desc <<-LONGDESC
-          `deactivate PLATFORM REPO` will try to deactivate the
-          specified repository for the specified platform.
+          `deactivate PLATFORM ARCH REPO` will try to deactivate the
+          specified repository for the specified platform and architecture.
         LONGDESC
 
-        def deactivate(platform, repo)
+        def deactivate(platform, arch, repo)
           Command::Repository::Deactivate.new(
             *command_params(
               platform: platform,
+              arch: arch,
               repo: repo
             )
           ).execute

data/lib/crowbar/client/app/role.rb

@@ -83,8 +83,8 @@ module Crowbar
           "Show details of a specific role"
 
         long_desc <<-LONGDESC
-          `show BARCLAMP ROLE` will print out the details for a specified
-          role for the specified barclamp. You can display the details in
+          `show BARCLAMP ROLE` will print out the nodes available to
+          assign the role. You can display the details in
           different output formats and you can filter the details by any
           search criteria.
 

data/lib/crowbar/client/command/proposal/create.rb

@@ -29,8 +29,8 @@ module Crowbar
 
           def request
             @request ||= Request::Proposal::Create.new(
-              args.easy_merge(
-                payload: payload_content
+              args.easy_merge!(
+                payload: payload_content.to_hash
               )
             )
           end

data/lib/crowbar/client/command/repository/list.rb

@@ -37,7 +37,7 @@ module Crowbar
               when 200
                 formatter = Formatter::Hash.new(
                   format: provide_format,
-                  headings: ["Platform", "Repo"],
+                  headings: ["Platform", "Architecture", "Repository"],
                   values: Filter::Hash.new(
                     filter: provide_filter,
                     values: content_from(request)
@@ -60,10 +60,13 @@ module Crowbar
           def content_from(request)
             [].tap do |row|
               request.parsed_response.each do |child|
-                row.push(
-                  platform: child["platform"],
-                  repo: child["id"]
-                )
+                child["repos"].each do |repo|
+                  row.push(
+                    platform: repo["platform"],
+                    arch: repo["arch"],
+                    repo: repo["id"]
+                  )
+                end
               end
             end
           end

data/lib/crowbar/client/command/role/show.rb

@@ -41,7 +41,7 @@ module Crowbar
               when 200
                 formatter = Formatter::Array.new(
                   format: provide_format,
-                  headings: ["Node"],
+                  headings: ["Nodes available to assign the role"],
                   values: Filter::Array.new(
                     filter: provide_filter,
                     values: content_from(request)
@@ -49,7 +49,7 @@ module Crowbar
                 )
 
                 if formatter.empty?
-                  err "No nodes"
+                  err "No nodes available to assign the role"
                 else
                   say formatter.result
                 end

data/lib/crowbar/client/config.rb

@@ -163,7 +163,7 @@ module Crowbar
         if ENV["CROWBAR_DEBUG"].present?
           [
             true, 1, "1", "t", "T", "true", "TRUE"
-          ].include? ENV["CROWBAR_ANONYMOUS"]
+          ].include? ENV["CROWBAR_DEBUG"]
         else
           false
         end

data/lib/crowbar/client/mixin/barclamp.rb

@@ -32,7 +32,7 @@ module Crowbar
           end
 
           def available_barclamps
-            @available_barclamps ||= Request::Barclamp::List.new.process.keys
+            @available_barclamps ||= Request::Barclamp::List.new.process.parsed_response.keys
           end
         end
       end

data/lib/crowbar/client/request.rb

@@ -44,15 +44,15 @@ module Crowbar
       autoload :Node,
         File.expand_path("../request/node", __FILE__)
 
-      autoload :Party,
-        File.expand_path("../request/party", __FILE__)
-
       autoload :Proposal,
         File.expand_path("../request/proposal", __FILE__)
 
       autoload :Repository,
         File.expand_path("../request/repository", __FILE__)
 
+      autoload :Rest,
+        File.expand_path("../request/rest", __FILE__)
+
       autoload :Role,
         File.expand_path("../request/role", __FILE__)
 

data/lib/crowbar/client/request/backup/create.rb

@@ -24,6 +24,17 @@ module Crowbar
         # Implementation for the backup create request
         #
         class Create < Base
+          #
+          # Override the request headers
+          #
+          # @return [Hash] the headers for the request
+          #
+          def headers
+            super.easy_merge!(
+              Crowbar::Client::Util::ApiVersion.new(2.0).headers
+            )
+          end
+
           #
           # Override the request content
           #
@@ -31,7 +42,9 @@ module Crowbar
           #
           def content
             super.easy_merge!(
-              name: attrs.name
+              backup: {
+                name: attrs.name
+              }
             )
           end
 
@@ -51,7 +64,8 @@ module Crowbar
           #
           def url
             [
-              "utils",
+              "api",
+              "crowbar",
               "backups"
             ].join("/")
           end

data/lib/crowbar/client/request/backup/delete.rb

@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+require "easy_diff"
+
 module Crowbar
   module Client
     module Request
@@ -22,6 +24,17 @@ module Crowbar
         # Implementation for the backup delete request
         #
         class Delete < Base
+          #
+          # Override the request headers
+          #
+          # @return [Hash] the headers for the request
+          #
+          def headers
+            super.easy_merge!(
+              Crowbar::Client::Util::ApiVersion.new(2.0).headers
+            )
+          end
+
           #
           # HTTP method that gets used by the request
           #
@@ -38,7 +51,8 @@ module Crowbar
           #
           def url
             [
-              "utils",
+              "api",
+              "crowbar",
               "backups",
               attrs.name
             ].join("/")

data/lib/crowbar/client/request/backup/download.rb

@@ -26,8 +26,7 @@ module Crowbar
         class Download < Base
           def headers
             super.easy_merge!(
-              "Content-Type" => "application/octet-stream",
-              "Accept" => "application/octet-stream"
+              Crowbar::Client::Util::ApiVersion.new(2.0).headers
             )
           end
 
@@ -47,7 +46,8 @@ module Crowbar
           #
           def url
             [
-              "utils",
+              "api",
+              "crowbar",
               "backups",
               attrs.name,
               "download"

data/lib/crowbar/client/request/backup/list.rb

@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+require "easy_diff"
+
 module Crowbar
   module Client
     module Request
@@ -22,6 +24,17 @@ module Crowbar
         # Implementation for the backup list request
         #
         class List < Base
+          #
+          # Override the request headers
+          #
+          # @return [Hash] the headers for the request
+          #
+          def headers
+            super.easy_merge!(
+              Crowbar::Client::Util::ApiVersion.new(2.0).headers
+            )
+          end
+
           #
           # HTTP method that gets used by the request
           #
@@ -38,7 +51,8 @@ module Crowbar
           #
           def url
             [
-              "utils",
+              "api",
+              "crowbar",
               "backups"
             ].join("/")
           end

data/lib/crowbar/client/request/backup/restore.rb

@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+require "easy_diff"
+
 module Crowbar
   module Client
     module Request
@@ -22,6 +24,17 @@ module Crowbar
         # Implementation for the backup restore request
         #
         class Restore < Base
+          #
+          # Override the request headers
+          #
+          # @return [Hash] the headers for the request
+          #
+          def headers
+            super.easy_merge!(
+              Crowbar::Client::Util::ApiVersion.new(2.0).headers
+            )
+          end
+
           #
           # HTTP method that gets used by the request
           #
@@ -38,7 +51,8 @@ module Crowbar
           #
           def url
             [
-              "utils",
+              "api",
+              "crowbar",
               "backups",
               attrs.name,
               "restore"

data/lib/crowbar/client/request/backup/upload.rb

@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+require "easy_diff"
+
 module Crowbar
   module Client
     module Request
@@ -22,13 +24,26 @@ module Crowbar
         # Implementation for the backup upload request
         #
         class Upload < Base
-          def params
-            {
-              headers: headers,
-              query: {
-                file: attrs.file
+          #
+          # Override the request headers
+          #
+          # @return [Hash] the headers for the request
+          #
+          def headers
+            super.easy_merge!(
+              Crowbar::Client::Util::ApiVersion.new(2.0).headers
+            )
+          end
+
+          def content
+            super.easy_merge!(
+              backup: {
+                payload: {
+                  multipart: true,
+                  file: attrs.file
+                }
               }
-            }
+            )
           end
 
           #
@@ -47,7 +62,8 @@ module Crowbar
           #
           def url
             [
-              "utils",
+              "api",
+              "crowbar",
               "backups",
               "upload"
             ].join("/")

data/lib/crowbar/client/request/base.rb

@@ -31,7 +31,7 @@ module Crowbar
         end
 
         def request
-          @request ||= Party.new
+          @request ||= Rest.new(url: url)
         end
 
         def content
@@ -46,25 +46,43 @@ module Crowbar
         end
 
         def params
-          {
-            body: content.to_json,
-            headers: headers
-          }
+          case method
+          when :post
+            [
+              method,
+              content
+            ]
+          when :put
+            [
+              method,
+              content.to_json
+            ]
+          else
+            [
+              method
+            ]
+          end
         end
 
         def process
-          result = request.send(
-            method,
-            [
-              "/",
-              url
-            ].join(""),
-            params
-          )
-
-          send(
-            errors[result.code]
-          ) if errors[result.code]
+          result = begin
+            request.send(
+              *params,
+              accept: headers["Accept"],
+              content_type: headers["Content-Type"]
+            )
+          rescue => e
+            if e.class.superclass == RestClient::RequestFailed
+              Hashie::Mash.new(
+                parsed_response: {
+                  error: e.message
+                },
+                code: e.http_code
+              )
+            else
+              raise e
+            end
+          end
 
           if block_given?
             yield result
@@ -72,42 +90,6 @@ module Crowbar
             result
           end
         end
-
-        def errors
-          {
-            401 => :not_authorized,
-            403 => :not_authorized,
-            500 => :internal_server,
-            502 => :bad_gateway,
-            503 => :service_unavailable,
-            504 => :gateway_timeout
-          }
-        end
-
-        def not_authorized
-          raise NotAuthorizedError,
-            "User is not authorized"
-        end
-
-        def internal_server
-          raise InternalServerError,
-            "An internal error occured"
-        end
-
-        def bad_gateway
-          raise BadGatewayError,
-            "Received a bad gateway error"
-        end
-
-        def service_unavailable
-          raise ServiceUnavailableError,
-            "Service is not available"
-        end
-
-        def gateway_timeout
-          raise GatewayTimeoutError,
-            "Received a gateway timeout"
-        end
       end
     end
   end