engineyard 0.2.13 → 0.3.0

data/lib/engineyard.rb

@@ -1,7 +1,7 @@
 module EY
   require 'engineyard/ruby_ext'
 
-  VERSION = "0.2.13"
+  VERSION = "0.3.0"
 
   autoload :Account, 'engineyard/account'
   autoload :API,     'engineyard/api'

data/lib/engineyard/action/deploy.rb

@@ -5,7 +5,7 @@ module EY
     class Deploy
       extend Util
 
-      EYSD_VERSION = "~>0.2.7"
+      EYSD_VERSION = "~>0.3.0"
 
       def self.call(env_name, branch, options)
         env_name ||= EY.config.default_environment

data/lib/engineyard/action/util.rb

@@ -14,34 +14,6 @@ module EY
         @repo ||= EY::Repo.new
       end
 
-      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 env_named(name)
-        env = account.environment_named(name)
-
-        if env.nil?
-          raise EnvironmentError, "Environment '#{env_name}' can't be found\n" +
-            "You can create it at #{EY.config.endpoint}"
-        else
-          env
-        end
-      end
-
     end
   end
 end

data/lib/engineyard/cli.rb

@@ -32,8 +32,16 @@ module EY
     desc "environments [--all]", "List cloud environments for this app, or all environments"
     method_option :all, :type => :boolean, :aliases => %(-a)
     def environments
-      require 'engineyard/action/list_environments'
-      EY::Action::ListEnvironments.call(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
+        EY.ui.say %|You do not have any cloud environments.|
+      end
     end
     map "envs" => :environments
 
@@ -45,20 +53,38 @@ module EY
 
     desc "ssh ENV", "Open an ssh session to the environment's application server"
     def ssh(name)
-      require 'engineyard/action/ssh'
-      EY::Action::SSH.call(name)
+      env = account.environment_named(name)
+      if env
+        Kernel.exec "ssh", "#{env.username}@#{env.app_master.public_hostname}", *ARGV[2..-1]
+      else
+        EY.ui.warn %|Could not find an environment named "#{name}"|
+      end
     end
 
     desc "logs ENV", "Retrieve the latest logs for an enviornment"
     def logs(name)
-      require 'engineyard/action/show_logs'
-      EY::Action::ShowLogs.call(name)
+      env_named(name).logs.each do |log|
+        EY.ui.info log.instance_name
+
+        if log.main
+          EY.ui.info "Main logs:"
+          EY.ui.say  log.main
+        end
+
+        if log.custom
+          EY.ui.info "Custom logs:"
+          EY.ui.say  log.custom
+        end
+      end
     end
 
     desc "upload_recipes ENV", "Upload custom chef recipes from the current directory to ENV"
     def upload_recipes(name)
-      require 'engineyard/action/upload_recipes'
-      EY::Action::UploadRecipes.call(name)
+      if account.upload_recipes_for(env_named(name))
+        EY.ui.say "Recipes uploaded successfully"
+      else
+        EY.ui.error "Recipes upload failed"
+      end
     end
 
     desc "version", "Print the version of the engineyard gem"
@@ -67,5 +93,42 @@ module EY
     end
     map "-v" => :version
 
+    private
+    def account
+      @account ||= EY::Account.new(EY::CLI::API.new)
+    end
+
+    def repo
+      @repo ||= EY::Repo.new
+    end
+
+    def env_named(env_name)
+      env = account.environment_named(env_name)
+
+      if env.nil?
+        raise EnvironmentError, "Environment '#{env_name}' can't be found\n" +
+          "You can create it at #{EY.config.endpoint}"
+      end
+
+      env
+    end
+
+    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
+
   end # CLI
 end # EY

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 2
-  - 13
-  version: 0.2.13
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-07 00:00:00 -07:00
+date: 2010-05-12 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -94,7 +94,6 @@ extra_rdoc_files: []
 
 files: 
 - bin/ey
-- lib/engineyard/#repo.rb#
 - lib/engineyard/account/api_struct.rb
 - lib/engineyard/account/app.rb
 - lib/engineyard/account/app_master.rb
@@ -103,11 +102,7 @@ files:
 - lib/engineyard/account/log.rb
 - lib/engineyard/account.rb
 - lib/engineyard/action/deploy.rb
-- lib/engineyard/action/list_environments.rb
 - lib/engineyard/action/rebuild.rb
-- lib/engineyard/action/show_logs.rb
-- lib/engineyard/action/ssh.rb
-- lib/engineyard/action/upload_recipes.rb
 - lib/engineyard/action/util.rb
 - lib/engineyard/api.rb
 - lib/engineyard/cli/api.rb

data/lib/engineyard/#repo.rb#

@@ -1,24 +0,0 @@
-module EY
-  class Repo
-
-    def initialize(path=File.expand_path('.'))
-      @path = path
-    end
-
-    def current_branch
-      head = File.read(File.join(@path, ".git/HEAD")).chomp
-      if head.gsub!("ref: refs/heads/", "")
-        head
-      else
-        nil
-      end
-    end
-
-    def urls
-      `git config -f #{@path}/.git/config --get-regexp 'remote.*.url'`.split(/\n/).map do |c|
-        c.split.last
-      end
-    end
-
-  end # Repo
-end # EY

data/lib/engineyard/action/list_environments.rb

@@ -1,22 +0,0 @@
-require 'engineyard/action/util'
-
-module EY
-  module Action
-    class ListEnvironments
-      extend Util
-
-      def self.call(all)
-        app, envs = app_and_envs(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
-          EY.ui.say %|You do not have any cloud environments.|
-        end
-      end
-    end
-  end
-end

data/lib/engineyard/action/show_logs.rb

@@ -1,26 +0,0 @@
-require 'engineyard/action/util'
-
-module EY
-  module Action
-    class ShowLogs
-      extend Util
-
-      def self.call(name)
-        env_named(name).logs.each do |log|
-          EY.ui.info log.instance_name
-
-          if log.main
-            EY.ui.info "Main logs:"
-            EY.ui.say  log.main
-          end
-
-          if log.custom
-            EY.ui.info "Custom logs:"
-            EY.ui.say  log.custom
-          end
-        end
-
-      end
-    end
-  end
-end

data/lib/engineyard/action/ssh.rb

@@ -1,19 +0,0 @@
-require 'engineyard/action/util'
-
-module EY
-  module Action
-    class SSH
-      extend Util
-
-      def self.call(name)
-
-        env = account.environment_named(name)
-        if env
-          Kernel.exec "ssh", "#{env.username}@#{env.app_master.public_hostname}", *ARGV[2..-1]
-        else
-          EY.ui.warn %|Could not find an environment named "#{name}"|
-        end
-      end
-    end
-  end
-end

data/lib/engineyard/action/upload_recipes.rb

@@ -1,17 +0,0 @@
-require 'engineyard/action/util'
-
-module EY
-  module Action
-    class UploadRecipes
-      extend Util
-
-      def self.call(name)
-        if account.upload_recipes_for(env_named(name))
-          EY.ui.say "Recipes uploaded successfully"
-        else
-          EY.ui.error "Recipes upload failed"
-        end
-      end
-    end
-  end
-end