crowbar-client 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5af7f5c6bab5cfaf58a39cd195ad78c94641d39b
-  data.tar.gz: 038f95011bd1e449e7c5b3121df21447fc427ece
+  metadata.gz: 3ecbbfcbd11f4a3f271ac148b1b133a263d3bf8f
+  data.tar.gz: 8337b224ca654899291ab830294c173dbfe57403
 SHA512:
-  metadata.gz: e3a803ba5baefeb1c258322cdbaf163bef2c90f40b0eb8344c7d889af337df7abd44860f6c453983fcff71d893ac8940921a9a9774be02668cd2ae3ae4cc917a
-  data.tar.gz: f1ea6e61388e472b8a9be57f304c64b4da1620668f98eb16a2c56ae2a7cca81717e7da25814370dd8aec364e5945488c0649df791f75449e5185c7fa0ec0341c
+  metadata.gz: 3b7d1e3f3d934c75f3edde8df6db94b9f7843a38d9ac70e27ffa9481e341f89eda52aaa31414b5493d21fa366a835bba4d03228351faa19bed14d97621f56ac2
+  data.tar.gz: c27a8bded618b8ec1bc361519a079e4549d1090d8614ec195b1acbf3d6d9dfa712e91c45983e577116779a75fe93afb54dc031caf5d1c20ef3793f9149d65970

data/CHANGELOG.md

@@ -1,5 +1,14 @@
 # Changelog
 
+## [2.2.0](https://github.com/crowbar/crowbar-client/releases/tag/v2.2.0) - 2015-12-03
+
+* BUGFIX
+  * Fixed reading of files for proposal create/edit (@tboerger)
+* ENHANCEMENT
+  * Added proper error handling to file read on proposal (@tboerger)
+  * Added subcommands for installation of admin server (@MaximilianMeister)
+  * Added proper error handling for general connection (@tboerger)
+
 ## [2.1.0](https://github.com/crowbar/crowbar-client/releases/tag/v2.1.0) - 2015-11-25
 
 * BREAKING

data/lib/crowbar/client.rb

@@ -49,6 +49,12 @@ module Crowbar
     class InvalidJsonError < SimpleCatchableError
     end
 
+    class InternalServerError < SimpleCatchableError
+    end
+
+    class NotAuthorizedError < SimpleCatchableError
+    end
+
     class UnavailableBarclampError < SimpleCatchableError
       def initialize(barclamp)
         super("Barclamp #{barclamp} is not available")

data/lib/crowbar/client/app.rb

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

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

@@ -69,8 +69,8 @@ module Crowbar
           Command::Barclamp::List.new(
             *command_params
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
       end
     end

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

@@ -38,12 +38,22 @@ module Crowbar
         end
 
         no_commands do
+          include Mixin::Format
+
           def say(message)
             $stdout.puts message
           end
 
           def err(message, exit_code = nil)
-            $stderr.puts message
+            case provide_format
+            when :json
+              $stderr.puts JSON.pretty_generate(
+                error: message
+              )
+            else
+              $stderr.puts message
+            end
+
             exit(exit_code) unless exit_code.nil?
           end
 
@@ -56,6 +66,19 @@ module Crowbar
               args
             ]
           end
+
+          def catch_errors(error)
+            case error
+            when SimpleCatchableError
+              err error.message, 1
+            when Errno::ECONNREFUSED
+              err "Connection to server refused", 1
+            when SocketError
+              err "Unknown server to connect to", 1
+            else
+              raise error
+            end
+          end
         end
       end
     end

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

@@ -54,8 +54,8 @@ module Crowbar
               file: file
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "export PROPOSAL [PROPOSAL]",
@@ -91,8 +91,8 @@ module Crowbar
               proposals: proposals
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
       end
     end

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

@@ -113,6 +113,10 @@ module Crowbar
         desc "server [COMMANDS]",
           "Server specific commands, call without params for help"
         subcommand "server", Crowbar::Client::App::Server
+
+        desc "installer [COMMANDS]",
+          "Installer specific commands, call without params for help"
+        subcommand "installer", Crowbar::Client::App::Installer
       end
     end
   end

data/lib/crowbar/client/app/host_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 NODE 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/app/installer.rb

@@ -0,0 +1,103 @@
+#
+# 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 App
+      class Installer < Base
+        desc "status",
+          "Show current installer status"
+
+        long_desc <<-LONGDESC
+          `status` will print out information about the current status
+          of the installer. You can display the list in different output
+          formats and you can filter the list by any search criteria.
+
+          With --format <format> option you can choose an output format
+          with the available options table, json or plain. You can also
+          use the shortcut options --table, --json or --plain.
+
+          With --filter <filter> option you can limit the result of
+          printed out elements. You can use any substring that is part
+          of the found elements.
+        LONGDESC
+
+        method_option :format,
+          type: :string,
+          default: "table",
+          banner: "<format>",
+          desc: "Format of the output, valid formats are table, json or plain"
+
+        method_option :table,
+          type: :boolean,
+          default: false,
+          aliases: [],
+          desc: "Format output as table, a shortcut for --format table option"
+
+        method_option :json,
+          type: :boolean,
+          default: false,
+          aliases: [],
+          desc: "Format output as table, a shortcut for --format table option"
+
+        method_option :plain,
+          type: :boolean,
+          default: false,
+          aliases: [],
+          desc: "Format output as table, a shortcut for --format table option"
+
+        method_option :filter,
+          type: :string,
+          default: nil,
+          banner: "<filter>",
+          desc: "Filter by criteria, display only data that contains filter"
+
+        def status
+          Command::Installer::Status.new(
+            *command_params
+          ).execute
+        rescue => e
+          catch_errors(e)
+        end
+
+        desc "start",
+          "Start the insallation of Crowbar"
+
+        long_desc <<-LONGDESC
+          `start` will trigger the installation of the Administration Server.
+
+          With --force you can enforce a reinstallation if the installation
+          has already been finished. Be careful with that option as you will
+          destroy an already existing installation.
+        LONGDESC
+
+        method_option :force,
+          type: :boolean,
+          default: false,
+          aliases: [],
+          desc: "Force Administration Server installation"
+
+        def start
+          Command::Installer::Start.new(
+            *command_params
+          ).execute
+        rescue => e
+          catch_errors(e)
+        end
+      end
+    end
+  end
+end

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

@@ -34,8 +34,8 @@ module Crowbar
               network: network
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "disable PROPOSAL NODE NETWORK",
@@ -54,8 +54,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/app/node.rb

@@ -80,8 +80,8 @@ module Crowbar
           Command::Node::Status.new(
             *command_params
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "list",
@@ -154,8 +154,8 @@ module Crowbar
           Command::Node::List.new(
             *command_params
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "show NAME_OR_ALIAS",
@@ -215,8 +215,8 @@ module Crowbar
               name: name
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "hardware NAME_OR_ALIAS",
@@ -233,8 +233,8 @@ module Crowbar
               name: name
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "identify NAME_OR_ALIAS",
@@ -251,8 +251,8 @@ module Crowbar
               name: name
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "delete NAME_OR_ALIAS",
@@ -269,8 +269,8 @@ module Crowbar
               name: name
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "reinstall NAME_OR_ALIAS",
@@ -287,8 +287,8 @@ module Crowbar
               name: name
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "reset NAME_OR_ALIAS",
@@ -305,8 +305,8 @@ module Crowbar
               name: name
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "shutdown NAME_OR_ALIAS",
@@ -323,8 +323,8 @@ module Crowbar
               name: name
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "reboot NAME_OR_ALIAS",
@@ -341,8 +341,8 @@ module Crowbar
               name: name
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "powercycle NAME_OR_ALIAS",
@@ -359,8 +359,8 @@ module Crowbar
               name: name
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "poweroff NAME_OR_ALIAS",
@@ -377,8 +377,8 @@ module Crowbar
               name: name
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "poweron NAME_OR_ALIAS",
@@ -395,8 +395,8 @@ module Crowbar
               name: name
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "allocate NAME_OR_ALIAS",
@@ -413,8 +413,8 @@ module Crowbar
               name: name
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "role NAME_OR_ALIAS ROLE",
@@ -432,8 +432,8 @@ module Crowbar
               value: value
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "rename NAME_OR_ALIAS ALIAS",
@@ -451,8 +451,8 @@ module Crowbar
               value: value
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
 
         desc "transition NAME_OR_ALIAS STATE",
@@ -470,8 +470,8 @@ module Crowbar
               state: state
             )
           ).execute
-        rescue SimpleCatchableError => e
-          err e.message, 1
+        rescue => e
+          catch_errors(e)
         end
       end
     end