cloudstack-cli 0.3.3 → 0.3.4

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cloudstack-cli (0.3.2)
+    cloudstack-cli (0.3.3)
       thor (~> 0.18.1)
 
 GEM

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

@@ -4,6 +4,7 @@ class Iso < CloudstackCli::Base
   option :project
   option :zone
   option :account
+  option :listall
   def list(type='featured')
     project = find_project if options[:project]
     unless %w(featured self self-executable executable community).include? type

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

@@ -15,8 +15,8 @@ class Stack < CloudstackCli::Base
             template: server["template"],
             iso: server["iso"] ,
             offering: server["offering"],
-            networks: server["networks"] ? server["networks"].split(', ') : nil,
-            port_rules: server["port_rules"] ? server["port_rules"].split(', ') : nil,
+            networks: string_to_array(server["networks"]),
+            port_rules: string_to_array(server["port_rules"]),
             project: stack["project"],
             disk_offering: server["disk_offering"],
             disk_size: server["disk_size"],
@@ -57,6 +57,10 @@ class Stack < CloudstackCli::Base
         exit
       end
     end
+
+    def string_to_array(string)
+      string ? string.gsub(', ', ',').split(', ') : nil
+    end
   end
 
 end

data/lib/cloudstack-cli/helper.rb

@@ -37,7 +37,6 @@ module CloudstackCli
           end
           t.join
         else
-          print ("\r" + "\e[A\e[K" * (status.size + 1)) if call > 0
           chars = print_job_status(jobs, status, chars,
             call == 0 ? opts.merge(no_clear: true) : opts
           )
@@ -77,20 +76,25 @@ module CloudstackCli
       end
 
       if args[:port_rules] && args[:port_rules].size > 0
-        frontendip = nil
-        args[:port_rules].each do |pf_rule|
-          ip = pf_rule.split(":")[0]
-          if ip != ''
-            ip_addr = client.get_public_ip_address(ip)
-          else
-            ip_addr = frontendip ||= client.associate_ip_address(
-              server["nic"].first["networkid"]
-            )
-          end
-          port = pf_rule.split(":")[1]
-          say "Create port forwarding rule #{ip_addr['ipaddress']}:#{port} for server #{args[:name]}.", :yellow
-          client.create_port_forwarding_rule(ip_addr["id"], port, 'TCP', port, server["id"])
+        create_port_rules(server, args[:port_rules])
+      end
+      server
+    end
+
+    def create_port_rules(server, port_rules)
+      frontendip = nil
+      port_rules.each do |pf_rule|
+        ip = pf_rule.split(":")[0]
+        if ip != ''
+          ip_addr = client.get_public_ip_address(ip)
+        else
+          ip_addr = frontendip ||= client.associate_ip_address(
+            server["nic"].first["networkid"]
+          )
         end
+        port = pf_rule.split(":")[1]
+        say "Create port forwarding rule #{ip_addr['ipaddress']}:#{port} for server #{server["name"]}.", :yellow
+        client.create_port_forwarding_rule(ip_addr["id"], port, 'TCP', port, server["id"])
       end
     end
 

data/lib/cloudstack-cli/version.rb

@@ -1,3 +1,3 @@
 module CloudstackCli
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

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

@@ -17,10 +17,14 @@ module CloudstackClient
       filter = args[:filter] || 'featured'
       params = {
           'command' => 'listIsos',
-          'templateFilter' => filter
+          'isoFilter' => filter
       }
       params['projectid'] = args[:project_id] if args[:project_id]
       params['zoneid'] = args[:zone_id] if args[:zone_id]
+      if args[:listall]
+        params['listall'] = true
+        params['isrecursive'] = true
+      end
       
       json = send_request(params)
       json['iso'] || []
@@ -37,7 +41,7 @@ module CloudstackClient
       # the name parameter should be added to the request.
       params = {
           'command' => 'listIsos',
-          'templateFilter' => 'executable'
+          'isoFilter' => 'executable'
       }
       json = send_request(params)
 

data/lib/cloudstack-client/version.rb

@@ -1,3 +1,3 @@
 module CloudstackClient
-  VERSION = "0.2.4"
+  VERSION = "0.2.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: cloudstack-cli
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-08-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rdoc