ec2cli 0.1.0 → 0.1.1

data/bin/ec2cli

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 $LOAD_PATH << File.join(File.dirname(__FILE__), '..', 'lib')
 
-Version = '0.1.0'
+Version = '0.1.1'
 
 HISTORY_FILE = File.join((ENV['HOME'] || ENV['USERPROFILE'] || '.'), '.ec2cli_history')
 HISTSIZE = 500

data/lib/ec2cli/ec2-driver.rb

@@ -39,7 +39,7 @@ module EC2
       when :DESCRIBE_IMAGES
         describe_images(parsed.filter, :all => parsed.all)
       when :RUN_INSTANCES
-        run_instainces(parsed.image_id)
+        run_instainces(parsed.image_id, parsed.options)
       when :START_INSTANCES
         start_instainces(parsed.instances)
       when :STOP_INSTANCES
@@ -157,7 +157,7 @@ module EC2
       if owner
         filter.delete_if {|k, v| k == owner[0] }
         params['Owner.1'] = owner[1].first
-      elsif not opts[:qll]
+      elsif not opts[:all]
         params['Owner.1'] = 'self'
       end
 

data/lib/ec2cli/ec2-parser.tab.rb

@@ -13,7 +13,7 @@ module EC2
 
 class Parser < Racc::Parser
 
-module_eval(<<'...end ec2-parser.y/module_eval...', 'ec2-parser.y', 143)
+module_eval(<<'...end ec2-parser.y/module_eval...', 'ec2-parser.y', 155)
 
 KEYWORDS = %w(
   ALL
@@ -106,103 +106,111 @@ end
 ##### State transition tables begin ###
 
 racc_action_table = [
-    10,    11,    30,    43,    60,    32,    12,    13,    14,    15,
-    58,    53,    59,    16,    30,    17,    63,    28,    57,    27,
-    34,    35,    34,    35,    38,    19,    20,    21,    34,    35,
-    38,    34,    35,    38,    51,    50,    34,    35,    30,    46,
-    30,    26,    25,    54,    55,    56,    24,    23,    43,    22,
-    46,    18,    67,    68 ]
+    10,    11,    30,    64,    46,    62,    12,    32,    56,    13,
+    14,    15,    54,    53,    16,    63,    17,    61,    67,    34,
+    35,    38,    34,    35,    19,    20,    21,    34,    35,    38,
+    34,    35,    38,    34,    35,    30,    28,    27,    43,    30,
+    30,    50,    26,    25,    57,    58,    59,    60,    24,    23,
+    43,    22,    46,    18,    71,    72,    73 ]
 
 racc_action_check = [
-     0,     0,    41,    25,    49,    21,     0,     0,     0,     0,
-    48,    41,    49,     0,    19,     0,    54,    18,    48,    17,
-    54,    54,    56,    56,    56,     9,     9,     9,    23,    23,
-    23,    24,    24,    24,    38,    38,    22,    22,    20,    30,
-    32,    16,    15,    43,    44,    46,    14,    13,    53,    12,
-    55,     1,    58,    60 ]
+     0,     0,    41,    52,    30,    51,     0,    21,    41,     0,
+     0,     0,    38,    38,     0,    52,     0,    51,    57,    59,
+    59,    59,    57,    57,     9,     9,     9,    23,    23,    23,
+    24,    24,    24,    22,    22,    19,    18,    17,    25,    20,
+    32,    33,    16,    15,    43,    44,    46,    49,    14,    13,
+    56,    12,    58,     1,    60,    62,    64 ]
 
 racc_action_pointer = [
-    -5,    51,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    23,
-   nil,   nil,    47,    45,    44,    27,    22,    10,    17,     7,
-    31,     2,    15,     7,    10,    -6,   nil,   nil,   nil,   nil,
-    30,   nil,    33,   nil,   nil,   nil,   nil,   nil,    13,   nil,
-   nil,    -5,   nil,    33,    36,   nil,    35,   nil,    -6,   -12,
-   nil,   nil,   nil,    39,    -1,    41,     1,   nil,    30,   nil,
-    32,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
+    -5,    53,   nil,   nil,   nil,   nil,   nil,   nil,   nil,    22,
+   nil,   nil,    49,    47,    46,    26,    22,    28,    36,    28,
+    32,     4,    11,     5,     8,    29,   nil,   nil,   nil,   nil,
+    -5,   nil,    33,    29,   nil,   nil,   nil,   nil,   -10,   nil,
+   nil,    -5,   nil,    34,    37,   nil,    36,   nil,   nil,    34,
+   nil,    -8,   -10,   nil,   nil,   nil,    41,     0,    43,    -3,
+    42,   nil,    32,   nil,    34,   nil,   nil,   nil,   nil,   nil,
+   nil,   nil,   nil,   nil ]
 
 racc_action_default = [
-   -39,   -39,    -1,    -2,    -3,    -4,    -5,    -6,    -7,   -39,
-   -11,   -12,   -39,   -39,   -39,   -39,   -39,   -39,   -39,   -13,
-   -13,   -39,   -39,   -39,   -39,   -39,   -29,   -30,    69,    -8,
-   -39,    -9,   -13,   -19,   -31,   -32,   -20,   -21,   -39,   -22,
-   -23,   -13,   -25,   -39,   -14,   -15,   -39,   -10,   -39,   -39,
-   -35,   -37,   -24,   -39,   -39,   -39,   -39,   -33,   -39,   -34,
-   -39,   -26,   -27,   -28,   -16,   -17,   -18,   -36,   -38 ]
+   -43,   -43,    -1,    -2,    -3,    -4,    -5,    -6,    -7,   -43,
+   -11,   -12,   -43,   -43,   -43,   -43,   -43,   -43,   -43,   -13,
+   -13,   -43,   -43,   -43,   -43,   -43,   -33,   -34,    74,    -8,
+   -43,    -9,   -13,   -20,   -35,   -36,   -24,   -25,   -43,   -26,
+   -27,   -13,   -29,   -43,   -14,   -15,   -43,   -10,   -19,   -21,
+   -22,   -43,   -43,   -39,   -41,   -28,   -43,   -43,   -43,   -43,
+   -43,   -37,   -43,   -38,   -43,   -30,   -31,   -32,   -16,   -17,
+   -18,   -23,   -40,   -42 ]
 
 racc_goto_table = [
-    33,    36,    39,    37,    40,    42,    45,    29,    31,     1,
-     7,     8,     9,     6,    44,     5,     4,     3,    41,     2,
-    47,    48,    49,   nil,   nil,   nil,   nil,   nil,   nil,    52,
-   nil,    64,    62,    61,    65,   nil,    66 ]
+    33,    36,    39,    37,    40,    42,    45,    29,    31,    44,
+     7,     8,     9,     1,     6,     5,     4,     3,    48,    49,
+    47,    41,     2,    51,    52,   nil,   nil,   nil,   nil,    55,
+   nil,   nil,   nil,   nil,    68,    66,    65,    69,   nil,    70 ]
 
 racc_goto_check = [
-    13,    13,    13,    14,    14,    16,    12,    10,    10,     1,
-     7,     8,     9,     6,    11,     5,     4,     3,    15,     2,
-    10,    17,    18,   nil,   nil,   nil,   nil,   nil,   nil,    10,
-   nil,    12,    13,    16,    13,   nil,    14 ]
+    13,    13,    13,    14,    14,    18,    12,    10,    10,    11,
+     7,     8,     9,     1,     6,     5,     4,     3,    15,    16,
+    10,    17,     2,    19,    20,   nil,   nil,   nil,   nil,    10,
+   nil,   nil,   nil,   nil,    12,    13,    18,    13,   nil,    14 ]
 
 racc_goto_pointer = [
-   nil,     9,    19,    17,    16,    15,    13,    10,    11,    12,
-   -12,   -16,   -24,   -22,   -20,    -7,   -20,   -17,   -16 ]
+   nil,    13,    22,    17,    16,    15,    14,    10,    11,    12,
+   -12,   -21,   -24,   -22,   -20,   -15,   -14,    -4,   -20,   -15,
+   -14 ]
 
 racc_goto_default = [
    nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
-   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil ]
+   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,   nil,
+   nil ]
 
 racc_reduce_table = [
   0, 0, :racc_error,
-  1, 26, :_reduce_none,
-  1, 26, :_reduce_none,
-  1, 26, :_reduce_none,
-  1, 26, :_reduce_none,
-  1, 26, :_reduce_none,
-  1, 26, :_reduce_none,
-  1, 26, :_reduce_none,
-  3, 27, :_reduce_8,
-  3, 27, :_reduce_9,
-  4, 27, :_reduce_10,
-  1, 34, :_reduce_none,
-  1, 34, :_reduce_none,
-  0, 35, :_reduce_none,
-  2, 35, :_reduce_14,
-  1, 36, :_reduce_15,
-  3, 36, :_reduce_16,
-  3, 37, :_reduce_17,
-  3, 37, :_reduce_18,
-  3, 28, :_reduce_19,
-  3, 29, :_reduce_20,
-  3, 29, :_reduce_21,
-  3, 30, :_reduce_22,
-  3, 30, :_reduce_23,
-  4, 31, :_reduce_24,
-  1, 40, :_reduce_25,
-  3, 40, :_reduce_26,
-  3, 41, :_reduce_27,
-  3, 41, :_reduce_28,
-  2, 32, :_reduce_29,
-  2, 33, :_reduce_30,
-  1, 38, :_reduce_none,
-  1, 38, :_reduce_none,
-  3, 39, :_reduce_33,
-  3, 39, :_reduce_34,
-  1, 42, :_reduce_35,
-  3, 42, :_reduce_36,
-  1, 43, :_reduce_37,
-  3, 43, :_reduce_38 ]
-
-racc_reduce_n = 39
-
-racc_shift_n = 69
+  1, 27, :_reduce_none,
+  1, 27, :_reduce_none,
+  1, 27, :_reduce_none,
+  1, 27, :_reduce_none,
+  1, 27, :_reduce_none,
+  1, 27, :_reduce_none,
+  1, 27, :_reduce_none,
+  3, 28, :_reduce_8,
+  3, 28, :_reduce_9,
+  4, 28, :_reduce_10,
+  1, 35, :_reduce_none,
+  1, 35, :_reduce_none,
+  0, 36, :_reduce_none,
+  2, 36, :_reduce_14,
+  1, 37, :_reduce_15,
+  3, 37, :_reduce_16,
+  3, 38, :_reduce_17,
+  3, 38, :_reduce_18,
+  4, 29, :_reduce_19,
+  0, 41, :_reduce_none,
+  1, 41, :_reduce_none,
+  1, 42, :_reduce_22,
+  3, 42, :_reduce_23,
+  3, 30, :_reduce_24,
+  3, 30, :_reduce_25,
+  3, 31, :_reduce_26,
+  3, 31, :_reduce_27,
+  4, 32, :_reduce_28,
+  1, 43, :_reduce_29,
+  3, 43, :_reduce_30,
+  3, 44, :_reduce_31,
+  3, 44, :_reduce_32,
+  2, 33, :_reduce_33,
+  2, 34, :_reduce_34,
+  1, 39, :_reduce_none,
+  1, 39, :_reduce_none,
+  3, 40, :_reduce_37,
+  3, 40, :_reduce_38,
+  1, 45, :_reduce_39,
+  3, 45, :_reduce_40,
+  1, 46, :_reduce_41,
+  3, 46, :_reduce_42 ]
+
+racc_reduce_n = 43
+
+racc_shift_n = 74
 
 racc_token_table = {
   false => 0,
@@ -217,21 +225,22 @@ racc_token_table = {
   :IDENTIFIER => 9,
   :EQ => 10,
   :RUN => 11,
-  :START => 12,
-  :STOP => 13,
-  :SET => 14,
-  :TAGS => 15,
-  "," => 16,
-  :NULL => 17,
-  :SHOW => 18,
-  :REGIONS => 19,
-  :USE => 20,
-  :STRING => 21,
-  :NUMBER => 22,
-  "(" => 23,
-  ")" => 24 }
-
-racc_nt_base = 25
+  :run_option => 12,
+  "," => 13,
+  :START => 14,
+  :STOP => 15,
+  :SET => 16,
+  :TAGS => 17,
+  :NULL => 18,
+  :SHOW => 19,
+  :REGIONS => 20,
+  :USE => 21,
+  :STRING => 22,
+  :NUMBER => 23,
+  "(" => 24,
+  ")" => 25 }
+
+racc_nt_base = 26
 
 racc_use_result_var = false
 
@@ -264,11 +273,12 @@ Racc_token_to_s_table = [
   "IDENTIFIER",
   "EQ",
   "RUN",
+  "run_option",
+  "\",\"",
   "START",
   "STOP",
   "SET",
   "TAGS",
-  "\",\"",
   "NULL",
   "SHOW",
   "REGIONS",
@@ -292,6 +302,8 @@ Racc_token_to_s_table = [
   "expr",
   "value",
   "value_list",
+  "run_option_clause",
+  "run_option_list",
   "attr_list",
   "attr",
   "number_list",
@@ -381,129 +393,147 @@ module_eval(<<'.,.,', 'ec2-parser.y', 47)
 
 module_eval(<<'.,.,', 'ec2-parser.y', 52)
   def _reduce_19(val, _values)
-                   struct(:RUN_INSTANCES, :image_id => val[2])
+                   struct(:RUN_INSTANCES, :image_id => val[2], :options => val[3])
              
   end
 .,.,
 
-module_eval(<<'.,.,', 'ec2-parser.y', 57)
-  def _reduce_20(val, _values)
+# reduce 20 omitted
+
+# reduce 21 omitted
+
+module_eval(<<'.,.,', 'ec2-parser.y', 60)
+  def _reduce_22(val, _values)
+                          [val[0]]
+                    
+  end
+.,.,
+
+module_eval(<<'.,.,', 'ec2-parser.y', 64)
+  def _reduce_23(val, _values)
+                          val[0] + [val[2]]
+                    
+  end
+.,.,
+
+module_eval(<<'.,.,', 'ec2-parser.y', 69)
+  def _reduce_24(val, _values)
                      struct(:START_INSTANCES, :instances => [val[2]])
                
   end
 .,.,
 
-module_eval(<<'.,.,', 'ec2-parser.y', 61)
-  def _reduce_21(val, _values)
+module_eval(<<'.,.,', 'ec2-parser.y', 73)
+  def _reduce_25(val, _values)
                      struct(:START_INSTANCES, :instances => val[2])
                
   end
 .,.,
 
-module_eval(<<'.,.,', 'ec2-parser.y', 66)
-  def _reduce_22(val, _values)
+module_eval(<<'.,.,', 'ec2-parser.y', 78)
+  def _reduce_26(val, _values)
                     struct(:STOP_INSTANCES, :instances => [val[2]])
               
   end
 .,.,
 
-module_eval(<<'.,.,', 'ec2-parser.y', 70)
-  def _reduce_23(val, _values)
+module_eval(<<'.,.,', 'ec2-parser.y', 82)
+  def _reduce_27(val, _values)
                     struct(:STOP_INSTANCES, :instances => val[2])
               
   end
 .,.,
 
-module_eval(<<'.,.,', 'ec2-parser.y', 75)
-  def _reduce_24(val, _values)
+module_eval(<<'.,.,', 'ec2-parser.y', 87)
+  def _reduce_28(val, _values)
                       struct(:CREATE_TAGS, :tags => val[2], :filter => val[3])
                 
   end
 .,.,
 
-module_eval(<<'.,.,', 'ec2-parser.y', 80)
-  def _reduce_25(val, _values)
+module_eval(<<'.,.,', 'ec2-parser.y', 92)
+  def _reduce_29(val, _values)
                     [val[0]]
               
   end
 .,.,
 
-module_eval(<<'.,.,', 'ec2-parser.y', 84)
-  def _reduce_26(val, _values)
+module_eval(<<'.,.,', 'ec2-parser.y', 96)
+  def _reduce_30(val, _values)
                     val[0] + [val[2]]
               
   end
 .,.,
 
-module_eval(<<'.,.,', 'ec2-parser.y', 89)
-  def _reduce_27(val, _values)
+module_eval(<<'.,.,', 'ec2-parser.y', 101)
+  def _reduce_31(val, _values)
                [val[0], val[2]]
          
   end
 .,.,
 
-module_eval(<<'.,.,', 'ec2-parser.y', 93)
-  def _reduce_28(val, _values)
+module_eval(<<'.,.,', 'ec2-parser.y', 105)
+  def _reduce_32(val, _values)
                [val[0], nil]
          
   end
 .,.,
 
-module_eval(<<'.,.,', 'ec2-parser.y', 98)
-  def _reduce_29(val, _values)
+module_eval(<<'.,.,', 'ec2-parser.y', 110)
+  def _reduce_33(val, _values)
                     struct(:SHOW_REGIONS)
               
   end
 .,.,
 
-module_eval(<<'.,.,', 'ec2-parser.y', 103)
-  def _reduce_30(val, _values)
+module_eval(<<'.,.,', 'ec2-parser.y', 115)
+  def _reduce_34(val, _values)
                  struct(:USE, :endpoint_or_region => val[1])
            
   end
 .,.,
 
-# reduce 31 omitted
+# reduce 35 omitted
 
-# reduce 32 omitted
+# reduce 36 omitted
 
-module_eval(<<'.,.,', 'ec2-parser.y', 110)
-  def _reduce_33(val, _values)
+module_eval(<<'.,.,', 'ec2-parser.y', 122)
+  def _reduce_37(val, _values)
                      val[1]
                
   end
 .,.,
 
-module_eval(<<'.,.,', 'ec2-parser.y', 114)
-  def _reduce_34(val, _values)
+module_eval(<<'.,.,', 'ec2-parser.y', 126)
+  def _reduce_38(val, _values)
                      val[1]
                
   end
 .,.,
 
-module_eval(<<'.,.,', 'ec2-parser.y', 119)
-  def _reduce_35(val, _values)
+module_eval(<<'.,.,', 'ec2-parser.y', 131)
+  def _reduce_39(val, _values)
                       [val[0]]
                 
   end
 .,.,
 
-module_eval(<<'.,.,', 'ec2-parser.y', 123)
-  def _reduce_36(val, _values)
+module_eval(<<'.,.,', 'ec2-parser.y', 135)
+  def _reduce_40(val, _values)
                        val[0] + [val[2]]
                 
   end
 .,.,
 
-module_eval(<<'.,.,', 'ec2-parser.y', 128)
-  def _reduce_37(val, _values)
+module_eval(<<'.,.,', 'ec2-parser.y', 140)
+  def _reduce_41(val, _values)
                       [val[0]]
                 
   end
 .,.,
 
-module_eval(<<'.,.,', 'ec2-parser.y', 132)
-  def _reduce_38(val, _values)
+module_eval(<<'.,.,', 'ec2-parser.y', 144)
+  def _reduce_42(val, _values)
                        val[0] + [val[2]]
                 
   end

data/lib/ec2cli/ec2-parser.y

@@ -48,11 +48,23 @@ rule
            [val[0], val[2]]
          }
 
-  run_stmt : RUN INSTANCES value
+  run_stmt : RUN INSTANCES value run_option_clause
              {
-               struct(:RUN_INSTANCES, :image_id => val[2])
+               struct(:RUN_INSTANCES, :image_id => val[2], :options => val[3])
              }
 
+  run_option_clause :
+                    | run_option_list
+
+  run_option_list : run_option
+                    {
+                      [val[0]]
+                    }
+                  | run_option_list ',' run_option
+                    {
+                      val[0] + [val[2]]
+                    }
+
   start_stmt : START INSTANCES value
                {
                  struct(:START_INSTANCES, :instances => [val[2]])

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2cli
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors: