cloudstack-cli 0.5.4 → 0.5.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4fd382092e6b838e263390534e9ce894d76e74b
-  data.tar.gz: d97473fb465c269be305e4f6a24722503616dff9
+  metadata.gz: 5dfcca0f542e684213495618ed1c34536fd1490e
+  data.tar.gz: 9af0ffdc6f40c4894f27fccb44d71e097949664a
 SHA512:
-  metadata.gz: 9d192a430759b011154bc20d8f2a9290b810f30783b3d50e65569c68164ea66edaa1bf678d437a1b5e4d14418081bfa408ddad3016cdb96a5172ee89e8596eab
-  data.tar.gz: f27eaad931a0f977a63159b1cccf9f3074edcb526f6a3c6712914ec6ebd56de1d1740fedfa8829ec343fad065d556f650b8155902e5dc08bd64b2e1d5faad185
+  metadata.gz: 3aba197e1259357da8ca08a17129e401ceedb00afa8b6aefea6b801c795fffc659aee9ce6dc39ddecb2f4edc5a93f7af58ef44309b865a6ef0dbe57e7a64a294
+  data.tar.gz: 299ac9cc95acba6dc197ca1bb0215f2930f3aff8671fef1d60b48e8ab6b0fb79a5613ae0dac7a77a8dde9ab9bfe02f14aefcbd495b0e6d6276f0af3f6b73af97

data/Gemfile

@@ -3,3 +3,4 @@ source 'https://rubygems.org'
 # Specify your gem's dependencies in cloudstack-cli.gemspec
 gemspec
 
+gem 'cloudstack_client', git: 'git@github.com:niwo/cloudstack_client.git', branch: 'master'

data/Gemfile.lock

@@ -1,14 +1,20 @@
+GIT
+  remote: git@github.com:niwo/cloudstack_client.git
+  revision: 7b28996ead63220d04b36766651d734e28383f90
+  branch: master
+  specs:
+    cloudstack_client (0.3.6)
+
 PATH
   remote: .
   specs:
     cloudstack-cli (0.5.4)
-      cloudstack_client (~> 0.3)
+      cloudstack_client (>= 0.3.5)
       thor (~> 0.18)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    cloudstack_client (0.3.4)
     json (1.8.1)
     rake (10.1.1)
     rdoc (4.1.1)
@@ -20,5 +26,6 @@ PLATFORMS
 
 DEPENDENCIES
   cloudstack-cli!
+  cloudstack_client!
   rake (~> 10.1)
   rdoc (~> 4.1)

data/cloudstack-cli.gemspec

@@ -4,25 +4,26 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'cloudstack-cli/version'
 
 Gem::Specification.new do |gem|
-  gem.name          = "cloudstack-cli"
+  gem.name          = 'cloudstack-cli'
   gem.version       = CloudstackCli::VERSION
-  gem.authors       = ["Nik Wolfgramm"]
-  gem.email         = ["nik.wolfgramm@gmail.com"]
+  gem.authors       = ['Nik Wolfgramm']
+  gem.email         = %w(nik.wolfgramm@gmail.com)
   gem.description   = %q{cloudstack-cli is a CloudStack API client written in Ruby.}
   gem.summary       = %q{cloudstack-cli CloudStack API client}
-  gem.homepage      = "https://github.com/niwo/cloudstack-cli"
+  gem.date          = Time.now.utc.strftime("%Y-%m-%d")
+  gem.homepage      = 'https://github.com/niwo/cloudstack-cli'
   gem.license       = 'MIT'
 
   gem.required_ruby_version = '>= 1.9.3'
   gem.files         = `git ls-files`.split($/)
-  gem.executables   = ['cs']
+  gem.executables   = %w(cs)
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
-  gem.require_paths = ["lib"]
+  gem.require_paths = %w(lib)
   gem.rdoc_options  = %w[--line-numbers --inline-source]
 
   gem.add_development_dependency('rdoc', '~> 4.1')
   gem.add_development_dependency('rake', '~> 10.1')
   
   gem.add_dependency('thor', '~> 0.18')
-  gem.add_dependency('cloudstack_client', '~> 0.3')
+  gem.add_dependency('cloudstack_client', '~> 0.3', '>= 0.3.6')
 end

data/lib/cloudstack-cli/base.rb

@@ -30,7 +30,7 @@ module CloudstackCli
         )
       end
 
-      def load_configuration(config_file = options[:config], env = options[:environment])
+      def load_configuration(config_file = options[:config_file], env = options[:environment])
         unless File.exists?(config_file)
           say "Configuration file #{config_file} not found.", :red
           say "Please run \'cs setup\' to create one."

data/lib/cloudstack-cli/cli.rb

@@ -3,59 +3,29 @@ module CloudstackCli
     include Thor::Actions
 
     package_name "cloudstack-cli" 
-    map %w(-v --version) => :version
 
-    class_option :config,
+    class_option :config_file,
       default: File.join(Dir.home, '.cloudstack-cli.yml'),
       aliases: '-c',
       desc: 'location of your cloudstack-cli configuration file'
 
-    class_option :environment,
+    class_option :env,
       aliases: '-e',
-      desc: 'environment to load from the configuration file'
+      desc: 'environment to use'
 
     class_option :debug,
       desc: 'enable debug output',
       type: :boolean
 
-    desc "version", "outputs the cloudstack-cli version"
+    desc "version", "print cloudstack-cli version number"
     def version
-      say "cloudstack-cli v#{CloudstackCli::VERSION}"
+      say "cloudstack-cli version #{CloudstackCli::VERSION}"
     end
+    map %w(-v --version) => :version
 
-    desc "setup", "initial setup of the Cloudstack connection"
-    option :url
-    option :api_key
-    option :secret_key
-    def setup(file = options[:config])
-      config = {}
-      unless options[:url]
-        say "Configuring #{options[:environment] || 'default'} environment."
-        say "What's the URL of your Cloudstack API?", :yellow
-        say "Example: https://my-cloudstack-service/client/api/"
-        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 options[:environment]
-        config = {options[:environment] => config}
-      end
-      if File.exists? file
-        begin
-          old_config = YAML::load(IO.read(file))
-        rescue
-          error "Can't load configuration from file #{config_file}."
-          exit 1
-        end
-        say "Warning: #{file} already exists.", :red
-        exit unless yes?("Do you want to merge your settings? [y/N]", :red)
-        config = old_config.merge(config)
-      end
-      File.open(file, 'w+') {|f| f.write(config.to_yaml) }
+    desc "setup", "initial configuration of Cloudstack connection settings"
+    def setup
+      invoke "environment:add", :environment => options[:environment]
     end
 
     desc "command COMMAND [arg1=val1 arg2=val2...]", "run a custom api command"
@@ -72,8 +42,10 @@ module CloudstackCli
     Dir[File.dirname(__FILE__) + '/commands/*.rb'].each do |command| 
       require command
     end
-    
-    map :env => :environment
+
+    desc "environment SUBCOMMAND ...ARGS", "Manage cloudstack-cli environments"
+    subcommand :environment, Environment
+    map 'env' => :environment
     
     desc "zone SUBCOMMAND ...ARGS", "Manage zones"
     subcommand :zone, Zone

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

@@ -1,22 +1,72 @@
 class Environment < CloudstackCli::Base
 
   desc "list", "list cloudstack-cli environments"
-    def environments(file = options[:config])
-      config = {}
+  def list
+    config = parse_configfile(options[:config_file])
+    table = [%w(Name URL)]
+    table << ["default", config[:url]]
+    config.each_key do |key|
+      table << [key, config[key][:url]] unless key.class == Symbol
+    end
+    print_table table
+  end
+
+  desc "add", "add a new Cloudstack environment"
+  option :url
+  option :api_key
+  option :secret_key
+  def add(env = options[:environment])
+    config = {}
+    unless options[:url]
+      say "Add a new environment (#{env || 'default'})."
+      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}
+    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)
+      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
+  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
+  end
+
+  no_commands do
+
+    def parse_configfile(file)
       if File.exists? file
         begin
-          config = YAML::load(IO.read(file))
+          return YAML::load(IO.read(file))
         rescue
-          error "Can't load configuration from file #{config_file}."
+          say "Error loading configuration from file #{file}.", :red
           exit 1
         end
-        table = [%w(Name URL)]
-        table << ["default", config[:url]]
-        config.each_key do |key|
-          table << [key, config[key][:url]] unless key.class == Symbol
-        end
-        print_table table
+      else
+        say "Can't load configuration from file #{file}.", :red
+        exit 1
       end
     end
 
+  end
+
 end

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

@@ -1,12 +1,11 @@
 class Network < CloudstackCli::Base
 
   desc "list", "list networks"
-  option :project
-  option :account
-  option :zone
+  option :project, desc: 'the project name of the network'
+  option :account, desc: 'the owner of the network'
+  option :zone, desc: 'typehe name of the zone the network belongs to'
   option :type, desc: 'the type of the network'
-  option :showid, type: :boolean
-  option :isdefault, type: :boolean
+  option :showid, type: :boolean, desc: 'show the network id'
   def list
     project = find_project if options[:project]
     if options[:zone]
@@ -23,8 +22,8 @@ class Network < CloudstackCli::Base
     elsif options[:account]
       networks = client.list_networks(account: options[:account], zone_id: zone_id)
     else
-      networks = client.list_networks(isdefault: options[:isdefault], zone_id: zone_id)
-      networks += client.list_networks(project_id: -1, isdefault: options[:isdefault], zone_id: zone_id)
+      networks = client.list_networks(zone_id: zone_id)
+      networks += client.list_networks(project_id: -1, zone_id: zone_id)
     end
 
     if options[:type]

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

@@ -1,19 +1,29 @@
 class Volume < CloudstackCli::Base
 
   desc "list", "list volumes"
-  option :project
+  option :project, desc: 'list resources by project'
+  option :account, desc: 'list resources by account'
+  option :keyword, desc: 'list by keyword'
+  option :name, desc: 'name of the disk volume'
+  option :type, desc: 'type of disk volume (ROOT or DATADISK)'
   def list
-    projectid = find_project['id'] if options[:project]
-    volumes = client.list_volumes(projectid)
+    if options[:project]
+      projectid = find_project['id']
+      options[:project_id] = projectid if projectid
+    end
+    volumes = client.list_volumes(options)
     if volumes.size < 1
-      puts "No volumes found."
+      say "No volumes found."
     else
-      table = [["Name", "Type", "Size", "VM", "Storage", "Offeringname"]]
+      table = [%w(Name Type Size VM Storage Offeringname)]
       volumes.each do |volume|
-        table << [volume['name'], volume['type'],
+        table << [
+          volume['name'], volume['type'],
           (volume['size'] / 1024**3).to_s + 'GB',
           volume['vmname'],
-          volume['storage'], volume['diskofferingname']]
+          volume['storage'],
+          volume['diskofferingname']
+        ]
       end
       print_table(table)
     end

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.5.4"
+  VERSION = "0.5.5"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.5.4
+  version: 0.5.5
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-01-13 00:00:00.000000000 Z
+date: 2014-01-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
@@ -59,6 +59,9 @@ dependencies:
     - - "~>"
       - !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
@@ -66,6 +69,9 @@ dependencies:
     - - "~>"
       - !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.
 email:
 - nik.wolfgramm@gmail.com