knife-solo 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6a9075b35d746ef773b48fab2a4058b9b10b007
-  data.tar.gz: 2a4a78e808b7052a9775fb8da0018abfdb07bd33
+  metadata.gz: cc5fe9ecb3ae1c82b5e1adceb0108d37d8b8ec56
+  data.tar.gz: 869dda3bdfa85f9f57591d162a3067924b6f039c
 SHA512:
-  metadata.gz: a2020e3b7d7971c882e29a4fe1391f96231d10de8643e5a045d612b45181df2f2e95e78728af0ee10be4c5513f2a2df127e5c928620a6988077d8e1e7bb6cacd
-  data.tar.gz: b6c1d721762e00bcfbc5cc25626094184c91d5feae3c882947cbf2772a62bd952c47eb5675af38ab07c4f7952cbd8f1012035ddca2b11b9e546e62435ceda8ce
+  metadata.gz: 1516533d664b431e2424d493a02088f240eac13e7398bda438251e475433794554450f5430035b81223687fcfe5beb080b9c48dd9a39616c333a9b0430451899
+  data.tar.gz: 7cbe38fe74bcacc0c6e22bf20861ecef1f80a976ecfabfc83418abc41f85e71898189299e030fc7b18bda5670d92befbd1f974483276fefece00f43de53dd94e

data/CHANGELOG.md

@@ -1,3 +1,29 @@
+# 0.4.1 / 2013-12-07
+
+## Changes and new features
+
+* Support Oracle Enterprise Linux ([311][])
+* Support Arch Linux ([327][])
+* Make sure wget is installed on Debianoids ([320][])
+
+## Fixes
+
+* Explicitly set root path for default `*_path` options in Chef 11.8.0 ([308][])
+* Verify that `node_path` is a String ([308][])
+* Fix compatibility with Ruby 1.8 ([0bcae4a][])
+
+## Thanks to our contributors!
+
+* [aromarom64][aromarom64]
+* [Łukasz Dubiel][bambuchaAdm]
+* [Takamura Soichi][piglovesyou]
+
+[308]: https://github.com/matschaffer/knife-solo/issues/308
+[311]: https://github.com/matschaffer/knife-solo/issues/311
+[320]: https://github.com/matschaffer/knife-solo/issues/320
+[327]: https://github.com/matschaffer/knife-solo/issues/327
+[0bcae4a]: https://github.com/matschaffer/knife-solo/commit/0bcae4a
+
 # 0.4.0 / 2013-10-30
 
 ## Changes and new features
@@ -386,6 +412,7 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 [aaronjensen]:   https://github.com/aaronjensen
 [amoslanka]:     https://github.com/amoslanka
 [ares]:          https://github.com/ares
+[aromarom64]:    https://github.com/aromarom64
 [avit]:          https://github.com/avit
 [bambuchaAdm]:   https://github.com/bambuchaAdm
 [brynary]:       https://github.com/brynary
@@ -411,6 +438,7 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 [patatepartie]:  https://github.com/patatepartie
 [patcon]:        https://github.com/patcon
 [pferdefleisch]: https://github.com/pferdefleisch
+[piglovesyou]:   https://github.com/piglovesyou
 [portertech]:    https://github.com/portertech
 [retr0h]:        https://github.com/retr0h
 [rmoriz]:        https://github.com/rmoriz

data/lib/knife-solo/bootstraps/linux.rb

@@ -29,6 +29,22 @@ module KnifeSolo::Bootstraps
       gem_install
     end
 
+    def yaourt_install
+      ui.msg("Installing required packages...")
+      stream_command <<-BASH
+        if ! sudo grep -Fxq "[archlinuxfrx]" /etc/pacman.conf ; then
+          sudo bash -c 'echo "[archlinuxfr]" >> /etc/pacman.conf'
+          sudo bash -c 'echo "SigLevel = Never" >> /etc/pacman.conf'
+          sudo bash -c 'echo "Server = http://repo.archlinux.fr/\\\$arch" >> /etc/pacman.conf'
+        fi
+        if ! command -v yaourt >/dev/null 2>&1 ; then
+          sudo pacman -Sy --noconfirm yaourt
+        fi
+        yaourt -S --noconfirm ruby-chef rsync
+      BASH
+      run_command("sudo gem install --no-rdoc --no-ri pry") # patch for ruby-chef
+    end
+
     def debianoid_gem_install
       ui.msg "Updating apt caches..."
       run_command("sudo apt-get update")
@@ -45,7 +61,7 @@ module KnifeSolo::Bootstraps
 
     def debianoid_omnibus_install
       run_command("sudo apt-get update")
-      run_command("sudo apt-get -y install rsync ca-certificates")
+      run_command("sudo apt-get -y install rsync ca-certificates wget")
       omnibus_install
     end
 
@@ -79,6 +95,8 @@ module KnifeSolo::Bootstraps
         {:type => "yum_omnibus"}
       when %r{Red Hat Enterprise}
         {:type => "yum_omnibus"}
+      when %r{Enterprise Linux Enterprise Linux Server}
+        {:type => "yum_omnibus"}
       when %r{Fedora release}
         {:type => "yum_omnibus"}
       when %r{Scientific Linux}
@@ -91,6 +109,8 @@ module KnifeSolo::Bootstraps
         {:type => "zypper_omnibus"}
       when %r{This is \\n\.\\O \(\\s \\m \\r\) \\t}
         {:type => "emerge_gem"}
+      when %r{Arch Linux \\r \(\\l\)}
+        {:type => "yaourt"}
       else
         raise "Distribution not recognized. Please run again with `-VV` option and file an issue: https://github.com/matschaffer/knife-solo/issues"
       end

data/lib/knife-solo/cookbook_manager_selector.rb

@@ -38,7 +38,7 @@ module KnifeSolo
     end
 
     def select_or_disable_by_chef_config!
-      managers.select! do |manager|
+      @managers = managers.select do |manager|
         if (conf = manager.enabled_by_chef_config?)
           Chef::Log.debug "#{manager} selected by configuration"
           return manager

data/lib/knife-solo/info.rb

@@ -1,6 +1,6 @@
 module KnifeSolo
   def self.version
-    '0.4.0'
+    '0.4.1'
   end
 
   def self.post_install_message

data/lib/knife-solo/node_config_command.rb

@@ -36,11 +36,17 @@ module KnifeSolo
           :long        => '--environment ENVIRONMENT',
           :description => 'The Chef environment for your node'
 
+        # Set default chef_repo_path for Chef >= 11.8.0
+        Chef::Config.chef_repo_path = '.'
       end
     end
 
     def nodes_path
       path = Chef::Config[:node_path]
+      if path && !path.is_a?(String)
+        ui.error %Q{node_path is not a String: #{path.inspect}, defaulting to "nodes"}
+        path = nil
+      end
       path && File.exist?(path) ? path : 'nodes'
     end
 

data/test/gemfiles/Gemfile.chef-master

@@ -0,0 +1,5 @@
+source 'https://rubygems.org'
+
+gemspec :path => '../..'
+
+gem 'chef', github: 'opscode/chef'

data/test/integration/archlinux_20131128_test.rb

@@ -0,0 +1,17 @@
+require 'integration_helper'
+
+class ArchLinux20131128Test < IntegrationTest
+  def user
+    "root"
+  end
+
+  def image_id
+    "ami-d1cbebb8"
+  end
+
+  # this install method takes over 15m on an m1.small
+  # Uncomment this if you need to verify Arch operation
+
+  # include EmptyCook
+  # include EncryptedDataBag
+end

data/test/integration/gentoo2011_test.rb

@@ -10,7 +10,7 @@ class Gentoo2011Test < IntegrationTest
   end
 
   # `emerge chef` takes a very long time (~ 50 minutes) on an m1.small
-  # Uncoment this if you need to verify Gentoo operation
+  # Uncomment this if you need to verify Gentoo operation
 
   # include EmptyCook
   # include Apache2Cook

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: knife-solo
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Mat Schaffer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-30 00:00:00.000000000 Z
+date: 2013-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: berkshelf
@@ -256,8 +256,10 @@ files:
 - test/deprecated_command_test.rb
 - test/gemfiles/Gemfile.chef-10
 - test/gemfiles/Gemfile.chef-11
+- test/gemfiles/Gemfile.chef-master
 - test/gitignore_test.rb
 - test/integration/amazon_linux_2012_09_bootstrap_test.rb
+- test/integration/archlinux_20131128_test.rb
 - test/integration/cases/apache2_bootstrap.rb
 - test/integration/cases/apache2_cook.rb
 - test/integration/cases/cache_path_usage.rb
@@ -370,8 +372,10 @@ test_files:
 - test/deprecated_command_test.rb
 - test/gemfiles/Gemfile.chef-10
 - test/gemfiles/Gemfile.chef-11
+- test/gemfiles/Gemfile.chef-master
 - test/gitignore_test.rb
 - test/integration/amazon_linux_2012_09_bootstrap_test.rb
+- test/integration/archlinux_20131128_test.rb
 - test/integration/cases/apache2_bootstrap.rb
 - test/integration/cases/apache2_cook.rb
 - test/integration/cases/cache_path_usage.rb