chef-extensions 0.2.1 → 0.3.0

data/Guardfile

@@ -1,9 +1,5 @@
 require 'rdiscount'
 
-guard 'rocco', :run_on => [:start, :change], :dir => 'docs' do
-  watch(%r{^lib/.*\.rb$})
-end
-
 guard 'minitest', :notify => false do
   watch(%r|^test/(.*)_test\.rb|)
   watch(%r|^lib/(.*)([^/]+)\.rb|)     { |m| "test/#{m[1]}#{m[2]}_test.rb" }

data/Rakefile

@@ -13,10 +13,9 @@ end
 
 task :default => [:test]
 
-task :version do
-  require 'chef'
-  puts Chef::Extensions::VERSION
-end
+
+
+### DOCUMENTATION
 
 desc 'Build rocco gh-pages'
 task :docs => :rocco do

data/chef-extensions.gemspec

@@ -20,7 +20,6 @@ Gem::Specification.new do |s|
 
   s.add_development_dependency "chef"
   s.add_development_dependency 'guard-minitest'
-  s.add_development_dependency "guard-rocco"
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'pry'
   s.add_development_dependency "rdiscount"

data/lib/chef-extensions/ip.rb

@@ -2,30 +2,39 @@ require File.expand_path('../platform', __FILE__)
 
 class Chef
   module Extensions
+    # In Ruby 1.9, there is `Socket.ip_address_list`, which would simplify all
+    # this greatly, but a lot of people still run chef under 1.8. This solution
+    # will work with both 1.8 & 1.9.
     module IP
       extend self
 
-      # **Get all local IPv4 addresses** <br />
-      # It excludes localhost. Easily adaptable to IPv6. <br />
-      # In Ruby 1.9, this is a simple call to `Socket.ip_address_list`.
-      def all
-        local_ips - localhost
+      # **Get all public IPv4 addresses** <br />
+      # Some of them might be local to the host, but it's not easy to say which
+      # is which without expensive queries and a complicated logic. <br />
+      # It excludes localhost.
+      def public_ipv4
+        local_ipv4 - localhost_ipv4
       end
 
-      protected
+      # **Get all local IPv4 addresses** <br />
+      # It includes localhost.
+      def local_ipv4
+        `echo "#{ifconfig}" | #{filter}`.split("\n")
+      end
 
-        def local_ips
-          `echo "#{ifconfig}" | #{filter}`.split("\n")
-        end
+      def localhost_ipv4
+        ["127.0.0.1"]
+      end
 
-        def localhost
-          ["127.0.0.1"]
-        end
+      # **Runs ifconfig shell utility** <br />
+      # Caching was not necessary, but it helps with tests.
+      def ifconfig
+        @ifconfig ||= `ifconfig`
+      end
 
-        def ifconfig
-          @ifconfig ||= `ifconfig`
-        end
+      protected
 
+        # Selects the appropriate awk filering based on OS platform
         def filter
           @filter ||= if Platform.linux?
             linux_filter
@@ -36,6 +45,7 @@ class Chef
           end
         end
 
+        # Linux's ifconfig returns a slightly different version that OS X
         def linux_filter
           "#{awk} { print $4 }'"
         end
@@ -44,6 +54,7 @@ class Chef
           "#{awk} { print $2 }'"
         end
 
+        # Common to both OS X & Linux
         def awk
           %{awk -F"[: ]+" '/inet /}
         end

data/lib/chef-extensions/version.rb

@@ -1,5 +1,5 @@
 class Chef
   module Extensions
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

data/test/chef-extensions/ip_test.rb

@@ -10,8 +10,19 @@ class Chef
           IP.instance_variable_set(:@ifconfig, ifconfig)
         end
 
-        it "all IPv4 addresses, excluding localhost" do
-          IP.all.must_equal([
+        it "all public IPv4 addresses (excludes localhost)" do
+          IP.public_ipv4.must_equal([
+            "10.100.1.11",
+            "10.100.1.10",
+            "192.168.86.1",
+            "192.168.203.1",
+            "11.11.11.1"
+          ])
+        end
+
+        it "all local IPv4 addresses (includes localhost)" do
+          IP.local_ipv4.must_equal([
+            "127.0.0.1",
             "10.100.1.11",
             "10.100.1.10",
             "192.168.86.1",
@@ -28,12 +39,20 @@ class Chef
           IP.instance_variable_set(:@filter, IP.send(:linux_filter))
         end
 
-        it "all IPv4 addresses, excluding localhost" do
-          IP.all.must_equal([
+        it "all public IPv4 addresses (excludes localhost)" do
+          IP.public_ipv4.must_equal([
             "10.0.1.10",
             "11.11.11.10"
           ])
         end
+
+        it "all local IPv4 addresses (includes localhost)" do
+          IP.local_ipv4.must_equal([
+            "10.0.1.10",
+            "11.11.11.10",
+            "127.0.0.1"
+          ])
+        end
       end
     end
   end

data/test/test_helper.rb

@@ -2,19 +2,8 @@ require 'rubygems'
 require 'bundler'
 Bundler.setup
 
-require 'minitest/unit'
-require 'minitest/spec'
-
-require 'turn/colorize'
-require 'turn/controller'
-require 'turn/runners/minirunner'
-
-Turn.config do |config|
-  config.format = :pretty
-end
-
-MiniTest::Unit.runner = Turn::MiniRunner.new
-MiniTest::Unit.autorun
+require 'turn/autorun'
+Turn.config.format = :pretty
 
 require 'pry'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chef-extensions
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Gerhard Lazu
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-15 00:00:00 Z
+date: 2012-02-16 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -46,7 +46,7 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: guard-rocco
+  name: minitest
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,7 +60,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: minitest
+  name: pry
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -74,7 +74,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: pry
+  name: rdiscount
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -88,7 +88,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rdiscount
+  name: rocco
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -102,7 +102,7 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: rocco
+  name: turn
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
@@ -115,20 +115,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: turn
-  prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id008
 description: Commands useful for checking internet connectivity, VM presence etc.
 email: 
 - gerhard@lazu.co.uk