ey-core 3.1.2 → 3.1.3

data/lib/ey-core/cli/web/main.rb

@@ -0,0 +1,21 @@
+require 'ey-core/cli/subcommand'
+require 'ey-core/cli/web/disable'
+require 'ey-core/cli/web/enable'
+require 'ey-core/cli/web/restart'
+
+module Ey
+  module Core
+    module Cli
+      module Web
+        class Main < Ey::Core::Cli::Subcommand
+          title "web"
+          summary "Web related commands"
+
+          mount Disable
+          mount Enable
+          mount Restart
+        end
+      end
+    end
+  end
+end

data/lib/ey-core/cli/web/restart.rb

@@ -1,23 +1,42 @@
-class Ey::Core::Cli::Web::Restart < Ey::Core::Cli::Web
-  title "restart"
-  summary "Restart all application servers in an environment"
+require 'ey-core/cli/subcommand'
 
-  option :environment, short: "e", long: "environment", description: "Name or id of the environment to deploy to.", argument: "environment"
-  option :account,     short: "c", long: "account",     description: "Name or id of the account that the environment resides in.", argument: "account"
+module Ey
+  module Core
+    module Cli
+      module Web
+        class Restart < Ey::Core::Cli::Subcommand
+          title "restart"
+          summary "Restart all application servers in an environment"
 
-  def handle
-    operator, environment = core_operator_and_environment_for(options)
+          option :environment,
+            short: "e",
+            long: "environment",
+            description: "Name or id of the environment to deploy to.",
+            argument: "environment"
 
-    puts "Restarting application servers in #{environment.name}".green
+          option :account,
+            short: "c",
+            long: "account",
+            description: "Name or id of the account that the environment resides in.",
+            argument: "account"
 
-    request = environment.restart_app_servers
-    request.wait_for { |r| r.ready? }
+          def handle
+            operator, environment = core_operator_and_environment_for(options)
 
-    if request.successful
-      puts "Successfully restarted application servers".green
-    else
-      puts "Restarting application servers has failed".red
-      ap request
+            puts "Restarting application servers in #{environment.name}".green
+
+            request = environment.restart_app_servers
+            request.wait_for { |r| r.ready? }
+
+            if request.successful
+              puts "Successfully restarted application servers".green
+            else
+              puts "Restarting application servers has failed".red
+              ap request
+            end
+          end
+        end
+      end
     end
   end
 end

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

@@ -1,4 +1,12 @@
-class Ey::Core::Cli::Whoami < Ey::Core::Cli::CurrentUser
-  title "whoami"
-  summary "Print the current user information (alias for current_user)"
+require 'ey-core/cli/current_user'
+
+module Ey
+  module Core
+    module Cli
+      class Whoami < CurrentUser
+        title "whoami"
+        summary "Print the current user information (alias for current_user)"
+      end
+    end
+  end
 end

data/lib/ey-core/mock/searching.rb

@@ -53,6 +53,10 @@ module Ey::Core::Mock
     def search(resources, params)
       search_params = Cistern::Hash.stringify_keys(params)
 
+      search_params.select { |k,v| v.respond_to?(:id) }.each do |k,v|
+        search_params[k] = v.id
+      end
+
       resources.select do |id, attrs|
         search_params.all? do |term, condition|
           if condition.kind_of? Array

data/lib/ey-core/model.rb

@@ -7,6 +7,11 @@ class Ey::Core::Model < Cistern::Model
     end
   end
 
+  def to_s
+    shortname = self.class.name.split("::").last
+    "#{shortname}:#{id}"
+  end
+
   def self.range_parser(v)
     case v
     when Range then

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

@@ -11,12 +11,19 @@ class Ey::Core::Client::Deployment < Ey::Core::Model
   attribute :resolved_ref
   attribute :started_at,     type: :time
   attribute :successful,     type: :boolean
+  attribute :verbose
+  attribute :streaming
+  attribute :request_url, aliases: :request
 
   has_one :account
   has_one :environment
   has_one :application
   has_one :user
 
+  def request
+    self.request_url && self.connection.requests.get(self.request_url.split("/").last)
+  end
+
   def timeout(message=nil)
     merge_attributes(self.connection.timeout_deployment("id" => self.id, "message" => message).body["deployment"])
   end

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

@@ -31,6 +31,11 @@ class Ey::Core::Client::Environment < Ey::Core::Model
 
   attr_accessor :application_id
 
+  def latest_deploy(app)
+    deployments = connection.deployments.all(environment_id: self.id, application_id: app.id)
+    deployments.first
+  end
+
   # @param application [Ey::Core::Client::Application]
   # @option opts [Ey::Core::Client::ApplicationArchive] :archive
   def deploy(application, opts={})

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

@@ -65,6 +65,8 @@ class Ey::Core::Client::Request < Ey::Core::Model
       self.connection.database_servers.get!(resource_id)
     when /database_service/
       self.connection.database_services.get!(resource_id)
+    when /deployment/
+      self.connection.deployments.get!(resource_id)
     when /firewall(?!_rule)/
       self.connection.firewalls.get!(resource_id)
     when /firewall_rule/

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

@@ -9,6 +9,7 @@ class Ey::Core::Client::User < Ey::Core::Model
   attribute :deleted_at
 
   has_many :accounts
+  has_many :environments
   has_many :keypairs
   has_many :tokens
 
@@ -33,4 +34,5 @@ class Ey::Core::Client::User < Ey::Core::Model
   def destroy!
     self.connection.destroy_user("id" => self.id) && true
   end
+
 end

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

@@ -14,7 +14,7 @@ class Ey::Core::Client
     def get_servers(params={})
       extract_url_params!(params)
 
-      headers, servers_page = search_and_page(params, :servers, search_keys: %w[cluster environment provider state private_hostname public_hostname provisioned_id role])
+      headers, servers_page = search_and_page(params, :servers, search_keys: %w[account environment provider state private_hostname public_hostname provisioned_id role])
 
       response(
         :body    => {"servers" => servers_page},

data/lib/ey-core/response.rb

@@ -13,6 +13,10 @@ class Ey::Core::Response
         }.inspect
       )
     end
+
+    def error_type
+      self.class.name.split(":").last
+    end
   end
 
   BadRequest        = Class.new(Error)

data/lib/ey-core/subscribable.rb

@@ -30,17 +30,17 @@ module Ey::Core::Subscribable
       end
 
       deferred.callback do
-        block.call({"meta" => true, "created_at" => Time.now,"message" => "successfully subscribed"})
+        block.call({"meta" => true, "created_at" => Time.now,"message" => "successfully connected to log streaming service\n"})
       end
 
       deferred.errback do |error|
-        block.call({"meta" => true, "created_at" => Time.now, "message" => "subscription failed: #{error.inspect}"})
+        block.call({"meta" => true, "created_at" => Time.now, "message" => "failed to stream output: #{error.inspect}\n"})
         EM.stop_event_loop
       end
 
       EventMachine::PeriodicTimer.new(5) do
         if resource.reload.ready?
-          block.call({"meta" => true, "created_at" => Time.now, "message" => "#{resource} is finished"})
+          block.call({"meta" => true, "created_at" => Time.now, "message" => "#{resource} finished"})
           EM.stop_event_loop
         end
       end

data/lib/ey-core/version.rb

@@ -1,5 +1,5 @@
 module Ey
   module Core
-    VERSION = "3.1.2"
+    VERSION = "3.1.3"
   end
 end

data/spec/ey-core/cli/accounts_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+require 'ey-core/cli/accounts'
+
+describe Ey::Core::Cli::Accounts do
+  set_up_cli
+
+  context 'ey-core recipes accounts' do
+    it 'lists my account ids' do
+      execute
+
+      expect(standard_output).to match(/#{Regexp.escape(account.id)}/)
+    end
+
+    it 'lists my account names' do
+      execute
+
+      expect(standard_output).to match(/#{Regexp.escape(account.name)}/)
+    end
+  end
+end

data/spec/ey-core/cli/recipes/apply_spec.rb

@@ -1,20 +1,10 @@
 require 'spec_helper'
-require 'stringio'
-require 'belafonte'
-require 'ey-core/cli'
-require 'ey-core/cli/subcommand'
-require 'ey-core/cli/recipes'
 require 'ey-core/cli/recipes/apply'
 
 describe Ey::Core::Cli::Recipes::Apply do
   set_up_cli
 
   before(:each) do
-    allow_any_instance_of(described_class).
-      to receive(:core_operator_and_environment_for).
-      with(any_args).
-      and_return([operator, environment])
-
     allow_any_instance_of(described_class).
       to receive(:run_chef).
       with(any_args).
@@ -22,7 +12,7 @@ describe Ey::Core::Cli::Recipes::Apply do
   end
 
   context 'ey-core recipes apply --main' do
-    let(:argv) {['--main']}
+    arguments '--main'
 
     it 'performs a main chef run' do
       expect(cli).to receive(:run_chef).with('main', environment)
@@ -33,7 +23,7 @@ describe Ey::Core::Cli::Recipes::Apply do
   end
 
   context 'ey-core recipes apply --custom' do
-    let(:argv) {['--custom']}
+    arguments '--custom'
 
     it 'performs a custom chef run' do
       expect(cli).to receive(:run_chef).with('custom', environment)
@@ -44,7 +34,7 @@ describe Ey::Core::Cli::Recipes::Apply do
   end
 
   context 'ey-core recipes apply --quick' do
-    let(:argv) {['--quick']}
+    arguments '--quick'
 
     it 'performs a quick chef run' do
       expect(cli).to receive(:run_chef).with('quick', environment)
@@ -55,7 +45,7 @@ describe Ey::Core::Cli::Recipes::Apply do
   end
 
   context 'ey-core recipes apply --full' do
-    let(:argv) {['--full']}
+    arguments '--full'
 
     it 'performs both a main and a custom chef run' do
       expect(cli).to receive(:run_chef).with('main', environment)
@@ -82,9 +72,6 @@ describe Ey::Core::Cli::Recipes::Apply do
         attempt = described_class.new(combination, stdin, stdout, stderr, kernel)
 
         expect(attempt.execute!).not_to eql(0)
-
-
-
       end
     end
   end

data/spec/ey-core/cli/recipes/download_spec.rb

@@ -0,0 +1,93 @@
+require 'spec_helper'
+require 'ey-core/cli/recipes/download'
+
+describe Ey::Core::Cli::Recipes::Download do
+  set_up_cli
+
+  before(:each) do
+    allow_any_instance_of(described_class).
+      to receive(:untar).
+      with(any_args).
+      and_return(true)
+
+    allow_any_instance_of(described_class).
+      to receive(:ungzip).
+      with(any_args).
+      and_return(true)
+  end
+
+  context 'ey-core recipes download' do
+    context 'with an existing cookbooks directory' do
+      before(:each) do
+        allow(File).to receive(:exist?).with("cookbooks").and_return(true)
+      end
+
+      it 'fails out, advising that the cookbooks already exist locally' do
+        status = execute
+
+        expect(error_output).
+          to include(
+            'Cannot download recipes, cookbooks directory already exists.'
+          )
+
+        expect(status).to eql(255)
+      end
+    end
+
+    context 'with no cookbooks directory' do
+      before(:each) do
+        allow(File).to receive(:exist?).with("cookbooks").and_return(false)
+
+        allow(environment).
+          to receive(:download_recipes).
+          and_return('cookbooks.tar.gz')
+
+        allow(cli).
+          to receive(:ungzip)
+
+        allow(cli).
+          to receive(:untar)
+      end
+
+      it 'advises that the cookbooks are being downloaded' do
+        execute
+
+        expect(standard_output).to include('Downloading recipes'.green)
+      end
+
+      it 'downloads the cookbooks archive' do
+        expect(environment).
+          to receive(:download_recipes).
+          and_call_original
+
+        execute
+      end
+
+      it 'advises that the downloaded archive is being extracted' do
+        execute
+
+        expect(standard_output).
+          to match(/Extracting recipes to 'cookbooks\/'/)
+      end
+
+      it 'unarchives the downloaded archive' do
+        allow(environment).to receive(:download_recipes).and_return('cookbooks.tar.gz')
+        expect(cli).
+          to receive(:ungzip).
+          with('cookbooks.tar.gz').
+          and_return('cookbooks.tar')
+
+        expect(cli).
+          to receive(:untar).
+          with('cookbooks.tar', './').
+          and_return(true)
+
+        execute
+      end
+
+      it 'exits cleanly' do
+        expect(execute).to eql(0)
+      end
+    end
+  end
+end

data/spec/ey-core/cli/recipes/upload_spec.rb

@@ -0,0 +1,80 @@
+require 'spec_helper'
+require 'ey-core/cli/recipes/upload'
+
+describe Ey::Core::Cli::Recipes::Upload do
+  set_up_cli
+
+  before(:each) do
+    allow_any_instance_of(described_class).
+      to receive(:run_chef).
+      with(any_args).
+      and_return(true)
+
+    allow_any_instance_of(described_class).
+      to receive(:upload_recipes).
+      with(any_args).
+      and_return(true)
+  end
+
+  context 'ey-core recipes upload' do
+    it 'advises that it is uploading recipes for the current environment' do
+      execute
+
+      expect(standard_output).
+        to match(/Uploading custom recipes for /)
+    end
+
+    it 'uploads the recipes' do
+      expect(cli).to receive(:upload_recipes).with(environment, 'cookbooks/')
+
+      execute
+    end
+    
+    context 'upon uploading successfully' do
+      it 'advises that the upload completed' do
+        execute
+
+        expect(standard_output).
+          to match(/Uploading custom recipes complete/)
+      end
+    end
+
+    context 'upon failing to upload' do
+      before(:each) do
+        allow(cli).
+          to receive(:upload_recipes).
+          with(environment, 'cookbooks/').
+          and_raise('big bada boom')
+      end
+
+      it 'aborts, advising that the upload failed' do
+        status = execute
+
+        expect(error_output).
+          to match(/There was a problem uploading the recipes/)
+
+        expect(status).not_to eql(0)
+      end
+    end
+  end
+
+  context 'ey-core recipes upload --apply' do
+    arguments '--apply'
+
+    it 'performs a custom chef run' do
+      expect(cli).to receive(:run_chef).with('custom', environment)
+
+      execute
+    end
+  end
+
+  context 'ey-core recipes upload --path /some/path' do
+    arguments '--file /some/path'
+
+    it 'uploads the recipes from the given path' do
+      expect(cli).to receive(:upload_recipes).with(environment, '/some/path')
+
+      execute
+    end
+  end
+end