engineyard 1.0.0 → 1.0.1

data/lib/engineyard/cli.rb

@@ -34,7 +34,7 @@ module EY
     method_option :ignore_bad_master, :type => :boolean,
       :desc => "Force a deploy even if the master is in a bad state"
     method_option :migrate, :type => :string, :aliases => %w(-m),
-      :default => 'rake db:migrate',
+      :lazy_default => true,
       :desc => "Run migrations via [MIGRATE], defaults to 'rake db:migrate'; use --no-migrate to avoid running migrations"
     method_option :environment, :type => :string, :aliases => %w(-e),
       :desc => "Environment in which to deploy this application"
@@ -63,7 +63,16 @@ module EY
 
       EY.ui.info "Beginning deploy for '#{app.name}' in '#{environment.name}' on server..."
 
-      if environment.deploy(app, deploy_ref, options[:migrate], options[:verbose])
+      # missing means do what the yaml file says
+      # nil means don't do it
+      # true (the lazy default) means do it with the custom command
+      # a string means do it with this specific command
+
+      deploy_options = {}
+      deploy_options['migrate'] = options['migrate'] if options.has_key?('migrate')
+      deploy_options['verbose'] = options['verbose'] if options.has_key?('verbose')
+
+      if environment.deploy(app, deploy_ref, deploy_options)
         EY.ui.info "Deploy complete"
       else
         raise EY::Error, "Deploy failed"

data/lib/engineyard/model/environment.rb

@@ -35,8 +35,41 @@ module EY
         app_master!.ensure_eydeploy_present(&blk)
       end
 
-      def deploy(app, ref, migration_command=nil, verbose=false)
-        app_master!.deploy(app, ref, migration_command, config, verbose)
+      def deploy(app, ref, deploy_options={})
+        # regarding deploy_options['migrate']:
+        #
+        # missing means migrate how the yaml file says to
+        # nil means don't migrate
+        # true means migrate w/custom command (if present) or default
+        # a string means migrate with this specific command
+
+        default_migration_command = config['migration_command'] || 'rake db:migrate'
+
+        migration_from_config = if config.has_key?('migrate')
+                                  if config['migrate']
+                                    default_migration_command
+                                  else
+                                    nil
+                                  end
+                                else
+                                  default_migration_command
+                                end
+
+        migration_from_command_line = if deploy_options['migrate'].nil?
+                                        nil
+                                      elsif deploy_options['migrate'].respond_to?(:to_str)
+                                        deploy_options['migrate'].to_str
+                                      else
+                                        default_migration_command
+                                      end
+
+        cmd = if deploy_options.has_key?('migrate')
+                migration_from_command_line
+              else
+                migration_from_config
+              end
+
+        app_master!.deploy(app, ref, cmd, config, deploy_options['verbose'])
       end
 
       def rollback(app, verbose=false)
@@ -107,7 +140,7 @@ module EY
       end
 
       def configuration
-        EY.config.environments[self.name]
+        EY.config.environments[self.name] || {}
       end
       alias_method :config, :configuration
 

data/lib/engineyard/model/instance.rb

@@ -3,7 +3,7 @@ require 'escape'
 module EY
   module Model
     class Instance < ApiStruct.new(:id, :role, :name, :status, :amazon_id, :public_hostname, :environment)
-      EYDEPLOY_VERSION = ENV["EY_DEPLOY_VERSION"] || "1.0.0"
+      EYDEPLOY_VERSION = ENV["EY_DEPLOY_VERSION"] || "1.0.1"
       EXIT_STATUS = Hash.new { |h,k| raise EY::Error, "ey-deploy version checker exited with unknown status code #{k}" }
       EXIT_STATUS.merge!({
         255 => :ssh_failed,

data/lib/engineyard/thor.rb

@@ -1,74 +1,8 @@
-$LOAD_PATH.unshift File.expand_path("../vendor", __FILE__)
 require 'thor'
 
 module EY
-  class Thor < ::Thor
-    def self.start(original_args=ARGV, config={})
-      @@original_args = original_args
-      super
-    end
-
-    no_tasks do
-      def self.subcommands
-        @@subcommands ||= {}
-      end
-
-      def self.subcommand(subcommand, subcommand_class)
-        subcommand = subcommand.to_s
-        subcommands[subcommand] = subcommand_class
-        subcommand_class.subcommand_help subcommand
-        define_method(subcommand) { |*_| subcommand_class.start(subcommand_args) }
-      end
-
-      def self.subcommand_help(cmd)
-        desc "#{cmd} help [COMMAND]", "Describe all subcommands or one specific subcommand."
-        class_eval <<-RUBY
-          def help(*args)
-            if args.empty?
-              EY.ui.say "usage: #{banner_base} #{cmd} COMMAND"
-              EY.ui.say
-              subcommands = self.class.printable_tasks.sort_by{|s| s[0] }
-              subcommands.reject!{|t| t[0] =~ /#{cmd} help$/}
-              EY.ui.print_help(subcommands)
-              EY.ui.say self.class.send(:class_options_help, EY.ui)
-              EY.ui.say "See #{banner_base} #{cmd} help COMMAND" +
-                " for more information on a specific subcommand." if args.empty?
-            else
-              super
-            end
-          end
-        RUBY
-      end
-
-      def subcommand_args
-        @@original_args[1..-1]
-      end
-
-      def self.banner_base
-        "ey"
-      end
-
-      def self.banner(task, task_help = false)
-        scmd = EY::Thor.subcommands.invert[self]
-        task = (task_help ? task.formatted_usage(self, false) : task.name)
-        [banner_base, scmd, task].compact.join(" ")
-      end
-    end
-
+  module UtilityMethods
     protected
-
-    def self.handle_no_task_error(task)
-      if self.banner_base == "thor"
-        raise UndefinedTaskError, "Could not find command #{task.inspect} in #{namespace.inspect} namespace."
-      else
-        raise UndefinedTaskError, "Could not find command #{task.inspect}."
-      end
-    end
-
-    def self.exit_on_failure?
-      true
-    end
-
     def api
       @api ||= EY::CLI::API.new
     end
@@ -106,7 +40,7 @@ module EY
         api.apps.match_one!(app_name)
       else
         api.app_for_repo!(repo)
-      end      
+      end
     end
 
     def get_apps(all_apps = false)
@@ -116,5 +50,53 @@ module EY
         [api.app_for_repo(repo)].compact
       end
     end
+
+  end # UtilityMethods
+
+  class Thor < ::Thor
+    include UtilityMethods
+
+    no_tasks do
+      def self.subcommand_help(cmd)
+        desc "#{cmd} help [COMMAND]", "Describe all subcommands or one specific subcommand."
+        class_eval <<-RUBY
+          def help(*args)
+            if args.empty?
+              EY.ui.say "usage: #{banner_base} #{cmd} COMMAND"
+              EY.ui.say
+              subcommands = self.class.printable_tasks.sort_by{|s| s[0] }
+              subcommands.reject!{|t| t[0] =~ /#{cmd} help$/}
+              EY.ui.print_help(subcommands)
+              EY.ui.say self.class.send(:class_options_help, EY.ui)
+              EY.ui.say "See #{banner_base} #{cmd} help COMMAND" +
+                " for more information on a specific subcommand." if args.empty?
+            else
+              super
+            end
+          end
+        RUBY
+      end
+
+      def self.banner_base
+        "ey"
+      end
+
+      def self.banner(task, task_help = false, subcommand = false)
+        scmd = EY::Thor.subcommands.invert[self]
+        task = (task_help ? task.formatted_usage(self, false, subcommand) : task.name)
+        [banner_base, scmd, task].compact.join(" ")
+      end
+
+      def self.handle_no_task_error(task)
+        raise UndefinedTaskError, "Could not find command #{task.inspect}."
+      end
+    end
+
+    protected
+
+    def self.exit_on_failure?
+      true
+    end
+
   end
 end

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '1.0.0'
+  VERSION = '1.0.1'
 end

data/spec/ey/deploy_spec.rb

@@ -97,6 +97,72 @@ describe "ey deploy" do
       @ssh_commands.last.should =~ /ey-deploy.*deploy/
       @ssh_commands.last.should_not =~ /--migrate/
     end
+
+    it "uses the default when --migrate is specified with no value" do
+      ey "deploy --migrate"
+      @ssh_commands.last.should match(/--migrate 'rake db:migrate'/)
+    end
+
+    context "customized in ey.yml" do
+      before { write_yaml({"environments" => {"giblets" => {
+                "migration_command" => 'thor fancy:migrate',
+              }}}) }
+      after  { File.unlink 'ey.yml' }
+
+      it "migrates with the custom command by default" do
+        ey "deploy"
+        @ssh_commands.last.should =~ /--migrate 'thor fancy:migrate'/
+      end
+    end
+
+    context "disabled in ey.yml" do
+      before { write_yaml({"environments" => {"giblets" => {"migrate" => false}}}) }
+      after  { File.unlink 'ey.yml' }
+
+      it "does not migrate by default" do
+        ey "deploy"
+        @ssh_commands.last.should =~ /ey-deploy.*deploy/
+        @ssh_commands.last.should_not =~ /--migrate/
+      end
+
+      it "can be turned back on with --migrate" do
+        ey "deploy --migrate 'rake fancy:migrate'"
+        @ssh_commands.last.should =~ /--migrate 'rake fancy:migrate'/
+      end
+
+      it "migrates with the default when --migrate is specified with no value" do
+        ey "deploy --migrate"
+        @ssh_commands.last.should match(/--migrate 'rake db:migrate'/)
+      end
+    end
+
+    context "explicitly enabled in ey.yml (the default)" do
+      before { write_yaml({"environments" => {"giblets" => {"migrate" => true}}}) }
+      after  { File.unlink 'ey.yml' }
+
+      it "migrates with the default" do
+        ey "deploy"
+        @ssh_commands.last.should match(/--migrate 'rake db:migrate'/)
+      end
+    end
+
+    context "customized and disabled in ey.yml" do
+      before { write_yaml({"environments" => {"giblets" => {
+                "migrate" => false,
+                "migration_command" => "thor fancy:migrate",
+              }}}) }
+      after  { File.unlink 'ey.yml' }
+
+      it "does not migrate by default" do
+        ey "deploy"
+        @ssh_commands.last.should_not match(/--migrate/)
+      end
+
+      it "migrates with the custom command when --migrate is specified with no value" do
+        ey "deploy --migrate"
+        @ssh_commands.last.should match(/--migrate 'thor fancy:migrate'/)
+      end
+    end
   end
 
   context "choosing something to deploy" do

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 1
   - 0
-  - 0
-  version: 1.0.0
+  - 1
+  version: 1.0.1
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-19 00:00:00 -07:00
+date: 2010-07-22 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -45,8 +45,22 @@ dependencies:
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
   prerelease: false
-  name: escape
+  name: thor
   requirement: &id003 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 13
+        - 8
+        version: 0.13.8
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  prerelease: false
+  name: escape
+  requirement: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -56,11 +70,11 @@ dependencies:
         - 4
         version: 0.0.4
   type: :runtime
-  version_requirements: *id003
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: json
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -70,11 +84,11 @@ dependencies:
         - 0
         version: 1.4.0
   type: :runtime
-  version_requirements: *id004
+  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
   prerelease: false
   name: rest-client
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
@@ -83,7 +97,7 @@ dependencies:
         - 4
         version: "1.4"
   type: :runtime
-  version_requirements: *id005
+  version_requirements: *id006
 description: This gem allows you to deploy your rails application to the Engine Yard cloud directly from the command line.
 email: cloud@engineyard.com
 executables: 
@@ -115,33 +129,6 @@ files:
 - lib/engineyard/repo.rb
 - lib/engineyard/ruby_ext.rb
 - lib/engineyard/thor.rb
-- lib/engineyard/vendor/thor/actions/create_file.rb
-- lib/engineyard/vendor/thor/actions/directory.rb
-- lib/engineyard/vendor/thor/actions/empty_directory.rb
-- lib/engineyard/vendor/thor/actions/file_manipulation.rb
-- lib/engineyard/vendor/thor/actions/inject_into_file.rb
-- lib/engineyard/vendor/thor/actions.rb
-- lib/engineyard/vendor/thor/base.rb
-- lib/engineyard/vendor/thor/core_ext/file_binary_read.rb
-- lib/engineyard/vendor/thor/core_ext/hash_with_indifferent_access.rb
-- lib/engineyard/vendor/thor/core_ext/ordered_hash.rb
-- lib/engineyard/vendor/thor/error.rb
-- lib/engineyard/vendor/thor/group.rb
-- lib/engineyard/vendor/thor/invocation.rb
-- lib/engineyard/vendor/thor/parser/argument.rb
-- lib/engineyard/vendor/thor/parser/arguments.rb
-- lib/engineyard/vendor/thor/parser/option.rb
-- lib/engineyard/vendor/thor/parser/options.rb
-- lib/engineyard/vendor/thor/parser.rb
-- lib/engineyard/vendor/thor/rake_compat.rb
-- lib/engineyard/vendor/thor/runner.rb
-- lib/engineyard/vendor/thor/shell/basic.rb
-- lib/engineyard/vendor/thor/shell/color.rb
-- lib/engineyard/vendor/thor/shell.rb
-- lib/engineyard/vendor/thor/task.rb
-- lib/engineyard/vendor/thor/util.rb
-- lib/engineyard/vendor/thor/version.rb
-- lib/engineyard/vendor/thor.rb
 - lib/engineyard/version.rb
 - lib/engineyard.rb
 - LICENSE

data/lib/engineyard/vendor/thor.rb

@@ -1,270 +0,0 @@
-require 'thor/base'
-
-# TODO: Update thor to allow for git-style CLI (git bisect run)
-class Thor
-  class << self
-    # Sets the default task when thor is executed without an explicit task to be called.
-    #
-    # ==== Parameters
-    # meth<Symbol>:: name of the defaut task
-    #
-    def default_task(meth=nil)
-      case meth
-        when :none
-          @default_task = 'help'
-        when nil
-          @default_task ||= from_superclass(:default_task, 'help')
-        else
-          @default_task = meth.to_s
-      end
-    end
-
-    # Defines the usage and the description of the next task.
-    #
-    # ==== Parameters
-    # usage<String>
-    # description<String>
-    #
-    def desc(usage, description, options={})
-      if options[:for]
-        task = find_and_refresh_task(options[:for])
-        task.usage = usage             if usage
-        task.description = description if description
-      else
-        @usage, @desc = usage, description
-      end
-    end
-
-    # Defines the long description of the next task.
-    #
-    # ==== Parameters
-    # long description<String>
-    #
-    def long_desc(long_description, options={})
-      if options[:for]
-        task = find_and_refresh_task(options[:for])
-        task.long_description = long_description if long_description
-      else
-        @long_desc = long_description
-      end
-    end
-
-    # Maps an input to a task. If you define:
-    #
-    #   map "-T" => "list"
-    #
-    # Running:
-    #
-    #   thor -T
-    #
-    # Will invoke the list task.
-    #
-    # ==== Parameters
-    # Hash[String|Array => Symbol]:: Maps the string or the strings in the array to the given task.
-    #
-    def map(mappings=nil)
-      @map ||= from_superclass(:map, {})
-
-      if mappings
-        mappings.each do |key, value|
-          if key.respond_to?(:each)
-            key.each {|subkey| @map[subkey] = value}
-          else
-            @map[key] = value
-          end
-        end
-      end
-
-      @map
-    end
-
-    # Declares the options for the next task to be declared.
-    #
-    # ==== Parameters
-    # Hash[Symbol => Object]:: The hash key is the name of the option and the value
-    # is the type of the option. Can be :string, :array, :hash, :boolean, :numeric
-    # or :required (string). If you give a value, the type of the value is used.
-    #
-    def method_options(options=nil)
-      @method_options ||= {}
-      build_options(options, @method_options) if options
-      @method_options
-    end
-
-    # Adds an option to the set of method options. If :for is given as option,
-    # it allows you to change the options from a previous defined task.
-    #
-    #   def previous_task
-    #     # magic
-    #   end
-    #
-    #   method_option :foo => :bar, :for => :previous_task
-    #
-    #   def next_task
-    #     # magic
-    #   end
-    #
-    # ==== Parameters
-    # name<Symbol>:: The name of the argument.
-    # options<Hash>:: Described below.
-    #
-    # ==== Options
-    # :desc     - Description for the argument.
-    # :required - If the argument is required or not.
-    # :default  - Default value for this argument. It cannot be required and have default values.
-    # :aliases  - Aliases for this option.
-    # :type     - The type of the argument, can be :string, :hash, :array, :numeric or :boolean.
-    # :banner   - String to show on usage notes.
-    #
-    def method_option(name, options={})
-      scope = if options[:for]
-        find_and_refresh_task(options[:for]).options
-      else
-        method_options
-      end
-
-      build_option(name, options, scope)
-    end
-
-    # Parses the task and options from the given args, instantiate the class
-    # and invoke the task. This method is used when the arguments must be parsed
-    # from an array. If you are inside Ruby and want to use a Thor class, you
-    # can simply initialize it:
-    #
-    #   script = MyScript.new(args, options, config)
-    #   script.invoke(:task, first_arg, second_arg, third_arg)
-    #
-    def start(original_args=ARGV, config={})
-      super do |given_args|
-        meth = given_args.first.to_s
-
-        if !meth.empty? && (map[meth] || meth !~ /^\-/)
-          given_args.shift
-        else
-          meth = nil
-        end
-
-        meth = normalize_task_name(meth)
-        task = all_tasks[meth]
-
-        if task
-          args, opts = Thor::Options.split(given_args)
-          config.merge!(:task_options => task.options)
-        else
-          args, opts = given_args, {}
-        end
-
-        task ||= Thor::Task::Dynamic.new(meth)
-        trailing = args[Range.new(arguments.size, -1)]
-        new(args, opts, config).invoke(task, trailing || [])
-      end
-    end
-
-    # Prints help information for the given task.
-    #
-    # ==== Parameters
-    # shell<Thor::Shell>
-    # task_name<String>
-    #
-    def task_help(shell, task_name)
-      meth = normalize_task_name(task_name)
-      task = all_tasks[meth]
-      handle_no_task_error(meth) unless task
-
-      shell.say "Usage:"
-      shell.say "  #{banner(task, true)}"
-      shell.say
-      class_options_help(shell, nil => task.options.map { |_, o| o })
-      if task.long_description
-        shell.say "Description:"
-        shell.print_wrapped(task.long_description, :ident => 2)
-      else
-        shell.say task.description
-      end
-    end
-
-    # Prints help information for this class.
-    #
-    # ==== Parameters
-    # shell<Thor::Shell>
-    #
-    def help(shell)
-      list = printable_tasks
-      Thor::Util.thor_classes_in(self).each do |klass|
-        list += klass.printable_tasks(false)
-      end
-      list.sort!{ |a,b| a[0] <=> b[0] }
-
-      shell.say "Tasks:"
-      shell.print_table(list, :ident => 2, :truncate => true)
-      shell.say
-      class_options_help(shell)
-    end
-
-    # Returns tasks ready to be printed.
-    def printable_tasks(all=true)
-      (all ? all_tasks : tasks).map do |_, task|
-        item = []
-        item << banner(task)
-        item << (task.description ? "# #{task.description.gsub(/\s+/m,' ')}" : "")
-        item
-      end
-    end
-
-    def handle_argument_error(task, error) #:nodoc:
-      raise InvocationError, "#{task.name.inspect} was called incorrectly. Call as #{task.formatted_usage(self, banner_base == "thor").inspect}."
-    end
-
-    protected
-
-      # The banner for this class. You can customize it if you are invoking the
-      # thor class by another ways which is not the Thor::Runner. It receives
-      # the task that is going to be invoked and a boolean which indicates if
-      # the namespace should be displayed as arguments.
-      #
-      def banner(task, task_help = false)
-        "#{banner_base} #{task.formatted_usage(self, banner_base == "thor")}"
-      end
-
-      def baseclass #:nodoc:
-        Thor
-      end
-
-      def create_task(meth) #:nodoc:
-        if @usage && @desc
-          tasks[meth.to_s] = Thor::Task.new(meth, @desc, @long_desc, @usage, method_options)
-          @usage, @desc, @long_desc, @method_options = nil
-          true
-        elsif self.all_tasks[meth.to_s] || meth.to_sym == :method_missing
-          true
-        else
-          puts "[WARNING] Attempted to create task #{meth.inspect} without usage or description. " <<
-               "Call desc if you want this method to be available as task or declare it inside a " <<
-               "no_tasks{} block. Invoked from #{caller[1].inspect}."
-          false
-        end
-      end
-
-      def initialize_added #:nodoc:
-        class_options.merge!(method_options)
-        @method_options = nil
-      end
-
-      # Receives a task name (can be nil), and try to get a map from it.
-      # If a map can't be found use the sent name or the default task.
-      #
-      def normalize_task_name(meth) #:nodoc:
-        meth = map[meth.to_s] || meth || default_task
-        meth.to_s.gsub('-','_') # treat foo-bar > foo_bar
-      end
-  end
-
-  include Thor::Base
-
-  map HELP_MAPPINGS => :help
-
-  desc "help [TASK]", "Describe available tasks or one specific task"
-  def help(task=nil)
-    task ? self.class.task_help(shell, task) : self.class.help(shell)
-  end
-end