ey-core 3.1.8 → 3.1.9

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

@@ -14,6 +14,9 @@ module Ey
             else
               puts "#{type.capitalize} chef run failed".red
               ap request
+              if server = environment.servers.first
+                puts "For logs try `ey logs --server #{server.provisioned_id}` --environment #{environment.name}"
+              end
             end
           end
 
@@ -25,7 +28,7 @@ module Ey
             elsif recipes_path.exist?
               environment.upload_recipes(archive_directory(path))
             else
-              raise RecipesNotFound, "Recipes file not found: #{recipes_path}"
+              raise RecipesNotFound, "Recipes not found, expected to find chef recipes in: #{File.expand_path(recipes_path)}"
             end
           end
         end

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

@@ -35,7 +35,11 @@ DESC
           abort "Unable to find matching environment".red unless environment
 
           servers = if option(:server)
-                      [environment.servers.get(option(:server))] || environment.servers.all(provisioned_id: option(:server))
+                      if option(:server).match(/i-/)
+                        environment.servers.all(provisioned_id: option(:server))
+                      else
+                        [environment.servers.get(option(:server))].compact
+                      end
                     else
                       environment.servers.all
                     end
@@ -43,16 +47,20 @@ DESC
           abort "No servers found".red if servers.empty?
 
           servers.each do |server|
-            name = server.name ? "#{server.name} (#{server.role})" : server.role
+            name = [server.provisioned_id, server.name, server.role].compact.join(" ")
 
-            if log = server.latest_main_log
+            if main_log = server.latest_main_log
               puts "Main logs for #{name}:".green
-              puts log.contents
-            end
-
-            if log = server.latest_custom_log
-              puts "Custom logs for #{name}:".green
-              puts log.contents
+              puts main_log.contents
+              if custom_log = server.latest_custom_log
+                #only older stack versions will have custom logs at all, so to avoid showing in-accurate logs, ensure the latest custom log is created (run) chronologically after the latest main log
+                if main_log.created_at < custom_log.created_at
+                  puts "Custom logs for #{name}:".green
+                  puts custom_log.contents
+                end
+              end
+            else
+              puts "No Logs".yellow
             end
           end
         end

data/lib/ey-core/cli/recipes/apply.rb

@@ -23,72 +23,24 @@ module Ey
             description: "Name or id of environment",
             argument: "environment"
 
-          switch :main,
-            short: "m",
-            long: "main",
-            description: "Apply main recipes only"
-
-          switch :custom,
-            short: "u",
-            long: "custom",
-            description: "Apply custom recipes only"
-
           switch :quick,
             short: "q",
             long: "quick",
-            description: "Quick chef run"
-
-          switch :full,
-            short: "f",
-            long: "full",
-            description: "Run main and custom chef"
+            description: "Quick chef run (if not specified, will run main chef run)"
 
           def handle
-            validate_run_type_flags
-
             operator, environment = core_operator_and_environment_for(options)
             raise "Unable to find matching environment" unless environment
 
             run_chef(run_type, environment)
-
-            if switch_active?(:full)
-              run_chef("custom", environment)
-            end
           end
 
           private
-          def validate_run_type_flags
-            if active_run_type_flags.length > 1
-              kernel.abort(
-                'Only one of --main, --custom, --quick, and --full may be specified.'
-              )
-            end
-          end
 
           def run_type
-            secondary_run_types[active_run_type] || default_run_type
+            (switch_active?(:quick) && "quick") || "main"
           end
 
-          def active_run_type
-            active_run_type_flags.first
-          end
-
-          def active_run_type_flags
-            [:main, :custom, :quick, :full].select {|switch|
-              switch_active?(switch)
-            }
-          end
-
-          def secondary_run_types
-            {
-              custom: 'custom',
-              quick: 'quick'
-            }
-          end
-
-          def default_run_type
-            'main'
-          end
         end
       end
     end

data/lib/ey-core/cli/recipes/upload.rb

@@ -46,11 +46,12 @@ module Ey
               upload_recipes(environment, path)
               puts "Uploading custom recipes complete".green
             rescue => e
+              puts e.message
               abort "There was a problem uploading the recipes".red
             end
 
             if switch_active?(:apply)
-              run_chef("custom", environment)
+              run_chef("main", environment)
             end
           end
         end

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

@@ -3,7 +3,7 @@ class Ey::Core::Client::Log < Ey::Core::Model
 
   identity :id
 
-  attribute :created_at
+  attribute :created_at, type: :time
   attribute :filename
   attribute :mime_type
   attribute :download_url

data/lib/ey-core/version.rb

@@ -1,5 +1,5 @@
 module Ey
   module Core
-    VERSION = "3.1.8"
+    VERSION = "3.1.9"
   end
 end

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

@@ -11,9 +11,7 @@ describe Ey::Core::Cli::Recipes::Apply do
       and_return(true)
   end
 
-  context 'ey-core recipes apply --main' do
-    arguments '--main'
-
+  context 'ey-core recipes apply' do
     it 'performs a main chef run' do
       expect(cli).to receive(:run_chef).with('main', environment)
 
@@ -22,17 +20,6 @@ describe Ey::Core::Cli::Recipes::Apply do
     end
   end
 
-  context 'ey-core recipes apply --custom' do
-    arguments '--custom'
-
-    it 'performs a custom chef run' do
-      expect(cli).to receive(:run_chef).with('custom', environment)
-      
-      execute
-      expect(kernel.exit_status).to eql(0)
-    end
-  end
-
   context 'ey-core recipes apply --quick' do
     arguments '--quick'
 
@@ -44,35 +31,4 @@ describe Ey::Core::Cli::Recipes::Apply do
     end
   end
 
-  context 'ey-core recipes apply --full' do
-    arguments '--full'
-
-    it 'performs both a main and a custom chef run' do
-      expect(cli).to receive(:run_chef).with('main', environment)
-      expect(cli).to receive(:run_chef).with('custom', environment)
-      
-      execute
-      expect(kernel.exit_status).to eql(0)
-    end
-  end
-
-  context 'attempting to use more than one run type flag' do
-    let(:run_type_flags) {['--main', '--custom', '--quick', '--full']}
-    let(:combinations) {run_type_flags.combination(2).to_a}
-
-    it 'aborts with advice regarding the run type flags' do
-      expect(kernel).
-        to receive(:abort).
-        with('Only one of --main, --custom, --quick, and --full may be specified.').
-        and_call_original.
-        exactly(combinations.length).
-        times
-
-      combinations.each do |combination|
-        attempt = described_class.new(combination, stdin, stdout, stderr, kernel)
-
-        expect(attempt.execute!).not_to eql(0)
-      end
-    end
-  end
 end

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

@@ -62,7 +62,7 @@ describe Ey::Core::Cli::Recipes::Upload do
     arguments '--apply'
 
     it 'performs a custom chef run' do
-      expect(cli).to receive(:run_chef).with('custom', environment)
+      expect(cli).to receive(:run_chef).with('main', environment)
 
       execute
     end

metadata

@@ -1,321 +1,366 @@
 --- !ruby/object:Gem::Specification
 name: ey-core
 version: !ruby/object:Gem::Version
-  version: 3.1.8
+  version: 3.1.9
+  prerelease: 
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-11 00:00:00.000000000 Z
+date: 2016-07-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: addressable
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.2'
 - !ruby/object:Gem::Dependency
   name: awesome_print
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: belafonte
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: cistern
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.12'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.12'
 - !ruby/object:Gem::Dependency
   name: colorize
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: ey-hmac
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: escape
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: faraday
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: faraday_middleware
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '0.9'
 - !ruby/object:Gem::Dependency
   name: faye
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "<"
+    - - <
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
   name: mime-types
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.99'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '2.99'
 - !ruby/object:Gem::Dependency
   name: oj
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: oj_mimic_json
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: sshkey
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '1.6'
 - !ruby/object:Gem::Dependency
   name: table_print
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: pry-nav
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - "~>"
+    - - ~>
       - !ruby/object:Gem::Version
         version: '3.0'
 - !ruby/object:Gem::Dependency
   name: ffaker
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
+    none: false
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
         version: '0'
 description: Engine Yard Core API Ruby Client
@@ -327,10 +372,10 @@ executables:
 extensions: []
 extra_rdoc_files: []
 files:
-- ".gitignore"
-- ".ruby-gemset"
-- ".ruby-version"
-- ".travis.yml"
+- .gitignore
+- .ruby-gemset
+- .ruby-version
+- .travis.yml
 - CHANGELOG.md
 - Gemfile
 - Guardfile
@@ -776,26 +821,27 @@ files:
 homepage: ''
 licenses:
 - MIT
-metadata: {}
 post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 1.8.23.2
 signing_key: 
-specification_version: 4
+specification_version: 3
 summary: Client library providing real and mock functionality for accessing Engine
   Yard's Core API
 test_files:

checksums.yaml

@@ -1,7 +0,0 @@
----
-SHA1:
-  metadata.gz: 41ca43dab10619d7b35f84b4006899bb4f0035d0
-  data.tar.gz: 0e6092841b676a228bd854576a3b1a28b707d2b2
-SHA512:
-  metadata.gz: cee0a745d53f98771ff37485ce6415a4d39af1df891f328020ed48f7ee0ef2f1733cc0c0add2de3621571d487c6e45fb8501310bee3d6cad9ef4c15b822997ae
-  data.tar.gz: c7a627acce7eec1877a548ce87afe18355056d1d2b4d81cc38b9ba76edf04666f6da98a1ca8d8b2f6e071a0ebcdd410df42ec2a9352efec58432aa05d93b1a4c