scli 0.0.5 → 0.0.6

data/lib/plugins/detach-volume.rb

@@ -2,13 +2,14 @@ module Scli
   def self.detvol
     cli = MyCLI.new
     cli.parse_options
-    volume_id = cli.config[:volume_id]
+    volume_id = cli.config[:volume_id] || ARGV[1]
     instance_id = cli.config[:instance_id]
-    if volume_id.nil? || instance_id.nil?
-      puts "Instance and volume id's are required, please retry."
+    if volume_id.nil?
+      puts "Volume ID is required, please retry."
     else
-      server = Scli::Compute.new.servers.get(instance_id)
       volume = Scli::Storage.new.volumes.get(volume_id)
+      instance_id = volume.instance_id if instance_id.nil?
+      server = Scli::Compute.new.servers.get(instance_id)
       if server.nil?
         puts "Could not find server: #{instance_id}"
       elsif volume.nil?
@@ -26,4 +27,4 @@ module Scli
   end
 end
 
-PLUGINS << ["detvol", "detach-volume", "Volume ID (Req -v), Instance ID (Req -i)", "scli detvol -i 123456 -v 23456"]
+PLUGINS << ["detvol", "detach-volume", "Volume ID (Req -v), Instance ID (Opt -i)", "scli detvol 23456"]

data/lib/plugins/terminate-instance.rb

@@ -21,4 +21,4 @@ module Scli
   end
 end
 
-PLUGINS << ["tin", "terminate-instance", "Instance ID (Req -i)", "scli tin 123456"]
+PLUGINS << ["tin", "terminate-instance", "Instance ID (Req -i)", "scli tin 123456"]

data/lib/scli.rb

@@ -76,7 +76,7 @@ class MyCLI
   option :format,
     :short => "-f FORMAT",
     :long => "--format FORMAT",
-    :description => "Format to use (ext3, raw)"
+    :description => "Format to use (EXT3, RAW)"
 
   option :private,
     :short => "-p",

data/scli.gemspec

@@ -1,7 +1,7 @@
 Gem::Specification.new do |s|
   s.name        = 'scli'
-  s.version     = '0.0.5'
-  s.date        = '2012-06-30'
+  s.version     = '0.0.6'
+  s.date        = '2012-11-20'
   s.platform    = Gem::Platform::RUBY
   s.authors     = ['Josh Pasqualetto']
   s.email       = ['josh.pasqualetto@sonian.net']
@@ -11,7 +11,7 @@ Gem::Specification.new do |s|
   s.license     = 'MIT'
   s.has_rdoc    = false
 
-  s.add_dependency('fog', '~> 1.3.1')
+  s.add_dependency('fog', '~> 1.7.0')
   s.add_dependency('mixlib-cli', '~> 1.2.2')
   s.add_dependency('terminal-table', '~> 1.4.5')
   s.add_dependency('colored', '1.2')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: scli
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-30 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fog
@@ -18,7 +18,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.7.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.3.1
+        version: 1.7.0
 - !ruby/object:Gem::Dependency
   name: mixlib-cli
   requirement: !ruby/object:Gem::Requirement