aws-ec2-list 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 39afd21079fb63bf6c2dd4ea8bd988e60a7f400b
-  data.tar.gz: fd6958f76f969412721051787d4104b6cb2ca8fb
+  metadata.gz: c884601b450da63b2a0eb2ece02707d3e3ffc95a
+  data.tar.gz: 9efa8070081e2b4ec70a8e9c398425268202ad19
 SHA512:
-  metadata.gz: 5a536dce47077358714f094fb6c8210d13c4d8674d80d1a23fb63294ca805c45e5a4799b827a47146bfef1edf912889917ea7a8769f64124da98757f3ffb9df0
-  data.tar.gz: 52208505e4d452000e786340f18ce2ae5c65fcfa25113c2e2fc4d497af52ae30a52fd5e466ef338e30f8bc54f16a9869a88866b29996fd2ca93e568f75f3fa4b
+  metadata.gz: 82a6e783a3d50e5fbd63fc8e1938450df5d32cb4c422e13db695d18c83f2fc983150fe68a99a64e904619f2f36b9c8263dbfafb3692da1766645c856a08c915a
+  data.tar.gz: a7205b841f4e856a754331f6df94d6beaf622f6ac1ab2638447765d35c19d90e34c5e00c8f830420fe2e38f80051a1618d1e3e210f51287cc5f57ae247f5df60

data/lib/aws_ec2_list.rb

@@ -5,44 +5,10 @@ require 'tabularize'
 
 module AwsEc2List
   def self.call(*args)
-    defaults = parse_args(args)
-    if defaults
-      DescribeInstances.new(defaults).call
-    else
-      DescribeInstances.new.call
-    end
-  end
-
-  private
-  def self.parse_args(args)
-    return nil if args.empty?
-    return args.first if args.first.is_a?(Hash)
-    option_string, default_args = args
-
-    option_string = option_string.first
-
-    if option_string && default_args
-      option_hash = option_string_to_hash(option_string)
-      option_hash.merge(default_args)
-
-    elsif option_string
-      option_string_to_hash(option_string)
-
-    end
-  end
-
-  def self.option_string_to_hash(option_string)
-    option_array = option_string.split("--").reject { |o| o.empty? }
-    option_array = option_array.map{ |opt| opt.split("=") }.flatten
-
-    option_hash = Hash[*option_array]
-
-    option_hash.keys.each do |key|
-      option_hash[key.to_sym] = option_hash.delete(key)
-    end
-
-    option_hash
+    defaults = ParseOption.new(args: args).call
+    DescribeInstances.new(defaults).call
   end
 end
 
 require_relative "aws_ec2_list/describe_instances"
+require_relative "aws_ec2_list/parse_option"

data/lib/aws_ec2_list/parse_option.rb

@@ -0,0 +1,35 @@
+require 'byebug'
+
+class AwsEc2List::ParseOption
+  include Virtus.model
+
+  attribute :args, Array
+
+  def call
+    return {} if args.nil? || args.flatten.empty?
+    option_string_to_hash
+  end
+
+  private
+  def option_string_to_hash
+    hash = Hash[*parse_array]
+
+    hash.keys.each do |key|
+      hash[key.to_sym] = hash.delete(key).strip
+    end
+
+    hash
+  end
+
+  def parse_array
+    multi_option.map{ |opt| opt.split("=") }.flatten
+  end
+
+  def multi_option
+    option_string.split("--").reject { |o| o.empty? }
+  end
+
+  def option_string
+    args.flatten.join(" ")
+  end
+end

data/lib/aws_ec2_list/version.rb

@@ -1,3 +1,3 @@
 module AwsEc2List
-  VERSION = "0.2.1"
+  VERSION = "0.2.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aws-ec2-list
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - pauloancheta
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-03-11 00:00:00.000000000 Z
+date: 2017-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aws-sdk
@@ -116,6 +116,7 @@ files:
 - lib/aws_ec2_list.rb
 - lib/aws_ec2_list/describe_instances.rb
 - lib/aws_ec2_list/instance.rb
+- lib/aws_ec2_list/parse_option.rb
 - lib/aws_ec2_list/version.rb
 homepage: https://github.com/pauloancheta/aws-ec2-list
 licenses: