crowbar-client 2.3.0 → 2.4.0

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

@@ -0,0 +1,42 @@
+#
+# Copyright 2015, SUSE Linux GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Crowbar
+  module Client
+    module Command
+      module Backup
+        class Restore < Base
+          def request
+            @request ||= Request::Backup::Restore.new(
+              args
+            )
+          end
+
+          def execute
+            request.process do |request|
+              case request.code
+              when 200
+                say "Successfully triggered a restore"
+              else
+                err request.parsed_response["error"]
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -19,6 +19,19 @@ module Crowbar
       module Backup
         class Upload < Base
           def request
+            args.file =
+              case args.file
+              when "-"
+                stdin.to_io
+              when File
+                args.file
+              else
+                File.new(
+                  args.file,
+                  File::RDONLY
+                )
+              end
+
             @request ||= Request::Backup::Upload.new(
               args
             )

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

@@ -15,11 +15,14 @@
 #
 
 require "hashie"
+require "active_support/number_helper"
 
 module Crowbar
   module Client
     module Command
       class Base
+        include ActiveSupport::NumberHelper
+
         attr_accessor :stdin
         attr_accessor :stdout
         attr_accessor :stderr

data/lib/crowbar/client/command/batch/build.rb

@@ -14,12 +14,32 @@
 # limitations under the License.
 #
 
+require "easy_diff"
+
 module Crowbar
   module Client
     module Command
       module Batch
         class Build < Base
           def request
+            args.easy_merge!(
+              includes: options.includes,
+              excludes: options.excludes
+            )
+
+            args.file =
+              case args.file
+              when "-"
+                stdin.to_io
+              when File
+                args.file
+              else
+                File.new(
+                  args.file,
+                  File::RDONLY
+                )
+              end
+
             @request ||= Request::Batch::Build.new(
               args
             )
@@ -27,6 +47,12 @@ module Crowbar
 
           def execute
             request.process do |request|
+              case request.code
+              when 200
+                say "Successfully built batch"
+              else
+                err request.body
+              end
             end
           end
         end

data/lib/crowbar/client/command/batch/export.rb

@@ -14,12 +14,19 @@
 # limitations under the License.
 #
 
+require "easy_diff"
+
 module Crowbar
   module Client
     module Command
       module Batch
         class Export < Base
           def request
+            args.easy_merge!(
+              includes: options.includes,
+              excludes: options.excludes
+            )
+
             @request ||= Request::Batch::Export.new(
               args
             )
@@ -27,8 +34,44 @@ module Crowbar
 
           def execute
             request.process do |request|
+              case request.code
+              when 200
+                if write(request.body)
+                  say "Successfully exported batch"
+                else
+                  err "Failed to export batch"
+                end
+              else
+                err request.parsed_response["error"]
+              end
             end
           end
+
+          protected
+
+          def write(body)
+            path.binmode
+            path.write body
+
+            true
+          rescue
+            false
+          end
+
+          def path
+            @path ||=
+              case args.file
+              when "-"
+                stdout.to_io
+              when File
+                args.file
+              else
+                File.new(
+                  args.file,
+                  File::CREAT | File::TRUNC | File::RDWR
+                )
+              end
+          end
         end
       end
     end

data/lib/crowbar/client/command/installer/start.rb

@@ -14,6 +14,8 @@
 # limitations under the License.
 #
 
+require "easy_diff"
+
 module Crowbar
   module Client
     module Command

data/lib/crowbar/client/filter/hash.rb

@@ -21,7 +21,7 @@ module Crowbar
         def process
           options[:values].select do |row|
             result = row.values.map do |value|
-              value.include? options[:filter]
+              value.to_s.include? options[:filter]
             end
 
             result.include? true

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

@@ -30,6 +30,9 @@ module Crowbar
         autoload :List,
           File.expand_path("../backup/list", __FILE__)
 
+        autoload :Restore,
+          File.expand_path("../backup/restore", __FILE__)
+
         autoload :Upload,
           File.expand_path("../backup/upload", __FILE__)
       end

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

@@ -23,9 +23,7 @@ module Crowbar
         class Create < Base
           def content
             super.easy_merge!(
-              backup: {
-                name: attrs.backup
-              }
+              name: attrs.name
             )
           end
 

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

@@ -27,7 +27,7 @@ module Crowbar
             [
               "utils",
               "backups",
-              attrs.id
+              attrs.name
             ].join("/")
           end
         end

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

@@ -36,7 +36,7 @@ module Crowbar
             [
               "utils",
               "backups",
-              attrs.id,
+              attrs.name,
               "download"
             ].join("/")
           end

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

@@ -0,0 +1,38 @@
+#
+# Copyright 2015, SUSE Linux GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+module Crowbar
+  module Client
+    module Request
+      module Backup
+        class Restore < Base
+          def method
+            :post
+          end
+
+          def url
+            [
+              "utils",
+              "backups",
+              attrs.name,
+              "restore"
+            ].join("/")
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -14,8 +14,6 @@
 # limitations under the License.
 #
 
-require "easy_diff"
-
 module Crowbar
   module Client
     module Request

data/lib/crowbar/client/request/batch/build.rb

@@ -19,12 +19,27 @@ module Crowbar
     module Request
       module Batch
         class Build < Base
+          def params
+            {
+              headers: headers,
+              query: {
+                includes: attrs.includes,
+                excludes: attrs.excludes,
+                file: attrs.file
+              }
+            }
+          end
+
           def method
-            :get
+            :post
           end
 
           def url
-            [].join("/")
+            [
+              "utils",
+              "batch",
+              "build"
+            ].join("/")
           end
         end
       end

data/lib/crowbar/client/request/batch/export.rb

@@ -14,17 +14,37 @@
 # limitations under the License.
 #
 
+require "easy_diff"
+
 module Crowbar
   module Client
     module Request
       module Batch
         class Export < Base
+          def content
+            super.easy_merge!(
+              includes: attrs.includes,
+              excludes: attrs.excludes
+            )
+          end
+
+          def headers
+            super.easy_merge!(
+              "Content-Type" => "application/octet-stream",
+              "Accept" => "application/octet-stream"
+            )
+          end
+
           def method
-            :get
+            :post
           end
 
           def url
-            [].join("/")
+            [
+              "utils",
+              "batch",
+              "export"
+            ].join("/")
           end
         end
       end

data/lib/crowbar/client/version.rb

@@ -18,7 +18,7 @@ module Crowbar
   module Client
     class Version
       MAJOR = 2
-      MINOR = 3
+      MINOR = 4
       PATCH = 0
 
       PRE = nil

data/spec/crowbar/client/command/backup/create_spec.rb

@@ -24,9 +24,7 @@ describe "Crowbar::Client::Command::Backup::Create" do
       stdin,
       stdout,
       stderr,
-      backup: {
-        name: "test-backup"
-      }
+      name: "test-backup"
     )
   end
 

data/spec/crowbar/client/command/backup/delete_spec.rb

@@ -24,8 +24,7 @@ describe "Crowbar::Client::Command::Backup::Delete" do
       stdin,
       stdout,
       stderr,
-      name: "test-backup",
-      created_at: "20150303-170203"
+      name: "test-backup"
     )
   end
 

data/spec/crowbar/client/command/backup/download_spec.rb

@@ -24,7 +24,7 @@ describe "Crowbar::Client::Command::Backup::Download" do
       stdin,
       stdout,
       stderr,
-      id: 1
+      name: "foo"
     )
   end
 

data/spec/crowbar/client/command/backup/restore_spec.rb

@@ -0,0 +1,40 @@
+#
+# Copyright 2015, SUSE Linux GmbH
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+require_relative "../../../../spec_helper"
+
+describe "Crowbar::Client::Command::Backup::Restore" do
+  include_context "command_context"
+
+  subject do
+    ::Crowbar::Client::Command::Backup::Restore.new(
+      stdin,
+      stdout,
+      stderr,
+      name: "test-backup"
+    )
+  end
+
+  it "should always return a request class" do
+    expect(subject.request).to(
+      be_a(
+        ::Crowbar::Client::Request::Backup::Restore
+      )
+    )
+  end
+
+  pending
+end