ey-core 3.1.2 → 3.1.3

data/spec/servers_spec.rb

@@ -4,11 +4,26 @@ describe 'servers' do
   let!(:client)      { create_client }
   let!(:account)     { create_account(client: client) }
   let!(:application) { create_application(account: account) }
+
   context "with a solo environment" do
 
     let!(:environment) { create_environment(account: account, application: application, name: Faker::Name.first_name) }
     let!(:server)      { environment.servers.first }
 
+    context "with a second account" do
+      let(:account2) { create_account(client: client) }
+      let(:app2)     { create_application(account: account2) }
+
+      context "with a solo env" do
+        let!(:environment2) { create_environment(account: account2, application: application, name: Faker::Name.first_name) }
+        let!(:server2) { environment2.servers.first }
+
+        it "filters servers by account" do
+          expect(client.servers.all(account: account2).map(&:id)).to contain_exactly(server2.id)
+        end
+      end
+    end
+
     it "has an association with the environment" do
       expect(server.environment).to eq(environment)
     end

data/spec/spec_helper.rb

@@ -1,6 +1,8 @@
 ENV['MOCK_CORE'] ||= 'true'
 ENV['CORE_URL'] ||= "http://api-development.localdev.engineyard.com:9292"
 
+require 'pry'
+require 'pry-nav'
 require 'tempfile'
 
 Bundler.require(:default, :test)
@@ -10,4 +12,9 @@ Dir[File.expand_path("../{shared,support}/*.rb", __FILE__)].each{|f| require(f)}
 
 RSpec.configure do |config|
   config.order = "random"
+  config.after(:each) do
+    $stdout = STDOUT
+    $stdin = STDIN
+    $stderr = STDERR
+  end
 end

data/spec/support/cli_helpers.rb

@@ -1,3 +1,6 @@
+require 'belafonte'
+require 'stringio'
+
 def set_up_cli
   let(:argv) {[]}
   let(:stdout) {StringIO.new}
@@ -6,6 +9,39 @@ def set_up_cli
   let(:kernel) {FakeKernel.new}
   let(:cli) {described_class.new(argv, stdin, stdout, stderr, kernel)}
   let(:execute) {cli.execute!}
-  let(:operator) {Object.new}
-  let(:environment) {Object.new}
+  let(:client) {create_client}
+  let(:account) {create_account(client: client)}
+  let(:app) {create_application(account: account, client: client)}
+  let(:environment) {create_environment(account: account, app: app)}
+
+  before(:each) do
+    allow_any_instance_of(described_class).
+      to receive(:core_operator_and_environment_for).
+      with(any_args).
+      and_return([client, environment])
+
+    allow_any_instance_of(described_class).
+      to receive(:core_accounts).
+      and_return([account])
+  end
+end
+
+def arguments(command_line)
+  let(:argv) {command_line.split(/\s+/)}
+end
+
+def error_output
+  @error_output ||= []
+  stderr.rewind
+  @error_output += stderr.readlines.map {|line| line.strip}
+  @error_output.uniq!
+  @error_output.join("\n")
+end
+
+def standard_output
+  @standard_output ||= []
+  stdout.rewind
+  @standard_output += stdout.readlines.map {|line| line.strip}
+  @standard_output.uniq!
+  @standard_output.join("\n")
 end

metadata

@@ -1,307 +1,350 @@
 --- !ruby/object:Gem::Specification
 name: ey-core
 version: !ruby/object:Gem::Version
-  version: 3.1.2
+  version: 3.1.3
+  prerelease: 
 platform: ruby
 authors:
 - Josh Lane
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-27 00:00:00.000000000 Z
+date: 2016-06-09 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: 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
@@ -313,10 +356,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
@@ -324,6 +367,10 @@ files:
 - README.md
 - Rakefile
 - bin/ey-core
+- examples/add_instance.rb
+- examples/boot_env.rb
+- examples/stop_env.rb
+- examples/terminate_instance.rb
 - ey-core.gemspec
 - lib/ey-core.rb
 - lib/ey-core/associations.rb
@@ -335,7 +382,14 @@ files:
 - lib/ey-core/cli/deploy.rb
 - lib/ey-core/cli/environments.rb
 - lib/ey-core/cli/errors.rb
+- lib/ey-core/cli/help.rb
+- lib/ey-core/cli/helpers/archive.rb
+- lib/ey-core/cli/helpers/chef.rb
+- lib/ey-core/cli/helpers/core.rb
+- lib/ey-core/cli/helpers/deprecated.rb
+- lib/ey-core/cli/helpers/log_streaming.rb
 - lib/ey-core/cli/helpers/server_sieve.rb
+- lib/ey-core/cli/helpers/stream_printer.rb
 - lib/ey-core/cli/init.rb
 - lib/ey-core/cli/login.rb
 - lib/ey-core/cli/logout.rb
@@ -344,6 +398,7 @@ files:
 - lib/ey-core/cli/recipes.rb
 - lib/ey-core/cli/recipes/apply.rb
 - lib/ey-core/cli/recipes/download.rb
+- lib/ey-core/cli/recipes/main.rb
 - lib/ey-core/cli/recipes/upload.rb
 - lib/ey-core/cli/scp.rb
 - lib/ey-core/cli/servers.rb
@@ -355,6 +410,7 @@ files:
 - lib/ey-core/cli/web.rb
 - lib/ey-core/cli/web/disable.rb
 - lib/ey-core/cli/web/enable.rb
+- lib/ey-core/cli/web/main.rb
 - lib/ey-core/cli/web/restart.rb
 - lib/ey-core/cli/whoami.rb
 - lib/ey-core/client.rb
@@ -702,8 +758,11 @@ files:
 - spec/deployments_spec.rb
 - spec/environment_plan_usage_spec.rb
 - spec/environments_spec.rb
+- spec/ey-core/cli/accounts_spec.rb
 - spec/ey-core/cli/helpers/server_sieve_spec.rb
 - spec/ey-core/cli/recipes/apply_spec.rb
+- spec/ey-core/cli/recipes/download_spec.rb
+- spec/ey-core/cli/recipes/upload_spec.rb
 - spec/features_spec.rb
 - spec/firewalls_spec.rb
 - spec/gems_spec.rb
@@ -746,26 +805,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:
@@ -790,8 +850,11 @@ test_files:
 - spec/deployments_spec.rb
 - spec/environment_plan_usage_spec.rb
 - spec/environments_spec.rb
+- spec/ey-core/cli/accounts_spec.rb
 - spec/ey-core/cli/helpers/server_sieve_spec.rb
 - spec/ey-core/cli/recipes/apply_spec.rb
+- spec/ey-core/cli/recipes/download_spec.rb
+- spec/ey-core/cli/recipes/upload_spec.rb
 - spec/features_spec.rb
 - spec/firewalls_spec.rb
 - spec/gems_spec.rb