dimension_shell 0.2.3 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce97af921d3a8a8c3d71d51ba80f39d61a3426d3
-  data.tar.gz: a81bab1d793c360be860f8997b915eb7d4a9e68f
+  metadata.gz: 8a3649b982ea2c25c35ca9c4ab65b595cc591312
+  data.tar.gz: e2758771f3f09bab789316d94449899c4c343f43
 SHA512:
-  metadata.gz: 970195cfc4fefc7dc4241d9f821989b1a4ea3e8467c5017f7df5db9842bd2840c40a3e73ae74b8c3e5df40d06f7a364327118651b8e632bb70f74978a12ca32a
-  data.tar.gz: 18292d7800a7f203268209bb527d29cbc7125da549a4f6153a41f15cb02ceb53d491b643505a8459832a6f3c1edc8cc7d2afdebeb1ef6e248701d0d84e85e3b2
+  metadata.gz: 8b115091ff58261551a0aefeece15826d36e02c9a1458643e9fab25709403b9acf7bd77d63c2dd83d30378ff1086b186ea922bb999bdba004ca78f9eff550653
+  data.tar.gz: a5b491b8d1fba2bbc9ec355aeec1630af1f5bbdc394593237672dcabf977db57d43304a89e9545a89afb3c653755fdb381c0cc320404d25a4a052c86b20b405f

data/CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 
-## 0.2.3 Linked gem-home to Github-repo, added example to README
-## 0.2.2 Initial commit
-
- - Hooray! :candy:
+ - 0.3.0 Added `list` command
+    - Added `list` command, which lists the first 250 servers for the given region.
+    - Added ssh-username to establishing connection-announcement.
+    - Internal improvements
+ - 0.2.3 Linked gem-home to Github-repo, added example to README
+ - 0.2.2 Initial commit
+    - Hooray! :candy:

data/README.md

@@ -11,21 +11,38 @@ root@2a00:33a0:47c0:110:1211:468:ac2d:62de:191f's password: *
 
 ## Usage
 
+### Connect
+
 ```
 $ dsh connect SERVERNAME -r REGION -o ORGANIZATION -u USERNAME -p PASSWORD -s SHELL_USER
 ```
 
-Connects to the dimensiondata-API at the specified REGION with the ORGANIZATION-id, USERNAME and PASSWORD to fetch all servers matching to SERVERNAME.
+Connects to the DimensionData-API at the specified REGION with the ORGANIZATION-id, USERNAME and PASSWORD to fetch all servers matching to SERVERNAME.
 
 If a matching server is found, its primary ipv6-address is taken to open a ssh-connection with the provided SHELL_USER.
 
 If the SHELL_USER is omitted, the connection will be established as `root`.
 
-### Region
+### list
+
+```
+$ dsh list -r REGION -o ORGANIZATION -u USERNAME -p PASSWORD
+```
+
+Connects to the DimensionData-API at the specified Region with the ORGANIZATION-id, USERNAME and PASSWORD to fetch a list of all servers at the given region.
+
+If the API-call is successful the returned servernames will be printed, followed by their operating system and their current state:
+
+``
+super-server (UBUNTU12/64) - NORMAL
+1 server/s in total.
+``
+
+#### Region
 
 The region-code is expanded to the subdomain `api-REGION`, f.e. the region-code `eu` is expanded to `https://api-eu.dimensiondata.com`.
 
-According to the API-documentation the following region-codes are accepted:
+According to the API-documentation the following region-codes will be accepted by the API:
 
 ```
  na: North America
@@ -60,6 +77,7 @@ Install it via Rubygems.org:
 ```
 $ gem install dimension_shell
 ```
+
 # Help
 
 File an issue - pull-requests are welcome.

data/lib/dimension_shell/cli.rb

@@ -7,35 +7,51 @@ require 'dimension_shell/cloud_control'
 
 module DimensionShell
   class Cli < Thor
+    default_options = {
+      %w(region -r) => :string,
+      %w(organization -o) => :string,
+      %w(username -u) => :string,
+      %w(password -p) => :string,
+    }
 
-    desc 'connect SERVERNAME', 'really connects to the server called SERVERNAME'
-    option :region,       type: :string,  aliases: :r
-    option :organization, type: :string,  aliases: :o
-    option :username,     type: :string,  aliases: :u
-    option :password,     type: :string,  aliases: :p
-    option :shell_user,   type: :string,  aliases: :s
+    desc 'connect SERVERNAME', 'connects to the server called SERVERNAME'
+    options default_options
+    option :shell_user, type: :string, aliases: '-s'
     def connect(servername)
-      _initialize_configuration
+      _init_command(options)
       shell_user = options[:shell_user] || configatron.shell_user || 'root'
-      @cloud_control = CloudControl.new({
-          region:       options[:region]       || configatron.region,
-          organization: options[:organization] || configatron.organization,
-          username:     options[:username]     || configatron.username,
-          password:     options[:password]     || configatron.password
-        })
+
       result = @cloud_control.get_server servername
-      if result[:reason] then
-        puts %Q(dsh: API access failed: #{result[:reason]})
+
+      if result[:failure] then
+        _api_access_failed result
       elsif result['totalCount'] != 1 then
-        puts %Q(dsh: No servername matched to "#{servername}".)
+        _puts %Q(No servername matched to "#{servername}".)
       else
         server = result['server'].first
         primary_ipv6 = server['networkInfo']['primaryNic']['ipv6']
-        puts "dsh: Server \"#{servername}\" found, opening secure shell to #{primary_ipv6}."
+        puts "Server \"#{servername}\" found, opening secure shell to #{shell_user}@#{primary_ipv6}."
         Kernel.exec("ssh #{shell_user}@#{primary_ipv6}")
       end
     end
 
+    desc 'list', 'lists all server available in the given region'
+    options default_options
+    def list
+      _init_command(options)
+
+      result = @cloud_control.get_server_list
+
+      if result[:failure] then
+        _api_access_failed result
+      else
+        result['server'].each { |server|
+          puts "#{server['name']} (#{server['operatingSystem']['displayName']}) - #{server['state']}"
+        }
+        puts %Q(#{result['totalCount']} server/s in total.)
+      end
+    end
+
   private
     def _get_config_path
       File.join(Dir.home, 'dsh.yml')
@@ -49,9 +65,27 @@ module DimensionShell
       end
     end
 
-    def _initialize_configuration
+    def _init_configuration
       configatron.configure_from_hash(_load_config_hash)
     end
+
+    def _init_command(options)
+      _init_configuration
+      @cloud_control = CloudControl.new({
+          region:       options[:region]       || configatron.region,
+          organization: options[:organization] || configatron.organization,
+          username:     options[:username]     || configatron.username,
+          password:     options[:password]     || configatron.password
+        })
+    end
+
+    def _puts(*args)
+      puts args.unshift('dsh: ').join()
+    end
+
+    def _api_access_failed(result)
+      _puts %Q(API access failed: #{result[:failure]})
+    end
   end
 
   DimensionShell::Cli.start

data/lib/dimension_shell/cloud_control.rb

@@ -12,12 +12,11 @@ module DimensionShell
     end
 
     def get_server(servername)
-      response = _invoke_get path: 'server/server', query: { name: servername }
-      if response.ok? then
-        JSON.parse(response.body)
-      else
-        { reason: "#{response.status.to_s} - #{response.reason.to_s}" }
-      end
+      _invoke_get path: 'server/server', query: { name: servername }
+    end
+
+    def get_server_list
+      _invoke_get path: 'server/server'
     end
 
   private
@@ -46,7 +45,13 @@ module DimensionShell
       client = HTTPClient.new(default_header: header, force_basic_auth: true)
       client.set_auth _api_base_uri, @username, @password
       #puts "Fetching url \"#{_api_domain(options[:path])}\""
-      client.get(_api_domain(options[:path]), :query => options[:query])
+      response = client.get(_api_domain(options[:path]), :query => options[:query])
+
+      if response.ok? then
+        JSON.parse(response.body)
+      else
+        { failure: "#{response.status.to_s} - #{response.reason.to_s}" }
+      end
     end
   end
 end

data/lib/dimension_shell/version.rb

@@ -1,3 +1,3 @@
 module DimensionShell
-  VERSION = "0.2.3"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dimension_shell
 version: !ruby/object:Gem::Version
-  version: 0.2.3
+  version: 0.3.0
 platform: ruby
 authors:
 - Florian Breisch
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-12-22 00:00:00.000000000 Z
+date: 2016-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,7 +53,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.9.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="