engineyard 0.2.7 → 0.2.9

data/lib/engineyard.rb

@@ -1,5 +1,5 @@
 module EY
-  VERSION = "0.2.7"
+  VERSION = "0.2.9"
 
   autoload :Account, 'engineyard/account'
   autoload :API,     'engineyard/api'

data/lib/engineyard/cli.rb

@@ -6,7 +6,7 @@ require 'engineyard/cli/error'
 
 module EY
   class CLI < Thor
-    EYSD_VERSION = "~>0.2.4.pre1"
+    EYSD_VERSION = "~>0.2.4"
 
     autoload :API, 'engineyard/cli/api'
     autoload :UI,  'engineyard/cli/ui'
@@ -106,27 +106,15 @@ module EY
     desc "environments [--all]", "List cloud environments for this app, or all environments"
     method_option :all, :type => :boolean, :aliases => %(-a)
     def environments
-      app = account.app_for_repo(repo)
-      if options[:all] || !app
-        envs = account.environments
-        if envs.empty?
-          EY.ui.say %|You do not have any cloud environments.|
-        else
-          EY.ui.say %|Cloud environments:|
-          EY.ui.print_envs(envs, EY.config.default_environment)
-        end
-
-        EY.ui.warn(NoAppError.new(repo).message) unless app || options[:all]
+      app, envs = app_and_envs(options[:all])
+      if app
+        EY.ui.say %|Cloud environments for #{app.name}:|
+        EY.ui.print_envs(envs, EY.config.default_environment)
+      elsif envs
+        EY.ui.say %|Cloud environments:|
+        EY.ui.print_envs(envs, EY.config.default_environment)
       else
-        app = account.app_for_repo(repo)
-        envs = app.environments
-        if envs.empty?
-          EY.ui.warn %|You have no environments set up for the application "#{app.name}"|
-          EY.ui.warn %|You can make one at #{EY.config.endpoint}|
-        else
-          EY.ui.say %|Cloud environments for #{app.name}:|
-          EY.ui.print_envs(envs, EY.config.default_environment)
-        end
+        EY.ui.say %|You do not have any cloud environments.|
       end
     end
     map "envs" => :environments
@@ -149,6 +137,23 @@ module EY
 
   private
 
+    def app_and_envs(all_envs = false)
+      app = account.app_for_repo(repo)
+
+      if all_envs || !app
+        envs = account.environments
+        EY.ui.warn(NoAppError.new(repo).message) unless app || all_envs
+        [nil, envs]
+      else
+        envs = app.environments
+        if envs.empty?
+          EY.ui.warn %|You have no environments set up for the application "#{app.name}"|
+          EY.ui.warn %|You can make one at #{EY.config.endpoint}|
+        end
+        envs.empty? ? [app, nil] : [app, envs]
+      end
+    end
+
     def account
       @account ||= EY::Account.new(API.new)
     end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 2
-  - 7
-  version: 0.2.7
+  - 9
+  version: 0.2.9
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-16 00:00:00 -07:00
+date: 2010-04-19 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency