arkaan 0.10.15 → 0.10.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: de38403b1504d551ce57770c8dc956c458e927be
-  data.tar.gz: dfbc6bc886ea63284bbf3b5908cf81a80edd7180
+  metadata.gz: e79f8f91720927f6d5e89c21ef13292b86b39095
+  data.tar.gz: 490d49bc35bd86a9a322da429dfb58871ebe7b76
 SHA512:
-  metadata.gz: 885736ed87ab48156a0ef432ca289bdcc539d3dc6c969a8031174157e63b0f6b8c51fded8da63af71c0b03ccf64f174925bd5c81dd8fec30554e84e91e5dba43
-  data.tar.gz: 48fbfb28810f278a667f804d554301de3d85ba7834dbd4dac8c5851fb2fe3de5471f14086f0734571e3b953f6d56ad3090f333ca6415e00d4f7d5204d717854c
+  metadata.gz: fed3f2a4d029df3d2f0b8d2e54b9abd34b9c97f167790c9815de4763b448b07e56ee233b228078404677db037b081d1085ec4a3d9352d98ec851cdde6959bc6c
+  data.tar.gz: 3b5458837bc6be617436d4ff47642bece33dd2e5b084aebecc5fa8964b4b1ba64f056f484bd0da765b71ae78ef3ada5b155a357d0780b6f17027b9dbf7c557cc

data/lib/arkaan/monitoring/instance.rb

@@ -16,7 +16,10 @@ module Arkaan
       field :running, type: Boolean, default: false
       # @!attribute [rw] type
       #   @return [Symbol] the type of the instance, determining its way of being deployed, restarted, etc.
-      enum_field :type, [:heroku], default: :heroku
+      enum_field :type, [:heroku, :local], default: :heroku
+      # @!attribute [rw] data
+      #   @return [Hash] the additional datas for this instance (for example for an Heroku instance it's all the data provided by the API)
+      field :data, type: Hash, default: {}
 
       scope :running , ->{ where(running: true) }
 

data/lib/arkaan/utils/micro_service.rb

@@ -17,11 +17,16 @@ module Arkaan
       # @!attribute [r] instance
       #   @return [Arkaan::Monitoring::Instance] the instance of the service currently deployed.
       attr_reader :instance
+      # @!attribute [r] type
+      #   @return [Symbol] the type of instance the application is declaring
+      attr_reader :type
 
       def initialize
         @location = false
         @service = false
+        @instance = false
         @name = false
+        @type = ENV['INSTANCE_TYPE'] || :heroku
       end
 
       # Determines if the application can be loaded (all the parameters have been correctly set)
@@ -107,6 +112,7 @@ module Arkaan
           @service = Arkaan::Monitoring::Service.where(key: @name).first
           register_service if @service.nil?
           register_instance
+          get_heroku_infos if type == :heroku && !test_mode
           if service
             load_standard_files
             load_test_files if test_mode
@@ -115,6 +121,19 @@ module Arkaan
         return self
       end
 
+      def get_heroku_infos
+        if !ENV['OAUTH_TOKEN'].nil? && instance != false && instance.persisted?
+          heroku = PlatformAPI.connect_oauth(ENV['OAUTH_TOKEN'])
+          regex = /\Ahttps?:\/\/([a-z\-]+).herokuapp.com\/?\z/
+          if instance.url.match(regex)
+            app_name = instance.url.scan(regex).first.first
+            instance.update_attribute(:data, heroku.app.info(app_name))
+            puts instance.data
+          end
+        end
+        return self
+      end
+
       def load_mongoid_configuration
         Mongoid.load!(File.join(location, 'config', 'mongoid.yml'))
       end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: arkaan
 version: !ruby/object:Gem::Version
-  version: 0.10.15
+  version: 0.10.16
 platform: ruby
 authors:
 - Vincent Courtois