engineyard 2.2.1 → 2.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    N2Y4ZmE1ZGQ5MDEzMWJiZDhlZWI0NmJjNGM5MGUyYjE2YjRlNTVjNw==
+    MWMzMTAwYWJkYWMyYjcxNjFhZjc0OThjZDM5M2E1MTJkMzIwNTg4Yg==
   data.tar.gz: !binary |-
-    NTA2OWMyYmY4MTUwZjU1MTI4MDkwMDY4MTk1ZTNhNGQ4YWUxNTM3NA==
+    NGM3OWVjYTI2ZWJmOGM5MzI3MjdiMjc3NDMzMTRiMmM3YTA4ZDFiNg==
 !binary "U0hBNTEy":
   metadata.gz: !binary |-
-    MTc2NTMzNWI1ODNiYzRkYzQ4MWJiOTMzMzY4NTAyMjdkMGQ0ZTc3MGYxM2Nh
-    MzRjYWQ1ODFlZTY4Y2VkN2M2M2EzYjBmNzJiNzNiMjJjM2JlMzFiYmNjNTM5
-    OGM3ODZiNTQxZjIwZjM2NTRkNjc4ODcxN2U1OTBhNmIxZjQ4MzQ=
+    ZGI4ZWRlNWE3NWIzZWE0MTc4ODBlMDcxNjllZTk3M2Y3NTE3ZmE3MDNjMzVk
+    ODgyOTc1ZjUzMjI2OGRhYTNmZmM4OGU3YzQzMGQxZmFiNGQ4ZTg5MWI4NzJi
+    NGY1M2Q1MWM4ODRhZWUyY2RkZjI2MzhjOTlhYTQzNzBjODgwMmM=
   data.tar.gz: !binary |-
-    ODQ0OTY5NDQwZTVjMzc4N2ZmOGU1Y2E0YTMzMmJlYjgwOGUxZGQyZDc1MGUx
-    ZWNiNjQ3NWE3NzIyMGYzNmNmNWU0ZThmNDMxZWZmYWRiNGFiZDBiNzQ3ZGFm
-    NGE5NjA1OTliMDNiNDA1ZDVjZGZlODIxMGM3ODllNGU0ZjU1ZTI=
+    OTY4OWZhOGZjZDdhYjY4NDc5OWE4ZjA5OTJhMjg4ZDFhNjVjMDFmMzM1ZjRj
+    ODJhMjNiYWY3MzBhZGMyNWI2MzFmNDkyNTliZmY1MzVhNWM5OGE2NjIzY2U1
+    YzU5OTU5Y2RjMjk4MDBlYTI5ZGM3ZDRmZDQxZmRjZGFiN2I4YmI=

data/README.md

@@ -18,38 +18,56 @@ you for your Engine Yard email and password.
 ### Configuration
 
 The `ey.yml` file allows options to be saved for each environment to which an
-application is deployed. Here's an example ey.yml file in `ROOT/config/ey.yml`:
+application is deployed.
+
+A typical Rails application will have a `config/ey.yml` like this:
+
+    ---
+    # This is all you need for a typical rails application.
+    defaults:
+      migrate: true
+      migration_command: rake db:migrate
+      precompile_assets: true
+
+The following `ey.yml` file shows other things that can be customized.
+A typical application will not need most of these options.
 
-    $ cat config/ey.yml
     ---
     # 'defaults' applies to all environments running this application.
+    # Only set these options if needed. The defaults are correct for most applications.
     defaults:
-      bundle_without: test development mygroup  # exclude groups on bundle install (leave blank to remove --without)
-      bundle_options: --local                   # add extra options to the bundle install command line (does not override bundle_without)
-      copy_exclude:                             # don't rsync the following dirs
-      - .git
+      bundler: detect                           # By default, bundler is detected via Gemfile. Options: true: always run bundler; false: never run bundler
+      composer: detect                          # By default, composer is detected via composer.lock. Options: true: always run composer; false: never run composer
+      npm: detect                               # By default, npm is detected via package.json. Options: true: always run npm; false: never run npm
+      bundle_without: GROUP1 GROUP2             # exclude groups on bundle install (default: test development)
+      bundle_options: --OPTION                  # extra bundle install options (--local, --quiet, etc; does not override bundle_without)
+      copy_exclude:                             # don't rsync the following dirs (some people like to skip .git)
+      - SOME_LARGE_DIR 
       maintenance_on_restart: false             # show maintenance page during app restart (default: false except for glassfish and mongrel)
-      maintenance_on_migrate: false             # show maintenance page during migrations (default: true)
+      maintenance_on_migrate: true              # show maintenance page during migrations (default: true)
       precompile_assets: true                   # enables rails assets precompilation (default: inferred using app/assets and config/application.rb)
       precomplie_assets_task: assets:precompile # override the assets:precompile rake task
-      precompile_unchanged_assets: true         # precompiles assets even if no changes would be detected (does not check for changes at all).
-      asset_dependencies: app/assets            # a list of relative paths to search for asset changes during each deploy.
-      assets_strategy: shifting                 # choose an alternet asset management strategy (shifting, cleaning, private, shared)
-      asset_roles: :all                         # specify on which roles to compile assets (default: [:app, :app_master, :solo] - must be an Array)
-      asset_roles:                              # (Array input for multiple roles) - Use hook deploy/before_compile_assets.rb for finer grained control.
-      - :app
-      - :app_master
-      - :util
+      precompile_unchanged_assets: false        # if true, does not check git for changes before precompiling assets.
+      asset_dependencies:                       # a list of relative paths to search for asset changes during each deploy.
+      - app/assets                              # default
+      - lib/assets                              # default
+      - vendor/assets                           # default
+      - Gemfile.lock                            # default
+      - config/routes.rb                        # default
+      - config/application.rb                   # default
+      - config/requirejs.yml                    # custom option (be sure to include defaults if you specify this option)
+      asset_strategy: shifting                  # choose an alternet asset management strategy. See rails_assets/strategy.rb for more info.
+      asset_roles: :all                         # specify on which roles to compile assets (default: [:app, :app_master, :solo])
       ignore_database_adapter_warning: true     # hide database adapter warning if you don't use MySQL or PostgreSQL (default: false)
 
     # Environment specific options apply only to a single environment and override settings in defaults.
     environments:
       env_production:
         precompile_unchanged_assets: true       # precompiles assets even if no changes would be detected (does not check for changes at all).
-        assets_strategy: shifting               # choose an alternet asset management strategy (shifting, cleaning, private, shared)
+        asset_strategy: shifting                # choose an alternet asset management strategy (shifting, cleaning, private, shared)
         asset_roles: :all                       # specify on which roles to compile assets (default: [:app, :app_master, :solo] - must be an Array)
       env_staging
-        assets_strategy: private                # Use an asset management that always refreshes, so staging enviroments don't get conflicts
+        asset_strategy: private                 # Use an asset management that always refreshes, so staging enviroments don't get conflicts
 
 These options in `ey.yml` will only work if the file is committed to your
 application repository. Make sure to commit this file. Different branches
@@ -59,6 +77,19 @@ found in the deploying commit will be used for the current deploy.
 
 ### Commands
 
+#### ey init
+
+Initialize a repository for deployment on Engine Yard Cloud.
+
+This command writes or updates an ey.yml file which explains options available
+for customizing the deployment process.
+
+`ey init` can be run in existing applications to update the ey.yml file
+without losing existing settings.
+
+NOTE: Please verify all settings and changes after running ey init for
+the first time.
+
 #### ey deploy
 
 This command must be run within the current directory containing the app to be
@@ -78,7 +109,7 @@ Options:
     -c, [--account=ACCOUNT]                   # Name of the account in which the environment can be found
     -a, [--app=APP]                           # Name of the application to deploy
     -e, [--environment=ENVIRONMENT]           # Environment in which to deploy this application
-    -m, [--migrate=MIGRATE]                   # Run migrations via [MIGRATE], defaults to 'rake db:migrate'; use --no-migrate to avoid running migrations
+    -m, [--migrate=MIGRATE]                   # Run migrations via [MIGRATE]; use --no-migrate to avoid running migrations
     -v, [--verbose]                           # Be verbose
         [--ignore-default-branch]             # Force a deploy of the specified branch even if a default is set
         [--ignore-bad-master]                 # Force a deploy even if the master is in a bad state
@@ -129,6 +160,32 @@ Options:
     -s, [--simple]                            # Print each environment name on its own on a new line
     -a, [--all]                               # Show all environments, not just ones associated with this application.
 
+#### ey servers
+
+List all servers on an environment.
+
+Options:
+
+    -c, [--account=ACCOUNT]                   # Name of the account in which the environment can be found
+    -e, [--environment=ENVIRONMENT]           # Show only servers in the named environment
+    -u, [--user]                              # Print the user@ in front of the server hostname to make ssh connections simpler
+    -s, [--simple]                            # Print each server on a new line with hostname, role, and name separated by tabs
+    -S, [--host]                              # Print each server on a new line with hostname only. Use -Su for 'user@host'
+
+Example output:
+
+    $ ey servers -s
+    ec2-10-0-0-0.us-west-2.compute.amazonaws.com	i-aabbccdd	app_master
+    ec2-10-0-0-1.us-west-2.compute.amazonaws.com	i-bbccddee	app
+    ec2-10-0-0-2.us-west-2.compute.amazonaws.com	i-ccddeeff	db_master
+    ec2-10-0-0-3.us-west-2.compute.amazonaws.com	i-ddeeffaa	util	resque
+
+    $ ey servers -Su
+    deploy@ec2-10-0-0-0.us-west-2.compute.amazonaws.com
+    deploy@ec2-10-0-0-1.us-west-2.compute.amazonaws.com
+    deploy@ec2-10-0-0-2.us-west-2.compute.amazonaws.com
+    deploy@ec2-10-0-0-3.us-west-2.compute.amazonaws.com
+
 
 #### ey logs
 

data/lib/engineyard.rb

@@ -1,9 +1,9 @@
-require 'engineyard-cloud-client'
-
 module EY
-  require 'engineyard/version'
-  require 'engineyard/error'
-  require 'engineyard/config'
-
   autoload :Repo,       'engineyard/repo'
+  autoload :Templates,  'engineyard/templates'
 end
+
+require 'engineyard-cloud-client'
+require 'engineyard/version'
+require 'engineyard/error'
+require 'engineyard/config'

data/lib/engineyard/cli.rb

@@ -4,6 +4,7 @@ require 'engineyard/thor'
 require 'engineyard/deploy_config'
 require 'engineyard/serverside_runner'
 require 'launchy'
+require 'fileutils'
 
 module EY
   class CLI < EY::Thor
@@ -36,10 +37,52 @@ module EY
       raise
     end
 
-    class_option :api_token, :type => :string, :desc => "Use API-TOKEN to authenticate this command"
+    class_option :api_token, :type => :string, :desc => "Use API_TOKEN to authenticate this command"
     class_option :serverside_version, :type => :string, :desc => "Please use with care! Override deploy system version (same as ENV variable ENGINEYARD_SERVERSIDE_VERSION)"
     class_option :quiet, :aliases => %w[-q], :type => :boolean, :desc => "Quieter CLI output."
 
+    desc "init",
+      "Initialize the current directory with an ey.yml configuration file."
+    long_desc <<-DESC
+      Initialize the current directory with an ey.yml configuration file.
+
+      Please read the generated file and make adjustments.
+      Many applications will need only the default behavior.
+      For reference, many available options are explained in the generated file.
+
+      IMPORTANT: THE GENERATED FILE '#{EY::Config.pathname_for_write}'
+      MUST BE COMMITTED TO YOUR REPOSITORY OR OPTIONS WILL NOT BE LOADED.
+    DESC
+    method_option :path, :type => :string, :aliases => %w(-p),
+      :desc => "Path for ey.yml (supported paths: #{EY::Config::CONFIG_FILES.join(', ')})"
+    def init
+      unless EY::Repo.exist?
+        raise EY::Error, "Working directory is not a repository. Aborting."
+      end
+
+      path = Pathname.new(options['path'] || EY::Config.pathname_for_write)
+
+      existing = {}
+      if path.exist?
+        ui.warn "Reinitializing existing file: #{path}"
+        existing = EY::Config.load_config
+      end
+
+      template = EY::Templates::EyYml.new(existing)
+      template.write(path)
+
+      ui.info <<-GIT
+
+Configuration generated: #{path}
+Go look at it, then add it to your repository!
+
+\tgit add #{path}
+\tgit commit -m "Add generated #{path} from ey init"
+
+      GIT
+    end
+
+
     desc "deploy [--environment ENVIRONMENT] [--ref GIT-REF]",
       "Deploy specified branch, tag, or sha to specified environment."
     long_desc <<-DESC
@@ -57,7 +100,7 @@ module EY
       :desc => "Force a deploy even if the master is in a bad state"
     method_option :migrate, :type => :string, :aliases => %w(-m),
       :lazy_default => true,
-      :desc => "Run migrations via [MIGRATE], defaults to '#{EY::DeployConfig::Migrate::DEFAULT}'; use --no-migrate to avoid running migrations"
+      :desc => "Run migrations via [MIGRATE]; use --no-migrate to avoid running migrations"
     method_option :ref, :type => :string, :aliases => %w(-r --branch --tag),
       :required => true, :default => '',
       :desc => "Git ref to deploy. May be a branch, a tag, or a SHA. Use -R to deploy a different ref if a default is set."
@@ -272,6 +315,47 @@ WARNING: Interrupting again may prevent Engine Yard Cloud from recording this
     end
     map "envs" => :environments
 
+    desc "servers", "List servers for an environment."
+    long_desc <<-DESC
+      Display a list of all servers on an environment.
+      Specify -s (--simple) to make parsing the output easier
+      or -uS (--user --host) to output bash loop friendly "user@hostname"
+    DESC
+
+    method_option :simple, :type => :boolean, :aliases => %(-s),
+      :desc => "Display all information in a simplified format without extra text or column alignment"
+    method_option :host, :type => :boolean, :aliases => %(-S),
+      :desc => "Display only hostnames, one per newline (use options -uS (--user --host) for user@hostname)"
+    method_option :user, :type => :boolean, :aliases => %w(-u),
+      :desc => "Include the ssh username in front of the hostname for easy SSH scripting"
+    method_option :account, :type => :string, :aliases => %w(-c),
+      :required => true, :default => '',
+      :desc => "Find environment in this account"
+    method_option :environment, :type => :string, :aliases => %w(-e),
+      :required => true, :default => '',
+      :desc => "Show servers in environment matching environment name"
+    def servers
+      if options[:environment] == '' && options[:account] == ''
+        repo.fail_on_no_remotes!
+      end
+
+      environment = nil
+      ui.mute_if(options[:simple] || options[:host]) do
+        environment = fetch_environment(options[:environment], options[:account])
+      end
+
+      username = options[:user] && environment.username
+      servers = environment.instances
+
+      if options[:host]
+        ui.print_hostnames(servers, username)
+      elsif options[:simple]
+        ui.print_simple_servers(servers, username)
+      else
+        ui.print_servers(servers, environment.hierarchy_name, username)
+      end
+    end
+
     desc "rebuild [--environment ENVIRONMENT]", "Rebuild specified environment."
     long_desc <<-DESC
       Engine Yard's main configuration run occurs on all servers. Mainly used to fix
@@ -338,7 +422,9 @@ WARNING: Interrupting again may prevent Engine Yard Cloud from recording this
     long_desc <<-DESC
       If a command is supplied, it will be run, otherwise a session will be
       opened. The application master is used for environments with clusters.
-      Option --all requires a command to be supplied and runs it on all servers.
+
+      Option --all requires a command to be supplied and runs it on all servers or
+      pass --each to connect to each server one after another.
 
       Note: this command is a bit picky about its ordering. To run a command with arguments on
       all servers, like "rm -f /some/file", you need to order it like so:
@@ -365,22 +451,56 @@ WARNING: Interrupting again may prevent Engine Yard Cloud from recording this
       :desc => "Run command on the utility servers with the given names. If no names are given, run on all utility servers."
     method_option :shell, :type => :string, :default => 'bash', :aliases => %w(-s),
       :desc => "Run command in a shell other than bash. Use --no-shell to run the command without a shell."
+    method_option :pty, :type => :boolean, :default => false, :aliases => %w(-t),
+      :desc => "If a command is given, run in a pty. Required for interactive commands like sudo."
+    method_option :bind_address, :type => :string, :aliases => %w(-L),
+      :desc => "When a command is not given, pass -L to the ssh command."
+    method_option :each, :type => :boolean, :default => false,
+      :desc => "If no command is given, connect to multiple servers each one after another, instead of exiting with an error."
 
     def ssh(cmd=nil)
       environment = fetch_environment(options[:environment], options[:account])
-      hosts = ssh_hosts(options, environment)
+      instances = ssh_hosts(options, environment)
+      ssh_opts = []
+
+      if cmd
+        if options[:shell]
+          cmd = Escape.shell_command([options[:shell],'-lc',cmd])
+        end
 
-      raise NoCommandError.new if cmd.nil? and hosts.size != 1
+        if options[:pty]
+          ssh_opts = ["-t"]
+        elsif cmd =~ /sudo/
+          ui.warn "sudo commands often need a tty to run correctly. Use -t option to spawn a tty."
+        end
+      else
+        if instances.size != 1 && options[:each] == false
+          raise NoCommandError.new
+        end
 
-      if options[:shell] && cmd
-        cmd = Escape.shell_command([options[:shell],'-lc',cmd])
+        if options[:bind_address]
+          ssh_opts = ["-L", options[:bind_address]]
+        end
       end
 
-      exits = hosts.map do |host|
-        system Escape.shell_command(['ssh', "#{environment.username}@#{host}", cmd].compact)
+      ssh_cmd = ["ssh"]
+      ssh_cmd += ssh_opts
+
+      trap(:INT) { abort "Aborting..." }
+
+      exits = instances.map do |instance|
+        host = instance.public_hostname
+        name = instance.name ? "#{instance.role} (#{instance.name})" : instance.role
+        ui.info "\nConnecting to #{name} #{host}..."
+        unless cmd
+          ui.info "Ctrl + C to abort"
+          sleep 1.3
+        end
+        system Escape.shell_command((ssh_cmd + ["#{environment.username}@#{host}"] + [cmd]).compact)
         $?.exitstatus
       end
-      exit exits.detect {|status| !status.zero?} || 0
+
+      exit exits.detect {|status| status != 0 } || 0
     end
 
     no_tasks do
@@ -407,7 +527,7 @@ WARNING: Interrupting again may prevent Engine Yard Cloud from recording this
 
         instances = environment.instances.select {|instance| filter[instance] }
         raise NoInstancesError.new(environment.name) if instances.empty?
-        return instances.map { |instance| instance.public_hostname }
+        return instances
       end
     end
 

data/lib/engineyard/cli/ui.rb

@@ -128,6 +128,48 @@ module EY
         return ''
       end
 
+      def mute_if(bool, &block)
+        bool ? mute(&block) : yield
+      end
+
+      def server_tuples(servers, username=nil)
+        user = username && "#{username}@"
+
+        servers.map do |server|
+          host = "#{user}#{server.hostname}"
+          [host, server.amazon_id, server.role, server.name]
+        end
+      end
+      private :server_tuples
+
+      def print_hostnames(servers, username=nil)
+        server_tuples(servers, username).each do |server_tuple|
+          puts server_tuple.first
+        end
+      end
+
+      def print_simple_servers(servers, username=nil)
+        server_tuples(servers, username).each do |server_tuple|
+          puts server_tuple.join("\t")
+        end
+      end
+
+      def print_servers(servers, name, username=nil)
+        tuples = server_tuples(servers, username)
+        count = tuples.size
+        puts "# #{count} server#{count == 1 ? '' : 's'} on #{name}"
+
+        host_width = tuples.map {|s| s[0].length }.max
+        host_format = "%-#{host_width}s" # "%-10s" left align
+
+        role_width = tuples.map {|s| s[2].length }.max
+        role_format = "%-#{role_width}s" # "%-10s" left align
+
+        tuples.each do |server_tuple|
+          puts "#{host_format}\t%s\t#{role_format}\t%s" % server_tuple
+        end
+      end
+
       def print_simple_envs(envs)
         puts envs.map{|env| env.name }.uniq.sort
       end

data/lib/engineyard/config.rb

@@ -5,19 +5,37 @@ require 'engineyard/error'
 
 module EY
   class Config
+    # This order is important.
     CONFIG_FILES = ["config/ey.yml", "ey.yml"].map {|path| Pathname.new(path)}.freeze
+    TEMPLATE_PATHNAME = Pathname.new(__FILE__).dirname.join('templates','ey.yml').freeze
 
-    attr_reader :path
+    def self.pathname_for_write
+      pathname || CONFIG_FILES.find{|pathname| pathname.dirname.exist? }
+    end
 
-    def initialize(file = nil)
-      @path = file ? Pathname.new(file) : CONFIG_FILES.find{|pathname| pathname.exist? }
-      @config = @path ? YAML.load_file(@path.to_s) : {}
-      @config ||= {} # load_file returns `false' when the file is empty
+    def self.pathname
+      CONFIG_FILES.find{|pathname| pathname.exist? }
+    end
+
+    def self.template_pathname
+      TEMPLATE_PATHNAME
+    end
 
-      unless Hash === @config
-        raise "ey.yml load error: Expected a Hash but a #{@config.class.name} was returned."
+    def self.load_config(path = pathname)
+      config = YAML.load_file(path.to_s) if path && path.exist?
+      config ||= {} # load_file returns `false' when the file is empty
+
+      unless Hash === config
+        raise "ey.yml load error: Expected a Hash but a #{config.class.name} was returned."
       end
+      config
+    end
 
+    attr_reader :path
+
+    def initialize(file = nil)
+      @path = file ? Pathname.new(file) : self.class.pathname
+      @config = self.class.load_config(@path)
       @config["environments"] ||= {}
     end
 
@@ -79,76 +97,6 @@ module EY
       EnvironmentConfig.new(environments[environment_name], environment_name, self)
     end
 
-    def set_environment_option(environment_name, key, value)
-      environments[environment_name] ||= {}
-      environments[environment_name][key] = value
-      write_ey_yaml
-    end
-
-    def write_ey_yaml
-      ensure_path
-      comments = ey_yml_comments
-      @path.open('w') do |f|
-        f.puts comments
-        f.puts YAML.dump(@config)
-      end
-    end
-
-    def set_default_option(key, value)
-      defaults[key] = value
-      write_ey_yaml
-    end
-
-    EY_YML_HINTS = <<-HINTS
-# ey.yml supports many deploy configuration options when committed in an
-# application's repository.
-#
-# Valid locations: REPO_ROOT/ey.yml or REPO_ROOT/config/ey.yml.
-#
-# Examples options (defaults apply to all environments for this application):
-#
-# defaults:
-#   migrate: true                           # Default --migrate choice for ey deploy
-#   migration_command: 'rake migrate'       # Default migrate command to run when migrations are enabled
-#   branch: default_deploy_branch           # Branch/ref to be deployed by default during ey deploy
-#   bundle_without: development test        # The string to pass to bundle install --without ''
-#   maintenance_on_migrate: true            # Enable maintenance page during migrate action (use with caution) (default: true)
-#   maintenance_on_restart: false           # Enable maintanence page during every deploy (default: false for unicorn & passenger)
-#   ignore_database_adapter_warning: false  # Hide the warning shown when the Gemfile does not contain a recognized database adapter (mongodb for example)
-#   your_own_custom_key: 'any attribute you put in ey.yml is available in deploy hooks'
-# environments:
-#   YOUR_ENVIRONMENT_NAME: # All options pertain only to the named environment
-#     any_option: 'override any of the options above with specific options for certain environments'
-#     migrate: false
-#
-# Further information available here:
-# https://support.cloud.engineyard.com/entries/20996661-customize-your-deployment-on-engine-yard-cloud
-#
-# NOTE: Please commit this file into your git repository.
-#
-    HINTS
-
-    def ey_yml_comments
-      if @path.exist?
-        existing = @path.readlines.grep(/^#/).map {|line| line.strip }.join("\n")
-      else
-        EY_YML_HINTS
-      end
-    end
-
-    def ensure_path
-      return if @path && @path.exist?
-      unless EY::Repo.exist?
-        raise "Not in application directory. Unable to save configuration."
-      end
-      if Pathname.new('config').exist?
-        @path = Pathname.new('config/ey.yml')
-      else
-        @path = Pathname.new('ey.yml')
-      end
-      @path
-    end
-
     class EnvironmentConfig
       attr_reader :name
 
@@ -162,28 +110,16 @@ module EY
         @parent.path
       end
 
-      def fetch(key, default = nil, &block)
-        @config.fetch(key.to_s) do
-          @parent.fetch_from_defaults(key.to_s, default, &block)
+      def ensure_exists
+        unless path && path.exist?
+          raise EY::Error, "Please initialize this application with the following command:\n\tey init"
         end
       end
 
-      def set(key, val)
-        if @config.empty? || !@config.has_key?(key.to_s)
-          @parent.set_default_option(key, val)
-        else
-          @config[key.to_s] = val
-          @parent.set_environment_option(@name, key, val)
+      def fetch(key, default = nil, &block)
+        @config.fetch(key.to_s) do
+          @parent.fetch_from_defaults(key.to_s, default, &block)
         end
-        val
-      end
-
-      def merge(other)
-        to_clean_hash.merge(other)
-      end
-
-      def to_clean_hash
-        @config.reject { |k,v| %w[branch migrate migration_command verbose].include?(k) }
       end
 
       def branch
@@ -191,22 +127,20 @@ module EY
       end
 
       def migrate
-        fetch('migrate')
-      end
-
-      def migrate=(mig)
-        set('migrate', mig)
+        ensure_exists
+        fetch('migrate') do
+          raise EY::Error, "'migrate' not found in #{path}. Reinitialize with:\n\tey init"
+        end
       end
 
       def migration_command
-        fetch('migration_command', nil)
+        ensure_exists
+        fetch('migration_command') do
+          raise EY::Error, "'migration_command' not found in #{path}. Reinitialize with:\n\tey init"
+        end
       end
 
-      def migration_command=(cmd)
-        set('migration_command', cmd)
-      end
       alias migrate_command migration_command
-      alias migrate_command= migration_command=
 
       def verbose
         fetch('verbose', false)