aptible-cli 0.6.0 → 0.6.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0e6d976b32bef3e1b4b34c49be4d7bfc524aa908
-  data.tar.gz: b53c2136b9de6bd7f09b87950bdf214f58adfffd
+  metadata.gz: 0a4dc9b3d5de431e99e8aef2e76fdf0a352c03f7
+  data.tar.gz: eaaba80a605eff86cdddb3bec822a57ae928d871
 SHA512:
-  metadata.gz: a7300533f684f475ad4e981d9b9534758ec666c1a57c83a4e605da5fe06286f03877b589303a7027b854fcf6470d1b76ba8cb987f0c4bf1423171abfa2f117db
-  data.tar.gz: 4b6a7f6c26295bdbacdf9093113e32431a9c9ef73bbec8f2017996a89d0955a0c405305dfeec6e418181b96f326cb68551be16ed24b2b68ef83d8c3c7f268488
+  metadata.gz: d86fdfec7a75ba6aa0234551c0b7c326ee6b408175ea41d7fb8e44c96f0f2db2ecd9346029f4ac36295f1e68d9690f9928a74efdba79c6f8e63d88a6905d5253
+  data.tar.gz: 7a115c06a8479359d96dade21f5467cdba4b50af226d828062b0b9a88722d46ef1772fc1e22c56f991e1d6e874bce0e0fb9105997d9a944d876c3fdd3df29852

data/lib/aptible/cli/helpers/app.rb

@@ -10,56 +10,71 @@ module Aptible
 
         class HandleFromGitRemote
           PATTERN = %r{
-  :((?<environment_handle>[0-9a-z\-_\.]+?)/)?(?<app_handle>[0-9a-z\-_\.]+)\.git
-  \z
-}x
+            :((?<environment_handle>[0-9a-z\-_\.]+?)/)?
+            (?<app_handle>[0-9a-z\-_\.]+)\.git
+            \z
+          }x
 
           def self.parse(url)
-            PATTERN.match(url)
+            PATTERN.match(url) || {}
           end
         end
 
-        def ensure_app(options = {})
-          remote = options[:remote] || ENV['APTIBLE_REMOTE']
-          handle = options[:app]
-          if handle
-            environment = ensure_environment(options)
-          else
-            handles = handle_from_remote(remote) || ensure_default_handle
-            handle = handles[:app_handle]
-            env_handle = handles[:environment_handle] || options[:environment]
-            environment = ensure_environment(environment: env_handle)
-          end
-
-          app = app_from_handle(handle, environment)
-          return app if app
-          fail Thor::Error, "Could not find app #{handle}"
+        def self.included(base)
+          base.extend ClassMethods
         end
 
-        def app_from_handle(handle, environment)
-          environment.apps.find do |a|
-            a.handle == handle
+        module ClassMethods
+          def app_options
+            option :app
+            option :environment
+            option :remote, aliases: '-r'
           end
         end
 
-        def ensure_default_handle
-          return default_handle if default_handle
-          fail Thor::Error, <<-ERR.gsub(/\s+/, ' ').strip
-            Could not find app in current working directory, please specify
-            with --app
-          ERR
+        def ensure_app(options = {})
+          remote = options[:remote] || ENV['APTIBLE_REMOTE'] || 'aptible'
+          app_handle = options[:app] || handles_from_remote(remote)[:app_handle]
+          environment_handle = options[:environment] ||
+                               handles_from_remote(remote)[:environment_handle]
+
+          unless app_handle
+            fail Thor::Error, <<-ERR.gsub(/\s+/, ' ').strip
+              Could not find app in current working directory, please specify
+              with --app
+            ERR
+          end
+
+          environment = environment_from_handle(environment_handle)
+          if environment_handle && !environment
+            fail Thor::Error, "Could not find environment #{environment_handle}"
+          end
+          apps = apps_from_handle(app_handle, environment)
+          case apps.count
+          when 1
+            return apps.first
+          when 0
+            fail Thor::Error, "Could not find app #{app_handle}"
+          else
+            fail Thor::Error, 'Multiple apps exist, please specify environment'
+          end
         end
 
-        def default_handle
-          handle_from_remote(:aptible)
+        def apps_from_handle(handle, environment)
+          if environment
+            apps = environment.apps
+          else
+            apps = Aptible::Api::App.all(token: fetch_token)
+          end
+          apps.select { |a| a.handle == handle }
         end
 
-        def handle_from_remote(remote_name)
+        def handles_from_remote(remote_name)
           git = Git.open(Dir.pwd)
           aptible_remote = git.remote(remote_name).url || ''
           HandleFromGitRemote.parse(aptible_remote)
         rescue
-          nil
+          {}
         end
       end
     end

data/lib/aptible/cli/helpers/environment.rb

@@ -30,6 +30,7 @@ module Aptible
         end
 
         def environment_from_handle(handle)
+          return nil unless handle
           Aptible::Api::Account.all(token: fetch_token).find do |a|
             a.handle == handle
           end

data/lib/aptible/cli/subcommands/apps.rb

@@ -4,6 +4,7 @@ module Aptible
       module Apps
         def self.included(thor)
           thor.class_eval do
+            include Helpers::App
             include Helpers::Environment
             include Helpers::Token
 
@@ -33,8 +34,7 @@ module Aptible
             end
 
             desc 'apps:scale TYPE NUMBER', 'Scale app to NUMBER of instances'
-            option :app
-            option :environment
+            app_options
             define_method 'apps:scale' do |type, n|
               num = Integer(n)
               app = ensure_app(options)
@@ -43,9 +43,8 @@ module Aptible
               attach_to_operation_logs(op)
             end
 
-            option :app
-            option :environment
             desc 'apps:deprovision', 'Deprovision an app'
+            app_options
             define_method 'apps:deprovision' do
               app = ensure_app(options)
               say "Deprovisioning #{app.handle}..."

data/lib/aptible/cli/subcommands/config.rb

@@ -10,8 +10,7 @@ module Aptible
             include Helpers::App
 
             desc 'config', "Print an app's current configuration"
-            option :app
-            option :remote, aliases: '-r'
+            app_options
             def config
               app = ensure_app(options)
               config = app.current_configuration
@@ -20,8 +19,7 @@ module Aptible
             end
 
             desc 'config:add', 'Add an ENV variable to an app'
-            option :app
-            option :remote, aliases: '-r'
+            app_options
             define_method 'config:add' do |*args|
               # FIXME: define_method - ?! Seriously, WTF Thor.
               app = ensure_app(options)
@@ -32,15 +30,13 @@ module Aptible
             end
 
             desc 'config:set', 'Alias for config:add'
-            option :app
-            option :remote, aliases: '-r'
+            app_options
             define_method 'config:set' do |*args|
               send('config:add', *args)
             end
 
             desc 'config:rm', 'Remove an ENV variable from an app'
-            option :app
-            option :remote, aliases: '-r'
+            app_options
             define_method 'config:rm' do |*args|
               # FIXME: define_method - ?! Seriously, WTF Thor.
               app = ensure_app(options)
@@ -51,8 +47,7 @@ module Aptible
             end
 
             desc 'config:unset', 'Alias for config:rm'
-            option :app
-            option :remote, aliases: '-r'
+            app_options
             define_method 'config:unset' do |*args|
               send('config:add', *args)
             end

data/lib/aptible/cli/subcommands/domains.rb

@@ -10,10 +10,8 @@ module Aptible
             include Helpers::App
 
             desc 'domains', "Print an app's current virtual domains"
-            option :app
-            option :environment
+            app_options
             option :verbose, aliases: '-v'
-            option :remote, aliases: '-r'
             def domains
               app = ensure_app(options)
               print_vhosts(app) do |vhost|

data/lib/aptible/cli/subcommands/logs.rb

@@ -10,8 +10,7 @@ module Aptible
             include Helpers::App
 
             desc 'logs', 'Follows logs from a running app'
-            option :app
-            option :remote, aliases: '-r'
+            app_options
             def logs
               app = ensure_app(options)
 

data/lib/aptible/cli/subcommands/ps.rb

@@ -11,8 +11,7 @@ module Aptible
             include Helpers::Env
 
             desc 'ps', 'Display running processes for an app'
-            option :app
-            option :remote, aliases: '-r'
+            app_options
             def ps
               app = ensure_app(options)
 

data/lib/aptible/cli/subcommands/rebuild.rb

@@ -8,8 +8,7 @@ module Aptible
             include Helpers::App
 
             desc 'rebuild', 'Rebuild an app, and restart its services'
-            option :app
-            option :remote, aliases: '-r'
+            app_options
             def rebuild
               app = ensure_app(options)
               operation = app.create_operation(type: 'rebuild')

data/lib/aptible/cli/subcommands/restart.rb

@@ -8,8 +8,7 @@ module Aptible
             include Helpers::App
 
             desc 'restart', 'Restart all services associated with an app'
-            option :app
-            option :remote, aliases: '-r'
+            app_options
             def restart
               app = ensure_app(options)
               operation = app.create_operation(type: 'restart')

data/lib/aptible/cli/subcommands/ssh.rb

@@ -15,8 +15,7 @@ module Aptible
 
               If specifying an app, invoke via: aptible ssh [--app=APP] COMMAND
             LONGDESC
-            option :app
-            option :remote, aliases: '-r'
+            app_options
             option :force_tty, type: :boolean
             def ssh(*args)
               app = ensure_app(options)

data/lib/aptible/cli/version.rb

@@ -1,5 +1,5 @@
 module Aptible
   module CLI
-    VERSION = '0.6.0'
+    VERSION = '0.6.1'
   end
 end

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

@@ -35,8 +35,7 @@ describe Aptible::CLI::Agent do
       allow(service).to receive(:create_operation) { op }
       allow(subject).to receive(:options) { { app: 'hello' } }
       allow(op).to receive(:resource) { apps.first }
-      allow(Aptible::Api::Account).to receive(:all) { [account] }
-      allow(account).to receive(:apps) { apps }
+      allow(Aptible::Api::App).to receive(:all) { apps }
 
       subject.send('apps:scale', 'web', 3)
     end

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

@@ -35,8 +35,7 @@ describe Aptible::CLI::Agent do
     it 'should print out the hostnames' do
       allow(service).to receive(:create_operation) { op }
       allow(subject).to receive(:options) { { app: 'hello' } }
-      allow(Aptible::Api::Account).to receive(:all) { [account] }
-      allow(account).to receive(:apps) { apps }
+      allow(Aptible::Api::App).to receive(:all) { apps }
 
       expect(app).to receive(:vhosts) { [vhost1, vhost2] }
       expect(subject).to receive(:say).with('domain1')
@@ -68,8 +67,7 @@ describe Aptible::CLI::Agent do
     it 'should print hostnames if -v is passed' do
       allow(service).to receive(:create_operation) { op }
       allow(subject).to receive(:options) { { verbose: true, app: 'hello' } }
-      allow(Aptible::Api::Account).to receive(:all) { [account] }
-      allow(account).to receive(:apps) { apps }
+      allow(Aptible::Api::App).to receive(:all) { apps }
 
       expect(app).to receive(:vhosts) { [vhost1, vhost2] }
       expect(subject).to receive(:say).with('domain1 -> host1')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aptible-cli
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.6.1
 platform: ruby
 authors:
 - Frank Macreery
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-23 00:00:00.000000000 Z
+date: 2016-02-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: aptible-api