chef-extensions 0.3.0 → 0.4.0

data/.rvmrc

@@ -1 +1 @@
-rvm use --create ree@chef-extensions
+rvm use --create 1.8.7@chef-extensions

data/chef-extensions.gemspec

@@ -7,7 +7,6 @@ Gem::Specification.new do |s|
   s.version     = Chef::Extensions::VERSION
   s.authors     = ["Gerhard Lazu"]
   s.email       = ["gerhard@lazu.co.uk"]
-  s.homepage    = "http://gchef.github.com/chef-extensions"
   s.summary     = %q{Chef extensions, can be used stand-alone}
   s.description = %q{Commands useful for checking internet connectivity, VM presence etc.}
 
@@ -18,11 +17,10 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_development_dependency "chef"
+  s.add_development_dependency 'chef'
   s.add_development_dependency 'guard-minitest'
   s.add_development_dependency 'minitest'
   s.add_development_dependency 'pry'
-  s.add_development_dependency "rdiscount"
+  s.add_development_dependency 'rdiscount'
   s.add_development_dependency "rocco"
-  s.add_development_dependency 'turn'
 end

data/lib/chef-extensions.rb

@@ -1,7 +1,8 @@
+require 'securerandom'
+
 require 'chef-extensions/version'
 require 'chef-extensions/ec2'
 require 'chef-extensions/ip'
-require 'securerandom'
 
 class Chef
   module Extensions

data/lib/chef-extensions/ec2.rb

@@ -6,8 +6,14 @@ class Chef
       # **Get the instance ID from AWS's metadata service** <br />
       # If we don't hear back within 1 second, time out.
       def instance_id
-        `curl --connect-timeout 1 http://169.254.169.254/2011-01-01/meta-data/instance-id 2>&1`.chomp
+        `curl --connect-timeout 1 #{aws_url} 2>&1`.chomp
       end
+
+      protected
+
+        def aws_url
+          "http://169.254.169.254/2011-01-01/meta-data/instance-id"
+        end
     end
   end
 end

data/lib/chef-extensions/ip.rb

@@ -11,7 +11,7 @@ class Chef
       # **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.
+      # This method excludes localhost.
       def public_ipv4
         local_ipv4 - localhost_ipv4
       end
@@ -27,7 +27,7 @@ class Chef
       end
 
       # **Runs ifconfig shell utility** <br />
-      # Caching was not necessary, but it helps with tests.
+      # Caching was not necessary, but it helps when testing.
       def ifconfig
         @ifconfig ||= `ifconfig`
       end
@@ -45,7 +45,7 @@ class Chef
           end
         end
 
-        # Linux's ifconfig returns a slightly different version that OS X
+        # Linux's ifconfig returns a slightly different version than OS X's.
         def linux_filter
           "#{awk} { print $4 }'"
         end

data/lib/chef-extensions/platform.rb

@@ -14,6 +14,30 @@ class Chef
       def linux?
         RUBY_PLATFORM.index('linux')
       end
+
+      # Returns true if architecture is 64bit!
+      #
+      def amd64?
+        !! architecture.index("x86_64")
+      end
+
+      # Returns true if architecture is 32bit!
+      #
+      def i386?
+        ! amd64?
+      end
+
+      # Package friendly architecture string
+      #
+      def arch
+        amd64? ? "amd64" : "i386"
+      end
+
+      # Retrieves and caches the architecture type
+      #
+      def architecture
+        @architecture ||= `uname -m`
+      end
     end
   end
 end

data/lib/chef-extensions/version.rb

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

data/test/chef-extensions/platform_test.rb

@@ -0,0 +1,44 @@
+require File.expand_path('../../test_helper', __FILE__)
+require 'chef-extensions/platform'
+
+class Chef
+  module Extensions
+    describe Platform do
+      describe "32bit architectures" do
+        before do
+          Platform.instance_variable_set(:@architecture, "i686")
+        end
+
+        it "amd64?" do
+          Platform.amd64?.must_equal false
+        end
+
+        it "i386?" do
+          Platform.i386?.must_equal true
+        end
+
+        it "arch" do
+          Platform.arch.must_equal "i386"
+        end
+      end
+
+      describe "64bit architectures" do
+        before do
+          Platform.instance_variable_set(:@architecture, "x86_64")
+        end
+
+        it "amd64?" do
+          Platform.amd64?.must_equal true
+        end
+
+        it "i386?" do
+          Platform.i386?.must_equal false
+        end
+
+        it "arch" do
+          Platform.arch.must_equal "amd64"
+        end
+      end
+    end
+  end
+end

data/test/test_helper.rb

@@ -2,8 +2,7 @@ require 'rubygems'
 require 'bundler'
 Bundler.setup
 
-require 'turn/autorun'
-Turn.config.format = :pretty
+require 'minitest/autorun'
 
 require 'pry'
 

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: chef-extensions
 version: !ruby/object:Gem::Version 
-  hash: 19
+  hash: 15
   prerelease: 
   segments: 
   - 0
-  - 3
+  - 4
   - 0
-  version: 0.3.0
+  version: 0.4.0
 platform: ruby
 authors: 
 - Gerhard Lazu
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-16 00:00:00 Z
+date: 2012-03-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: chef
@@ -101,20 +101,6 @@ dependencies:
         version: "0"
   type: :development
   version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: turn
-  prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
-    none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
-  type: :development
-  version_requirements: *id007
 description: Commands useful for checking internet connectivity, VM presence etc.
 email: 
 - gerhard@lazu.co.uk
@@ -140,10 +126,11 @@ files:
 - lib/chef-extensions/platform.rb
 - lib/chef-extensions/version.rb
 - test/chef-extensions/ip_test.rb
+- test/chef-extensions/platform_test.rb
 - test/fixtures/osx.ifconfig
 - test/fixtures/ubuntu.ifconfig
 - test/test_helper.rb
-homepage: http://gchef.github.com/chef-extensions
+homepage: 
 licenses: []
 
 post_install_message: 
@@ -172,12 +159,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: chef-extensions
-rubygems_version: 1.8.10
+rubygems_version: 1.8.17
 signing_key: 
 specification_version: 3
 summary: Chef extensions, can be used stand-alone
 test_files: 
 - test/chef-extensions/ip_test.rb
+- test/chef-extensions/platform_test.rb
 - test/fixtures/osx.ifconfig
 - test/fixtures/ubuntu.ifconfig
 - test/test_helper.rb