knife-rackspace 1.0.0 → 1.0.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 967c80d89cf4bd3ce780e24b678aaf50324c52f6
-  data.tar.gz: 68897241bb46bd04c1f61e9ed40b9ea002997a8e
+  metadata.gz: 3424287dbc7b2fc0cacf8f5d59f5f270620f114f
+  data.tar.gz: 622cf2499996948177d909c495ca9d036a9cf149
 SHA512:
-  metadata.gz: aeaed772b104df0db30785c4ca82f3ff121bb3e311201bc48de2c3b6f8df21b1f1784278a14e2895796acb4a68fcb6cd48a3951135ca5c75735b1278e233ffd3
-  data.tar.gz: f2501f2c1f7d29e6f3778d58145f2768bb6b6a9a355a0e49a778ae2573cb8ee07838587536ad42268bea2d9392563ce013fd6206d28142cb2c59701f3f4508fc
+  metadata.gz: a55cb84a25d9374ec39003f52312c58960e907eeff6f68612fd63e77d103ac773261c23a384fc12389b1ddcc079d893440228c6f69eac81a529509a550bc57fc
+  data.tar.gz: c727dbaa60bc04a9f2c5899c193cad18555e2ec9bcbd5493096b83a72a5dab724130bd913775e91b8dc59fd2ddae2b7146a0552f0395677b4fb670ab75027037

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v1.0.1
+* Fix Server List exception (#131)
+* Fix bug preferring knife over CLI configurations items (#128)
+
 ## v1.0.0
 * Use fog/rackspace instead of fog gem
 * Require Ruby 2.2.2 / Chef 12 and general cleanup

data/lib/chef/knife/rackspace_base.rb

@@ -159,7 +159,7 @@ class Chef
 
       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)

data/lib/chef/knife/rackspace_server_list.rb

@@ -39,7 +39,7 @@ class Chef
         if version_one?
           network_list = %w{public private}
         else
-          network_list = connection.images.sort_by(&:name).collect { |t| t.label }
+          network_list = connection.networks.sort_by(&:label).collect { |t| t.label }
         end
         server_list.insert(2, network_list.collect { |n| ui.color("#{n.capitalize} IP", :bold) }).flatten!
         num_columns_across = server_list.length

data/lib/knife-rackspace/version.rb

@@ -1,6 +1,6 @@
 module Knife
   module Rackspace
-    VERSION = "1.0.0"
+    VERSION = "1.0.1"
     MAJOR, MINOR, TINY = VERSION.split(".")
   end
 end

data/spec/unit/rackspace_base_spec.rb

@@ -36,3 +36,29 @@ describe "auth_endpoint" do
     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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: knife-rackspace
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.0.1
 platform: ruby
 authors:
 - Adam Jacob
@@ -12,7 +12,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-11-16 00:00:00.000000000 Z
+date: 2016-12-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: knife-windows