crowbar-client 2.4.0 → 2.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ad1e74fd43f734f1de83365be861088e5fe578f3
-  data.tar.gz: 7227247e2f6d0650fbaaa3a4ee94e3560f16324b
+  metadata.gz: e4b636e56d83e9730ca3c0673c16bf3b224da00b
+  data.tar.gz: c0890e422cedfaae4323992edbbddecea89227da
 SHA512:
-  metadata.gz: 48598a6ec995593fc838e7a5dfa08a476605445fb7fc0d2d6f643e1ab88b73d812b1c8e07ebc546305d72db39cdbfbeeabf2019f4c87ea38ed432b3c6079cf0d
-  data.tar.gz: 0deaf315129041b3fdd4209734324170476de4a6bb9b21324d6c525f957d781d7c37a2cbaa81d539e3555674b7f781e224d391ae41714343596b09e1e39bf34e
+  metadata.gz: ff7ebe7f47b711872f134a1741a4219469efbb88eab2dd6935ce76ab13bf5f05061693e540312aab02f1fee700ca23e5ab6e88c8d6f5eccaa462c9dab897c13f
+  data.tar.gz: 38d95910370053dc116d07355c75c30bd8b66e7d6f55af623115983d5bc91ca02db27408a11967046f44b8fe3d588ed1717850c893fc4ebc4e7d8d7b0dcbea2b

data/CHANGELOG.md

@@ -1,5 +1,13 @@
 # Changelog
 
+## [2.4.1](https://github.com/crowbar/crowbar-client/releases/tag/v2.4.1) - 2015-02-08
+
+* BUGFIX
+  * Fixed updated path to installer API (@jdsn)
+  * Print correct help output for backup commands (@tboerger)
+* ENHANCEMENT
+  * Integrated changes for fixed batch API (@tboerger)
+
 ## [2.4.0](https://github.com/crowbar/crowbar-client/releases/tag/v2.4.0) - 2015-01-27
 
 * BUGFIX

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

@@ -106,7 +106,7 @@ module Crowbar
           catch_errors(e)
         end
 
-        desc "create",
+        desc "create NAME",
           "Create a new backup"
 
         long_desc <<-LONGDESC
@@ -125,7 +125,7 @@ module Crowbar
           catch_errors(e)
         end
 
-        desc "delete",
+        desc "delete NAME",
           "Delete a backup"
 
         long_desc <<-LONGDESC
@@ -144,7 +144,7 @@ module Crowbar
           catch_errors(e)
         end
 
-        desc "upload",
+        desc "upload FILE",
           "Upload a backup"
 
         long_desc <<-LONGDESC
@@ -162,7 +162,7 @@ module Crowbar
           catch_errors(e)
         end
 
-        desc "download",
+        desc "download NAME [FILE]",
           "Download a backup"
 
         long_desc <<-LONGDESC

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

@@ -63,11 +63,11 @@ module Crowbar
           catch_errors(e)
         end
 
-        desc "export FILE",
+        desc "export [FILE]",
           "Export proposals to file or stdout"
 
         long_desc <<-LONGDESC
-          `export FILE` will collect the informations of the proposals
+          `export [FILE]` will collect the information of the proposals
           in a YAML format. You can directly provide a path to a file or
           just pipe the content into stdout. To pipe the content to
           stdout you should just write a `-` instead of a specific
@@ -98,7 +98,7 @@ module Crowbar
           banner: "BARCLAMP[.PROPOSAL]",
           desc: "Exclude a specific barclamp or proposal for export"
 
-        def export(file)
+        def export(file = nil)
           Command::Batch::Export.new(
             *command_params(
               file: file

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

@@ -51,7 +51,7 @@ module Crowbar
               when 200
                 say "Successfully built batch"
               else
-                err request.body
+                err request.parsed_response["error"]
               end
             end
           end

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

@@ -14,6 +14,7 @@
 # limitations under the License.
 #
 
+require "base64"
 require "easy_diff"
 
 module Crowbar
@@ -36,7 +37,7 @@ module Crowbar
             request.process do |request|
               case request.code
               when 200
-                if write(request.body)
+                if write(request.parsed_response)
                   say "Successfully exported batch"
                 else
                   err "Failed to export batch"
@@ -50,15 +51,21 @@ module Crowbar
           protected
 
           def write(body)
-            path.binmode
-            path.write body
+            path(body["name"]).tap do |path|
+              path.binmode
+              path.write(
+                Base64.decode64(
+                  body["file"]
+                )
+              )
 
-            true
+              true
+            end
           rescue
             false
           end
 
-          def path
+          def path(name = nil)
             @path ||=
               case args.file
               when "-"
@@ -67,7 +74,7 @@ module Crowbar
                 args.file
               else
                 File.new(
-                  args.file,
+                  args.file || name,
                   File::CREAT | File::TRUNC | File::RDWR
                 )
               end

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

@@ -28,13 +28,6 @@ module Crowbar
             )
           end
 
-          def headers
-            super.easy_merge!(
-              "Content-Type" => "application/octet-stream",
-              "Accept" => "application/octet-stream"
-            )
-          end
-
           def method
             :post
           end

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

@@ -33,6 +33,7 @@ module Crowbar
 
           def url
             [
+              "installer",
               "installer",
               "start"
             ].join("/")

data/lib/crowbar/client/request/installer/status.rb

@@ -25,6 +25,7 @@ module Crowbar
 
           def url
             [
+              "installer",
               "installer",
               "status"
             ].join("/")

data/lib/crowbar/client/version.rb

@@ -19,7 +19,7 @@ module Crowbar
     class Version
       MAJOR = 2
       MINOR = 4
-      PATCH = 0
+      PATCH = 1
 
       PRE = nil
 

data/spec/crowbar/client/request/batch/build_spec.rb

@@ -47,7 +47,7 @@ describe "Crowbar::Client::Request::Batch::Build" do
     let!(:headers) do
       {
         "Accept" => "application/json",
-        "Content-Length" => "403",
+        "Content-Length" => "694",
         "Content-Type" => "multipart/form-data; boundary=-----------RubyMultipartPost"
       }
     end

data/spec/crowbar/client/request/batch/export_spec.rb

@@ -45,8 +45,8 @@ describe "Crowbar::Client::Request::Batch::Export" do
 
     let!(:headers) do
       {
-        "Content-Type" => "application/octet-stream",
-        "Accept" => "application/octet-stream"
+        "Content-Type" => "application/json",
+        "Accept" => "application/json"
       }
     end
   end

data/spec/crowbar/client/request/installer/start_spec.rb

@@ -42,7 +42,7 @@ describe "Crowbar::Client::Request::Installer::Start" do
     end
 
     let!(:url) do
-      "installer/start"
+      "installer/installer/start"
     end
 
     let!(:headers) do

data/spec/crowbar/client/request/installer/status_spec.rb

@@ -52,7 +52,7 @@ describe "Crowbar::Client::Request::Installer::Status" do
     end
 
     let!(:url) do
-      "installer/status"
+      "installer/installer/status"
     end
 
     let!(:headers) do

data/spec/fixtures/batch.yml

@@ -0,0 +1,14 @@
+proposals:
+- barclamp: provisioner
+  attributes:
+    shell_prompt: USER@ALIAS:CWD SUFFIX
+- barclamp: database
+  deployment:
+    elements:
+      database-server:
+        - "@@controller1@@"
+- barclamp: rabbitmq
+  deployment:
+    elements:
+      rabbitmq-server:
+        - "@@controller1@@"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: crowbar-client
 version: !ruby/object:Gem::Version
-  version: 2.4.0
+  version: 2.4.1
 platform: ruby
 authors:
 - Thomas Boerger
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-01-27 00:00:00.000000000 Z
+date: 2016-02-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler