ey-core 3.0.4 → 3.0.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1fc43dd7e0537390e4176ab2bba75430348f3f54
-  data.tar.gz: ff4cb06ebced47b4838dc04fc0cb3da8c23fc02b
+  metadata.gz: 1dc4da29698ad9bb948ca751e854c4efb134aab9
+  data.tar.gz: 89e4e06dfeee04459768395059a892ce38865f2c
 SHA512:
-  metadata.gz: 70165d9bd64ae03255a4c12c6e75f683649ab68a66657d3d8e894c1decf7c9d974c60c8b2e5fc81a16abf6015dea88af9ef0791398960cfac3261e9077d88561
-  data.tar.gz: e3f26187c8549e810afa942983754af7adcf00e380b7436594012db0bfbc427656f615b2fde33572e10953e1a09cfdbffe516f17bc5b7eadb185df617675ce13
+  metadata.gz: 5bea713bee5a23c8e5371eac1c4138e4d6cc240fb9bf96ba4995c84e923c01ec1fbdc3fe0100827d4182578bca59feb894301d76d867482d25e7def36e8812ca
+  data.tar.gz: af636f6e784f5371f79e9f9ddd300a171cfa76c6ee1ac976d81d0b163850e307a36c4063ef5fe642f8b4cd8278bab42a810c5b84aa262f88d0aa73529eebbd02

data/lib/ey-core/cli.rb

@@ -45,6 +45,10 @@ class Ey::Core::Cli
         options[:logger] = v ? Logger.new(STDOUT) : Logger.new(nil)
       end
 
+      opts.on("-e", "--execute-command [COMMAND]", "Execute Command") do |c|
+        @execute_command = c
+      end
+
       opts.separator ""
       opts.separator "Common options:"
 
@@ -74,8 +78,12 @@ class Ey::Core::Cli
   end
 
   def console
-    Pry.config.prompt = proc { |obj, nest_level, _| "ey-core:> " }
-    self.pry
+    if @execute_command
+      @client.instance_eval(@execute_command)
+    else
+      Pry.config.prompt = proc { |obj, nest_level, _| "ey-core:> " }
+      @client.pry
+    end
   end
 
   def show

data/lib/ey-core/client.rb

@@ -292,6 +292,7 @@ class Ey::Core::Client < Cistern::Service
   request :update_application_archive
   request :update_billing
   request :update_blueprint
+  request :update_environment
   request :update_membership
   request :update_server
   request :update_ssl_certificate
@@ -334,7 +335,7 @@ class Ey::Core::Client < Cistern::Service
 
       unless @authentication == :none
         if !@auth_id && !@auth_key && !@token
-          raise "Missing token. Use Ey::Core::Client.new(token: mytoken) or add \"'#{@url}': mytoken\" to your ~/.ey-core file" unless @token
+          raise "Missing token. Use Ey::Core::Client.new(token: mytoken) or add \"'#{@url}': mytoken\" to your ~/.ey-core file (see: https://cloud.engineyard.com/cli)" unless @token
         elsif options[:token] || (@token && !@auth_id) # token was explicitly provided
           @authentication = :token
         else

data/lib/ey-core/models/environment.rb

@@ -51,8 +51,8 @@ class Ey::Core::Client::Environment < Ey::Core::Model
     connection.requests.new(response.body["request"])
   end
 
-  def apply(type="main")
-    connection.requests.new(self.connection.apply_environment_updates("id" => self.id, "type" => type).body["request"])
+  def apply(type="main", data={})
+    connection.requests.new(self.connection.apply_environment_updates("id" => self.id, "type" => type, "data" => data).body["request"])
   end
 
   def deprovision
@@ -152,23 +152,29 @@ class Ey::Core::Client::Environment < Ey::Core::Model
   end
 
   def save!
-    requires :application_id, :account_id, :region
+    if new_record?
+      requires :application_id, :account_id, :region
 
-    params = {
-      "url"         => self.collection.url,
-      "account"     => self.account_id,
-      "environment" => {
-        "name"                      => self.name,
-        "application_id"            => self.application_id,
-        "region"                    => self.region,
-      },
-    }
+      params = {
+        "url"         => self.collection.url,
+        "account"     => self.account_id,
+        "environment" => {
+          "name"                      => self.name,
+          "application_id"            => self.application_id,
+          "region"                    => self.region,
+        },
+      }
 
-    params["environment"].merge!("database_service" => self.database_service.id) if self.database_service
+      params["environment"].merge!("database_service" => self.database_service.id) if self.database_service
 
-    if new_record?
       merge_attributes(self.connection.create_environment(params).body["environment"])
-    else raise NotImplementedError # update
+    else
+      requires :identity
+      attributes = Cistern::Hash.slice(Cistern::Hash.stringify_keys(self.attributes), "nane", "release_label")
+      connection.update_environment(
+        "id"     => self.identity,
+        "environment" => attributes,
+      )
     end
   end
 end

data/lib/ey-core/models/log.rb

@@ -3,6 +3,7 @@ class Ey::Core::Client::Log < Ey::Core::Model
 
   identity :id
 
+  attribute :created_at
   attribute :filename
   attribute :mime_type
   attribute :download_url
@@ -30,4 +31,14 @@ class Ey::Core::Client::Log < Ey::Core::Model
 
     merge_attributes(self.connection.create_log(params).body["log"])
   end
+
+  def contents
+    body = Faraday.get(download_url).body
+    if filename.match(/\.gz$/)
+      Zlib::GzipReader.new(StringIO.new(body, "rb")).read
+    else
+      body
+    end
+  end
+
 end

data/lib/ey-core/models/request.rb

@@ -21,9 +21,14 @@ class Ey::Core::Client::Request < Ey::Core::Model
     merge_attributes(connection.request_callback("url" => self.callback_url).body["request"])
   end
 
-  def ready!(timeout = self.service.timeout, interval = self.service.poll_interval)
-    wait_for!(timeout, interval) { ready? }
-    raise Ey::Core::RequestFailure.new(self) unless successful?
+  def ready!(timeout = self.service.timeout, interval = self.service.poll_interval, raise_on_failure = true, &block)
+    wait_for!(timeout, interval) do
+      yield self if block_given?
+      ready?
+    end
+    if raise_on_failure && !successful?
+      raise Ey::Core::RequestFailure.new(self)
+    end
     self
   end
 

data/lib/ey-core/models/server.rb

@@ -33,6 +33,7 @@ class Ey::Core::Client::Server < Ey::Core::Model
   has_many :volumes
   has_many :events, key: :server_events
   has_many :firewalls
+  has_many :logs
 
   attr_accessor :mnt_volume_size, :volume_size, :iops, :snapshot_id
 
@@ -42,6 +43,14 @@ class Ey::Core::Client::Server < Ey::Core::Model
     connection.requests.new(self.connection.apply_server_updates("id" => self.identity, "type" => type).body["request"])
   end
 
+  def latest_main_log
+    logs.select{|l| l.filename.match(/main/)}.sort_by(&:created_at).last
+  end
+
+  def latest_custom_log
+    logs.select{|l| l.filename.match(/custom/)}.sort_by(&:created_at).last
+  end
+
   def reboot
     requires :identity
 

data/lib/ey-core/requests/update_environment.rb

@@ -0,0 +1,17 @@
+class Ey::Core::Client
+  class Real
+    def update_environment(params={})
+      request(
+        :method => :put,
+        :path   => "/environments/#{params.fetch("id")}",
+        :body   => {"environment" => params.fetch("environment")},
+      )
+    end
+  end
+
+  class Mock
+    def update_environment(params={})
+      raise NotImplementedError
+    end
+  end
+end

data/lib/ey-core/version.rb

@@ -1,5 +1,5 @@
 module Ey
   module Core
-    VERSION = "3.0.4"
+    VERSION = "3.0.5"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ey-core
 version: !ruby/object:Gem::Version
-  version: 3.0.4
+  version: 3.0.5
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-11 00:00:00.000000000 Z
+date: 2016-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -435,6 +435,7 @@ files:
 - lib/ey-core/requests/update_billing.rb
 - lib/ey-core/requests/update_blueprint.rb
 - lib/ey-core/requests/update_connector.rb
+- lib/ey-core/requests/update_environment.rb
 - lib/ey-core/requests/update_membership.rb
 - lib/ey-core/requests/update_server.rb
 - lib/ey-core/requests/update_ssl_certificate.rb
@@ -522,7 +523,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Client library providing real and mock functionality for accessing Engine