chef-sugar 1.2.4 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 88dea16b14233aa2ccce869c337375af3e633620
-  data.tar.gz: 7ae5046aada8196b1b46b232c8a06df043e77be7
+  metadata.gz: e4921a6576cb0835a4c354addd664b79c6f94c69
+  data.tar.gz: 8ed52146e75365873ff64693b44d127f19c0f170
 SHA512:
-  metadata.gz: 8a96e2a69f606eea91185bbeb053c11a5cdfc45bb7fcaf00c9719ef4fccfbb6fb679c035cdc58caa4a43bd1356870adf280e3b9ee971d3fea3d35f1792443c44
-  data.tar.gz: 2b4de17fcbbd1bee8096f4edb8790701e0d7d3977a092a7157273c75929d9f3e37972c725ce5c2893720fa7b94aadbf2f148fc0525d67330f026a1595a540b34
+  metadata.gz: f75621f0511404674586253794b0633295e1400c75e654b9ed073eb2fe523a813513a2628db89f013e7434a820d41192cef989de0bbc153b9117952ae5ea5234
+  data.tar.gz: 6fd194785292ecfaddacadec69f3f65b042d08fe46c1e8594b6133f5140151f632add36e48f72e50dc3a5bad66ef39eaa60dc737ff07a05c16149d1b7e826ae8

data/.travis.yml

@@ -3,4 +3,6 @@ rvm:
   - 2.0.0
   - 2.1
 
+bundler_args: --jobs 7
+
 script: bundle exec rspec --color --format progress

data/CHANGELOG.md

@@ -2,6 +2,11 @@ Chef Sugar Changelog
 =========================
 This file is used to list changes made in each version of the chef-sugar cookbook and gem.
 
+v1.2.6 (2014-03-16)
+-------------------
+- Fix a bug in `vagrant?` returning false on newer Vagrant versions
+- Remove Coveralls
+
 v1.2.4 (2014-03-13)
 -------------------
 - See (1.2.2), but I botched the release

data/README.md

@@ -1,8 +1,6 @@
 Chef::Sugar
 ================
 [![Build Status](https://secure.travis-ci.org/sethvargo/chef-sugar.png?branch=master)](http://travis-ci.org/sethvargo/chef-sugar)
-[![Coverage
-Status](https://coveralls.io/repos/sethvargo/chef-sugar/badge.png?branch=master)](https://coveralls.io/r/sethvargo/chef-sugar?branch=master)
 [![Gem Version](https://badge.fury.io/rb/chef-sugar.png)](http://badge.fury.io/rb/chef-sugar)
 [![Dependency Status](https://gemnasium.com/sethvargo/chef-sugar.png)](https://gemnasium.com/sethvargo/chef-sugar)
 [![Code Climate](https://codeclimate.com/github/sethvargo/chef-sugar.png)](https://codeclimate.com/github/sethvargo/chef-sugar)

data/chef-sugar.gemspec

@@ -29,7 +29,6 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'stove', '~> 2.0.0.beta'
 
   spec.add_development_dependency 'chefspec',        '~> 3.0'
-  spec.add_development_dependency 'coveralls',       '~> 0.7'
   spec.add_development_dependency 'test-kitchen',    '~> 1.1'
   spec.add_development_dependency 'kitchen-vagrant', '~> 0.14'
 end

data/lib/chef/sugar/vagrant.rb

@@ -29,8 +29,44 @@ class Chef
       #   otherwise
       #
       def vagrant?(node)
+        vagrant_key?(node) || vagrant_domain?(node) || vagrant_user?(node)
+      end
+
+      private
+
+      #
+      # Check if the +vagrant+ key exists on the +node+ object. This key is no
+      # longer populated by vagrant, but it is kept around for legacy purposes.
+      #
+      # @param (see vagrant?)
+      # @return (see vagrant?)
+      #
+      def vagrant_key?(node)
         node.key?('vagrant')
       end
+
+      #
+      # Check if "vagrantup.com" is included in the node's domain. Technically,
+      # this would make Chef Sugar falsely detect +vagrant?+ on any of
+      # Hashicorp's servers. But if that edge case becomes a serious problem,
+      # @mitchellh has my phone number.
+      #
+      # @param (see vagrant?)
+      # @return (see vagrant?)
+      #
+      def vagrant_domain?(node)
+        node['domain'] && node['domain'].include?('vagrantup.com')
+      end
+
+      #
+      # Check if the system contains a +vagrant+ user.
+      #
+      # @param (see vagrant?)
+      # @return (see vagrant?)
+      #
+      def vagrant_user?(node)
+        node['etc'] && node['etc']['passwd'] && node['etc']['passwd']['vagrant']
+      end
     end
 
     module DSL

data/lib/chef/sugar/version.rb

@@ -16,6 +16,6 @@
 
 class Chef
   module Sugar
-    VERSION = '1.2.4'
+    VERSION = '1.2.6'
   end
 end

data/metadata.rb

@@ -14,4 +14,4 @@ For the most up-to-date information and documentation, please visit the [Chef
 Sugar project page on GitHub](https://github.com/sethvargo/chef-sugar).
 EOH
 
-version          '1.2.3'
+version          '1.2.6'

data/recipes/default.rb

@@ -18,7 +18,7 @@
 #
 
 chef_gem('chef-sugar') do
-  version '1.2.2'
+  version '1.2.4'
   action  :nothing
 end.run_action(:install)
 

data/spec/spec_helper.rb

@@ -1,6 +1,3 @@
-require 'coveralls'
-Coveralls.wear!
-
 require 'rspec'
 require 'chefspec'
 require 'chef/sugar'

data/spec/unit/chef/sugar/vagrant_spec.rb

@@ -9,6 +9,16 @@ describe Chef::Sugar::Vagrant do
       expect(described_class.vagrant?(node)).to be_true
     end
 
+    it 'returns true when the domain is vagrantup.com' do
+      node = { 'domain' => 'bacon.vagrantup.com' }
+      expect(described_class.vagrant?(node)).to be_true
+    end
+
+    it 'returns true when the vagrant user exists on the system' do
+      node = { 'etc' => { 'passwd' => { 'vagrant' => {} } } }
+      expect(described_class.vagrant?(node)).to be_true
+    end
+
     it 'returns false when the machine is not on vagrant' do
       node = {}
       expect(described_class.vagrant?(node)).to be_false

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef-sugar
 version: !ruby/object:Gem::Version
-  version: 1.2.4
+  version: 1.2.6
 platform: ruby
 authors:
 - Seth Vargo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-14 00:00:00.000000000 Z
+date: 2014-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -66,20 +66,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '3.0'
-- !ruby/object:Gem::Dependency
-  name: coveralls
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.7'
 - !ruby/object:Gem::Dependency
   name: test-kitchen
   requirement: !ruby/object:Gem::Requirement