engineyard 2.1.3 → 2.2.0.rc1

data/lib/engineyard/cli.rb

@@ -324,7 +324,7 @@ WARNING: Interrupting again may prevent Engine Yard Cloud from recording this
 
       runner = serverside_runner(app_env, deploy_config.verbose)
       runner.rollback do |args|
-        args.config = deploy_config.extra_config if deploy_config.extra_config
+        args.config = {'deployed_by' => api.current_user.name, 'input_ref' => 'N/A'}.merge(deploy_config.extra_config || {})
       end
 
       if runner.call(ui.out, ui.err)

data/lib/engineyard/config.rb

@@ -11,7 +11,13 @@ module EY
 
     def initialize(file = nil)
       @path = file ? Pathname.new(file) : CONFIG_FILES.find{|pathname| pathname.exist? }
-      @config = (@path ? YAML.load_file(@path.to_s) : {}) || {} # load_file returns `false' when the file is empty
+      @config = @path ? YAML.load_file(@path.to_s) : {}
+      @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["environments"] ||= {}
     end
 

data/lib/engineyard/version.rb

@@ -1,4 +1,4 @@
 module EY
-  VERSION = '2.1.3'
-  ENGINEYARD_SERVERSIDE_VERSION = ENV['ENGINEYARD_SERVERSIDE_VERSION'] || '2.1.4'
+  VERSION = '2.2.0.rc1'
+  ENGINEYARD_SERVERSIDE_VERSION = ENV['ENGINEYARD_SERVERSIDE_VERSION'] || '2.2.0.rc2'
 end

data/spec/engineyard/config_spec.rb

@@ -14,6 +14,11 @@ describe EY::Config do
       write_yaml({}, 'ey.yml')
       EY::Config.new.environments.should == {}
     end
+
+    it "rases an error when yaml produces an unexpected result" do
+      File.open('ey.yml', "w") {|f| f << "this isn't a hash" }
+      expect { EY::Config.new }.to raise_error(RuntimeError, "ey.yml load error: Expected a Hash but a String was returned.")
+    end
   end
 
   describe "endpoint" do

data/spec/ey/rollback_spec.rb

@@ -45,6 +45,8 @@ describe "ey rollback" do
       config_options.should_not be_nil
       config_options['some'].should == 'stuff'
       config_options['more'].should == 'crap'
+      config_options['input_ref'].should_not be_nil
+      config_options['deployed_by'].should_not be_nil
     end
 
     it "supports legacy --extra-deploy-hook-options" do

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: engineyard
 version: !ruby/object:Gem::Version
-  version: 2.1.3
-  prerelease: 
+  version: 2.2.0.rc1
+  prerelease: 6
 platform: ruby
 authors:
 - Engine Yard Cloud Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-17 00:00:00.000000000 Z
+date: 2013-07-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rest-client
@@ -424,18 +424,12 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
-      segments:
-      - 0
-      hash: -4308353544926307178
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
-  - - ! '>='
+  - - ! '>'
     - !ruby/object:Gem::Version
-      version: '0'
-      segments:
-      - 0
-      hash: -4308353544926307178
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.25