ey-core 3.2.4 → 3.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b489ceaf6f7e474b2337f96fc3eafb224a937d99
-  data.tar.gz: 306111004fbbe08ad7e9983098081eae13ec7910
+  metadata.gz: d0f3833d05cac75ec11d7fe518652eb51ea835aa
+  data.tar.gz: 5ad5a49994ddcedc0f6ca9ad50d8640e0d6dbedc
 SHA512:
-  metadata.gz: f0c15aea22fd0c244b5240cb41c0b422c64e4721786ba1e4e2f8827b46bfb25e120ee58a5054b742e9b5218d38ed311d46cacdcbbbe8a1d3e20b85ed24a1feac
-  data.tar.gz: cc9fe75f9ea736248b7113ee69535874a186be4c122e02aa174d74e0289bf7104876e189a19ba34d582fce241a07b832168dab6a5659e1956cffb5a0841c85a3
+  metadata.gz: 21953fe50f30dcd32c333ca2af941e6daa9dd357bb8a660b51335a2344aa55106a91df8424e83edd6ac262861328558e29b14f863d5b01fb0837fb27dd9428cc
+  data.tar.gz: 889858ed3b518c9957135562f7c0d567930f2d882b511919a15f69f9b2b0ca0aebf6570b5afff316f06ff2cbea634f2fefbb12d57a5becdb5eb5f27357465f0d

data/lib/ey-core/cli/helpers/core.rb

@@ -119,6 +119,7 @@ module Ey
           def core_client
             @core_client ||= begin
               opts = {url: core_url, config_file: self.class.core_file}
+              opts.merge!(token: ENV["CORE_TOKEN"]) if ENV["CORE_TOKEN"]
               if ENV["DEBUG"]
                 opts[:logger] = ::Logger.new(STDOUT)
               end

data/lib/ey-core/client.rb

@@ -340,7 +340,9 @@ class Ey::Core::Client < Cistern::Service
                end
 
       @authentication = nil
-      @token = if options.has_key?(:token) && options[:token].nil?
+      @token = if ENV["CORE_TOKEN"]
+                 ENV["CORE_TOKEN"]
+               elsif options.has_key?(:token) && options[:token].nil?
                  @authentication = :none
                else
                  options[:token] || token_dotfile[@url] || token_dotfile[@url.gsub(/\/$/, "")] # matching with or without trailing slash

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

@@ -4,6 +4,7 @@ class Ey::Core::Client::Server < Ey::Core::Model
   identity :id, type: :integer
 
   attribute :created_at,       type: :time
+  attribute :dedicated,        type: :boolean
   attribute :deleted_at,       type: :time
   attribute :deprovisioned_at, type: :time
   attribute :devices,          type: :array
@@ -107,14 +108,15 @@ class Ey::Core::Client::Server < Ey::Core::Model
         "snapshot"    => self.snapshot_id,
         "force"       => self.force,
         "server"      => {
+          "dedicated"       => self.dedicated,
           "flavor"          => self.flavor_id,
           "iops"            => self.iops,
           "location"        => self.location || environment.region,
           "mnt_volume_size" => self.mnt_volume_size,
           "name"            => self.name,
+          "release_label"   => self.release_label,
           "role"            => self.role,
           "volume_size"     => self.volume_size,
-          "release_label"   => self.release_label,
         }
       }
       connection.requests.new(connection.create_server(server_attributes).body["request"])

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

@@ -115,6 +115,7 @@ class Ey::Core::Client
         "account"          => url_for("/accounts/#{resource_identity(environment["account"])}"),
         "alerts"           => url_for("/servers/#{id}/alerts"),
         "created_at"       => Time.now.to_s,
+        "dedicated"        => !!options[:dedicated],
         "deprovisioned_at" => Time.now.to_s,
         "devices"          => block_device_map,
         "enabled"          => true,

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

@@ -42,6 +42,7 @@ class Ey::Core::Client
         "account"          => url_for("/accounts/#{account}"),
         "alerts"           => url_for("/servers/#{resource_id}/alerts"),
         "created_at"       => Time.now.to_s,
+        "dedicated"        => !!server["dedicated"],
         "deprovisioned_at" => nil,
         "devices"          => block_device_map(server),
         "enabled"          => true,

data/lib/ey-core/version.rb

@@ -1,5 +1,5 @@
 module Ey
   module Core
-    VERSION = "3.2.4"
+    VERSION = "3.2.5"
   end
 end

data/spec/servers_spec.rb

@@ -82,6 +82,16 @@ describe 'servers' do
       }
     end
 
+    it "adds a dedicated app server" do
+      server = client.servers.create!(
+        :environment => environment,
+        :role        => "app",
+        :flavor_id   => "m3.large",
+        :dedicated   => true,
+      ).resource!
+      expect(server.dedicated).to be_truthy
+    end
+
     it "adds an app server" do
       expect {
         client.servers.create!(

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ey-core
 version: !ruby/object:Gem::Version
-  version: 3.2.4
+  version: 3.2.5
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-01-06 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
@@ -890,4 +890,3 @@ test_files:
 - spec/tokens_spec.rb
 - spec/untracked_servers_spec.rb
 - spec/users_spec.rb
-has_rdoc: