chef-sugar-rackspace 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0283047c23349f14f045529d7f6c3ef9a63c8c02
-  data.tar.gz: 43f6d7037c2e4bb5d25205c28a1c37711b431179
+  metadata.gz: b2ea2b95702f677b15c5e8ca4a97d2e721a9402f
+  data.tar.gz: 249a1b705d2893af550ab8591b8f655ad0d8beb8
 SHA512:
-  metadata.gz: 4c3b2319fa418958f59f8a87625acd5369c27843156a4f579ea54a37003e23fbc5a797b6b886e268145b8f9d27759a5948f33852f5f7eef042b370f47de54a42
-  data.tar.gz: b38250b16635c73386bcde1592434644d21f27afcd5a6883d08637fdf8ef938928215eb994e9321255ed1d8a4d64c7f54ccc4fbc08eb79ceda65c4152eeb1982
+  metadata.gz: 34048dfae0277faa95803b8a27e3c2c2c0581390464846fea0039af11cdc5e988bbfbf757d78653688a021607795b5aed59e4a3674958f8b9f9680d28e695faf
+  data.tar.gz: fe0c1d1078cd5fac5ac18bd62b2b1fbbac26c881f81562835bdcb795c872c93f328327e1c8d7a12add885f45058119742de785ee55ccb0c2f0148ed9ac53b517

data/.rubocop.yml

@@ -0,0 +1,21 @@
+# This configuration was generated by `rubocop --auto-gen-config`
+# on 2015-04-07 11:00:29 -0500 using RuboCop version 0.30.0.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+Metrics/AbcSize:
+  Max: 20
+
+Metrics/LineLength:
+  Max: 100
+
+Metrics/MethodLength:
+  Max: 20
+
+Style/Documentation:
+  Enabled: false
+
+Style/ModuleFunction:
+  Enabled: false

data/CHANGELOG.md

@@ -1,6 +1,12 @@
 chef-sugar-rackspace CHANGELOG
 ==============================
 
+0.3.0
+-----
+- [martinb3] - Bumped chefspec pinning to newer
+- [martinb3] - Added rubocop
+- [jarosser06] - rackconnected? no longer fails if the rackconnect ohai plugin is not installed
+
 0.2.0
 -----
 - [jarosser06] - Added rackconnected? sugar method

data/Gemfile

@@ -1,2 +1,5 @@
 source 'https://rubygems.org'
+
 gemspec
+
+gem 'rubocop'

data/README.md

@@ -17,6 +17,11 @@ Rackconnect helpers require the [Rackconnect Ohai plugin](https://github.com/jar
 
 - `rackconnected?` - return true if the node is rackconnected
 
+####Note
+If the rackconnect plugin is not installed but the helper is called
+rackconnected? will return false.  This should not be an issue in most
+cases but could cause unexepected results on a rackconnected server.
+
 #### rackconnected?
 ```ruby
 unless rackconnected?

data/Rakefile

@@ -4,7 +4,7 @@ require 'rspec/core/rake_task'
 RSpec::Core::RakeTask.new do |t|
   t.rspec_opts = [
     '--color',
-    '--format progress',
+    '--format progress'
   ].join(' ')
 end
 

data/chef-sugar-rackspace.gemspec

@@ -22,7 +22,7 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = %w(lib)
 
-  spec.add_runtime_dependency 'chef-sugar', '~> 2.0'
+  spec.add_runtime_dependency 'chef-sugar', '~> 3.0'
 
   spec.add_development_dependency 'rake'
   spec.add_development_dependency 'bundler',         '~> 1.3'

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

@@ -9,7 +9,7 @@ class Chef
       ## if no label is passed and more than one cloud
       ## network is attached it will pop the first off
       ## the array
-      def cloud_network_ip(node, label=nil)
+      def cloud_network_ip(node, label = nil)
         networks = cloud_networks(node)
         return '' if networks.empty?
 
@@ -21,40 +21,37 @@ class Chef
         end
 
         ## Return the first ip address in ips
-        return net['ips'].first['ip']
+        net['ips'].first['ip']
       end
 
       def best_rackspace_ip_for(node, other)
-        begin
-          ## Fail early if either node has no cloud networks
-          node_clnet = cloud_networks(node)
-          fail if node_clnet.empty?
+        node_clnet = cloud_networks(node)
+        fail 'no cloud networks found for this node' if node_clnet.empty?
 
-          other_clnet = cloud_networks(other)
-          fail if other_clnet.empty?
+        other_clnet = cloud_networks(other)
+        fail 'no cloud networks found for other node' if other_clnet.empty?
 
-          ip = nil
-          node_clnet.each_key do |node_label|
-            other_clnet.each_key do |other_label|
-              if node_label == other_label
-                ip = other_clnet[node_label]['ips'].first['ip']
-              end
+        ip = nil
+        node_clnet.each_key do |node_label|
+          other_clnet.each_key do |other_label|
+            if node_label == other_label
+              ip = other_clnet[node_label]['ips'].first['ip']
             end
           end
+        end
 
-          # Couldn't locate a matching cloud network, falling through
-          fail if ip.nil?
+        # Couldn't locate a matching cloud network, falling through
+        fail 'could not locate a matching cloud network' if ip.nil?
 
-          return ip
-        rescue
-          best_ip_for(node, other)
-        end
+        return ip
+      rescue
+        best_ip_for(node, other)
       end
 
       def cloud_networks(node)
         networks = {}
-        return networks unless node.has_key? 'rackspace'
-        if node['rackspace'].has_key? 'private_networks'
+        return networks unless node.key? 'rackspace'
+        if node['rackspace'].key? 'private_networks'
           private_networks = node['rackspace']['private_networks']
 
           unless private_networks.nil? || private_networks.empty?
@@ -64,12 +61,12 @@ class Chef
           end
         end
 
-        return networks
+        networks
       end
     end
 
     module DSL
-      def cloud_network_ip(label=nil)
+      def cloud_network_ip(label = nil)
         Chef::Sugar::IP.cloud_network_ip(node, label)
       end
 

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

@@ -6,11 +6,11 @@ class Chef
       extend self
 
       def rackconnected?(node)
-        return false unless node.has_key? 'rackspace'
-        if node['rackspace'].has_key? 'rackconnect'
+        return false unless node.key? 'rackspace'
+        if node['rackspace'].key? 'rackconnect'
           return node['rackspace']['rackconnect']['enabled']
         else
-          fail 'must have rackconnect ohai plugin installed'
+          return false
         end
       end
     end

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

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

data/metadata.rb

@@ -1,8 +1,8 @@
-name             'chef-sugar-rackspace'
-maintainer       'Jim Rosser'
+name 'chef-sugar-rackspace'
+maintainer 'Jim Rosser'
 maintainer_email 'jarosser06@gmail.com'
-license          'MIT'
-description      'Installs the chef-sugar-rackspace gem'
+license 'MIT'
+description 'Installs the chef-sugar-rackspace gem'
 long_description IO.read(File.join(File.dirname(__FILE__), 'README.md'))
-require          File.expand_path('../lib/chef/sugar/rackspace/version', __FILE__)
-version         Chef::Sugar::Rackspace::VERSION
+require File.expand_path('../lib/chef/sugar/rackspace/version', __FILE__)
+version Chef::Sugar::Rackspace::VERSION

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

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Chef::Sugar::IP do
-
   fake_node = {
     'cloud' => {
       'public_ipv4' => '23.253.110.230',
@@ -38,14 +37,14 @@ describe Chef::Sugar::IP do
   context 'when on different cloud networks' do
     before do
       node['rackspace']['private_networks'] = [{
-            'ips' => [{ 'ip' => '192.168.10.2' }],
-            'label' => 'myprivatenet1'
-          }]
+        'ips' => [{ 'ip' => '192.168.10.2' }],
+        'label' => 'myprivatenet1'
+      }]
 
       other['rackspace']['private_networks'] = [{
-          'ips' => [{ 'ip' => '192.168.12.4' }],
-          'label' => 'myprivatenet2'
-        }]
+        'ips' => [{ 'ip' => '192.168.12.4' }],
+        'label' => 'myprivatenet2'
+      }]
     end
     it '#best_rackspace_ip_for returns the service net ip address' do
       expect(described_class.best_rackspace_ip_for(node, other)).to eq(other['cloud']['local_ipv4'])
@@ -59,14 +58,14 @@ describe Chef::Sugar::IP do
   context 'when on the same cloud network' do
     before do
       node['rackspace']['private_networks'] = [{
-           'ips' => [{ 'ip' => '192.168.10.2' }],
-           'label' => 'myprivatenet1'
-        }]
+        'ips' => [{ 'ip' => '192.168.10.2' }],
+        'label' => 'myprivatenet1'
+      }]
 
       other['rackspace']['private_networks'] = [{
-          'ips' => [{ 'ip' => '192.168.10.4' }],
-          'label' => 'myprivatenet1'
-        }]
+        'ips' => [{ 'ip' => '192.168.10.4' }],
+        'label' => 'myprivatenet1'
+      }]
     end
     it '#best_rackspace_ip_for returns other\'s cloud network ip address' do
       expect(described_class.best_rackspace_ip_for(node, other)).to eq('192.168.10.4')

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

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 describe Chef::Sugar::Rackconnect do
-
   fake_node = {
     'rackspace' => {}
   }
@@ -9,8 +8,8 @@ describe Chef::Sugar::Rackconnect do
   let(:node)  { fake_node }
 
   context 'when the ohai plugin is not found' do
-    it '#rackconnected? raises an error' do
-      expect{described_class.rackconnected?(node)}.to raise_error(RuntimeError)
+    it '#rackconnected? returns false' do
+      expect(described_class.rackconnected?(node)).to eq(false)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-sugar-rackspace
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Jim Rosser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-04-07 00:00:00.000000000 Z
+date: 2015-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-sugar
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.0'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -103,6 +103,7 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".kitchen.yml"
+- ".rubocop.yml"
 - ".travis.yml"
 - Berksfile
 - CHANGELOG.md