engineyard-serverside 2.0.2 → 2.0.3

data/lib/engineyard-serverside/configuration.rb

@@ -22,7 +22,16 @@ module EY
 
       # Calls def_option and adds a name? predicate method
       def self.def_boolean_option(name, default=nil, &block)
-        def_option(name, default, &block)
+        key ||= name.to_s
+
+        define_method(name) do
+          if block
+            val = fetch(key) {instance_eval(&block)}
+          else
+            val = fetch(key, default)
+          end
+          not [false,nil,'false','nil'].include?(val) # deal with command line options turning booleans into strings
+        end
         alias_method(:"#{name}?", name)
       end
 

data/lib/engineyard-serverside/version.rb

@@ -1,5 +1,5 @@
 module EY
   module Serverside
-    VERSION = '2.0.2'
+    VERSION = '2.0.3'
   end
 end

data/spec/configuration_spec.rb

@@ -11,7 +11,7 @@ describe EY::Serverside::Deploy::Configuration do
         'account_name' => 'acc',
         'migrate' => nil,
         'branch' => 'branch_from_command_line',
-        'config' => {'custom' => 'custom_from_extra_config'}.to_json
+        'config' => {'custom' => 'custom_from_extra_config', 'maintenance_on_migrate' => 'false'}.to_json
       })
 
       @deploy = FullTestDeploy.new(test_servers, @config, test_shell)
@@ -25,6 +25,7 @@ describe EY::Serverside::Deploy::Configuration do
             'branch' => 'branch_from_ey_yml',
             'custom' => 'custom_from_ey_yml',
             'bundle_without' => 'only test',
+            'maintenance_on_migrate' => true,
           }
         }
       }
@@ -69,5 +70,11 @@ describe EY::Serverside::Deploy::Configuration do
       @deploy.load_ey_yml
       @deploy.config.bundle_without.should == 'only test'
     end
+
+    it "overrides boolean ey.yml only options with --conifg strings" do
+      write_ey_yml 'ey.yml', @yaml_data
+      @deploy.load_ey_yml
+      @deploy.config.should_not be_maintenance_on_migrate
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: engineyard-serverside
 version: !ruby/object:Gem::Version
-  version: 2.0.2
+  version: 2.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-19 00:00:00.000000000 Z
+date: 2012-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -477,7 +477,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2910105700547415890
+      hash: 3769806345729603200
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: