ec2-host 0.5.3 → 0.5.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e80e3a14cf3ad4795bc1273295ee6b035e507d5c
-  data.tar.gz: d032c6349e2f6a6e7a0e9f0463143e244a3aee42
+  metadata.gz: 3b7d6280530844f177bffe3fb56b25cf79cd3559
+  data.tar.gz: 92be8e05ef52d54aa68e69cef73d3f20035266f6
 SHA512:
-  metadata.gz: a46430ddba38a195b0a075bef6f09f0eda61753dada4e13f97b349a6ff90b7bdecf75be1fe2ecb44d0035d93b284c4293f8cb63e4c03934cbd509ff8c7919ca4
-  data.tar.gz: 548aca969b81f3988c6b5d668b9f2255df8e528bd24dbb5f96634f9dfec507412a742e9144ba8a46e628c8e7be93d213b64dec1640b0998fe90f798b526db46c
+  metadata.gz: 85621d795fa491c5b9501fc3253f4cd7c0f03b138e2006a8fe5656586a9c3794c96177da31317c1ae20a87bfebeb27e5d109d0c209d1973bd30fd17b343448f4
+  data.tar.gz: ee5bee41bebc34f67b4e4c98dd45dc654d6a4f1534da94704582537a19bcfb3d86c4216f949f95172dd7a0e2cb69f75fedc47206c045f6081e2b6b613693812d

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+# 0.5.4 (2017/01/19)
+
+Enhancements:
+
+* Add --spot and --no-spot option
+
+Fixes:
+
+* Show instances whose roles are empty
+
 # 0.5.3 (2017/01/19)
 
 Enhancements:

data/lib/ec2/host.rb

@@ -92,7 +92,7 @@ class EC2
       raise ArgumentError, "Hash expected (options)" unless @options.is_a?(Hash)
       @conditions = []
       conditions.each do |condition|
-        @conditions << Hash[condition.map {|k, v| [k, Array(v).map(&:to_s)]}]
+        @conditions << Hash[condition.map {|k, v| [k, StringUtil.stringify_symbols(Array(v))]}]
       end
       raise ArgumentError, "Array of Hash, or Hash expected (conditions)" unless @conditions.all? {|h| h.kind_of?(Hash)}
     end

data/lib/ec2/host/cli.rb

@@ -45,6 +45,9 @@ class EC2
         op.on('--monitoring one,two,three', Array, "filter with instance monitoring") {|v|
           opts[:monitoring] = v
         }
+        op.on('--[no-]spot', "filter to spot or non-spot instances") {|v|
+          opts[:spot] = v
+        }
         Config.optional_options.each do |opt, tag|
           op.on("--#{opt.to_s.gsub('_', '-')} one,two,three", Array, opt) {|v|
             opts[opt.to_sym] = v

data/lib/ec2/host/host_data.rb

@@ -75,16 +75,20 @@ class EC2
         instance.monitoring.state
       end
 
+      def placement
+        instance.placement
+      end
+
       def availability_zone
         instance.placement.availability_zone
       end
 
-      def spot?
-        instance.instance_lifecycle == 'spot'
+      def tenancy
+        instance.placement.tenancy
       end
 
-      def dedicated?
-        instance.placement.tenancy == 'dedicated'
+      def instance_lifecycle
+        instance.instance_lifecycle
       end
 
       # compatibility with dino-host
@@ -114,7 +118,7 @@ class EC2
         state == "stopping"
       end
 
-      def stopped
+      def stopped?
         state == "stopped"
       end
 
@@ -126,6 +130,16 @@ class EC2
         state == "pending"
       end
 
+      def spot?
+        instance_lifecycle == 'spot'
+      end
+      alias :spot :spot?
+
+      def dedicated?
+        tenancy == 'dedicated'
+      end
+      alias :dedicated :dedicated?
+
       # match with condition or not
       #
       # @param [Hash] condition search parameters
@@ -159,7 +173,7 @@ class EC2
           "launch_time" => launch_time,
           "state" => state,
           "monitoring" => monitoring,
-          "spot" => spot?,
+          "spot" => spot,
         )
       end
 
@@ -200,6 +214,7 @@ class EC2
             (condition["role#{i}".to_sym] || condition["usage#{i}".to_sym] || []).first
           end
         end
+        return true if parts.compact.empty? # no role conditions
         roles.find {|role| role.match?(*parts) }
       end
 

data/lib/ec2/host/string_util.rb

@@ -26,6 +26,10 @@ class EC2
       def self.singularize(string)
         string.chomp('s')
       end
+
+      def self.stringify_symbols(array)
+        array.map {|e| e.is_a?(Symbol) ? e.to_s : e }
+      end
     end
   end
 end

data/lib/ec2/host/version.rb

@@ -1,5 +1,5 @@
 class EC2
   class Host
-    VERSION = '0.5.3'
+    VERSION = '0.5.4'
   end
 end

data/spec/host_spec.rb

@@ -5,6 +5,7 @@ shared_examples_for 'host' do
     [ :hostname,
       :roles,
       :region,
+      :availability_zone,
       :service,
       :status,
       :tags,
@@ -15,6 +16,7 @@ shared_examples_for 'host' do
       :launch_time,
       :state,
       :monitoring,
+      :spot,
       :ip,
       :start_date,
       :usages,
@@ -50,13 +52,15 @@ describe EC2::Host do
         'status',
         'tags',
         'region',
+        'availability_zone',
         'instance_id',
         'instance_type',
         'private_ip_address',
         'public_ip_address',
         'launch_time',
         'state',
-        'monitoring'
+        'monitoring',
+        'spot',
       ])
     end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ec2-host
 version: !ruby/object:Gem::Version
-  version: 0.5.3
+  version: 0.5.4
 platform: ruby
 authors:
 - Naotoshi Seo