aws-ec2-instance_types 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a65bc623f999bd670af5133c4c90605e63502d99
-  data.tar.gz: d68e8e984d8dd074cb4a7b0a587e20fc96a69cbd
+  metadata.gz: 296a86c6c9f1a27ff7f04ecc94a41e54877252b3
+  data.tar.gz: 5e335f7cfb8188b3eb996050caf8c85577167827
 SHA512:
-  metadata.gz: 1d32fdb6191a39ec204ae2ffdfd11eaf623e16b79d9a85c0f51972af2fd9c6ecc0558fda868e8aec314eb3b68770e87ce769451480cf9ce1e30df88f729e2ecb
-  data.tar.gz: 5f45998c7a02a745943c5a96c59462f9e9595300df7727f88976cdd288642804381f73363d198e5eb6ff0bf0e4529a45e3b58f78d483f8bd0b9a0cf6db36bb61
+  metadata.gz: 3463e440d24644218ca492fdcb7f106fb720f2a4788706a59d7889a5b957cfcc08124aed2a34f94e46c31d7b8939ef842db91e92aac5ecfe5bbf13d55687d5e2
+  data.tar.gz: 86449e0c5ef9afa146799bc6462f6c264db621f3eeb713f96e5f633aa5c0c45a763aace3dd38de25f28c622e1028c6ff39fdde88ec229c6d812b4354928b08f5

data/lib/dldinternet/aws/ec2/instance_types/cli.rb

@@ -16,6 +16,8 @@ module DLDInternet
           class_option :debug,        :type => :boolean
           class_option :log_level,    :type => :string, :banner => 'Log level ([:trace, :debug, :info, :step, :warn, :error, :fatal, :todo])'
           class_option :inifile,      :type => :string
+          class_option :help,         :type => :boolean
+          class_option :format,       :type => :string, :default => 'pretty', :banner => '[:pretty, :yaml, :json]'
 
           no_commands do
 
@@ -41,7 +43,15 @@ module DLDInternet
             parse_options
             puts 'get instance types' if options[:verbose]
 
-            puts DLDInternet::AWS::EC2::Instance_Types.getEC2_Instance_Types().ai
+            it = DLDInternet::AWS::EC2::Instance_Types.getEC2_Instance_Types()
+            case options[:format]
+            when /yaml/
+              puts it.to_yaml line_width: 1024, indentation: 4, canonical: false
+            when /json/
+              puts JSON.pretty_generate( it, { indent: "\t", space: ' '})
+            else
+              puts it.ai
+            end
             0
           end
 

data/lib/dldinternet/aws/ec2/instance_types/mixins/ec2_instance_types.rb

@@ -32,7 +32,8 @@ module DLDInternet
                     when /json/
                       f.write JSON.pretty_generate(it, { indent: "\t", space: ' '})
                     else
-                      abort! "Internal: Unsupported format #{format}. Should have noticed this earlier!"
+                      f.write YAML::dump(it)
+                      # abort! "Unsupported save format #{format}!"
                   end
                   f.close
                 end
@@ -48,14 +49,15 @@ module DLDInternet
               case format
                 when /json/
                   JSON.parse(spec)
-                when /yaml/
+                #when /yaml/
+                else
                   begin
                     YAML.load(spec)
                   rescue Psych::SyntaxError => e
                     abort! "Error in the template specification: #{e.message}\n#{spec.split(/\n/).map{|l| "#{i+=1}: #{l}"}.join("\n")}"
                   end
-                else
-                  abort! "Unsupported file type: #{path}"
+                # else
+                #   abort! "Unsupported file type: #{path}"
               end
             end
 

data/lib/dldinternet/aws/ec2/instance_types/mixins/no_commands.rb

@@ -28,6 +28,10 @@ module DLDInternet
             end
 
             def parse_options
+              if options[:help]
+                Cli.start(['help'])
+                exit 0
+              end
               validate_options
 
               lcs = ::Logging::ColorScheme.new( 'compiler', :levels => {

data/lib/dldinternet/aws/ec2/instance_types/version.rb

@@ -3,7 +3,7 @@ module DLDInternet
     module EC2
       module Instance_Types
         # aws-ec2-instance_types version
-        VERSION = '1.3.1'
+        VERSION = '1.4.0'
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-ec2-instance_types
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Christo De Lange
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-09-19 00:00:00.000000000 Z
+date: 2014-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler