chef-sugar-rackspace 0.3.0 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2ea2b95702f677b15c5e8ca4a97d2e721a9402f
-  data.tar.gz: 249a1b705d2893af550ab8591b8f655ad0d8beb8
+  metadata.gz: 10e191a88187bd742a097dd79b98912ba8a95f26
+  data.tar.gz: 4a0b42ce178942286361892bad73971cdafebe88
 SHA512:
-  metadata.gz: 34048dfae0277faa95803b8a27e3c2c2c0581390464846fea0039af11cdc5e988bbfbf757d78653688a021607795b5aed59e4a3674958f8b9f9680d28e695faf
-  data.tar.gz: fe0c1d1078cd5fac5ac18bd62b2b1fbbac26c881f81562835bdcb795c872c93f328327e1c8d7a12add885f45058119742de785ee55ccb0c2f0148ed9ac53b517
+  metadata.gz: 7b9a92d86a8ea7d5563030f0fb986f1dc40f47085744785ab222dcfcae40ca07bee94095c01851c78368b934e25d5c4688845c1e95e17221c1b321b9f89d60bf
+  data.tar.gz: cbf43a8519a1ec0cba564a88518eedec9b182c35c58b602c9b9999619778b1bacfc837ca9381583c008d7aafe89e5b2e6b74238c5f65ce9ffdb74f54ad0b4d4d

data/CHANGELOG.md

@@ -1,6 +1,11 @@
 chef-sugar-rackspace CHANGELOG
 ==============================
 
+0.4.0
+-----
+- [jarosser06] - Added rackconnect_v2? and rackconnect_v3? based on the rackconnect ohai plugin
+- [jarosser06] - Syntax cleanup on rackconnected?
+
 0.3.0
 -----
 - [martinb3] - Bumped chefspec pinning to newer

data/lib/chef/sugar/rackspace/rackconnect.rb

@@ -5,13 +5,20 @@ class Chef
     module Rackconnect
       extend self
 
+      def rackconnect_v2?(node)
+        return node['rackspace']['rackconnect']['version'] == 2
+      end
+
+      def rackconnect_v3?(node)
+        return node['rackspace']['rackconnect']['version'] == 3
+      end
+
       def rackconnected?(node)
-        return false unless node.key? 'rackspace'
-        if node['rackspace'].key? 'rackconnect'
-          return node['rackspace']['rackconnect']['enabled']
-        else
-          return false
-        end
+        return true if
+          node['rackspace'] &&
+          node['rackspace']['rackconnect'] &&
+          node['rackspace']['rackconnect']['enabled']
+        false
       end
     end
 
@@ -19,6 +26,14 @@ class Chef
       def rackconnected?
         Chef::Sugar::Rackconnect.rackconnected?(node)
       end
+
+      def rackconnect_v2?
+        Chef::Sugar::Rackconnect.rackconnect_v2?(node)
+      end
+
+      def rackconnect_v3?
+        Chef::Sugar::Rackconnect.rackconnect_v3?(node)
+      end
     end
   end
 end

data/lib/chef/sugar/rackspace/version.rb

@@ -1,7 +1,7 @@
 class Chef
   module Sugar
     module Rackspace
-      VERSION = '0.3.0'
+      VERSION = '0.4.0'
     end
   end
 end

data/spec/unit/chef/sugar/rackspace/rackconnect_spec.rb

@@ -38,4 +38,38 @@ describe Chef::Sugar::Rackconnect do
       expect(described_class.rackconnected?(node)).to eq(false)
     end
   end
+
+  context 'when rackconnect v3' do
+    before do
+      node['rackspace'] = {
+        'rackconnect' => {
+          'enabled' => true,
+          'version' => 3
+        }
+      }
+    end
+    it '#rackconnect_v3? returns true' do
+      expect(described_class.rackconnect_v3?(node)).to eq(true)
+    end
+    it '#rackconnect_v2? returns false' do
+      expect(described_class.rackconnect_v2?(node)).to eq(false)
+    end
+  end
+
+  context 'when rackconnect v2' do
+    before do
+      node['rackspace'] = {
+        'rackconnect' => {
+          'enabled' => true,
+          'version' => 2
+        }
+      }
+    end
+    it '#rackconnect_v3? returns false' do
+      expect(described_class.rackconnect_v3?(node)).to eq(false)
+    end
+    it '#rackconnect_v2? returns true' do
+      expect(described_class.rackconnect_v2?(node)).to eq(true)
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-sugar-rackspace
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors:
 - Jim Rosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-14 00:00:00.000000000 Z
+date: 2015-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-sugar