aptible-cli 0.6.9 → 0.7.0

data/spec/aptible/cli/subcommands/domains_spec.rb

@@ -1,49 +1,39 @@
-require 'ostruct'
 require 'spec_helper'
 
-class App < OpenStruct
-end
-
-class Service < OpenStruct
-end
-
-class Operation < OpenStruct
-end
-
-class Vhost < OpenStruct
-end
-
 describe Aptible::CLI::Agent do
   before { subject.stub(:ask) }
   before { subject.stub(:save_token) }
   before { subject.stub(:fetch_token) { double 'token' } }
 
-  let(:service) { Service.new(process_type: 'web') }
-  let(:op) { Operation.new(status: 'succeeded') }
-  let(:app) { App.new(handle: 'hello', services: [service]) }
-  let(:apps) { [app] }
-  let(:account) do
-    Account.new(bastion_host: 'localhost',
-                dumptruck_port: 1234,
-                handle: 'aptible')
+  let!(:account) { Fabricate(:account) }
+  let!(:app) { Fabricate(:app, handle: 'hello', account: account) }
+  let!(:service) { Fabricate(:service, app: app) }
+  let(:op) { Fabricate(:operation, status: 'succeeded', resource: app) }
+
+  before do
+    allow(Aptible::Api::App).to receive(:all) { [app] }
+    allow(Aptible::Api::Account).to receive(:all) { [account] }
   end
 
-  let(:vhost1) { Vhost.new(virtual_domain: 'domain1', external_host: 'host1') }
-  let(:vhost2) { Vhost.new(virtual_domain: 'domain2', external_host: 'host2') }
+  let!(:vhost1) do
+    Fabricate(:vhost, virtual_domain: 'domain1', external_host: 'host1',
+                      service: service)
+  end
+
+  let!(:vhost2) do
+    Fabricate(:vhost, virtual_domain: 'domain2', external_host: 'host2',
+                      service: service)
+  end
 
   describe '#domains' do
     it 'should print out the hostnames' do
       expect(subject).to receive(:environment_from_handle)
         .with('foobar')
         .and_return(account)
-      expect(subject).to receive(:apps_from_handle).and_return(apps)
-      allow(service).to receive(:create_operation) { op }
+      expect(subject).to receive(:apps_from_handle).and_return([app])
       allow(subject).to receive(:options) do
         { environment: 'foobar', app: 'web' }
       end
-      allow(Aptible::Api::App).to receive(:all) { apps }
-
-      expect(app).to receive(:vhosts) { [vhost1, vhost2] }
       expect(subject).to receive(:say).with('domain1')
       expect(subject).to receive(:say).with('domain2')
 
@@ -51,19 +41,15 @@ describe Aptible::CLI::Agent do
     end
 
     it 'should fail if app is non-existent' do
-      allow(service).to receive(:create_operation) { op }
-      allow(Aptible::Api::Account).to receive(:all) { [account] }
-      allow(account).to receive(:apps) { apps }
+      allow(subject).to receive(:options) { { app: 'not-an-app' } }
 
       expect do
         subject.send('domains')
-      end.to raise_error(Thor::Error)
+      end.to raise_error(Thor::Error, /Could not find app/)
     end
 
     it 'should fail if environment is non-existent' do
-      allow(service).to receive(:create_operation) { op }
       allow(Aptible::Api::Account).to receive(:all) { [] }
-      allow(account).to receive(:apps) { apps }
 
       expect do
         subject.send('domains')
@@ -74,14 +60,11 @@ describe Aptible::CLI::Agent do
       expect(subject).to receive(:environment_from_handle)
         .with('foobar')
         .and_return(account)
-      expect(subject).to receive(:apps_from_handle).and_return(apps)
-      allow(service).to receive(:create_operation) { op }
+      expect(subject).to receive(:apps_from_handle).and_return([app])
       allow(subject).to receive(:options) do
         { verbose: true, app: 'hello', environment: 'foobar' }
       end
-      allow(Aptible::Api::App).to receive(:all) { apps }
 
-      expect(app).to receive(:vhosts) { [vhost1, vhost2] }
       expect(subject).to receive(:say).with('domain1 -> host1')
       expect(subject).to receive(:say).with('domain2 -> host2')
 

data/spec/aptible/cli/subcommands/logs_spec.rb

@@ -1,33 +1,28 @@
-require 'ostruct'
 require 'spec_helper'
 
-class App < OpenStruct
-end
-
-class Service < OpenStruct
-end
-
 describe Aptible::CLI::Agent do
   before { subject.stub(:ask) }
   before { subject.stub(:save_token) }
   before { subject.stub(:fetch_token) { double 'token' } }
 
-  let(:service) { Service.new(process_type: 'web') }
-  let(:app) do
-    App.new(handle: 'foobar', status: 'provisioned', services: [service])
-  end
+  let!(:app) { Fabricate(:app, handle: 'foobar') }
+  let!(:service) { Fabricate(:service, app: app) }
 
   describe '#logs' do
+    before { allow(Aptible::Api::Account).to receive(:all) { [app.account] } }
+    before { allow(Aptible::Api::App).to receive(:all) { [app] } }
+    before { subject.options = { app: app.handle } }
+
     it 'should fail if the app is unprovisioned' do
-      allow(app).to receive(:status) { 'pending' }
-      allow(subject).to receive(:ensure_app) { app }
-      expect { subject.send('logs') }.to raise_error(Thor::Error)
+      app.status = 'pending'
+      expect { subject.send('logs') }
+        .to raise_error(Thor::Error, /Have you deployed foobar yet/)
     end
 
     it 'should fail if the app has no services' do
-      allow(app).to receive(:services) { [] }
-      allow(subject).to receive(:ensure_app) { app }
-      expect { subject.send('logs') }.to raise_error(Thor::Error)
+      app.services = []
+      expect { subject.send('logs') }
+        .to raise_error(Thor::Error, /Have you deployed foobar yet/)
     end
   end
 end

data/spec/aptible/cli/subcommands/ps_spec.rb

@@ -1,13 +1,11 @@
-require 'ostruct'
 require 'spec_helper'
 
-class App < OpenStruct
-end
-
-class Account < OpenStruct
-end
-
 describe Aptible::CLI::Agent do
+  let(:account) do
+    Fabricate(:account, bastion_host: 'bastion.com', dumptruck_port: 45022)
+  end
+  let(:app) { Fabricate(:app, account: account) }
+
   before { subject.stub(:ask) }
   before { subject.stub(:save_token) }
   before { subject.stub(:fetch_token) { double 'token' } }
@@ -15,11 +13,6 @@ describe Aptible::CLI::Agent do
   before { subject.stub(:set_env) }
   before { Kernel.stub(:exec) }
 
-  let(:account) do
-    Account.new(bastion_host: 'bastion.com', dumptruck_port: 45022)
-  end
-  let(:app) { App.new(handle: 'hello', account: account) }
-
   describe '#ps' do
     it 'should set ENV["APTIBLE_CLI_COMMAND"]' do
       expect(subject).to receive(:set_env).with('APTIBLE_CLI_COMMAND', 'ps')

data/spec/fabricators/account_fabricator.rb

@@ -0,0 +1,10 @@
+class StubAccount < OpenStruct; end
+
+Fabricator(:account, from: :stub_account) do
+  bastion_host 'localhost'
+  dumptruck_port 1234
+  handle 'aptible'
+
+  apps { [] }
+  databases { [] }
+end

data/spec/fabricators/app_fabricator.rb

@@ -0,0 +1,14 @@
+class StubApp < OpenStruct
+  def vhosts
+    services.map(&:vhosts).flatten
+  end
+end
+
+Fabricator(:app, from: :stub_app) do
+  handle 'hello'
+  status 'provisioned'
+  account
+  services { [] }
+
+  after_create { |app| app.account.apps << app }
+end

data/spec/fabricators/backup_fabricator.rb

@@ -0,0 +1,10 @@
+class StubBackup < OpenStruct; end
+
+Fabricator(:backup, from: :stub_backup) do
+  id { sequence(:backup_id) }
+  aws_region { %w(us-east-1 us-west-1).sample }
+  created_at { Time.now }
+  database
+
+  after_create { |backup| backup.database.backups << backup }
+end

data/spec/fabricators/database_fabricator.rb

@@ -0,0 +1,15 @@
+class StubDatabase < OpenStruct; end
+
+Fabricator(:database, from: :stub_database) do
+  type 'postgresql'
+  handle do |attrs|
+    Fabricate.sequence(:database) { |i| "#{attrs[:type]}-#{i}" }
+  end
+  passphrase 'password'
+  connection_url 'postgresql://aptible:password@10.252.1.125:49158/db'
+  account
+
+  backups { [] }
+
+  after_create { |database| database.account.databases << database }
+end

data/spec/fabricators/operation_fabricator.rb

@@ -0,0 +1,6 @@
+class StubOperation < OpenStruct; end
+
+Fabricator(:operation, from: :stub_operation) do
+  status 'queued'
+  resource { Fabricate(:app) }
+end

data/spec/fabricators/service_fabricator.rb

@@ -0,0 +1,9 @@
+class StubService < OpenStruct; end
+
+Fabricator(:service, from: :stub_service) do
+  process_type 'web'
+  app
+  vhosts { [] }
+
+  after_create { |service| service.app.services << service }
+end

data/spec/fabricators/vhost_fabricator.rb

@@ -0,0 +1,9 @@
+class StubVhost < OpenStruct; end
+
+Fabricator(:vhost, from: :stub_vhost) do
+  virtual_domain 'domain1'
+  external_host 'host1'
+  service
+
+  after_create { |vhost| vhost.service.vhosts << vhost }
+end

data/spec/spec_helper.rb

@@ -1,7 +1,15 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 
-require 'webmock/rspec'
+Bundler.require :development
+
+require 'simplecov'
+SimpleCov.start
+
+if ENV['CI']
+  require 'codecov'
+  SimpleCov.formatter = SimpleCov::Formatter::Codecov
+end
 
 # Load shared spec files
 Dir["#{File.dirname(__FILE__)}/shared/**/*.rb"].each do |file|

metadata

@@ -1,57 +1,71 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.6.9
+  version: 0.7.0
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-05-26 00:00:00.000000000 Z
+date: 2016-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-api
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.5
+        version: 0.9.7
 - !ruby/object:Gem::Dependency
   name: aptible-auth
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.11.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.11.3
+        version: 0.11.7
+- !ruby/object:Gem::Dependency
+  name: aptible-resource
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.3.6
 - !ruby/object:Gem::Dependency
   name: thor
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.19.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.19.0
+        version: 0.19.1
 - !ruby/object:Gem::Dependency
   name: git
   requirement: !ruby/object:Gem::Requirement
@@ -80,6 +94,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: chronic_duration
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.6
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.10.6
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -164,6 +192,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: fabrication
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.15.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.15.2
 description: Aptible CLI
 email:
 - frank@macreery.com
@@ -182,6 +224,7 @@ files:
 - Rakefile
 - aptible-cli.gemspec
 - bin/aptible
+- codecov.yml
 - lib/aptible/cli.rb
 - lib/aptible/cli/agent.rb
 - lib/aptible/cli/helpers/app.rb
@@ -192,6 +235,7 @@ files:
 - lib/aptible/cli/helpers/token.rb
 - lib/aptible/cli/helpers/tunnel.rb
 - lib/aptible/cli/subcommands/apps.rb
+- lib/aptible/cli/subcommands/backup.rb
 - lib/aptible/cli/subcommands/config.rb
 - lib/aptible/cli/subcommands/db.rb
 - lib/aptible/cli/subcommands/domains.rb
@@ -202,13 +246,23 @@ files:
 - lib/aptible/cli/subcommands/ssh.rb
 - lib/aptible/cli/version.rb
 - spec/aptible/cli/agent_spec.rb
-- spec/aptible/cli/helpers/handle_from_git_remote.rb
+- spec/aptible/cli/helpers/git_remote_handle_strategy_spec.rb
+- spec/aptible/cli/helpers/handle_from_git_remote_spec.rb
+- spec/aptible/cli/helpers/options_handle_strategy_spec.rb
 - spec/aptible/cli/helpers/tunnel_spec.rb
 - spec/aptible/cli/subcommands/apps_spec.rb
+- spec/aptible/cli/subcommands/backup_spec.rb
 - spec/aptible/cli/subcommands/db_spec.rb
 - spec/aptible/cli/subcommands/domains_spec.rb
 - spec/aptible/cli/subcommands/logs_spec.rb
 - spec/aptible/cli/subcommands/ps_spec.rb
+- spec/fabricators/account_fabricator.rb
+- spec/fabricators/app_fabricator.rb
+- spec/fabricators/backup_fabricator.rb
+- spec/fabricators/database_fabricator.rb
+- spec/fabricators/operation_fabricator.rb
+- spec/fabricators/service_fabricator.rb
+- spec/fabricators/vhost_fabricator.rb
 - spec/mock/ssh_mock.rb
 - spec/spec_helper.rb
 homepage: https://github.com/aptible/aptible-cli
@@ -231,18 +285,28 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5.1
+rubygems_version: 2.6.4
 signing_key: 
 specification_version: 4
 summary: Command-line interface for Aptible services
 test_files:
 - spec/aptible/cli/agent_spec.rb
-- spec/aptible/cli/helpers/handle_from_git_remote.rb
+- spec/aptible/cli/helpers/git_remote_handle_strategy_spec.rb
+- spec/aptible/cli/helpers/handle_from_git_remote_spec.rb
+- spec/aptible/cli/helpers/options_handle_strategy_spec.rb
 - spec/aptible/cli/helpers/tunnel_spec.rb
 - spec/aptible/cli/subcommands/apps_spec.rb
+- spec/aptible/cli/subcommands/backup_spec.rb
 - spec/aptible/cli/subcommands/db_spec.rb
 - spec/aptible/cli/subcommands/domains_spec.rb
 - spec/aptible/cli/subcommands/logs_spec.rb
 - spec/aptible/cli/subcommands/ps_spec.rb
+- spec/fabricators/account_fabricator.rb
+- spec/fabricators/app_fabricator.rb
+- spec/fabricators/backup_fabricator.rb
+- spec/fabricators/database_fabricator.rb
+- spec/fabricators/operation_fabricator.rb
+- spec/fabricators/service_fabricator.rb
+- spec/fabricators/vhost_fabricator.rb
 - spec/mock/ssh_mock.rb
 - spec/spec_helper.rb