engineyard 2.0.0.pre1 → 2.0.0.pre2

data/README.rdoc

@@ -28,9 +28,12 @@ The ey.yml file allows options to be saved for each environment to which an appl
         copy_exclude:                             # don't rsync the following dirs
         - .git
         verbose: true                             # always run verbose deploy (unless overriden on command line)
+        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)
+        precompile_assets: true                   # enables rails assets precompilation (default: inferred using app/assets and config/application.rb)
+        ignore_database_adapter_warning: true     # hide database adapter warning if you don't use MySQL or PostgreSQL (default: false)
 
-
-This ey.yml file will turn off default migrations, set the default command to "rake fancy:migrate" and set the default deploy branch to "deploy".
+Many of the options in ey.yml will only work if the file is committed to your application repository. Make sure to commit this file.
 
 == Commands
 
@@ -38,34 +41,39 @@ Command:
   ey deploy
 
   Options:
-    -r, --branch, --tag, [--ref=REF]          # Git ref to deploy. May be a branch, a tag, or a SHA.
-        [--ignore-bad-master]                 # Force a deploy even if the master is in a bad state
-    -v, [--verbose]                           # Be verbose
+    -r, [--ref=REF] [--branch=] [--tag=]        # Git ref to deploy. May be a branch, a tag, or a SHA.
+    -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
+    -v, [--verbose]                           # Be verbose
         [--ignore-default-branch]             # Force a deploy of the specified branch even if a default is set
-    -e, [--environment=ENVIRONMENT]           # Environment in which to deploy this application
-    -c, [--account=ACCOUNT]                   # Name of the account in which the environment can be found
+        [--ignore-bad-master]                 # Force a deploy even if the master is in a bad state
         [--extra-deploy-hook-options key:val] # Additional options to be made available in deploy hooks (in the 'config' hash)
+                                              # Add more keys as follows: --extra-deploy-hook-options key1:val1 key2:val2
 
 
   Description:
-    This command must be run with the current directory containing the app to be
+    This command must be run within the current directory containing the app to be
     deployed. If ey.yml specifies a default branch then the ref parameter can be
     omitted. Furthermore, if a default branch is specified but a different
     command is supplied the deploy will fail unless --ignore-default-branch
     is used.
 
-    Migrations are run by default with 'rake db:migrate'. A different command
-    can be specified via --migrate "ruby do_migrations.rb". Migrations can also
-    be skipped entirely by using --no-migrate.
+    If ey.yml does not specify a default migrate choice, you will be prompted to
+    specify a migration choice. A different command can later be specified via
+    --migrate "ruby do_migrations.rb". Migrations can also be skipped entirely
+    by using --no-migrate.
 
 Command:
   ey environments
 
   Options:
-    -s, [--simple]
-    -a, [--all]
+    -c, [--account=ACCOUNT]                   # Name of the account in which the environment can be found
+    -a, [--app=APP]                           # Name of the application containing the environments
+    -e, [--environment=ENVIRONMENT]           # Show only environments matching named environment
+    -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.
 
   Description:
     By default, environments for this app are displayed. The --all option will display all environments, including those for this app.
@@ -162,8 +170,11 @@ Command:
     The maintenance page is taken from the app currently being deployed. This means that you can customize maintenance pages to tell users the reason for downtime on every
     particular deploy.
 
-    Maintenance pages searched for in order of decreasing priority: * public/maintenance.html.custom * public/maintenance.html.tmp * public/maintenance.html *
-    public/system/maintenance.html.default
+    Maintenance pages searched for in order of decreasing priority:
+      * public/maintenance.html.custom
+      * public/maintenance.html.tmp
+      * public/maintenance.html
+      * public/system/maintenance.html.default
 
 Command:
   ey ssh
@@ -217,129 +228,21 @@ Command:
 
 == API Client
 
-This library also contains a Ruby ey_api library to the Engine Yard Cloud API.
-
-Setup:
-
-    token  = EY::CloudClient.authenticate("your@email.com", "password")
-    ey_api = EY::CloudClient.new(token)
-
-Current User:
-
-    user = ey_api.current_user
-    user.class # => EY::CloudClient::User
-    user.name  # => "Your Name"
-    user.email # => "your@email.com"
-
-Apps:
-
-    apps = ey_api.apps # loads all your app data at once; caches result
-
-    app = apps.find {|app| app.name == 'myapp'}
-    app.class           # => EY::CloudClient::App
-    app.name            # => 'myapp'
-    app.id              # => 123
-    app.repository_uri  # => git@github.com:myaccount/myapp.git
-
-    app.account.class   # => EY::CloudClient::Account
-
-    app.app_environments.first.class # => EY::CloudClient::AppEnvironment
-    app.app_environments.map {|e| e.environment.name} # => ['myapp_production', 'myapp_staging']
-
-Create a new application (to be booted within Environments):
-
-    account = EY::CloudClient::Account.new(ey_api, {:id => 4212, :name => 'drnic'})
-    app = EY::CloudClient::App.create(ey_api,
-      "account"        => account
-      "name"           => "myapp",
-      "repository_uri" => "git@github.com:mycompany/myapp.git",
-      "app_type_id"    => "rails3",
-    })
-
-Valid `app_type_id` are: `rack, rails2, rails3, rails4, sinatra, nodejs`. For some your account may require an early access feature to be enabled.
-
-Accounts:
-
-    account = app.account
-    account.class   # => EY::CloudClient::Account
-    account.id      # => 1234
-    account.name    # => 'myaccount'
-
-Keypairs:
-
-Upload your SSH public keys before you create Environments.
-
-    keypair = EY::CloudClient::Keypair.create(ey_api, {
-      "name"       => 'laptop',
-      "public_key" => "ssh-rsa OTHERKEYPAIR"
-    })
-
-Environments:
-
-    envs = ey_api.environments # loads all your environment data at once; caches result
-
-    env = envs.find {|e| e.name == 'myapp_production'}
-    env.class             # => EY::CloudClient::Environment
-    env.name              # => 'myapp_production'
-    env.id                # => 2345
-    env.framework_env     # => "production"
-    env.app_server_stack_name     # => "nginx_thin"
-    env.deployment_configurations # => {"myapp"=>{"name"=>"myapp", "uri"=>nil, "migrate"=>{"command"=>"rake db:migrate", "perform"=>false}, "repository_uri"=>"git@github.com:myaccount/myapp.git", "id"=>123, "domain_name"=>"_"}}
-    env.load_balancer_ip_address  # => "1.2.3.4"
-
-    # if environment isn't booted
-    env.instances_count     # => 0
-    env.app_master          # => nil
-    env.instances.count     # => []
-
-    # if environment is booted
-    env.instances_count     # => 1
-    env.app_master.class    # => EY::CloudClient::Instance
-    env.instances.first.class # => EY::CloudClient::Instance
-
-Create a new environment (for a given App):
-
-    app = EY::CloudClient::App.new(ey_api, {:id => 4212, :name => 'drnic'})
-    env = EY::CloudClient::Environment.create(ey_api,
-      "app"                   => app,
-      "name"                  => 'myapp_production',
-      "app_server_stack_name" => 'nginx_thin',       # default: nginx_passenger3
-      "region"                => 'us-west-1',        # default: us-east-1
-      "framework_env"         => 'staging'           # default: production
-    })
-
-
-Valid `app_server_stack_name` values: `nginx_unicorn, nginx_passenger3, nginx_nodejs, nginx_thin, nginx_puma`. For some your account may require an early access feature to be enabled.
-
-Instances:
-
-    instance = env.instances.first
-    instance.class        # => EY::CloudClient::Instance
-    instance.id           # => 12345
-    instance.role         # => "solo"
-    instance.status       # => "running"
-    instance.amazon_id    # => "i-abcdefg"
-    instance.hostname     # => "ec2-1-2-3-4.compute-1.amazonaws.com"
-    instance.public_hostname # => "ec2-1-2-3-4.compute-1.amazonaws.com" # alias of hostname
-
-Debugging:
-
-Setup for debugging:
+See https://github.com/engineyard/engineyard-cloud-client for the API client library.
 
-    ENV['DEBUG']='1'
-    require 'engineyard/cli'
-    EY.ui = EY::CLI::UI.new
+== DEBUG
 
-The API commands will print internal information:
+The API commands will print internal information if $DEBUG is set:
 
-    app = EY::CloudClient::App.create(ey_api, account, 'myapp2', 'git@github.com:myaccount/myapp2.git', 'rails3')
+    DEBUG=1 ey environments --all
            Token  YOURTOKEN
-         Request  POST https://cloud.engineyard.com/api/v2/accounts/1234/apps
-          Params  {"app"=>{"name"=>"myapp2", "app_type_id"=>"rails3", "repository_uri"=>"git@github.com:myaccount/myapp2.git"}}
+         Request  GET https://cloud.engineyard.com/api/v2/apps
+          Params  {}
         Response
-    {"app"=>
-      {"environments"=>[],
-       "name"=>"myapp2",
-       "repository_uri"=>"git@github.com:myaccount/myapp2.git",
-       "account"=>{"name"=>"myaccount", "id"=>1234},
-       "id"=>12345}}
+    {"apps"=>
+      [{"environments"=>[],
+        "name"=>"myapp",
+        "repository_uri"=>"git@github.com:myaccount/myapp.git",
+        "app_type_id"=>"rails3",
+        "account"=>{"name"=>"myaccount", "id"=>1234},
+        "id"=>12345}]}

data/bin/ey_perftools

@@ -0,0 +1,12 @@
+#!/usr/bin/env ruby
+require 'perftools'
+PerfTools::CpuProfiler.start("/Users/martinemde/p/ey/engineyard/status_profile")
+$:.unshift(File.expand_path('../../lib', __FILE__))
+require 'engineyard/cli'
+
+begin
+  EY::CLI.start
+rescue
+  exit(1)
+end
+PerfTools::CpuProfiler.stop

data/lib/engineyard.rb

@@ -1,5 +1,3 @@
-thor_lib = File.expand_path(File.join(File.dirname(__FILE__), 'vendor', 'thor', 'lib'))
-$:.unshift thor_lib
 require 'engineyard-cloud-client'
 
 module EY

data/lib/engineyard/cli.rb

@@ -32,6 +32,8 @@ module EY
       raise
     end
 
+    class_option :api_token, :type => :string, :desc => "Use API-TOKEN to authenticate this command"
+
     desc "deploy [--environment ENVIRONMENT] [--ref GIT-REF]",
       "Deploy specified branch, tag, or sha to specified environment."
     long_desc <<-DESC
@@ -70,10 +72,7 @@ module EY
     method_option :extra_deploy_hook_options, :type => :hash, :default => {},
       :desc => "Additional options to be made available in deploy hooks (in the 'config' hash)"
     def deploy
-      ui.info "Loading application data from EY Cloud..."
-
       app_env = fetch_app_environment(options[:app], options[:environment], options[:account])
-      app_env.environment.ignore_bad_bridge = options[:ignore_bad_master]
 
       env_config    = config.environment_config(app_env.environment_name)
       deploy_config = EY::DeployConfig.new(options, env_config, repo, ui)
@@ -85,7 +84,7 @@ module EY
         :extra_config    => deploy_config.extra_config,
       })
 
-      runner = serverside_runner(app_env, deploy_config.verbose)
+      runner = serverside_runner(app_env, deploy_config.verbose, options[:ignore_bad_master])
 
       out = EY::CLI::UI::Tee.new(ui.out, deployment.out)
       err = EY::CLI::UI::Tee.new(ui.err, deployment.err)

data/lib/engineyard/cli/api.rb

@@ -21,11 +21,12 @@ module EY
 
       attr_reader :token
 
-      def initialize(endpoint, ui)
+      def initialize(endpoint, ui, token = nil)
         @ui = ui
         EY::CloudClient.endpoint = endpoint
 
-        @token = ENV['ENGINEYARD_API_TOKEN'] if ENV['ENGINEYARD_API_TOKEN']
+        @token = token # specified on command line
+        @token ||= ENV['ENGINEYARD_API_TOKEN'] if ENV['ENGINEYARD_API_TOKEN']
         @token ||= EY::EYRC.load.api_token
         @token ||= self.class.authenticate(ui)
 

data/lib/engineyard/thor.rb

@@ -4,7 +4,7 @@ module EY
   module UtilityMethods
     protected
     def api
-      @api ||= EY::CLI::API.new(config.endpoint, ui)
+      @api ||= EY::CLI::API.new(config.endpoint, ui, options[:api_token])
     end
 
     def config
@@ -28,8 +28,8 @@ module EY
       @repo ||= EY::Repo.new
     end
 
-    def serverside_runner(app_env, verbose)
-      ServersideRunner.new(app_env.environment.bridge!.hostname, app_env.app, app_env.environment, verbose)
+    def serverside_runner(app_env, verbose, ignore_bad_bridge = false)
+      ServersideRunner.new(app_env.environment.bridge!(ignore_bad_bridge).hostname, app_env.app, app_env.environment, verbose)
     end
 
     def use_default_environment
@@ -40,6 +40,8 @@ module EY
     end
 
     def fetch_environment(environment_name, account_name)
+      ui.info "Loading application data from EY Cloud..."
+
       environment_name ||= use_default_environment
       remotes = repo.remotes if in_repo?
       constraints = {
@@ -70,6 +72,8 @@ module EY
     end
 
     def fetch_app_environment(app_name, environment_name, account_name)
+      ui.info "Loading application data from EY Cloud..."
+
       environment_name ||= use_default_environment
       remotes = repo.remotes if in_repo?
       constraints = {

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '2.0.0.pre1'
+  VERSION = '2.0.0.pre2'
 end

data/spec/engineyard/cli/api_spec.rb

@@ -8,6 +8,12 @@ describe EY::CLI::API do
     clean_eyrc
   end
 
+  it "uses the token specified token over the ENV token if passed" do
+    ENV['ENGINEYARD_API_TOKEN'] = 'envtoken'
+    EY::CLI::API.new('http://fake.local', EY::CLI::UI.new, 'specifiedtoken').token.should == 'specifiedtoken'
+    ENV.delete('ENGINEYARD_API_TOKEN')
+  end
+
   it "uses the token from $ENGINEYARD_API_TOKEN if set" do
     ENV['ENGINEYARD_API_TOKEN'] = 'envtoken'
     EY::CLI::API.new('http://fake.local', EY::CLI::UI.new).token.should == 'envtoken'

data/spec/ey/deploy_spec.rb

@@ -18,6 +18,12 @@ describe "ey deploy without an eyrc file" do
 
     read_eyrc.should == {"api_token" => scenario_api_token}
   end
+
+  it "uses the token on the command line" do
+    api_scenario "one app, one environment"
+    ey(%w[deploy --no-migrate --api-token] + [scenario_api_token])
+    @ssh_commands.should_not be_empty
+  end
 end
 
 

data/spec/ey/ssh_spec.rb

@@ -153,12 +153,12 @@ end
 describe "ey ssh --all" do
   before do
     @ssh_flag = %w[--all]
-    @hosts = %w(app_hostname 
-                app_master_hostname 
-                util_fluffy_hostname 
-                util_rocky_hostname 
-                db_master_hostname 
-                db_slave_1_hostname 
+    @hosts = %w(app_hostname
+                app_master_hostname
+                util_fluffy_hostname
+                util_rocky_hostname
+                db_master_hostname
+                db_slave_1_hostname
                 db_slave_2_hostname)
   end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard
 version: !ruby/object:Gem::Version
-  version: 2.0.0.pre1
+  version: 2.0.0.pre2
   prerelease: 6
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-22 00:00:00.000000000 Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -27,6 +27,22 @@ dependencies:
     - - ~>
       - !ruby/object:Gem::Version
         version: 1.6.0
+- !ruby/object:Gem::Dependency
+  name: thor
+  requirement: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.15.2
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.15.2
 - !ruby/object:Gem::Dependency
   name: highline
   requirement: !ruby/object:Gem::Requirement
@@ -82,7 +98,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre1
+        version: 2.0.0.pre2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -90,7 +106,7 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 2.0.0.pre1
+        version: 2.0.0.pre2
 - !ruby/object:Gem::Dependency
   name: engineyard-cloud-client
   requirement: !ruby/object:Gem::Requirement
@@ -98,7 +114,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -106,7 +122,7 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: 1.0.2
 - !ruby/object:Gem::Dependency
   name: net-ssh
   requirement: !ruby/object:Gem::Requirement
@@ -308,11 +324,13 @@ extensions: []
 extra_rdoc_files: []
 files:
 - bin/ey
+- bin/ey_perftools
 - lib/engineyard/cli/api.rb
 - lib/engineyard/cli/recipes.rb
 - lib/engineyard/cli/ui.rb
 - lib/engineyard/cli/web.rb
 - lib/engineyard/cli.rb
+- lib/engineyard/commands/deploy.rb
 - lib/engineyard/config.rb
 - lib/engineyard/deploy_config/migrate.rb
 - lib/engineyard/deploy_config/ref.rb
@@ -324,37 +342,6 @@ files:
 - lib/engineyard/thor.rb
 - lib/engineyard/version.rb
 - lib/engineyard.rb
-- lib/vendor/thor/lib/thor/actions/create_file.rb
-- lib/vendor/thor/lib/thor/actions/create_link.rb
-- lib/vendor/thor/lib/thor/actions/directory.rb
-- lib/vendor/thor/lib/thor/actions/empty_directory.rb
-- lib/vendor/thor/lib/thor/actions/file_manipulation.rb
-- lib/vendor/thor/lib/thor/actions/inject_into_file.rb
-- lib/vendor/thor/lib/thor/actions.rb
-- lib/vendor/thor/lib/thor/base.rb
-- lib/vendor/thor/lib/thor/core_ext/file_binary_read.rb
-- lib/vendor/thor/lib/thor/core_ext/hash_with_indifferent_access.rb
-- lib/vendor/thor/lib/thor/core_ext/ordered_hash.rb
-- lib/vendor/thor/lib/thor/error.rb
-- lib/vendor/thor/lib/thor/group.rb
-- lib/vendor/thor/lib/thor/invocation.rb
-- lib/vendor/thor/lib/thor/parser/argument.rb
-- lib/vendor/thor/lib/thor/parser/arguments.rb
-- lib/vendor/thor/lib/thor/parser/option.rb
-- lib/vendor/thor/lib/thor/parser/options.rb
-- lib/vendor/thor/lib/thor/parser.rb
-- lib/vendor/thor/lib/thor/rake_compat.rb
-- lib/vendor/thor/lib/thor/runner.rb
-- lib/vendor/thor/lib/thor/shell/basic.rb
-- lib/vendor/thor/lib/thor/shell/color.rb
-- lib/vendor/thor/lib/thor/shell/html.rb
-- lib/vendor/thor/lib/thor/shell.rb
-- lib/vendor/thor/lib/thor/task.rb
-- lib/vendor/thor/lib/thor/util.rb
-- lib/vendor/thor/lib/thor/version.rb
-- lib/vendor/thor/lib/thor.rb
-- lib/vendor/thor/LICENSE.md
-- lib/vendor/thor/README.md
 - LICENSE
 - README.rdoc
 - spec/engineyard/cli/api_spec.rb