crowbar-client 2.1.0 → 2.2.0

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

@@ -72,8 +72,8 @@ module Crowbar
               barclamp: barclamp
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "show BARCLAMP PROPOSAL",
@@ -134,8 +134,8 @@ module Crowbar
               proposal: proposal
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "create BARCLAMP PROPOSAL",
@@ -184,8 +184,8 @@ module Crowbar
               proposal: proposal
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "edit BARCLAMP PROPOSAL",
@@ -234,8 +234,8 @@ module Crowbar
               proposal: proposal
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "delete BARCLAMP PROPOSAL",
@@ -253,8 +253,8 @@ module Crowbar
               proposal: proposal
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "dequeue BARCLAMP PROPOSAL",
@@ -272,8 +272,8 @@ module Crowbar
               proposal: proposal
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "commit BARCLAMP PROPOSAL",
@@ -291,8 +291,8 @@ module Crowbar
               proposal: proposal
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
       end
     end

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

@@ -70,8 +70,8 @@ module Crowbar
           Command::Repository::List.new(
             *command_params
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "activate PLATFORM REPO",
@@ -89,8 +89,8 @@ module Crowbar
               repo: repo
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "activate-all",
@@ -105,8 +105,8 @@ module Crowbar
           Command::Repository::ActivateAll.new(
             *command_params
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "deactivate PLATFORM REPO",
@@ -124,8 +124,8 @@ module Crowbar
               repo: repo
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "deactivate-all",
@@ -140,8 +140,8 @@ module Crowbar
           Command::Repository::DeactivateAll.new(
             *command_params
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
       end
     end

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

@@ -33,8 +33,8 @@ module Crowbar
               proposal: proposal
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "nodes",
@@ -49,8 +49,8 @@ module Crowbar
           Command::Reset::Nodes.new(
             *command_params
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
       end
     end

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

@@ -72,8 +72,8 @@ module Crowbar
               barclamp: barclamp
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "show BARCLAMP ROLE",
@@ -131,8 +131,8 @@ module Crowbar
               role: role
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
       end
     end

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

@@ -32,8 +32,8 @@ module Crowbar
               barclamp: barclamp
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
       end
     end

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

@@ -36,8 +36,8 @@ module Crowbar
               suggestion: suggestion
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "deallocate PROPOSAL SERVICE NETWORK",
@@ -56,8 +56,8 @@ module Crowbar
               network: network
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
       end
     end

data/lib/crowbar/client/command.rb

@@ -29,6 +29,9 @@ module Crowbar
       autoload :HostIP,
         File.expand_path("../command/host_ip", __FILE__)
 
+      autoload :Installer,
+        File.expand_path("../command/installer", __FILE__)
+
       autoload :Interface,
         File.expand_path("../command/interface", __FILE__)
 

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

@@ -0,0 +1,29 @@
+#
+# 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 Installer
+        autoload :Status,
+          File.expand_path("../installer/status", __FILE__)
+
+        autoload :Start,
+          File.expand_path("../installer/start", __FILE__)
+      end
+    end
+  end
+end

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

@@ -0,0 +1,50 @@
+#
+# 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 Installer
+        class Start < Base
+          def request
+            @request ||= Request::Installer::Start.new(
+              args.easy_merge(
+                force: options.force
+              )
+            )
+          end
+
+          def execute
+            request.process do |request|
+              case request.code
+              when 200
+                say "Triggered installation process"
+              when 226
+                say "Crowbar already installing"
+              when 410
+                say "Installation is already done"
+              when 501
+                err "Platform is not supported"
+              else
+                err request.parsed_response["error"]
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -0,0 +1,68 @@
+#
+# 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 Installer
+        class Status < Base
+          include Mixin::Format
+          include Mixin::Filter
+
+          def request
+            @request ||= Request::Installer::Status.new(
+              args
+            )
+          end
+
+          def execute
+            request.process do |request|
+              case request.code
+              when 200
+                formatter = Formatter::Nested.new(
+                  format: provide_format,
+                  headings: ["Status", "Value"],
+                  values: Filter::Subset.new(
+                    filter: provide_filter,
+                    values: content_from(request)
+                  ).result
+                )
+
+                if formatter.empty?
+                  err "No status"
+                else
+                  say formatter.result
+                end
+              else
+                err request.parsed_response["error"]
+              end
+            end
+          end
+
+          protected
+
+          def content_from(request)
+            request.parsed_response.except(
+              "errorMsg",
+              "noticeMsg",
+              "successMsg"
+            )
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -66,9 +66,11 @@ module Crowbar
 
           def from_data
             json = begin
-              JSON.load options[:data]
-            rescue
-              err "Invalid json data"
+              JSON.load(
+                options[:data]
+              )
+            rescue JSON::ParserError
+              err "Failed to parse JSON"
             end
 
             if options[:merge]
@@ -82,9 +84,21 @@ module Crowbar
 
           def from_file
             json = begin
-              JSON.load options[:file]
+              file = File.read(
+                options[:file]
+              )
+
+              JSON.load(
+                file
+              )
+            rescue Errno::EACCES
+              err "Failed to access file"
+            rescue Errno::ENOENT
+              err "Failed to read file"
+            rescue JSON::ParserError
+              err "Failed to parse JSON"
             rescue
-              err "Invalid json file"
+              err "Failed to process file"
             end
 
             if options[:merge]

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

@@ -65,9 +65,11 @@ module Crowbar
 
           def from_data
             json = begin
-              JSON.load options[:data]
-            rescue
-              err "Invalid json data"
+              JSON.load(
+                options[:data]
+              )
+            rescue JSON::ParserError
+              err "Failed to parse JSON"
             end
 
             if options[:merge]
@@ -81,9 +83,21 @@ module Crowbar
 
           def from_file
             json = begin
-              JSON.load options[:file]
+              file = File.read(
+                options[:file]
+              )
+
+              JSON.load(
+                file
+              )
+            rescue Errno::EACCES
+              err "Failed to access file"
+            rescue Errno::ENOENT
+              err "Failed to read file"
+            rescue JSON::ParserError
+              err "Failed to parse JSON"
             rescue
-              err "Invalid json file"
+              err "Failed to process file"
             end
 
             if options[:merge]