ey-pro-cli 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d3ac1354471718392e29083db65e0a4778490ce
-  data.tar.gz: bb5d44ca7f4e4e40c7160e83585b550af339ba96
+  metadata.gz: 58c137b95089a3aad6cd5f491ce381e2e5c045b7
+  data.tar.gz: 3859a426ceebe15351e4bdfcdbd729b274631930
 SHA512:
-  metadata.gz: 88947ac9c4683060f4195f67fe3460e996d0c019bbc671a9f1e9d7f39de64d4afd021a67115cb79c5dc2330e29345b40922c4cb241fe92e6963a48f219f79d54
-  data.tar.gz: 58b3a3d2d5c4ec2e961a9a9983c8bda5bb5984f8d65a8d880928ccf8996149d4d59b62603139b2303da9a34c9c2c20d28e436e035431ba395b12ab90080c7505
+  metadata.gz: 3e1dcb49285ffd2d1861479cf36bd0e194f77af8d21d02b208b586001c13ab9bd0a41792d328d70af572184ae6408aa053e16982a08aa4980a76fdcb780acc33
+  data.tar.gz: 92d6ad641b39ef3a1b3170cd0e2759a585ea23171f82860c57703d07401b0fef25b1cd431b8f9e0848e64435e5a6e78eb138c778960e5bee42eecd03c44eeddf

data/.travis.yml

@@ -0,0 +1,17 @@
+language: ruby
+sudo: false
+rvm:
+  - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - ruby-head
+notifications:
+  email: false
+  webhooks:
+    urls:
+      - https://ensemble.engineyard.com/travis
+    on_success: always
+    on_failure: always
+    on_start: true
+
+script: bundle exec rake

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    ey-pro-cli (0.0.2)
+    ey-pro-cli (0.0.3)
       addressable (~> 2.2)
       cistern (~> 0.11, >= 0.11.1)
       colorize
@@ -48,6 +48,7 @@ GEM
     faye-websocket (0.10.0)
       eventmachine (>= 0.12.0)
       websocket-driver (>= 0.5.1)
+    ffaker (2.1.0)
     http_parser.rb (0.6.0)
     method_source (0.8.2)
     mime-types (2.6.1)
@@ -60,6 +61,7 @@ GEM
     pry-nav (0.2.4)
       pry (>= 0.9.10, < 0.11.0)
     rack (1.6.4)
+    rake (10.4.2)
     rspec (3.3.0)
       rspec-core (~> 3.3.0)
       rspec-expectations (~> 3.3.0)
@@ -86,8 +88,10 @@ PLATFORMS
 DEPENDENCIES
   awesome_print
   ey-pro-cli!
+  ffaker
   pry
   pry-nav
+  rake
   rspec
 
 BUNDLED WITH

data/README.md

@@ -1 +1,40 @@
 # ey-pro-cli
+
+Command line interface for interacting with Engine Yard Pro.  This gem is the spiritual successor to the [engineyard](https://github.com/engineyard/engineyard) gem.
+
+### Install
+
+Install ey-pro-cli like any other ruby gem:
+
+    gem install ey-pro-cli
+
+### Login
+
+If you do not have a `~/.ey-core` file with a valid API token, you will need to run `ey-pro login` in order to retrieve your API token.  This command will ask for your Engine Yard email and password.
+
+
+### Commands
+
+#### ey login
+
+Retrieve your Engine Yard API token
+
+#### ey logout
+
+Delete your Engine Yard API token from the configuration file.  Useful for switching accounts
+
+#### ey deploy
+
+Deploy your application to Engine Yard Pro.
+
+```
+Options:
+      [--ref=REF]                          # A git reference to deploy
+      [--migrate=MIGRATE]                  # The migration command to run
+      -e, --environment=ENVIRONMENT            # Name of the environment to deploy to
+      -a, [--account=ACCOUNT]                  # Name of the account that the environment resides in.  If no account is specified, the app will deploy to the first environment that meets the criteria, in the accounts you have access to.
+      [--app=APP]                          # Application name to deploy.  If :account is not specified, this will be the first app that matches the criteria in the accounts you have access to.
+      [--stream=STREAM]                    # Stream deploy output to console
+      [--no-migrate=NO-MIGRATE]            # Do not run migration command
+      [--no-update-check=NO-UPDATE-CHECK]  # Do not check for updates
+```

data/Rakefile

@@ -0,0 +1,12 @@
+#!/usr/bin/env rake
+require "bundler/gem_tasks"
+
+namespace :spec do
+  task :mocked do
+    sh "bundle exec rspec spec/"
+  end
+end
+
+task :spec => ["spec:mocked"]
+
+task default: "spec:mocked"

data/ey-pro-cli.gemspec

@@ -28,6 +28,9 @@ Gem::Specification.new do |s|
   s.add_development_dependency "awesome_print"
   s.add_development_dependency "pry"
   s.add_development_dependency "pry-nav"
+  s.add_development_dependency "rspec", "~> 3.0"
+  s.add_development_dependency "ffaker"
+  s.add_development_dependency "rake"
 
   #ey-core dependencies
   s.add_dependency "addressable", "~> 2.2"

data/lib/ey_pro_cli.rb

@@ -1,5 +1,6 @@
 if ENV["TEST"] == 'true'
   require 'awesome_print'
+  require 'pry'
 end
 
 $:.unshift(File.dirname(__FILE__) + '/vendor/core')
@@ -10,15 +11,59 @@ require File.expand_path(File.dirname(__FILE__) + '/ey_pro_cli/version')
 require File.expand_path(File.dirname(__FILE__) + '/vendor/core/ey-core')
 
 class EyProCli < Thor
+  class << self
+    attr_accessor :core_file
+
+    def core_file
+      @core_file ||= File.expand_path("~/.ey-core")
+    end
+  end
+
+  desc "login", "Retrieve API token from Engine Yard Pro"
+
+  def login
+    email    = ENV["EMAIL"]    || ask("Email:")
+    password = ENV["PASSWORD"] || ask("Password:", echo: false)
+
+    token = unauthenticated_core_client.get_api_token(email, password).body["api_token"]
+
+    existing_token = core_yaml[core_url]
+    write_token    = if existing_token && existing_token != token
+                       puts "New token does not match existing token.  Overwriting".yellow
+                       true
+                     elsif existing_token == token
+                       puts "Token already exists".green
+                       false
+                     else
+                       puts "Writing token".green
+                       true
+                     end
+    write_core_yaml(token) if write_token
+  rescue Ey::Core::Response::Unauthorized
+    abort "Invalid email or password".yellow
+  end
+
+  desc "logout", "Remove your Engine Yard Pro API token"
+
+  def logout
+    if core_yaml[core_url]
+      core_yaml.delete(core_url)
+      write_core_yaml
+      puts "Successfully removed API token from credentials file".green
+    else
+      puts "No API token found".yellow
+    end
+  end
+
   desc "deploy [OPTIONS]", "Deploy your EY Pro application"
   option :ref,              desc: "A git reference to deploy"
   option :migrate,          desc: "The migration command to run"
-  option :environment,      desc: "Name of the environment to deploy to", required: true
-  option :account,          desc: "Name of the account that the environment resides in.  If no account is specified, the app will deploy to the first environment that meets the criteria, in the accounts you have access to."
+  option :environment,      desc: "Name of the environment to deploy to", required: true, aliases: "-e"
+  option :account,          desc: "Name of the account that the environment resides in.  If no account is specified, the app will deploy to the first environment that meets the criteria, in the accounts you have access to.", aliases: "-a"
   option :app,              desc: "Application name to deploy.  If :account is not specified, this will be the first app that matches the criteria in the accounts you have access to."
-  option :stream,           desc: "Stream deploy output to console", type: :boolean
+  option :stream,           desc: "Stream deploy output to console"
   option "no-migrate",      desc: "Do not run migration command"
-  option "no-update-check", desc: "Do not check for updates", type: :boolean
+  option "no-update-check", desc: "Do not check for updates"
 
   def deploy
     check_for_updates unless options["no-update-check"]
@@ -46,6 +91,20 @@ class EyProCli < Thor
     end
   end
 
+  no_commands do
+    def unauthenticated_core_client
+      @unauthenticated_core_client ||= Ey::Core::Client.new(token: nil, url: core_url)
+    end
+
+    def core_client
+      @core_client ||= Ey::Core::Client.new(url: core_url, config_file: self.class.core_file)
+    end
+
+    def core_url
+      (ENV["CORE_URL"] && File.join(ENV["CORE_URL"], '/')) || "https://api.engineyard.com/"
+    end
+  end
+
   private
 
   def check_for_updates
@@ -65,9 +124,13 @@ Current Version:   #{current_version}
     end
   end
 
-  def core_client
-    url = ENV["CORE_URL"] || "https://api.engineyard.com"
-    @core_client ||= Ey::Core::Client.new(url: url)
+  def write_core_yaml(token=nil)
+    core_yaml[core_url] = token if token
+    File.open(self.class.core_file, "w") { |f| f.puts core_yaml.to_yaml }
+  end
+
+  def core_yaml
+    @core_yaml ||= YAML.load_file(self.class.core_file) || {}
   end
 
   def core_account_for(options={})

data/lib/ey_pro_cli/version.rb

@@ -1,3 +1,3 @@
 module EyProCliVersion
-  VERSION = "0.0.3"
+  VERSION = "0.0.4"
 end

data/lib/vendor/core/ey-core/client.rb

@@ -3,16 +3,16 @@ class Ey::Core::Client < Cistern::Service
   model_path "ey-core/models"
   request_path "ey-core/requests"
 
-  collection :accounts
   collection :account_cancellations
   collection :account_referrals
-  collection :addons
+  collection :accounts
   collection :addon_attachments
+  collection :addons
   collection :addresses
   collection :alerts
-  collection :applications
   collection :application_archives
   collection :application_deployments
+  collection :applications
   collection :backup_files
   collection :backups
   collection :cluster_components
@@ -21,39 +21,40 @@ class Ey::Core::Client < Cistern::Service
   collection :component_actions
   collection :components
   collection :connectors
+  collection :contacts
   collection :costs
+  collection :database_plan_usages
   collection :database_server_revisions
   collection :database_server_snapshots
+  collection :database_server_usages
   collection :database_servers
   collection :database_services
-  collection :database_server_usages
-  collection :database_plan_usages
-  collection :environments
   collection :environment_plan_usages
-  collection :firewalls
-  collection :firewall_rules
+  collection :environments
   collection :features
+  collection :firewall_rules
+  collection :firewalls
   collection :gems
-  collection :keypairs
   collection :keypair_deployments
+  collection :keypairs
   collection :legacy_alerts
-  collection :load_balancers
-  collection :load_balancer_services
   collection :load_balancer_nodes
+  collection :load_balancer_services
+  collection :load_balancers
   collection :logical_databases
   collection :logs
   collection :memberships
   collection :messages
-  collection :contacts
   collection :plan_usages
-  collection :providers
   collection :provider_locations
+  collection :providers
   collection :requests
-  collection :servers
   collection :server_events
   collection :server_usages
-  collection :slots
+  collection :servers
+  collection :services
   collection :slot_components
+  collection :slots
   collection :ssl_certificates
   collection :storage_users
   collection :storages
@@ -64,33 +65,33 @@ class Ey::Core::Client < Cistern::Service
   collection :volumes
 
   model :account
+  model :account_cancellation
   model :account_referral
   model :account_trial
-  model :alert
-  model :billing
-  model :account_cancellation
   model :addon
   model :addon_attachment
   model :address
-  model :legacy_alert
+  model :alert
   model :application
   model :application_archive
   model :application_deployment
   model :backup
   model :backup_file
+  model :billing
   model :cluster
   model :cluster_component
   model :cluster_update
   model :component
   model :component_action
   model :connector
+  model :contact
   model :cost
+  model :database_plan_usage
   model :database_server
-  model :database_server_snapshot
   model :database_server_revision
-  model :database_service
+  model :database_server_snapshot
   model :database_server_usage
-  model :database_plan_usage
+  model :database_service
   model :environment
   model :environment_plan_usage
   model :feature
@@ -99,15 +100,14 @@ class Ey::Core::Client < Cistern::Service
   model :gem
   model :keypair
   model :keypair_deployment
+  model :legacy_alert
   model :load_balancer
-  model :load_balancer_service
   model :load_balancer_node
+  model :load_balancer_service
   model :log
   model :logical_database
   model :membership
   model :message
-  model :metadata
-  model :contact
   model :plan_usage
   model :provider
   model :provider_location
@@ -115,6 +115,7 @@ class Ey::Core::Client < Cistern::Service
   model :server
   model :server_event
   model :server_usage
+  model :service
   model :slot
   model :slot_component
   model :ssl_certificate
@@ -144,6 +145,7 @@ class Ey::Core::Client < Cistern::Service
   request :create_connector
   request :create_database_server
   request :create_database_service
+  request :create_database_service_snapshot
   request :create_environment
   request :create_firewall
   request :create_firewall_rule
@@ -200,6 +202,7 @@ class Ey::Core::Client < Cistern::Service
   request :get_alert
   request :get_alerting_environments
   request :get_alerts
+  request :get_api_token
   request :get_application
   request :get_application_archive
   request :get_application_archives
@@ -320,14 +323,18 @@ class Ey::Core::Client < Cistern::Service
   request :update_untracked_server
   request :upload_file
 
-  recognizes :token, :url, :logger, :adapter, :builder, :connection_options, :auth_id, :auth_key, :cache
+  recognizes :token, :url, :logger, :adapter, :builder, :connection_options, :auth_id, :auth_key, :cache, :config_file
 
   module Shared
     attr_reader :authentication, :url, :cache
 
     def setup(options)
       token_dotfile = begin
-                        YAML.load_file(File.expand_path("~/.ey-core"))
+                        if options[:config_file]
+                          YAML.load_file(options[:config_file]) || {} # if the file is empty, yaml returns false
+                        else
+                          YAML.load_file(File.expand_path("~/.ey-core"))
+                        end
                       rescue Errno::ENOENT
                         {}
                       end
@@ -338,19 +345,27 @@ class Ey::Core::Client < Cistern::Service
                  Ey::Core::MemoryCache
                else options[:cache]
                end
-      @token = options[:token] || token_dotfile[@url] || token_dotfile[@url.gsub(/\/$/, "")] # matching with or without trailing slash
+
+      @authentication = nil
+      @token = if 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
+               end
 
       # For HMAC
       @auth_id  = options[:auth_id]
       @auth_key = options[:auth_key]
 
-      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
-      elsif options[:token] || (@token && !@auth_id) # token was explicitly provided
-        @authentication = :token
-      else
-        @authentication = :hmac
-        @token = nil
+      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
+        elsif options[:token] || (@token && !@auth_id) # token was explicitly provided
+          @authentication = :token
+        else
+          @authentication = :hmac
+          @token = nil
+        end
       end
 
       @logger = options[:logger] || Logger.new(nil)
@@ -411,6 +426,12 @@ class Ey::Core::Client < Cistern::Service
     def url_for(path)
       File.join(@url.to_s, path.to_s)
     end
+
+    # @deprecated will be removed in 3.x
+    # @see {#services}
+    def metadata
+      services.get("core")
+    end
   end
 
   class Real
@@ -438,10 +459,12 @@ class Ey::Core::Client < Cistern::Service
           :interval_randomness => 0.05,
           :backoff_factor      => 2
 
-        if @token
-          builder.use Ey::Core::TokenAuthentication, @token
-        else
-          builder.use :hmac, @auth_id, @auth_key
+        unless @authentication == :none
+          if @token
+            builder.use Ey::Core::TokenAuthentication, @token
+          else
+            builder.use :hmac, @auth_id, @auth_key
+          end
         end
 
         builder.use Ey::Core::Logger, @logger
@@ -590,8 +613,23 @@ class Ey::Core::Client < Cistern::Service
                     }
                   }
                   possible_provider_locations = {
-                    "azure" => [{"id"=>"East US", "name"=>"East US"}, {"id"=>"North Europe", "name"=>"North Europe"}, {"id"=>"West Europe", "name"=>"West Europe"}, {"id"=>"West US", "name"=>"West US"}, {"id"=>"Japan East", "name"=>"Japan East"}],
-                    "aws" => [{"id"=>"us-east-1", "name"=>"Eastern United States"}, {"id"=>"us-west-1", "name"=>"Western US (Northern CA)"}, {"id"=>"us-west-2", "name"=>"Western US (Oregon)"}, {"id"=>"sa-east-1", "name"=>"South America"}, {"id"=>"eu-west-1", "name"=>"Europe"}, {"id"=>"ap-southeast-1", "name"=>"Singapore"}, {"id"=>"ap-southeast-2", "name"=>"Australia"}, {"id"=>"ap-northeast-1", "name"=>"Japan"}]
+                    "azure" => [
+                      { "id" => "East US",      "name" => "East US" },
+                      { "id" => "North Europe", "name" => "North Europe" },
+                      { "id" => "West Europe",  "name" => "West Europe" },
+                      { "id" => "West US",      "name" => "West US" },
+                      { "id" => "Japan East",   "name" => "Japan East" }
+                    ],
+                    "aws" => [
+                      { "id" => "us-east-1",      "name" => "Eastern United States" },
+                      { "id" => "us-west-1",      "name" => "Western US (Northern CA)" },
+                      { "id" => "us-west-2",      "name" => "Western US (Oregon)" },
+                      { "id" => "sa-east-1",      "name" => "South America" },
+                      { "id" => "eu-west-1",      "name" => "Europe" },
+                      { "id" => "ap-southeast-1", "name" => "Singapore" },
+                      { "id" => "ap-southeast-2", "name" => "Australia" },
+                      { "id" => "ap-northeast-1", "name" => "Japan" }
+                    ]
                   }
                   {
                     :accounts                    => {},

data/lib/vendor/core/ey-core/collections/services.rb

@@ -0,0 +1,14 @@
+class Ey::Core::Client::Services < Cistern::Collection
+
+  model Ey::Core::Client::Service
+
+  def all(options={})
+    connection.get_metadata.body.map { |name, attr|
+      new(attr.merge("name" => name))
+    }
+  end
+
+  def get(name)
+    self.all.find { |s| s.name == name }
+  end
+end

data/lib/vendor/core/ey-core/mock/helper.rb

@@ -3,7 +3,7 @@ module Ey::Core::Mock
     def create_database_service_resource(params)
       database_service    = params["database_service"]
       logical_database    = params["logical_database"]
-      database_service_id = database_service["id"]
+      database_service_id = database_service.fetch("id")
       database_server     = params["database_server"]
       provider_id         = params["provider_id"]
 
@@ -30,7 +30,6 @@ module Ey::Core::Mock
         "deleted_at"   => nil,
       )
 
-
       engine, location, _ = require_parameters(database_server, "engine", "location", "flavor", "version")
       database_server_id = self.uuid
 
@@ -40,7 +39,6 @@ module Ey::Core::Mock
              else 9922
              end
 
-
       database_server.merge!(
         "id"               => database_server_id,
         "provisioned_id"   => "#{database_service["name"].downcase}master",
@@ -71,9 +69,10 @@ module Ey::Core::Mock
           "location"       => location.gsub(/[a-z]$/, ""),
           "rules"          => url_for("/firewalls/#{firewall_id}/rules")
         }
+
         self.data[:database_server_firewalls] << [database_server_id, firewall_id]
-        self.data[:database_servers][database_server.fetch("id")] = database_server
-        self.data[:database_services][database_service.fetch("id")] = database_service
+        self.data[:database_servers][database_server_id] = database_server
+        self.data[:database_services][database_service_id] = database_service
 
         contacts.each { |contact|
           self.data[:contacts][contact.fetch("id")] = contact
@@ -84,6 +83,8 @@ module Ey::Core::Mock
           self.data[:logical_databases][logical_database.fetch("id")] = logical_database
         end
 
+        database_server.delete("resource_url")
+        database_service.delete("resource_url")
         r.delete("resource_url")
       end
     end

data/lib/vendor/core/ey-core/mock/util.rb

@@ -15,5 +15,9 @@ module Ey::Core::Mock
     def ip_address
       Array.new(4){rand(256)}.join('.')
     end
+
+    def api_token
+      SecureRandom.hex(20)
+    end
   end
 end

data/lib/vendor/core/ey-core/models/database_server_snapshot.rb

@@ -3,14 +3,35 @@ class Ey::Core::Client::DatabaseServerSnapshot < Ey::Core::Model
 
   identity :id
 
-  attribute :location
+  attribute :deleted_at,     type: :time
   attribute :engine
   attribute :engine_version
-  attribute :storage, type: :integer
-  attribute :provisioned_id
-  attribute :deleted_at, type: :time
+  attribute :location
   attribute :provisioned_at, type: :time
+  attribute :provisioned_id
+  attribute :storage,        type: :integer
 
   has_one :provider
   has_one :database_server
+  has_one :database_service
+
+  attr_accessor :name
+
+  def save
+    if new_record?
+      create_params = if collection.url
+                        { "url" => collection.url }
+                      elsif self.database_service
+                        { "database_service" => self.database_service.identity }
+                      else
+                        requires_one :database_server, :database_service
+
+                        { "database_service" => self.database_server.database_service.identity }
+                      end
+
+      connection.requests.new(
+        connection.create_database_service_snapshot(create_params.merge("name" => self.name)).body["request"]
+      )
+    end
+  end
 end

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

@@ -51,6 +51,8 @@ class Ey::Core::Client::Request < Ey::Core::Model
         connection.providers.get!(id).database_server_snapshots
       elsif collection == "database-servers"
         connection.database_servers.get!(id).snapshots
+      else
+        connection.database_server_snapshots.get!(resource_id)
       end
     when /database_server/
       self.connection.database_servers.get!(resource_id)

data/lib/vendor/core/ey-core/models/service.rb

@@ -0,0 +1,10 @@
+class Ey::Core::Client::Service < Cistern::Model
+
+  identity :name
+
+  attribute :now, type: :time
+  attribute :environment
+  attribute :revision
+  attribute :version
+
+end

data/lib/vendor/core/ey-core/requests/bootstrap_logical_database.rb

@@ -24,7 +24,7 @@ class Ey::Core::Client
 
       if database_service.is_a?(Hash)
         require_parameters(params["database_service"], "name")
-        database_service["id"] = self.serial_id
+        database_service["id"] = self.uuid
       else
         database_service = find(:database_services, database_service)
         existing_database_service = true

data/lib/vendor/core/ey-core/requests/create_database_service.rb

@@ -20,7 +20,7 @@ class Ey::Core::Client
 
       require_parameters(params["database_service"], "name")
       request_id  = self.uuid
-      resource_id = self.serial_id
+      resource_id = self.uuid
 
       database_service = params["database_service"].dup
       database_service["id"] = resource_id

data/lib/vendor/core/ey-core/requests/create_database_service_snapshot.rb

@@ -0,0 +1,69 @@
+class Ey::Core::Client
+  class Real
+    def create_database_service_snapshot(params={})
+      (url = params.delete("url")) || (name = params.fetch("name"))
+
+      request(
+        :method => :post,
+        :path   => "/database-services/#{name}/snapshot",
+        :url    => url,
+        :body   => params,
+      )
+    end
+  end
+
+  class Mock
+    def create_database_service_snapshot(_params={})
+      params = Cistern::Hash.stringify_keys(_params)
+
+      server_or_service_id = resource_identity(params["url"]) || require_parameters(params, "database_service")
+
+      database_service = if (database_server = self.data[:database_servers][server_or_service_id])
+                           find(:database_services, resource_identity(database_server["database_service"]))
+                         else
+                           find(:database_services, database_service_id)
+                         end
+
+      database_server ||= self.data[:database_servers].values.find { |ds| url_for("/database-services/#{database_service["id"]}") == ds["database_service"] }
+      database_service_id = database_service["id"]
+
+      find(:database_services, database_service_id)
+
+      request_id  = self.uuid
+      resource_id = self.uuid
+
+      resource = {
+        "id"                => resource_id,
+        "created_at"        => Time.now.to_s,
+        "updated_at"        => Time.now.to_s,
+        "resource_url"      => url_for("/database-server-snapshots/#{resource_id}"),
+        "provisioned_id"    => params["name"] || "rds:#{database_server["provisioned_id"]}-#{Time.now.strftime("%Y-%M-%D-%H")}",
+        "database_server"   => url_for("/database-servers/#{database_server["id"]}"),
+        "database_service"  => url_for("/database-services/#{database_service_id}"),
+        "provider"          => database_service["provider"],
+        "provisioned_at"    => Time.now.to_s,
+        "logical_databases" => url_for("database-server-snapshots/#{resource_id}/logical-databases"),
+      }.merge(Cistern::Hash.slice(database_server, "storage", "engine", "engine_version"))
+
+      request = {
+        "id"           => request_id,
+        "type"         => "provision_database_server_snapshot",
+        "successful"   => "true",
+        "started_at"   => Time.now,
+        "finished_at"  => nil,
+        "resource_url" => url_for("/database-server-snapshots/#{resource_id}"),
+        "resource"     => [:database_server_snapshots, resource_id, resource],
+      }
+
+      self.data[:requests][request_id] = request
+
+      response_hash = request.dup
+      response_hash.delete("resource")
+
+      response(
+        :body    => {"request" => response_hash},
+        :status  => 201,
+      )
+    end
+  end
+end

data/lib/vendor/core/ey-core/requests/get_api_token.rb

@@ -0,0 +1,19 @@
+class Ey::Core::Client
+  class Real
+    def get_api_token(username, password)
+      request(
+        :path   => "tokens",
+        :method => :post,
+        :body   => {email: username, password: password},
+      )
+    end
+  end
+
+  class Mock
+    def get_api_token(username, password)
+      response(
+        :body => {"api_token" => self.api_token}
+      )
+    end
+  end
+end

data/lib/vendor/core/ey-core/requests/get_metadata.rb

@@ -1,26 +1,22 @@
 class Ey::Core::Client
   class Real
     def get_metadata(params={})
-      url = params["url"]
-
-      request(
-        :path => "metadata",
-        :url  => url,
-      )
+      request(path: "metadata")
     end
   end # Real
 
   class Mock
     def get_metadata(params={})
       response(
-        :body   => {
-          environment: "mock",
-          revision: "mock",
-          version: "mock",
-          now: Time.now
+        :body => {
+          "core" => {
+            "environment" => "mock",
+            "revision"    => "mock",
+            "version"     => "mock",
+            "now"         => Time.now,
+          }
         },
-        :status => 200,
-        )
+      )
     end
   end # Mock
 end # Ey::Core::Client

data/lib/vendor/core/ey-core/version.rb

@@ -1,5 +1,5 @@
 module Ey
   module Core
-    VERSION = "2.7.3"
+    VERSION = "2.7.6"
   end
 end

data/spec/deploy_spec.rb

@@ -0,0 +1,57 @@
+require 'spec_helper'
+
+describe EyProCli do
+  describe "deploy" do
+    before(:each) do
+      @tempfile.write <<-EOF
+---
+'#{subject.core_url}': #{SecureRandom.hex(20)}'
+      EOF
+      @tempfile.rewind
+      subject.class.core_file = @tempfile
+    end
+
+    let(:options) { {} }
+
+    context "with a running environment" do
+      before(:each) do
+        account, environment, application = boot_environment(subject.core_client)
+
+        options.merge!(
+          :account     => account.name,
+          :app         => application.name,
+          :environment => environment.name,
+        )
+      end
+
+      it "successfully deploys" do
+        subject.options = options
+
+        expect(capture(:stdout) { subject.deploy }).to match(/deploy successful/i)
+      end
+
+      context "--stream" do
+        before(:each) { options.merge!(stream: true) }
+
+        it "streams" do
+          subject.options = options
+          expect(capture(:stdout) { subject.deploy }).to match(/subscription failed/i) # proves that the flag works, even if the mock doesn't
+        end
+      end
+
+      context "--no-update-check" do
+        before(:each) { subject.options = options }
+
+        it "has the updater message without the flag" do
+          expect(capture(:stdout) { subject.deploy }).to match(/gem outdated, consider updating/i)
+        end
+
+        it "does not have the message with the flag" do
+          options.merge!("no-update-check" => true)
+
+          expect(capture(:stdout) { subject.deploy }).not_to match(/gem outdated, consider updating/i)
+        end
+      end
+    end
+  end
+end

data/spec/login_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe EyProCli do
+  describe "login" do
+    context "with a valid user and password" do
+      before(:each) { subject.class.core_file = @tempfile }
+
+      it "writes the token" do
+        allow(subject).to receive(:ask) { FFaker::Internet.email }
+
+        output = capture(:stdout) { subject.login }
+        expect(output).to match(/writing token/i)
+
+        expect(read_yaml(@tempfile)).to have_key("https://api.engineyard.com/")
+      end
+
+      it "updates the token if it does not match" do
+        allow(subject).to receive(:ask) { FFaker::Internet.email }
+
+        output = capture(:stdout) { subject.login }
+        expect(output).to match(/writing token/i)
+
+        output = capture(:stdout) { subject.login }
+        expect(output).to match(/token does not match/i)
+      end
+
+      it "does not update the token if it already exists" do
+        allow(subject).to receive(:ask) { FFaker::Internet.email }
+
+        output = capture(:stdout) { subject.login }
+        expect(output).to match(/writing token/i)
+
+        yaml = read_yaml(@tempfile)
+        expect(yaml).to have_key("https://api.engineyard.com/")
+
+        allow(subject.unauthenticated_core_client).to receive(:get_api_token) {
+          Ey::Core::Response.new(
+            :body => {"api_token" => yaml["https://api.engineyard.com/"]}
+          )
+        }
+
+        output = capture(:stdout) { subject.login }
+        expect(output).to match(/token already exists/i)
+      end
+    end
+  end
+end

data/spec/logout_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe EyProCli do
+  describe "logout" do
+    context "with a token" do
+      before(:each) do
+        subject.class.core_file = @tempfile
+
+        allow(subject).to receive(:ask) { FFaker::Internet.email }
+
+        expect(capture(:stdout) { subject.login }).to match(/writing token/i)
+      end
+
+      it "removes the token" do
+        expect(capture(:stdout) { subject.logout }).to match(/successfully removed api token/i)
+
+        expect(read_yaml(@tempfile)).not_to have_key("https://api.engineyard.com/")
+      end
+    end
+  end
+end

data/spec/spec_helper.rb

@@ -0,0 +1,37 @@
+require 'pry'
+require 'tempfile'
+require 'awesome_print'
+require 'ffaker'
+require 'securerandom'
+
+ENV["MOCK_CLI"] ||= 'true'
+
+def capture(stream)
+  begin
+    stream = stream.to_s
+    eval "$#{stream} = StringIO.new"
+    yield
+    result = eval("$#{stream}").string
+  ensure
+    eval("$#{stream} = #{stream.upcase}")
+  end
+
+  result
+end
+
+require File.expand_path("../../lib/ey_pro_cli", __FILE__)
+
+Dir[File.expand_path("../{shared,support}/*.rb", __FILE__)].each{|f| require(f)}
+
+if ENV["MOCK_CLI"]
+  Ey::Core::Client.mock!
+  Ey::Core::Client.reset!
+end
+
+RSpec.configure do |config|
+  config.order = "random"
+
+  config.before(:each) do
+    @tempfile = Tempfile.new(".ey-core")
+  end
+end

data/spec/support/core_helper.rb

@@ -0,0 +1,32 @@
+module CoreHelper
+  def boot_environment(core_client)
+    account               = core_client.accounts.create(name: SecureRandom.hex(4))
+    environment           = account.environments.create(name: SecureRandom.hex(4))
+    application           = account.applications.create(name: SecureRandom.hex(4))
+    provider              = create_provider(account)
+    cluster               = environment.clusters.create(name: SecureRandom.hex(4), location: "us-west-2", provider: provider)
+    app_component         = core_client.components.first(name: "default_deployer")
+    www_cluster_component = cluster.cluster_components.create!(component: app_component, configuration: { application: application.id})
+    cluster.slots.create(quantity: 1)
+
+    [account, environment, application]
+  end
+
+  def create_provider(account)
+    attributes = {type: :aws, provisioned_id: SecureRandom.hex(8)}
+    attributes[:credentials] ||= {
+      :instance_aws_secret_id  => SecureRandom.hex(6),
+      :instance_aws_secret_key => SecureRandom.hex(6),
+      :aws_secret_id           => SecureRandom.hex(6),
+      :aws_secret_key          => SecureRandom.hex(6),
+      :aws_login               => FFaker::Internet.email,
+      :aws_pass                => SecureRandom.hex(6),
+    }
+
+    account.providers.create!(attributes).resource!
+  end
+end
+
+RSpec.configure do |config|
+  config.include(CoreHelper)
+end

data/spec/support/yaml_helper.rb

@@ -0,0 +1,10 @@
+module YamlHelper
+  def read_yaml(tempfile)
+    tempfile.rewind
+    YAML.load_file(tempfile)
+  end
+end
+
+RSpec.configure do |config|
+  config.include(YamlHelper)
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ey-pro-cli
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Engine Yard Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-24 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor
@@ -94,6 +94,48 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.0'
+- !ruby/object:Gem::Dependency
+  name: ffaker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
@@ -207,9 +249,11 @@ extensions: []
 extra_rdoc_files: []
 files:
 - ".gitignore"
+- ".travis.yml"
 - Gemfile
 - Gemfile.lock
 - README.md
+- Rakefile
 - bin/ey-pro
 - ey-pro-cli.gemspec
 - lib/ey_pro_cli.rb
@@ -268,6 +312,7 @@ files:
 - lib/vendor/core/ey-core/collections/server_events.rb
 - lib/vendor/core/ey-core/collections/server_usages.rb
 - lib/vendor/core/ey-core/collections/servers.rb
+- lib/vendor/core/ey-core/collections/services.rb
 - lib/vendor/core/ey-core/collections/slot_components.rb
 - lib/vendor/core/ey-core/collections/slots.rb
 - lib/vendor/core/ey-core/collections/ssl_certificates.rb
@@ -338,6 +383,7 @@ files:
 - lib/vendor/core/ey-core/models/server.rb
 - lib/vendor/core/ey-core/models/server_event.rb
 - lib/vendor/core/ey-core/models/server_usage.rb
+- lib/vendor/core/ey-core/models/service.rb
 - lib/vendor/core/ey-core/models/slot.rb
 - lib/vendor/core/ey-core/models/slot_component.rb
 - lib/vendor/core/ey-core/models/ssl_certificate.rb
@@ -367,6 +413,7 @@ files:
 - lib/vendor/core/ey-core/requests/create_connector.rb
 - lib/vendor/core/ey-core/requests/create_database_server.rb
 - lib/vendor/core/ey-core/requests/create_database_service.rb
+- lib/vendor/core/ey-core/requests/create_database_service_snapshot.rb
 - lib/vendor/core/ey-core/requests/create_environment.rb
 - lib/vendor/core/ey-core/requests/create_firewall.rb
 - lib/vendor/core/ey-core/requests/create_firewall_rule.rb
@@ -423,6 +470,7 @@ files:
 - lib/vendor/core/ey-core/requests/get_alert.rb
 - lib/vendor/core/ey-core/requests/get_alerting_environments.rb
 - lib/vendor/core/ey-core/requests/get_alerts.rb
+- lib/vendor/core/ey-core/requests/get_api_token.rb
 - lib/vendor/core/ey-core/requests/get_application.rb
 - lib/vendor/core/ey-core/requests/get_application_archive.rb
 - lib/vendor/core/ey-core/requests/get_application_archives.rb
@@ -550,6 +598,12 @@ files:
 - lib/vendor/core/ey-core/subscribable.rb
 - lib/vendor/core/ey-core/token_authentication.rb
 - lib/vendor/core/ey-core/version.rb
+- spec/deploy_spec.rb
+- spec/login_spec.rb
+- spec/logout_spec.rb
+- spec/spec_helper.rb
+- spec/support/core_helper.rb
+- spec/support/yaml_helper.rb
 homepage: 
 licenses: []
 metadata: {}
@@ -573,5 +627,11 @@ rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Command-line deployment for Engine Yard pro
-test_files: []
+test_files:
+- spec/deploy_spec.rb
+- spec/login_spec.rb
+- spec/logout_spec.rb
+- spec/spec_helper.rb
+- spec/support/core_helper.rb
+- spec/support/yaml_helper.rb
 has_rdoc: