ey-core 3.1.9 → 3.1.10

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 0a2ccdb43d93c2b71693f033656d4a22d2d27c0e
+  data.tar.gz: 1ba3ed1d50111cdc4479e0b98fe96d26c4b94924
+SHA512:
+  metadata.gz: 0cd9461689b956a7482504159fbeeb4a1b5ecaf52a28828f9eb88e3eb8596be9308e1fb9f179a3b434a4a0fd06bdb9719b97895bc4ff224335bba52a264cf708
+  data.tar.gz: b2e59843b4c0420eec5f4a071504b9de63d2dd1f090f192471b113a5a9fc6c7cecb4729c305444b6ff76cc63da399c98db29e7e6d113a4f26d32d97431f6b5b0

data/.travis.yml

@@ -14,6 +14,10 @@ cache: bundler
 
 rvm:
   - 1.9.3
+  - 2.0.0
+  - 2.1.0
+  - 2.2.0
+  - 2.2.2
   - 2.3.1
 
 env:

data/ey-core.gemspec

@@ -27,6 +27,7 @@ Gem::Specification.new do |gem|
   gem.add_dependency "escape"
   gem.add_dependency "faraday", "~> 0.9"
   gem.add_dependency "faraday_middleware", "~> 0.9"
+  gem.add_dependency "rack", "= 1.6.4" #maintain ruby 1.9 - 2.2.(0|1) compatibility
   gem.add_dependency "faye"
   gem.add_dependency "highline"
   gem.add_dependency "json", "< 2.0"

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

@@ -5,10 +5,23 @@ module Ey
     module Cli
       module Helpers
         module Chef
-          def run_chef(type, environment)
-            request = environment.apply(type)
+          def run_chef(type, environment, options = {})
+            no_wait = options.delete(:no_wait)
+            options[:streaming] = true unless no_wait
+            request = environment.apply(type, options)
             puts "Started #{type} chef run".green
-            request.wait_for { |r| r.ready? }
+            if no_wait
+              return
+            end
+            streamable_instance_update = nil
+            if request.read_channel
+              request.subscribe do |m|
+                print m["message"] if m.is_a?(Hash)
+              end
+              puts "" # fix console output from stream
+            else
+              request.wait_for { |r| r.ready? }
+            end
             if request.successful
               puts "#{type.capitalize} chef run completed".green
             else
@@ -28,7 +41,7 @@ module Ey
             elsif recipes_path.exist?
               environment.upload_recipes(archive_directory(path))
             else
-              raise RecipesNotFound, "Recipes not found, expected to find chef recipes in: #{File.expand_path(recipes_path)}"
+              raise RecipesNotFound, "Recipes not found, expected to find chef recipes in: #{File.expand_path(recipes_path)}, use --file to specify a different path"
             end
           end
         end

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

@@ -28,11 +28,28 @@ module Ey
             long: "quick",
             description: "Quick chef run (if not specified, will run main chef run)"
 
+          switch :verbose,
+            long: "verbose",
+            description: "verbose chef run (include chef setup and stack traces)"
+
+          switch :no_wait,
+            long: "no-wait",
+            description: "Don't wait for apply to finish, exit after started"
+
+          option :watch,
+            long: "watch",
+            description: "Specify an instance amazon_id or server role to watch chef logs (defaults to app_master)",
+            argument: "instance"
+
           def handle
             operator, environment = core_operator_and_environment_for(options)
             raise "Unable to find matching environment" unless environment
 
-            run_chef(run_type, environment)
+            opts = {}
+            opts[:no_wait] = switch_active?(:no_wait)
+            opts[:verbose] = switch_active?(:verbose)
+            opts[:watch]   = option(:watch)
+            run_chef(run_type, environment, opts)
           end
 
           private

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

@@ -36,6 +36,19 @@ module Ey
             long: "apply",
             description: "Apply the recipes immediately after they are uploaded"
 
+          switch :verbose,
+            long: "verbose",
+            description: "(used in conjunction with --apply) verbose chef run (include chef setup and stack traces)"
+
+          switch :no_wait,
+            long: "no-wait",
+            description: "(used in conjunction with --apply) Don't wait for apply to finish, exit after started"
+
+          option :watch,
+            long: "watch",
+            description: "Specify an instance amazon_id or server role to watch chef logs (defaults to app_master)",
+            argument: "instance"
+
           def handle
             operator, environment = core_operator_and_environment_for(options)
             path = option(:file) || "cookbooks/"
@@ -51,7 +64,11 @@ module Ey
             end
 
             if switch_active?(:apply)
-              run_chef("main", environment)
+              opts = {}
+              opts[:no_wait] = switch_active?(:no_wait)
+              opts[:verbose] = switch_active?(:verbose)
+              opts[:watch]   = option(:watch)
+              run_chef("main", environment, opts)
             end
           end
         end

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

@@ -1,4 +1,5 @@
 class Ey::Core::Client::Request < Ey::Core::Model
+  extend Ey::Core::Associations
   include Ey::Core::Subscribable
 
   identity :id
@@ -15,6 +16,8 @@ class Ey::Core::Client::Request < Ey::Core::Model
   attribute :type
   attribute :updated_at,        type: :time
 
+  has_many :dependencies, model: :requests
+
   def callback
     requires :callback_url
 

data/lib/ey-core/subscribable.rb

@@ -24,24 +24,32 @@ module Ey::Core::Subscribable
     EM.run do
       client = Faye::Client.new(url)
       client.set_header("Authorization", "Token #{token}")
+      next_ready_check = Time.now + 5
+      handle_output = Proc.new do |m|
+        next_ready_check = Time.now + 1
+        block.call(m)
+      end
 
       deferred = client.subscribe(subscription) do |message|
-        block.call(JSON.load(message))
+        handle_output.call(JSON.load(message))
       end
 
       deferred.callback do
-        block.call({"meta" => true, "created_at" => Time.now,"message" => "successfully connected to log streaming service\n"})
+        handle_output.call({"meta" => true, "created_at" => Time.now,"message" => "log output stream connection established, waiting...\n"})
       end
 
       deferred.errback do |error|
-        block.call({"meta" => true, "created_at" => Time.now, "message" => "failed to stream output: #{error.inspect}\n"})
+        handle_output.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} finished"})
-          EM.stop_event_loop
+      EventMachine::PeriodicTimer.new(1) do
+        if Time.now > next_ready_check
+          if resource.reload.ready?
+            handle_output.call({"meta" => true, "created_at" => Time.now, "message" => "#{resource} finished"})
+            EM.stop_event_loop
+          end
+          next_ready_check = Time.now + 5
         end
       end
     end

data/lib/ey-core/version.rb

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

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

@@ -13,7 +13,7 @@ describe Ey::Core::Cli::Recipes::Apply do
 
   context 'ey-core recipes apply' do
     it 'performs a main chef run' do
-      expect(cli).to receive(:run_chef).with('main', environment)
+      expect(cli).to receive(:run_chef).with('main', environment, {no_wait: nil, verbose: nil, watch: nil})
 
       execute
       expect(kernel.exit_status).to eql(0)
@@ -24,7 +24,7 @@ describe Ey::Core::Cli::Recipes::Apply do
     arguments '--quick'
 
     it 'performs a quick chef run' do
-      expect(cli).to receive(:run_chef).with('quick', environment)
+      expect(cli).to receive(:run_chef).with('quick', environment, {no_wait: nil, verbose: nil, watch: nil})
       
       execute
       expect(kernel.exit_status).to eql(0)

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('main', environment)
+      expect(cli).to receive(:run_chef).with('main', environment, {no_wait: nil, verbose: nil, watch: nil})
 
       execute
     end

metadata

@@ -1,366 +1,335 @@
 --- !ruby/object:Gem::Specification
 name: ey-core
 version: !ruby/object:Gem::Version
-  version: 3.1.9
-  prerelease: 
+  version: 3.1.10
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-19 00:00:00.000000000 Z
+date: 2016-08-03 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: rack
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.4
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.6.4
 - !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
@@ -372,10 +341,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
@@ -821,27 +790,26 @@ 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: 1.8.23.2
+rubygems_version: 2.4.5
 signing_key: 
-specification_version: 3
+specification_version: 4
 summary: Client library providing real and mock functionality for accessing Engine
   Yard's Core API
 test_files: