engineyard 0.7.1 → 0.8.0

data/lib/engineyard/cli.rb

@@ -23,14 +23,16 @@ module EY
       This command must be run with 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 --force is used.
+      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.
     DESC
-    method_option :force, :type => :boolean, :aliases => %w(-f),
+    method_option :ignore_default_branch, :type => :boolean,
       :desc => "Force a deploy of the specified branch even if a default is set"
+    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',
       :desc => "Run migrations via [MIGRATE], defaults to 'rake db:migrate'; use --no-migrate to avoid running migrations"
@@ -45,11 +47,12 @@ module EY
     def deploy
       app         = fetch_app(options[:app])
       environment = fetch_environment(options[:environment], app)
+      environment.ignore_bad_master = options[:ignore_bad_master]
       deploy_ref  = if options[:app]
-                      environment.resolve_branch(options[:ref], options[:force]) ||
+                      environment.resolve_branch(options[:ref], options[:ignore_default_branch]) ||
                         raise(EY::Error, "When specifying the application, you must also specify the ref to deploy\nUsage: ey deploy --app <app name> --ref <branch|tag|ref>")
                     else
-                      environment.resolve_branch(options[:ref], options[:force]) ||
+                      environment.resolve_branch(options[:ref], options[:ignore_default_branch]) ||
                         repo.current_branch ||
                         raise(DeployArgumentError)
                     end

data/lib/engineyard/error.rb

@@ -68,7 +68,7 @@ module EY
   class BranchMismatch < EY::Error
     def initialize(default_branch, branch)
       super %|Your deploy branch is set to "#{default_branch}".\n| +
-        %|If you want to deploy branch "#{branch}", use --force.|
+        %|If you want to deploy branch "#{branch}", use --ignore-default_branch.|
     end
   end
 

data/lib/engineyard/model/environment.rb

@@ -1,6 +1,9 @@
 module EY
   module Model
-    class Environment < ApiStruct.new(:id, :name, :instances, :instances_count, :apps, :app_master, :username, :stack_name, :api)
+    class Environment < ApiStruct.new(:id, :name, :framework_env, :instances, :instances_count, :apps, :app_master, :username, :stack_name, :api)
+
+      attr_accessor :ignore_bad_master
+
       def self.from_hash(hash)
         super.tap do |env|
           env.username = hash['ssh_username']
@@ -22,7 +25,7 @@ module EY
         master = app_master
         if master.nil?
           raise NoAppMaster.new(name)
-        elsif master.status != "running"
+        elsif !ignore_bad_master && master.status != "running"
           raise BadAppMasterStatus.new(master.status)
         end
         master

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)
-      EYSD_VERSION = ENV["EY_DEPLOY_VERSION"] || "0.7.1"
+      EYSD_VERSION = ENV["EY_DEPLOY_VERSION"] || "0.8.0"
       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,
@@ -117,9 +117,11 @@ module EY
           command << instance_tuple.join(',')
         end
 
+        framework_arg = ['--framework-env', environment.framework_env]
+
         verbose_arg = verbose ? ['--verbose'] : []
 
-        cmd = Escape.shell_command(start + deploy_args + instance_args + verbose_arg)
+        cmd = Escape.shell_command(start + deploy_args + framework_arg + instance_args + verbose_arg)
         puts cmd if verbose
         ssh cmd
       end

data/lib/engineyard/version.rb

@@ -1,3 +1,3 @@
 module EY
-  VERSION = '0.7.1'
+  VERSION = '0.8.0'
 end

data/spec/engineyard/model/environment_spec.rb

@@ -115,6 +115,13 @@ describe "EY::Model::Environment#app_master!" do
     }.should raise_error(EY::BadAppMasterStatus)
   end
 
+  it "returns the app master if told to ignore the app master being in a non-running state" do
+    env = make_env_with_master("status" => "error")
+    env.ignore_bad_master = true
+    env.app_master!.should_not be_nil
+    env.app_master!.id.should == 44206
+  end
+
   it "raises an error if the app master is absent" do
     env = make_env_with_master(nil)
     lambda {

data/spec/ey/deploy_spec.rb

@@ -175,13 +175,13 @@ describe "ey deploy" do
         @ssh_commands.last.should =~ /--branch master/
       end
 
-      it "complains about a non-default branch without --force" do
+      it "complains about a non-default branch without --ignore-default_branch" do
         ey "deploy -r current-branch", :expect_failure => true
         @err.should =~ /deploy branch is set to "master"/
       end
 
-      it "deploys a non-default branch with --force" do
-        ey "deploy -r current-branch --force"
+      it "deploys a non-default branch with --ignore-default-branch" do
+        ey "deploy -r current-branch --ignore-default-branch"
         @ssh_commands.last.should =~ /--branch current-branch/
       end
     end

data/spec/support/fake_awsm.ru

@@ -155,6 +155,7 @@ private
             "instances_count" => 1,
             "stack_name" => "nginx_mongrel",
             "id" => 200,
+            "framework_env" => "production",
             "app_master" => {
               "status" => "running",
               "id" => 27220,
@@ -208,6 +209,7 @@ private
                 "instances_count" => 1,
                 "stack_name" => "nginx_mongrel",
                 "id" => 200,
+                "framework_env" => "production",
                 "app_master" => _instances.first}],
             "repository_uri" => git_remote}]
       end
@@ -223,6 +225,7 @@ private
             "instances_count" => 1,
             "stack_name" => "nginx_mongrel",
             "id" => 200,
+            "framework_env" => "production",
             "app_master" => _instances[0]}]
       end
 
@@ -273,6 +276,7 @@ private
                 "instances_count" => 1,
                 "stack_name" => "nginx_mongrel",
                 "id" => 200,
+                "framework_env" => "production",
                 "app_master" => {
                   "status" => "running",
                   "id" => 27220,
@@ -308,6 +312,7 @@ private
             "instances_count" => 1,
             "stack_name" => "nginx_mongrel",
             "id" => 200,
+            "framework_env" => "production",
             "app_master" => {
               "status" => "running",
               "id" => 27220,
@@ -379,6 +384,7 @@ private
                 "app_master" => keycollector_master,
                 "instances" => [keycollector_master],
                 "id" => 4359,
+                "framework_env" => "production",
                 "stack_name" => "nginx_mongrel"}],
           }, {
             "name" => "rails232app",
@@ -394,6 +400,7 @@ private
                 "name" => "giblets",
                 "app_master" => railsapp_master,
                 "instances" => [railsapp_master],
+                "framework_env" => "production",
                 "id" => 200,
                 "stack_name" => "nginx_unicorn"}],
           }]
@@ -414,6 +421,7 @@ private
                 "id" => 6125}],
           }, {
             "id" => 4359,
+            "framework_env" => "production",
             "name" => "keycollector_production",
             "ssh_username" => "deploy",
             "stack_name" => "nginx_mongrel",
@@ -448,6 +456,7 @@ private
                 "apps" => apps,
                 "instances_count" => 1,
                 "stack_name" => "nginx_mongrel",
+                "framework_env" => "production",
                 "id" => 200,
                 "app_master" => {
                   "status" => "running",
@@ -469,6 +478,7 @@ private
                 "instances_count" => 1,
                 "stack_name" => "nginx_passenger",
                 "id" => 8371,
+                "framework_env" => "production",
                 "app_master" => {
                   "public_hostname" => '127.3.2.1',
                   "status" => "running",
@@ -488,6 +498,7 @@ private
                 "instances_count" => 1,
                 "stack_name" => "nginx_passenger",
                 "id" => 8371,
+                "framework_env" => "production",
                 "app_master" => {
                   "public_hostname" => '127.44.55.66',
                   "status" => "running",
@@ -514,6 +525,7 @@ private
             "instances_count" => 1,
             "stack_name" => "nginx_mongrel",
             "id" => 200,
+            "framework_env" => "production",
             "app_master" => {
               "public_hostname" => "ec2-174-129-198-124.compute-1.amazonaws.com",
               "status" => "running",
@@ -536,6 +548,7 @@ private
             "instances_count" => 1,
             "stack_name" => "nginx_passenger",
             "id" => 8371,
+            "framework_env" => "production",
             "app_master" => {
               "public_hostname" => '127.3.2.1',
               "status" => "running",
@@ -559,6 +572,7 @@ private
             "instances_count" => 1,
             "stack_name" => "nginx_passenger",
             "id" => 8371,
+            "framework_env" => "production",
             "app_master" => {
               "public_hostname" => '127.44.55.66',
               "status" => "running",

data/spec/support/shared_behavior.rb

@@ -113,32 +113,40 @@ end
 shared_examples_for "it invokes eysd" do
   include Spec::Helpers::SharedIntegrationTestUtils
 
-  it "passes --verbose to eysd" do
-    api_scenario "one app, one environment"
-    run_ey({:env => 'giblets', :verbose => true})
-    @ssh_commands.should have_command_like(/eysd.*deploy.*--verbose/)
-  end
+  context "with arguments" do
+    before(:all) do
+      api_scenario "one app, one environment"
+      run_ey({:env => 'giblets', :verbose => true})
+    end
 
-  it "passes along instance information to eysd" do
-    api_scenario "one app, one environment"
-    run_ey({:env => 'giblets'})
+    it "passes --verbose to eysd" do
+      @ssh_commands.should have_command_like(/eysd.*deploy.*--verbose/)
+    end
 
-    instance_args = [
-      Regexp.quote("ec2-174-129-198-124.compute-1.amazonaws.com,app_master"),
-      Regexp.quote("ec2-174-129-142-53.compute-1.amazonaws.com,db_master"),
-      Regexp.quote("ec2-72-44-46-66.compute-1.amazonaws.com,app"),
-      Regexp.quote("ec2-184-73-116-228.compute-1.amazonaws.com,util,fluffy"),
-    ]
+    it "passes along instance information to eysd" do
+      instance_args = [
+        Regexp.quote("ec2-174-129-198-124.compute-1.amazonaws.com,app_master"),
+        Regexp.quote("ec2-174-129-142-53.compute-1.amazonaws.com,db_master"),
+        Regexp.quote("ec2-72-44-46-66.compute-1.amazonaws.com,app"),
+        Regexp.quote("ec2-184-73-116-228.compute-1.amazonaws.com,util,fluffy"),
+      ]
+
+      # they should all be mentioned
+      instance_args.each do |i|
+        @ssh_commands.last.should =~ /#{i}/
+      end
 
-    # they should all be mentioned
-    instance_args.each do |i|
-      @ssh_commands.last.should =~ /#{i}/
+      # after the option '--instances'
+      @ssh_commands.last.should match(/--instances (#{instance_args.join('|')})/)
+    end
+
+    it "passes the framework environment" do
+      @ssh_commands.last.should match(/--framework-env production/)
     end
 
-    # after the option '--instances'
-    @ssh_commands.last.should match(/--instances (#{instance_args.join('|')})/)
   end
 
+
   context "eysd installation" do
     before(:all) do
       api_scenario "one app, one environment"

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 7
-  - 1
-  version: 0.7.1
+  - 8
+  - 0
+  version: 0.8.0
 platform: ruby
 authors: 
 - EY Cloud Team
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-06-29 00:00:00 -07:00
+date: 2010-06-30 00:00:00 -07:00
 default_executable: ey
 dependencies: 
 - !ruby/object:Gem::Dependency