kytoon 1.4.1 → 1.4.2

data/CHANGELOG

@@ -1,3 +1,7 @@
+* Tue Aug 20 2013 Dan Prince <dprince@redhat.com> - 1.4.2
+  -Add --remote option to be used when listing remote CloudCue
+   groups.
+
 * Tue Aug 20 2013 Dan Prince <dprince@redhat.com> - 1.4.1
   -Add ability to list remote groups with CloudCue provider.
   -Test fixes for CloudCue.

data/VERSION

@@ -1 +1 @@
-1.4.1
+1.4.2

data/lib/kytoon/providers/cloud_cue/server_group.rb

@@ -238,7 +238,7 @@ class ServerGroup
     until online or (count*20) >= timeout.to_i do
       count+=1
       begin
-        sg=ServerGroup.get(:id => @id, :source => "remote")
+        sg=ServerGroup.get(:id => @id, :remote => true)
 
         online=true
         sg.servers.each do |server|
@@ -279,7 +279,7 @@ class ServerGroup
         server_group.pretty_print
       end
     end
-    sg=ServerGroup.get(:id => sg.id, :source => "remote")
+    sg=ServerGroup.get(:id => sg.id, :remote => true)
     sg.cache_to_disk
     puts "Server group online."
     sg
@@ -289,11 +289,10 @@ class ServerGroup
   # Get a server group. The following options are available:
   #
   # :id - The ID of the server group to get. Defaults to ENV['GROUP_ID']
-  # :source - valid options are 'cache' and 'remote'
+  # :remote - true or false
   def self.get(options={})
 
-    source = ENV['KYTOON_CLOUDCUE_SOURCE'] or options[:source]
-    source = 'cache' if source.nil? or source.empty?
+    remote = options[:remote] or false
     id = options[:id]
     if id.nil? then
       group = ServerGroup.most_recent
@@ -301,27 +300,24 @@ class ServerGroup
       id = group.id
     end
 
-    if source == "remote" then
+    if remote then
       xml=Connection.get("/server_groups/#{id}.xml")
       ServerGroup.from_xml(xml)
-    elsif source == "cache" then
+    else
       out_file = File.join(@@data_dir, "#{id}.xml")
       raise "No server group files exist." if not File.exists?(out_file)
       ServerGroup.from_xml(IO.read(out_file))
-    else
-      raise "Invalid get :source specified."
     end
 
   end
 
-  # :source - valid options are 'remote' and 'cache'
+  # :remote - true or false
   def self.index(options={})
 
-    source = ENV['KYTOON_CLOUDCUE_SOURCE'] or options[:source]
-    source = 'cache' if source.nil? or source.empty?
+    remote = options[:remote] or false
     server_groups=[]
 
-    if source == "remote" then
+    if remote then
       xml=Connection.get("/server_groups.xml")
       dom = REXML::Document.new(xml)
       REXML::XPath.each(dom, "//server-group") do |group_xml|

data/lib/kytoon/server_group.rb

@@ -52,9 +52,10 @@ class ServerGroup
     @@group_class.create(sg)
   end
 
-  def self.get(id=nil)
+  def self.get(id=nil, options={})
     self.init
-    @@group_class.get(:id => id)
+    options[:id] = id
+    @@group_class.get(options)
   end
 
   def self.delete(id=nil)

data/lib/kytoon/thor_tasks.rb

@@ -23,10 +23,11 @@ class ThorTasks < Thor
 
   desc "list", "List existing server groups."
   method_options :group_type => :string
+  method_options :remote => :boolean, :default => false
   def list(options=(options or {}))
     begin
       ServerGroup.init(options[:group_type])
-      ServerGroup.index()
+      ServerGroup.index({:remote => options[:remote]})
     rescue KytoonException => ke
       puts ke.message
       exit 1
@@ -36,10 +37,11 @@ class ThorTasks < Thor
   desc "show", "Print information for a server group."
   method_options :group_id => :string
   method_options :group_type => :string
+  method_options :remote => :boolean, :default => false
   def show(options=(options or {}))
     begin
       ServerGroup.init(options[:group_type])
-      sg = ServerGroup.get(options[:group_id])
+      sg = ServerGroup.get(options[:group_id], {:remote => options[:remote]})
       sg.pretty_print
     rescue KytoonException => ke
       puts ke.message
@@ -50,10 +52,11 @@ class ThorTasks < Thor
   desc "delete", "Delete a server group."
   method_options :group_id => :string
   method_options :group_type => :string
+  method_options :remote => :boolean, :default => false
   def delete(options=(options or {}))
     begin
       ServerGroup.init(options[:group_type])
-      sg = ServerGroup.get(options[:group_id])
+      sg = ServerGroup.get(options[:group_id], {:remote => options[:remote]})
       sg.delete
       SshUtil.remove_known_hosts_ip(sg.gateway_ip)
     rescue KytoonException => ke
@@ -65,10 +68,11 @@ class ThorTasks < Thor
   desc "ip", "Print the IP address of the gateway server"
   method_options :group_id => :string
   method_options :group_type => :string
+  method_options :remote => :boolean, :default => false
   def ip(options=(options or {}))
     begin
       ServerGroup.init(options[:group_type])
-      sg = ServerGroup.get(options[:group_id])
+      sg = ServerGroup.get(options[:group_id], {:remote => options[:remote]})
       puts sg.gateway_ip
     rescue KytoonException => ke
       puts ke.message
@@ -79,16 +83,22 @@ class ThorTasks < Thor
   desc "ssh", "SSH into a group."
   method_options :group_id => :string
   method_options :group_type => :string
+  method_options :remote => :boolean, :default => false
   def ssh(*)
     begin
       ServerGroup.init(options[:group_type])
       args=ARGV[1, ARGV.length].join(" ")
-      sg = ServerGroup.get(options[:group_id])
-      if (ARGV[1] and ARGV[1] =~ /^--group_id.*/) and (ARGV[2] and ARGV[2] =~ /^--group_id.*/)
-        args=ARGV[3, ARGV.length].join(" ")
-      elsif ARGV[1] and ARGV[1] =~ /^--group_id.*/
-        args=ARGV[2, ARGV.length].join(" ")
-      end
+      sg = ServerGroup.get(options[:group_id], {:remote => options[:remote]})
+      #if (ARGV[1] and ARGV[1] =~ /^--group_id.*/) and (ARGV[2] and ARGV[2] =~ /^--group_id.*/)
+        #args=ARGV[3, ARGV.length].join(" ")
+      #elsif ARGV[1] and ARGV[1] =~ /^--group_id.*/
+        #args=ARGV[2, ARGV.length].join(" ")
+      #end
+      arg_count = 1
+      arg_count +=1 if args =~ /--group_type/
+      arg_count +=1 if args =~ /--group_id/
+      arg_count +=1 if args =~ /--remote/
+      args=ARGV[arg_count, ARGV.length].join(" ")
       exec("ssh -o \"StrictHostKeyChecking no\" root@#{sg.gateway_ip} #{args}")
     rescue KytoonException => ke
       puts ke.message

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: kytoon
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.4.2
   prerelease: 
 platform: ruby
 authors:
@@ -283,7 +283,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3489483367199471003
+      hash: 1893588902202544719
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: