cloudstack-cli 0.3.11 → 0.4.0

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: b11471c299adace0851b9aae26162928755ae80f
+  data.tar.gz: 09187a0c3bb5e5ffa504a9fc84811e8759d837c0
+SHA512:
+  metadata.gz: c50f031e9f05e41f419bcffcc27695b162680d43c54922fa7b20c3dc16c4a691bae62296c059c7869a702bf3bc2d45b9c19a128e5f3bb70af8b1834c5b8aecf6
+  data.tar.gz: ec8442e1444e4bca685896f0daf3f1f6d56710905c1d770ca86b919752daf58e82d7217ff9bd56530ea05951d959d3cad3f409c07b865d53ce3c089c5d02808b

data/Gemfile.lock

@@ -1,12 +1,14 @@
 PATH
   remote: .
   specs:
-    cloudstack-cli (0.3.11)
+    cloudstack-cli (0.4.0)
+      cloudstack_client (~> 0.2.10)
       thor (~> 0.18.1)
 
 GEM
   remote: https://rubygems.org/
   specs:
+    cloudstack_client (0.2.10)
     json (1.8.1)
     rake (10.0.4)
     rdoc (4.0.1)

data/bin/cs

@@ -1,6 +1,5 @@
 #!/usr/bin/env ruby
 
-require 'cloudstack_client'
-require 'cloudstack_cli'
+require 'cloudstack-cli'
 
 CloudstackCli::Cli.start(ARGV)

data/cloudstack-cli.gemspec

@@ -24,4 +24,5 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency('rake', '~> 10.0.4')
   
   gem.add_dependency('thor', '~> 0.18.1')
+  gem.add_dependency('cloudstack_client', '~> 0.2.10')
 end

data/lib/{cloudstack_cli.rb → cloudstack-cli.rb}

@@ -1,3 +1,5 @@
+require "cloudstack_client"
+
 require "cloudstack-cli/version"
 require "cloudstack-cli/helper"
 require "cloudstack-cli/base"

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

@@ -11,7 +11,9 @@ class Router < CloudstackCli::Base
   option :command, desc: "command to execute for each router: START or STOP"
   option :reverse, type: :boolean, default: false, desc: "reverse listing of routers"
   def list
-   	projectid = find_project['id'] if options[:project]
+    if options[:project]
+   	  projectid = options[:project] =~ /-1|all/ ? '-1' : find_project['id']
+    end
 		routers = client.list_routers(
 			{
 				account: options[:account], 

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.3.11"
+  VERSION = "0.4.0"
 end

metadata

@@ -1,36 +1,32 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.11
-  prerelease: 
+  version: 0.4.0
 platform: ruby
 authors:
 - Nik Wolfgramm
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-11-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -38,7 +34,6 @@ dependencies:
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -46,7 +41,6 @@ dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
@@ -54,11 +48,24 @@ dependencies:
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.18.1
+- !ruby/object:Gem::Dependency
+  name: cloudstack_client
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.10
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.10
 description: cloudstack-cli is a CloudStack API client written in Ruby.
 email:
 - nik.wolfgramm@gmail.com
@@ -74,6 +81,7 @@ files:
 - README.md
 - bin/cs
 - cloudstack-cli.gemspec
+- lib/cloudstack-cli.rb
 - lib/cloudstack-cli/base.rb
 - lib/cloudstack-cli/cli.rb
 - lib/cloudstack-cli/commands/account.rb
@@ -103,37 +111,11 @@ files:
 - lib/cloudstack-cli/commands/zone.rb
 - lib/cloudstack-cli/helper.rb
 - lib/cloudstack-cli/version.rb
-- lib/cloudstack-client/client.rb
-- lib/cloudstack-client/commands/account.rb
-- lib/cloudstack-client/commands/capacity.rb
-- lib/cloudstack-client/commands/cluster.rb
-- lib/cloudstack-client/commands/disk_offering.rb
-- lib/cloudstack-client/commands/domain.rb
-- lib/cloudstack-client/commands/host.rb
-- lib/cloudstack-client/commands/ip_address.rb
-- lib/cloudstack-client/commands/iso.rb
-- lib/cloudstack-client/commands/job.rb
-- lib/cloudstack-client/commands/load_balancer_rule.rb
-- lib/cloudstack-client/commands/network.rb
-- lib/cloudstack-client/commands/pod.rb
-- lib/cloudstack-client/commands/port_forwarding_rule.rb
-- lib/cloudstack-client/commands/project.rb
-- lib/cloudstack-client/commands/router.rb
-- lib/cloudstack-client/commands/server.rb
-- lib/cloudstack-client/commands/service_offering.rb
-- lib/cloudstack-client/commands/snapshot.rb
-- lib/cloudstack-client/commands/ssh_key_pair.rb
-- lib/cloudstack-client/commands/template.rb
-- lib/cloudstack-client/commands/user.rb
-- lib/cloudstack-client/commands/volume.rb
-- lib/cloudstack-client/commands/zone.rb
-- lib/cloudstack-client/version.rb
-- lib/cloudstack_cli.rb
-- lib/cloudstack_client.rb
 - test/stack_example.json
 homepage: https://bitbucket.org/swisstxt/cloudstack-cli
 licenses:
 - MIT
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --line-numbers
@@ -141,22 +123,20 @@ rdoc_options:
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.23
+rubygems_version: 2.0.3
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: cloudstack-cli CloudStack API client
 test_files:
 - test/stack_example.json

data/lib/cloudstack-client/client.rb

@@ -1,136 +0,0 @@
-require 'base64'
-require 'openssl'
-require 'uri'
-require 'cgi'
-require 'net/http'
-require 'net/https'
-require 'json'
-require 'yaml'
-
-module CloudstackClient
-  class Connection
-
-    @@async_poll_interval = 2.0
-    @@async_timeout = 400
-
-    # include all commands
-    Dir.glob(File.dirname(__FILE__) + "/commands/*.rb").each do |file| 
-      require file
-      module_name = File.basename(file, '.rb').split('_').map{|f| f.capitalize}.join
-      include Object.const_get("CloudstackClient").const_get(module_name)
-    end
-
-    attr_accessor :verbose
-
-    def initialize(api_url, api_key, secret_key, opts = {})
-      @api_url = api_url
-      @api_key = api_key
-      @secret_key = secret_key
-      @use_ssl = api_url.start_with? "https"
-      @verbose = opts[:quiet] ? false : true
-      @debug = opts[:debug] ? true : false
-    end
-
-    ##
-    # Sends a synchronous request to the CloudStack API and returns the response as a Hash.
-    #
-    # The wrapper element of the response (e.g. mycommandresponse) is discarded and the
-    # contents of that element are returned.
-
-    def send_request(params)
-      params['response'] = 'json'
-      params['apiKey'] = @api_key
-
-      params_arr = []
-      params.sort.each { |elem|
-        params_arr << elem[0].to_s + '=' + CGI.escape(elem[1].to_s).gsub('+', '%20').gsub(' ','%20')
-      }
-
-      debug_output JSON.pretty_generate(params) if @debug
-
-      data = params_arr.join('&')
-      signature = OpenSSL::HMAC.digest('sha1', @secret_key, data.downcase)
-      signature = Base64.encode64(signature).chomp
-      signature = CGI.escape(signature)
-
-      url = "#{@api_url}?#{data}&signature=#{signature}"
-
-      uri = URI.parse(url)
-      http = Net::HTTP.new(uri.host, uri.port)
-      http.use_ssl = @use_ssl
-      http.verify_mode = OpenSSL::SSL::VERIFY_NONE
-
-      begin
-        response = http.request(Net::HTTP::Get.new(uri.request_uri))
-      rescue
-        puts "Error connecting to API:"
-        puts "#{@api_url} is not reachable"
-        exit 1
-      end
-
-      if !response.is_a?(Net::HTTPOK)
-        puts "Error #{response.code}: #{response.message}"
-        puts JSON.pretty_generate(JSON.parse(response.body))
-        puts "URL: #{url}"
-        exit 1
-      end
-
-      begin 
-        json = JSON.parse(response.body)
-      rescue JSON::ParserError
-        puts "Error parsing response from server."
-        exit 1
-      end
-      json[params['command'].downcase + 'response']
-    end
-
-    ##
-    # Sends an asynchronous request and waits for the response.
-    #
-    # The contents of the 'jobresult' element are returned upon completion of the command.
-
-    def send_async_request(params)
-
-      json = send_request(params)
-
-      params = {
-          'command' => 'queryAsyncJobResult',
-          'jobId' => json['jobid']
-      }
-
-      max_tries = (@@async_timeout / @@async_poll_interval).round
-      max_tries.times do
-        json = send_request(params)
-        status = json['jobstatus']
-
-        print "." if @verbose
-
-        if status == 1
-          return json['jobresult']
-        elsif status == 2
-          puts
-          puts "Request failed (#{json['jobresultcode']}): #{json['jobresult']}"
-          exit 1
-        end
-
-        STDOUT.flush
-        sleep @@async_poll_interval
-      end
-
-      print "\n"
-      puts "Error: Asynchronous request timed out"
-      exit 1
-    end
-
-    private
-
-    def debug_output(output, seperator = '-' * 80)
-      puts
-      puts seperator 
-      puts output
-      puts seperator
-      puts
-    end
-
-  end # class
-end

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

@@ -1,22 +0,0 @@
-module CloudstackClient
-
-	module Account
-
-		##
-    # Lists accounts.
-
-    def list_accounts(args = { :name => nil })
-      params = {
-        'command' => 'listAccounts',
-        'listall' => 'true',
-        'isrecursive' => 'true'
-      }
-      params['name'] = args[:name] if args[:name]
-
-      json = send_request(params)
-      json['account'] || []
-    end
-
-	end
-
-end

data/lib/cloudstack-client/commands/capacity.rb

@@ -1,19 +0,0 @@
-module CloudstackClient
-
-	module Capacity
-
-		##
-    # List capacity.
-
-    def list_capacity(args = {})
-      params = {
-        'command' => 'listCapacity',
-      }
-
-      json = send_request(params)
-      json['capacity'] || []
-    end
-
-	end
-
-end

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

@@ -1,19 +0,0 @@
-module CloudstackClient
-
-	module Cluster
-
-		##
-    # Lists clusters.
-
-    def list_clusters(args = {})
-      params = {
-        'command' => 'listClusters',
-      }
-
-      json = send_request(params)
-      json['cluster'] || []
-    end
-
-	end
-
-end

data/lib/cloudstack-client/commands/disk_offering.rb

@@ -1,49 +0,0 @@
-module CloudstackClient
-
-	module DiskOffering
-
-		##
-    # Lists all available disk offerings.
-
-    def list_disk_offerings(domain = nil)
-      params = {
-          'command' => 'listDiskOfferings'
-      }
-
-      if domain
-        params['domainid'] = list_domains(domain).first["id"]
-      end
-
-      json = send_request(params)
-      json['diskoffering'] || []
-    end
-
-    ##
-    # Get disk offering by name.
-
-    def get_disk_offering(name)
-
-      # TODO: use name parameter
-      # listServiceOfferings in CloudStack 2.2 doesn't seem to work
-      # when the name parameter is specified. When this is fixed,
-      # the name parameter should be added to the request.
-      params = {
-          'command' => 'listDiskOfferings'
-      }
-      json = send_request(params)
-
-      services = json['diskoffering']
-      return nil unless services
-
-      services.each { |s|
-        if s['name'] == name then
-          return s
-        end
-      }
-      nil
-    end
-
-
-	end
-
-end