Merge pull request #128 from shortdudey123/prefer_cli_config

Prefer CLI config over Knife config for locate_config_value

lib/chef/knife/rackspace_base.rb

@@ -159,7 +159,7 @@ def auth_endpoint
 
       def locate_config_value(key)
         key = key.to_sym
-        Chef::Config[:knife][key] || config[key]
+        config[key] || Chef::Config[:knife][key]
       end
 
       def msg_pair(label, value, color = :cyan)

spec/unit/rackspace_base_spec.rb

@@ -36,3 +36,29 @@ class RackspaceBaseTester < Chef::Knife
     expect(tester.auth_endpoint).to eq(::Fog::Rackspace::UK_AUTH_ENDPOINT)
   end
 end
+
+describe "locate_config_value" do
+  it 'with cli options' do
+    # CLI
+    tester = RackspaceBaseTester.new
+    tester.parse_options([ "--rackspace-api-key", "12345" ])
+
+    # Knife Config
+    Chef::Config[:knife][:rackspace_api_key] = "67890"
+
+    # Test
+    expect(tester.locate_config_value(:rackspace_api_key)).to eq("12345")
+  end
+
+  it 'without cli options' do
+    # CLI
+    tester = RackspaceBaseTester.new
+    tester.parse_options([])
+
+    # Knife Config
+    Chef::Config[:knife][:rackspace_api_key] = "67890"
+
+    # Test
+    expect(tester.locate_config_value(:rackspace_api_key)).to eq("67890")
+  end
+end