engineyard 0.2.11 → 0.2.12

data/lib/engineyard/action/show_logs.rb

@@ -0,0 +1,26 @@
+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

@@ -0,0 +1,19 @@
+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

@@ -0,0 +1,17 @@
+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

data/lib/engineyard/action/util.rb

@@ -0,0 +1,47 @@
+module EY
+  module Action
+    module Util
+
+    protected
+
+      def account
+        # XXX it stinks that we have to use EY::CLI::API explicitly
+        # here; I don't want to have this lateral Action --> CLI reference
+        @account ||= EY::Account.new(EY::CLI::API.new)
+      end
+
+      def repo
+        @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

@@ -1,11 +1,10 @@
 require 'thor'
 require 'engineyard'
-require 'engineyard/cli/error'
+require 'engineyard/error'
+require 'engineyard/cli/thor_fixes'
 
 module EY
   class CLI < Thor
-    EYSD_VERSION = "~>0.2.6"
-
     autoload :API, 'engineyard/cli/api'
     autoload :UI,  'engineyard/cli/ui'
 
@@ -21,131 +20,45 @@ module EY
       :desc => "Force a deploy of the specified branch"
     method_option :migrate, :type => :string, :aliases => %w(-m),
       :default => 'rake db:migrate',
-      :desc => "Run migrations via [MIGRATE], defaults to 'rake db:migrate'"
+      :desc => "Run migrations via [MIGRATE], defaults to 'rake db:migrate'; use --no-migrate to avoid running migrations"
     method_option :install_eysd, :type => :boolean, :aliases => %(-s),
       :desc => "Force remote install of eysd"
     def deploy(env_name = nil, branch = nil)
-      app = account.app_for_repo(repo)
-      raise NoAppError.new(repo) unless app
-
-      env_name ||= EY.config.default_environment
-      raise DeployArgumentError if !env_name && app.environments.size != 1
-
-      default_branch = EY.config.default_branch(env_name)
-      branch ||= (default_branch || repo.current_branch)
-      raise DeployArgumentError unless branch
-
-      invalid_branch = default_branch && (branch != default_branch) && !options[:force]
-      raise BranchMismatch.new(default_branch, branch) if invalid_branch
-
-      if env_name && app.environments
-        env = app.environments.find{|e| e.name == env_name }
-      else
-        env = app.environments.first
-      end
-
-      if !env && account.environment_named(env_name)
-        raise EnvironmentError, "Environment '#{env_name}' doesn't run this application\nYou can add it at #{EY.config.endpoint}"
-      elsif !env
-        raise NoEnvironmentError
-      end
-
-      running = env.app_master && env.app_master.status == "running"
-      raise EnvironmentError, "No running instances for environment #{env.name}\nStart one at #{EY.config.endpoint}" unless running
-
-      hostname = env.app_master.public_hostname
-      username = env.username
-
-      EY.ui.info "Connecting to the server..."
-      ssh_to(hostname, "eysd check '#{EY::VERSION}' '#{EYSD_VERSION}'", username, false)
-      case $?.exitstatus
-      when 255
-        raise EnvironmentError, "SSH connection to #{hostname} failed"
-      when 127
-        EY.ui.warn "Server does not have ey-deploy gem installed"
-        eysd_installed = false
-      when 0
-        eysd_installed = true
-      else
-        raise EnvironmentError, "ey-deploy version not compatible"
-      end
-
-      if !eysd_installed || options[:install_eysd]
-        EY.ui.info "Installing ey-deploy gem..."
-        ssh_to(hostname,
-            "sudo gem install ey-deploy -v '#{EYSD_VERSION}'",
-            username)
-      end
-
-      deploy_cmd = "eysd deploy --app #{app.name} --branch #{branch}"
-      if env.config
-        escaped_config_option = env.config.to_json.gsub(/"/, "\\\"")
-        deploy_cmd << " --config '#{escaped_config_option}'"
-      end
-
-      if options['migrate']
-        deploy_cmd << " --migrate='#{options[:migrate]}'"
-      end
-
-      EY.ui.info "Running deploy on server..."
-      deployed = ssh_to(hostname, deploy_cmd, username)
-
-      if deployed
-        EY.ui.info "Deploy complete"
-      else
-        raise EY::Error, "Deploy failed"
-      end
+      require 'engineyard/action/deploy'
+      EY::Action::Deploy.call(env_name, branch, options)
     end
 
 
     desc "environments [--all]", "List cloud environments for this app, or all environments"
     method_option :all, :type => :boolean, :aliases => %(-a)
     def environments
-      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
+      require 'engineyard/action/list_environments'
+      EY::Action::ListEnvironments.call(options[:all])
     end
     map "envs" => :environments
 
+    desc "rebuild [ENV]", "Rebuild environment (ensure configuration is up-to-date)"
+    def rebuild(name = nil)
+      require 'engineyard/action/rebuild'
+      EY::Action::Rebuild.call(name)
+    end
+
     desc "ssh ENV", "Open an ssh session to the environment's application server"
     def ssh(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
+      require 'engineyard/action/ssh'
+      EY::Action::SSH.call(name)
     end
 
-    desc "logs environment", "Retrieve the latest logs for an enviornment"
-    def logs(environment)
-      env = account.environment_named(environment)
-
-      if env.nil?
-        raise EnvironmentError, "Environment '#{env_name}' can't be found\n" +
-          "You can create it at #{EY.config.endpoint}"
-      else
-        env.logs.each do |log|
-          EY.ui.info log.instance_name
-
-          if log.main
-            EY.ui.info "Main logs:"
-            EY.ui.say  log.main
-          end
+    desc "logs ENV", "Retrieve the latest logs for an enviornment"
+    def logs(name)
+      require 'engineyard/action/show_logs'
+      EY::Action::ShowLogs.call(name)
+    end
 
-          if log.custom
-            EY.ui.info "Custom logs:"
-            EY.ui.say  log.custom
-          end
-        end # logs_for_environment(env).each
-      end # env.nil?
+    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)
     end
 
     desc "version", "Print the version of the engineyard gem"
@@ -154,44 +67,5 @@ module EY
     end
     map "-v" => :version
 
-  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
-
-    def repo
-      @repo ||= EY::Repo.new
-    end
-
-    def ssh_to(hostname, remote_cmd, user, output = true)
-      cmd = %{ssh -o StrictHostKeyChecking=no -q #{user}@#{hostname} "#{remote_cmd}"}
-      cmd << %{ &> /dev/null} unless output
-      EY.ui.debug(cmd)
-      puts cmd if output
-      unless ENV["NO_SSH"]
-        system cmd
-      else
-        true
-      end
-    end
-
   end # CLI
 end # EY

data/lib/engineyard/cli/thor_fixes.rb

@@ -0,0 +1,26 @@
+# This particular pile of monkeypatch can be removed once we have a
+# thor that doesn't consume an argument for --no-migrate.
+#
+# A fix has been written and a pull request sent.
+# The fix is
+# http://github.com/smerritt/thor/commit/421b2e97684e67ee393a13b3873e1a784bb83f68
+
+class Thor
+  class Arguments
+    private
+
+    def no_or_skip?(arg)
+      arg =~ /^--(no|skip)-([-\w]+)$/
+      $2
+    end
+
+    def parse_string(name)
+      if no_or_skip?(name)
+        nil
+      else
+        shift
+      end
+    end
+
+  end
+end

data/lib/engineyard/error.rb

@@ -0,0 +1,48 @@
+module EY
+  class Error < RuntimeError; end
+
+  class NoAppError < Error
+    def initialize(repo)
+      @repo = repo
+    end
+
+    def message
+      error = [%|There is no application configured for any of the following remotes:|]
+      @repo.urls.each{|url| error << %|\t#{url}| }
+      error << %|You can add this application at #{EY.config.endpoint}|
+        error.join("\n")
+    end
+  end
+
+  class EnvironmentError < EY::Error
+  end
+
+  class NoEnvironmentError < EY::Error
+    def initialize(env_name=nil)
+      @env_name = env_name
+    end
+
+    def message
+      "No environment named '#{@env_name}'\nYou can create one at #{EY.config.endpoint}"
+    end
+  end
+
+  class BranchMismatch < EY::Error
+    def initialize(default_branch, branch)
+      super(nil)
+      @default_branch, @branch = default_branch, branch
+    end
+
+    def message
+      %|Your deploy branch is set to "#{@default_branch}".\n| +
+        %|If you want to deploy branch "#{@branch}", use --force.|
+    end
+  end
+
+  class DeployArgumentError < EY::Error
+    def message
+      %|"deploy" was called incorrectly. Call as "deploy [ENVIRONMENT] [BRANCH]"\n| +
+        %|You can set default environments and branches in ey.yml|
+    end
+  end
+end

data/lib/engineyard/repo.rb

@@ -21,4 +21,4 @@ module EY
     end
 
   end # Repo
-end # EY
+end # EY

data/lib/engineyard/ruby_ext.rb

@@ -0,0 +1,9 @@
+class Object
+  unless respond_to?(:tap)
+    # Ruby 1.9 has it, 1.8 doesn't
+    def tap
+      yield self
+      self
+    end
+  end
+end

data/spec/engineyard/account/api_struct_spec.rb

@@ -0,0 +1,37 @@
+require 'spec_helper'
+
+describe EY::Account::ApiStruct do
+  class Foo < EY::Account::ApiStruct.new(:fruit); end
+  class FooWithAccount < EY::Account::ApiStruct.new(:fruit, :account); end
+
+  it "acts like a normal struct" do
+    f = Foo.new("banana")
+
+    f.fruit.should == "banana"
+  end
+
+  describe "from_hash initializer" do
+    it "assigns values from string keys" do
+      f = Foo.from_hash("fruit" => "banana")
+      f.should == Foo.new("banana")
+    end
+
+    it "assigns values from symbol keys" do
+      f = Foo.from_hash(:fruit => "banana")
+      f.should == Foo.new("banana")
+    end
+  end
+
+  describe "from_array initializer" do
+    it "provides a from_array initializer" do
+      f = Foo.from_array([:fruit => "banana"])
+      f.should == [Foo.new("banana")]
+    end
+
+    it "handles an account as the second argument" do
+      f = FooWithAccount.from_array([:fruit => "banana"], "account")
+      f.should == [FooWithAccount.new("banana", "account")]
+    end
+  end
+
+end