cloudstack-cli 0.5.8 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1b80bad1dfc75be88c1e41485ba830238d3e6905
-  data.tar.gz: 75a02bf7304b5a57b2eea1a1cf7d994ace7a8b62
+  metadata.gz: a83e808e4d6c14b9b83212dcc08626703a0955a6
+  data.tar.gz: 758f54540afe222f8a3e7d81b079c34cd2f40b75
 SHA512:
-  metadata.gz: f3f1b99c24a31e4fb4cf689ebd336c61df93ffe1766a059df7f81ca0411f0d47e2f40d9fdad32155469c97f264bea9fe8e61199043667c80ffbcf8060cf42ba0
-  data.tar.gz: 8ddceb29263913e464bb9f6b0b55b8a452a3fb9a072ff7cedcb21aa54e088779273a5f13cbfe19a97c319318be18a8000b257b35ddf4a0fe5e05d17cfcd73099
+  metadata.gz: b4c060f6132b9cb05a40c066eab6f59f1bb9370ef6056a629b1e3e289ac84381bfe3fe68d700a80fe7861e524e5dd60e26cd886a19539a09e1fdb63ae1420d2d
+  data.tar.gz: 83475400d4d05965c10a3ec8bb8636e29a31c5653149181c3a2760ec3e65d099d268f1e40fc5a0f0f7cce196d5837bf2ce0696388185fa6b626bc175cf8944ba

data/Gemfile.lock

@@ -8,7 +8,7 @@ GIT
 PATH
   remote: .
   specs:
-    cloudstack-cli (0.5.8)
+    cloudstack-cli (0.6.0)
       cloudstack_client (~> 0.3, >= 0.3.6)
       thor (~> 0.18)
 

data/lib/cloudstack-cli/base.rb

@@ -30,22 +30,24 @@ module CloudstackCli
         )
       end
 
-      def load_configuration(config_file = options[:config_file], env = options[:environment])
+      def load_configuration(config_file = options[:config_file], env = options[:env])
         unless File.exists?(config_file)
           say "Configuration file #{config_file} not found.", :red
           say "Please run \'cs setup\' to create one."
           exit 1
         end
+
         begin
           config = YAML::load(IO.read(config_file))
         rescue
-          error "Can't load configuration from file #{config_file}."
+          say "Can't load configuration from file #{config_file}.", :red
           exit 1
         end
+        
+        env ||= config[:default]
         if env
-          config = config[env]
-          unless config
-            error "Can't find environment #{env} in configuration file."
+          unless config = config[env]
+            say "Can't find environment #{env}.", :red
             exit 1
           end
         end

data/lib/cloudstack-cli/commands/account.rb

@@ -17,6 +17,7 @@ class Account < CloudstackCli::Base
         table << [account['name'], TYPES[account['accounttype']], account['domain']]
       end
       print_table table
+      say "Total number of accounts: #{accounts.size}"
     end
   end
   

data/lib/cloudstack-cli/commands/cluster.rb

@@ -14,6 +14,7 @@ class Cluster < CloudstackCli::Base
         ]
       end
       print_table table
+      say "Total number of clusters: #{clusters.size}"
     end
   end
 

data/lib/cloudstack-cli/commands/compute_offer.rb

@@ -17,6 +17,7 @@ class ComputeOffer < CloudstackCli::Base
         ]
       end
       print_table table
+      say "Total number of offerings: #{offerings.size}"
     end
   end
 

data/lib/cloudstack-cli/commands/disk_offer.rb

@@ -17,6 +17,7 @@ class DiskOffer < CloudstackCli::Base
         ]
       end
       print_table table
+      say "Total number of offerings: #{offerings.size}"
     end
   end
 end

data/lib/cloudstack-cli/commands/domain.rb

@@ -11,6 +11,7 @@ class Domain < CloudstackCli::Base
         table << [domain['name'], domain['path']]
       end
       print_table table
+      say "Total number of domains: #{domains.size}"
     end
   end
   

data/lib/cloudstack-cli/commands/environment.rb

@@ -2,11 +2,13 @@ class Environment < CloudstackCli::Base
 
   desc "list", "list cloudstack-cli environments"
   def list
-    config = parse_configfile(options[:config_file])
-    table = [%w(Name URL)]
-    table << ["default", config[:url]]
+    config = parse_config_file
+    table = [%w(Name URL Default)]
+    table << ['-', config[:url], !config[:default]]
     config.each_key do |key|
-      table << [key, config[key][:url]] unless key.class == Symbol
+      unless key.class == Symbol
+        table << [key, config[key][:url], key == config[:default]]
+      end
     end
     print_table table
   end
@@ -15,54 +17,98 @@ class Environment < CloudstackCli::Base
   option :url
   option :api_key
   option :secret_key
+  option :default, type: :boolean
   def add(env = options[:environment])
     config = {}
     unless options[:url]
-      say "Add a new environment (#{env || 'default'})."
+      say "Add a new environment...", :green
+      say "Environment name: #{env}" if env
       say "What's the URL of your Cloudstack API?", :yellow
       say "Example: https://my-cloudstack-service/client/api/", :green
       config[:url] = ask("URL:", :magenta)
     end
+    
     unless options[:api_key]
       config[:api_key] = ask("API Key:", :magenta)
     end
+    
     unless options[:secret_key]
       config[:secret_key] = ask("Secret Key:", :magenta)
     end
+    
     if env
       config = {env => config}
+      config[:default] = env if options[:default]
     end
+    
     if File.exists? options[:config_file]
-      old_config = parse_configfile(options[:config_file])
-      say "Warning: #{options[:config_file]} already exists.", :red
-      exit unless yes?("Do you want to merge your settings? [y/N]", :red)
+      newfile = true
+      old_config = parse_config_file
+      if !env || old_config.has_key?(env)
+        say "This environment already exists!", :red
+        exit unless yes?("Do you want to override your settings? [y/N]", :yellow)
+      end
       config = old_config.merge(config)
     end
-    File.open(options[:config_file], 'w+') {|f| f.write(config.to_yaml) }
-    say "OK, config-file written to #{options[:config_file]}.", :green
+
+    write_config_file(config)
+    if newfile
+      say "OK. Created configuration file at #{options[:config_file]}.", :green
+    else
+      say "Added environment #{env}", :green
+    end
   end
 
   desc "delete", "delete a Cloudstack connection"
-  def delete(name)
-    config = parse_configfile(options[:config_file])
-    exit unless yes?("Do you really want delete environment #{name}? [y/N]", :red)
-    config.delete(name)
-    File.open(options[:config_file], 'w+') {|f| f.write(config.to_yaml) }
-    say "OK.", :green
+  def delete(env)
+    config = parse_config_file
+    if config.delete(env)
+      exit unless yes?("Do you really want to delete environment #{env}? [y/N]", :yellow)
+      config.delete :default if config[:default] == env
+      write_config_file(config)
+      say "OK.", :green
+    else
+      say "Environment #{env} does not exist.", :red
+    end
+  end
+
+  desc "default ENV", "set the default environment"
+  def default(env)
+    config = parse_config_file
+    if env == '-'
+      config.delete :default
+    else
+      unless config.has_key?(env)
+        say "Environment #{env} does not exist.", :red
+        exit 1
+      end
+      config[:default] = env
+    end
+    write_config_file(config)
+    say "Default environment set to #{env}."
   end
 
   no_commands do
 
-    def parse_configfile(file)
-      if File.exists? file
+    def parse_config_file
+      if File.exists? options[:config_file]
         begin
-          return YAML::load(IO.read(file))
+          return YAML::load(IO.read(options[:config_file]))
         rescue
-          say "Error loading configuration from file #{file}.", :red
+          say "Error loading configuration from file #{options[:config_file]}.", :red
           exit 1
         end
       else
-        say "Can't load configuration from file #{file}.", :red
+        say "Can't load configuration from file #{options[:config_file]}.", :red
+        exit 1
+      end
+    end
+
+    def write_config_file(config)
+      begin
+        return File.open(options[:config_file], 'w+') {|f| f.write(config.to_yaml) }
+      rescue
+        say "Can't open configuration file #{options[:config_file]} for writing.", :red
         exit 1
       end
     end

data/lib/cloudstack-cli/commands/host.rb

@@ -14,6 +14,7 @@ class Host < CloudstackCli::Base
         ]
       end
       print_table table
+      say "Total number of hosts: #{hosts.size}"
     end
   end
 

data/lib/cloudstack-cli/commands/ip_address.rb

@@ -32,6 +32,7 @@ class IpAddress < CloudstackCli::Base
         table << [address["ipaddress"], address["account"], address["zonename"]]
       end
       print_table table
+      say "Total number of addresses: #{addresses.size}"
     end
   end
 

data/lib/cloudstack-cli/commands/iso.rb

@@ -25,6 +25,7 @@ class Iso < CloudstackCli::Base
         table <<  [iso['name'], iso['zonename'], iso['bootable']]
       end
       print_table(table)
+      say "Total number of isos: #{isos.size}"
     end
   end
 

data/lib/cloudstack-cli/commands/load_balancer.rb

@@ -15,6 +15,7 @@ class LoadBalancer < CloudstackCli::Base
         table << [rule['name'], rule['publicip'], rule['publicport']]
       end
       print_table table
+      say "Total number of rules: #{rules.count}"
     end
   end
 

data/lib/cloudstack-cli/commands/network.rb

@@ -51,6 +51,7 @@ class Network < CloudstackCli::Base
         table[-1] << network["vlan"] if options[:showvlan]
       end
       print_table table
+      say "Total number of networks: #{networks.count}"
     end
   end
 

data/lib/cloudstack-cli/commands/physical_network.rb

@@ -19,6 +19,7 @@ class PhysicalNetwork < CloudstackCli::Base
         ]
       end
       print_table table
+      say "Total number of networks: #{networks.count}"
     end
   end
 

data/lib/cloudstack-cli/commands/pod.rb

@@ -14,6 +14,7 @@ class Pod < CloudstackCli::Base
         ]
       end
       print_table table
+      say "Total number of pods: #{pods.count}"
     end
   end
 

data/lib/cloudstack-cli/commands/port_rule.rb

@@ -55,6 +55,7 @@ class PortRule < CloudstackCli::Base
         ]
       end
       print_table table
+      say "Total number of rules: #{rules.count}"
     end
   end
 

data/lib/cloudstack-cli/commands/project.rb

@@ -24,6 +24,7 @@ class Project < CloudstackCli::Base
         table << [project['name'], project['displaytext'], project['domain']]
       end
       print_table(table)
+      say "Total number of projects: #{projects.count}"
     end
   end
   

data/lib/cloudstack-cli/commands/router.rb

@@ -161,7 +161,7 @@ class Router < CloudstackCli::Base
         end
         print_table table
         puts
-        say "Number of routers: #{routers.size}"
+        say "Total number of routers: #{routers.size}"
       end
     end
   end

data/lib/cloudstack-cli/commands/snapshot.rb

@@ -18,6 +18,7 @@ class Snapshot < CloudstackCli::Base
         ]
       end
       print_table table
+      say "Total number of snapshots: #{snapshots.size}"
     end
   end
 

data/lib/cloudstack-cli/commands/template.rb

@@ -16,13 +16,14 @@ class Template < CloudstackCli::Base
       zone_id: zone ? zone['id'] : nil
     )
     if templates.size < 1
-      puts "No templates found"
+      puts "No templates found."
     else
       table = [["Name", "Zone", "Format"]]
       templates.each do |template|
         table <<  [template['name'], template['zonename'], template['format']]
       end
       print_table(table)
+      say "Total number of templates: #{templates.size}"
     end
   end
 

data/lib/cloudstack-cli/commands/user.rb

@@ -22,6 +22,7 @@ class User < CloudstackCli::Base
         ]
       end
       print_table table
+      say "Total number of users: #{users.size}"
     end
   end
   

data/lib/cloudstack-cli/commands/volume.rb

@@ -23,6 +23,7 @@ class Volume < CloudstackCli::Base
         ]
       end
       print_table(table)
+      say "Total number of volumes: #{volumes.size}"
     end
   end
 

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.5.8"
+  VERSION = "0.6.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.8
+  version: 0.6.0
 platform: ruby
 authors:
 - Nik Wolfgramm
@@ -14,62 +14,62 @@ dependencies:
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '4.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '10.1'
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.18'
 - !ruby/object:Gem::Dependency
   name: cloudstack_client
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: '0.3'
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 0.3.6
 description: cloudstack-cli is a CloudStack API client written in Ruby.
@@ -80,7 +80,7 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
+- ".gitignore"
 - Gemfile
 - Gemfile.lock
 - LICENSE.txt
@@ -125,23 +125,23 @@ licenses:
 metadata: {}
 post_install_message: 
 rdoc_options:
-- --line-numbers
-- --inline-source
+- "--line-numbers"
+- "--inline-source"
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.3
+rubygems_version: 2.2.0
 signing_key: 
 specification_version: 4
 summary: cloudstack-cli CloudStack API client