miasma 0.2.6 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: aebc0393d265e3f5dfa814404af11e3668e2bb82
-  data.tar.gz: d72c1b1bd1d3727a0693c9e81c50d14ac502bd0d
+  metadata.gz: 4a74043b0719d34f3ad9967c6345ad9f26175336
+  data.tar.gz: f58390eaca85d115434f260d6db8cf47869942f2
 SHA512:
-  metadata.gz: b09ca540d448dfbb34d93abfc431bf96165dc44e237dd96e7eb3f6a2899c54ca5c537edba9be292e9f34c5e05dc725d024055de4e5bcff172dea33cffb0f8afd
-  data.tar.gz: 00b056a517c7dfb837c2c68874ed343ca3c9c25604d7a75d7a03101105a4dbfbd665891c84dfa46162a389ce18dafc3c5b72c78c167cff15d43dae3fbb41f122
+  metadata.gz: 25776c602dc8f1b1d2b8815fe8cb2b313ba1a7eada1f64918888a9668b309cc6853ea31de11932159f13ff9782b090c14558425d85bdd0e97a598198e69a3596
+  data.tar.gz: 3c9e161d83a4c092e9fc62bd401245509013bf1c29dd47ca8840f1fe947ec6c9995d3fc175e2182f748f8d1cfc463546b0ca7b71337d32d5322aa4197d94acf3

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+# v0.2.8
+* Allow multiple expected response codes
+* Fix API type provided when building server instance from ASG
+* Remove automatic key sorting on Smash conversions
+* Allow name based matching for data loading within AWS orchestration
+
 # v0.2.6
 * Add default filter implementation on collection
 * Allow disable of automatic body extraction

data/lib/miasma/contrib/aws/compute.rb

@@ -89,20 +89,21 @@ module Miasma
             request(:path => '/', :params => options.merge('Action' => 'DescribeInstances'))
           end
           results.map do |srv|
-            srv = srv[:instancesSet][:item]
-            Server.new(
-              self,
-              :id => srv[:instanceId],
-              :name => srv.fetch(:tagSet, :item, []).map{|tag| tag[:value] if tag.is_a?(Hash) && tag[:key] == 'Name'}.compact.first,
-              :image_id => srv[:imageId],
-              :flavor_id => srv[:instanceType],
-              :state => SERVER_STATE_MAP.fetch(srv.get(:instanceState, :name), :pending),
-              :addresses_private => [Server::Address.new(:version => 4, :address => srv[:privateIpAddress])],
-              :addresses_public => [Server::Address.new(:version => 4, :address => srv[:ipAddress])],
-              :status => srv.get(:instanceState, :name),
-              :key_name => srv[:keyName]
-            ).valid_state
-          end
+            [srv[:instancesSet][:item]].flatten.compact.map do |srv|
+              Server.new(
+                self,
+                :id => srv[:instanceId],
+                :name => srv.fetch(:tagSet, :item, []).map{|tag| tag[:value] if tag.is_a?(Hash) && tag[:key] == 'Name'}.compact.first,
+                :image_id => srv[:imageId],
+                :flavor_id => srv[:instanceType],
+                :state => SERVER_STATE_MAP.fetch(srv.get(:instanceState, :name), :pending),
+                :addresses_private => [Server::Address.new(:version => 4, :address => srv[:privateIpAddress])],
+                :addresses_public => [Server::Address.new(:version => 4, :address => srv[:ipAddress])],
+                :status => srv.get(:instanceState, :name),
+                :key_name => srv[:keyName]
+              ).valid_state
+            end
+          end.flatten
         end
 
       end

data/lib/miasma/contrib/aws/orchestration.rb

@@ -67,7 +67,9 @@ module Miasma
               d_stk['StackId'] == stk['StackId']
             end || Smash.new
             stk.merge!(desc)
-            next if stack && stack.id != stk['StackId']
+            if(stack)
+              next if stack.id != stk['StackId'] && stk['StackId'].split('/')[1] != stack.id
+            end
             new_stack = stack || Stack.new(self)
             new_stack.load_data(
               :id => stk['StackId'],
@@ -228,6 +230,17 @@ module Miasma
           end
         end
 
+        # Return single stack
+        #
+        # @param ident [String] name or ID
+        # @return [Stack]
+        def stack_get(ident)
+          i = Stack.new(self)
+          i.id = ident
+          i.reload
+          i.name ? i : nil
+        end
+
         # Return all stacks
         #
         # @param options [Hash] filter

data/lib/miasma/models/auto_scale/group.rb

@@ -37,7 +37,7 @@ module Miasma
         attribute :desired_size, Integer, :coerce => lambda{|v| v.to_i}
         attribute :current_size, Integer, :coerce => lambda{|v| v.to_i}
         attribute :state, Symbol, :allowed_values => []
-        attribute :servers, Server, :multiple => true, :coerce => lambda{|v,obj| Server.new(obj.api, v)}
+        attribute :servers, Server, :multiple => true, :coerce => lambda{|v,obj| Server.new(obj.api_for(:compute), v)}
 
         on_missing :reload
 

data/lib/miasma/models/orchestration/stacks.rb

@@ -7,17 +7,6 @@ module Miasma
       # Abstract stack collection
       class Stacks < Types::Collection
 
-        # Locate stack by name or ID
-        #
-        # @param ident [String, Numeric] name or ID
-        # @return [Stack]
-        def get(ident)
-          all.detect do |stack|
-            stack.id.to_s == ident.to_s ||
-              stack.name.to_s == ident.to_s
-          end
-        end
-
         # Return stacks matching given filter
         #
         # @param options [Hash] filter options
@@ -39,6 +28,15 @@ module Miasma
           api.stack_all
         end
 
+        # @return [Stack]
+        def perform_get(ident)
+          if(api.respond_to?(:stack_get))
+            api.stack_get(ident)
+          else
+            super
+          end
+        end
+
       end
 
     end

data/lib/miasma/types/api.rb

@@ -65,7 +65,7 @@ module Miasma
       # @param args [Hash] options
       # @option args [String, Symbol] :method HTTP request method
       # @option args [String] :path request path
-      # @option args [Integer] :expects expected response status code
+      # @option args [Integer, Array<Integer>] :expects expected response status code
       # @option args [TrueClass, FalseClass] :disable_body_extraction do not auto-parse response body
       # @return [Smash] {:result => HTTP::Response, :headers => Smash, :body => Object}
       # @raises [Error::ApiError::RequestError]
@@ -94,7 +94,7 @@ module Miasma
           _connection = connection
         end
         result = make_request(_connection, http_method, request_args)
-        unless(result.code == args.fetch(:expects, 200).to_i)
+        unless([args.fetch(:expects, 200)].flatten.compact.map(&:to_i).include?(result.code))
           raise Error::ApiError::RequestError.new(result.reason, :response => result)
         end
         format_response(result, !args[:disable_body_extraction])

data/lib/miasma/types/collection.rb

@@ -97,7 +97,7 @@ module Miasma
 
       protected
 
-      # Return model with given name or ID
+      # Return model with given ID or name
       #
       # @param ident [String, Symbol] model identifier
       # @return [Model, NilClass]

data/lib/miasma/utils/smash.rb

@@ -80,15 +80,15 @@ module Miasma
       # Convert to Hash
       #
       # @return [Hash]
-      def to_hash
-        self.to_type_converter(::Hash, :to_hash)
+      def to_hash(*args)
+        self.to_type_converter(::Hash, :to_hash, *args)
       end
 
       # Calculate checksum of hash (sha256)
       #
       # @return [String] checksum
       def checksum
-        Digest::SHA256.hexdigest(self.to_smash.to_s)
+        Digest::SHA256.hexdigest(self.to_smash(:sorted).to_s)
       end
 
     end
@@ -102,8 +102,8 @@ class Hash
   # Convert to Smash
   #
   # @return [Smash]
-  def to_smash
-    self.to_type_converter(::Smash, :to_smash)
+  def to_smash(*args)
+    self.to_type_converter(::Smash, :to_smash, *args)
   end
   alias_method :hulk_smash, :to_smash
 
@@ -114,12 +114,17 @@ class Hash
   # @param type [Class] hash type
   # @param convert_call [Symbol] builtin hash convert
   # @return [Smash]
-  def to_type_converter(type, convert_call)
+  def to_type_converter(type, convert_call, *args)
     type.new.tap do |smash|
-      self.sort_by do |entry|
-        entry.first.to_s
-      end.each do |k,v|
-        smash[k.is_a?(Symbol) ? k.to_s : k] = smash_conversion(v, convert_call)
+      if(args.include?(:sorted))
+        process = self.sort_by do |entry|
+          entry.first.to_s
+        end
+      else
+        process = self
+      end
+      process.each do |k,v|
+        smash[k.is_a?(Symbol) ? k.to_s : k] = smash_conversion(v, convert_call, *args)
       end
     end
   end
@@ -129,13 +134,13 @@ class Hash
   # @param obj [Object]
   # @param convert_call [Symbol] builtin hash convert
   # @return [Smash, Object]
-  def smash_conversion(obj, convert_call)
+  def smash_conversion(obj, convert_call, *args)
     case obj
     when Hash
-      obj.send(convert_call)
+      obj.send(convert_call, *args)
     when Array
       obj.map do |i|
-        smash_conversion(i, convert_call)
+        smash_conversion(i, convert_call, *args)
       end
     else
       obj

data/lib/miasma/version.rb

@@ -1,4 +1,4 @@
 module Miasma
   # current library version
-  VERSION = Gem::Version.new('0.2.6')
+  VERSION = Gem::Version.new('0.2.8')
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: miasma
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.8
 platform: ruby
 authors:
 - Chris Roberts
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-09 00:00:00.000000000 Z
+date: 2014-12-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie