knife-solo 0.3.0.pre3 → 0.3.0.pre4

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 904d74c337d53936e856d39cbba88504da008ba8
+  data.tar.gz: 450ff917a4c869ed34b664083c00b15534281244
+SHA512:
+  metadata.gz: 1ab1298a915aa64fdc6e5b84dafa6f7c792c6ad8ff279c9b02e96916c85140515f2b6e9a74d8d320f1f3fbf9f5f9441f24be54e4c93a07ce6740a0c398f595ae
+  data.tar.gz: 2049637c24941db8f9828cb8fcf7b14f1e6e644944bfb9fca1ee79e4e8be50356e3d5b7f71ba2167949deaca532abd3f51058bafbbca90be3d4c7040b218b093

data/CHANGELOG.md

@@ -4,19 +4,22 @@
 
 ## Changes and new features
 
-* Automatically add librarian to cookbook paths when syncing ([226])
 * BREAKING: Generate solo.rb based on knife.rb settings ([199])
-    - `solo.rb` is not used and a warning is issued if it still found
+    - `solo.rb` is not used and a warning is issued if it is still found
     - You have to specify the local cookbook etc. paths in `.chef/knife.rb`
 * BREAKING: Set root path with `--provisioning-path` or `knife[:provisioning_path]` and use ~/chef-solo by default ([1], [86], [125], [128], [177], [197])
 * BREAKING: Remove hard dependency on Librarian-Chef ([211])
     - If you use Librarian integration you need to install the librarian-chef gem yourself
+* Add Berkshelf integration ([227])
+* Automatically add librarian to cookbook paths when syncing ([226])
 * Add `--solo` option and `knife[:solo]` configuration option to `knife bootstrap` ([207])
 * `--prerelease` option to allow pre-release versions of chef omnibus or rubygem to be installed ([205])
 * Prepare/bootstrap now installs the same version of Chef that the workstation is running ([186])
 * Switch `--omnibus-version` flag to `--bootstrap-version` ([185])
 * Support `--override-runlist` option ([204])
+* Support Fedora 18 and other new EL distros ([229], [51a581])
 * Drop support for openSUSE 11
+* Upgrade chef-solo-search to v0.4.0
 
 ## Fixes
 
@@ -28,14 +31,22 @@
 * Ensure rsync is installed on openSUSE ([f43ba4])
 * Clean up bootstrap classes ([213])
 * Rsync dot files by default, exclude only VCS dirs ([d21756], [1d3485])
-* Standardize messaging across commands [215]
+* Standardize messaging across commands ([215], [d37162])
 * Librarian-Chef was not run by default when knife-solo was invoked from ruby ([221])
+* Fix `solo init` on Ruby 1.8 ([230])
+* Fix deprecated commands to include options and dependencies from the new ones ([233])
+* Parse Chef version even if chef-solo command prints warnings ([235], [238])
+* Upgrade CentOS in integration tests to 5.8 and 6.3 ([237])
+* Default to `lsb_release` for detecting the Linux distro and add support for RHEL based systems where /etc/issue is modified ([234], [242])
 
 ## Thanks to our contributors!
 
 * [David Kinzer][dkinzer]
 * [Naoya Ito][naoya]
 * [David Radcliffe][dwradcliffe]
+* [Łukasz Dubiel][bambuchaAdm]
+* [kmdsbng][kmdsbng]
+* [Darshan Patil][dapatil]
 
 [1]: https://github.com/matschaffer/knife-solo/issues/1
 [86]: https://github.com/matschaffer/knife-solo/issues/86
@@ -56,10 +67,21 @@
 [213]: https://github.com/matschaffer/knife-solo/issues/213
 [215]: https://github.com/matschaffer/knife-solo/issues/215
 [221]: https://github.com/matschaffer/knife-solo/issues/221
-[226]: https://github.com/matschaffer/knife-solo/issues/221
+[226]: https://github.com/matschaffer/knife-solo/issues/226
+[227]: https://github.com/matschaffer/knife-solo/issues/227
+[229]: https://github.com/matschaffer/knife-solo/issues/229
+[230]: https://github.com/matschaffer/knife-solo/issues/230
+[233]: https://github.com/matschaffer/knife-solo/issues/233
+[234]: https://github.com/matschaffer/knife-solo/issues/234
+[235]: https://github.com/matschaffer/knife-solo/issues/235
+[237]: https://github.com/matschaffer/knife-solo/issues/237
+[238]: https://github.com/matschaffer/knife-solo/issues/238
+[242]: https://github.com/matschaffer/knife-solo/issues/242
 [d21756]: https://github.com/matschaffer/knife-solo/commit/d21756
 [1d3485]: https://github.com/matschaffer/knife-solo/commit/1d3485
 [f43ba4]: https://github.com/matschaffer/knife-solo/commit/f43ba4
+[51a581]: https://github.com/matschaffer/knife-solo/commit/51a581
+[d37162]: https://github.com/matschaffer/knife-solo/commit/d37162
 
 # 0.2.0 / 2013-02-12
 
@@ -307,8 +329,10 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 [amoslanka]:     https://github.com/amoslanka
 [ares]:          https://github.com/ares
 [avit]:          https://github.com/avit
+[bambuchaAdm]:   https://github.com/bambuchaAdm
 [brynary]:       https://github.com/brynary
 [btm]:           https://github.com/btm
+[dapatil]:       https://github.com/dapatil
 [davidsch]:      https://github.com/davidsch
 [deepak]:        https://github.com/deepak
 [dkinzer]:       https://github.com/dkinzer
@@ -321,6 +345,7 @@ And a special thanks to [Teemu Matilainen][tmatilai] who is now on the list of d
 [hrp]:           https://github.com/hrp
 [jgarber]:       https://github.com/jgarber
 [jgrevich]:      https://github.com/jgrevich
+[kmdsbng]:       https://github.com/kmdsbng
 [naoya]:         https://github.com/naoya
 [natlownes]:     https://github.com/natlownes
 [patatepartie]:  https://github.com/patatepartie

data/lib/chef/knife/solo_bootstrap.rb

@@ -19,7 +19,7 @@ class Chef
 
       # Use (some) options from prepare and cook commands
       self.options = SoloPrepare.options
-      [:librarian, :sync_only, :why_run].each { |opt| option opt, SoloCook.options[opt] }
+      [:berkshelf, :librarian, :sync_only, :why_run].each { |opt| option opt, SoloCook.options[opt] }
 
       def run
         validate!

data/lib/chef/knife/solo_clean.rb

@@ -21,6 +21,7 @@ class Chef
 
       def run
         validate!
+        ui.msg "Cleaning up #{host}..."
         run_command "rm -rf #{provisioning_path}"
       end
 

data/lib/chef/knife/solo_cook.rb

@@ -1,6 +1,5 @@
 require 'chef/knife'
 
-require 'knife-solo'
 require 'knife-solo/ssh_command'
 require 'knife-solo/node_config_command'
 require 'knife-solo/tools'
@@ -18,9 +17,11 @@ class Chef
 
       deps do
         require 'chef/cookbook/chefignore'
+        require 'knife-solo'
+        require 'knife-solo/berkshelf'
+        require 'knife-solo/librarian'
         require 'erubis'
         require 'pathname'
-        require 'tempfile'
         KnifeSolo::SshCommand.load_deps
         KnifeSolo::NodeConfigCommand.load_deps
       end
@@ -40,6 +41,10 @@ class Chef
         :long        => '--sync-only',
         :description => 'Only sync the cookbook - do not run Chef'
 
+      option :berkshelf,
+        :long        => '--no-berkshelf',
+        :description => 'Skip berks install'
+
       option :librarian,
         :long        => '--no-librarian',
         :description => 'Skip librarian-chef install'
@@ -72,6 +77,7 @@ class Chef
 
           check_chef_version if config[:chef_check]
           generate_node_config
+          berkshelf_install if config_value(:berkshelf, true)
           librarian_install if config_value(:librarian, true)
           sync_kitchen
           generate_solorb
@@ -100,14 +106,19 @@ class Chef
         cookbook_paths.each_with_index do |path, i|
           upload_to_provision_path(path, "/cookbooks-#{i + 1}", 'cookbook_path')
         end
+        upload_to_provision_path(node_config, 'dna.json')
         upload_to_provision_path(nodes_path, 'nodes')
         upload_to_provision_path(:role_path, 'roles')
         upload_to_provision_path(:data_bag_path, 'data_bags')
         upload_to_provision_path(:encrypted_data_bag_secret, 'data_bag_key')
       end
 
+      def expand_path(path)
+        Pathname.new(path).expand_path
+      end
+
       def expanded_config_paths(key)
-        Array(Chef::Config[key]).map { |path| Pathname.new(path).expand_path }
+        Array(Chef::Config[key]).map { |path| expand_path path }
       end
 
       def cookbook_paths
@@ -115,6 +126,7 @@ class Chef
       end
 
       def add_cookbook_path(path)
+        path = expand_path path
         cookbook_paths.unshift(path) unless cookbook_paths.include?(path)
       end
 
@@ -122,10 +134,6 @@ class Chef
         KnifeSolo.resource('patch_cookbooks')
       end
 
-      def nodes_path
-        'nodes'
-      end
-
       def chefignore
         @chefignore ||= ::Chef::Cookbook::Chefignore.new("./")
       end
@@ -146,6 +154,10 @@ class Chef
         adjust_rsync_path(path)
       end
 
+      def rsync_debug
+        '-v' if debug?
+      end
+
       # see http://stackoverflow.com/questions/5798807/rsync-permission-denied-created-directories-have-no-permissions
       def rsync_permissions
         '--chmod=ugo=rwX' if windows_client?
@@ -168,33 +180,14 @@ class Chef
         ui.msg "#{msg} finished in #{Time.now - start} seconds"
       end
 
-      def librarian_install
-        if !File.exist? 'Cheffile'
-          Chef::Log.debug "Cheffile not found"
-        elsif !load_librarian
-          ui.warn "Librarian-Chef could not be loaded"
-          ui.warn "Please add the librarian-chef gem to your Gemfile or install it manually with `gem install librarian-chef`"
-        else
-          ui.msg "Installing Librarian cookbooks..."
-          Librarian::Action::Resolve.new(librarian_env).run
-          Librarian::Action::Install.new(librarian_env).run
-          add_cookbook_path librarian_env.install_path
-        end
+      def berkshelf_install
+        path = KnifeSolo::Berkshelf.new(config, ui).install
+        add_cookbook_path(path) if path
       end
 
-      def load_librarian
-        begin
-          require 'librarian/action'
-          require 'librarian/chef'
-        rescue LoadError
-          false
-        else
-          true
-        end
-      end
-
-      def librarian_env
-        @librarian_env ||= Librarian::Chef::Environment.new
+      def librarian_install
+        path = KnifeSolo::Librarian.new(config, ui).install
+        add_cookbook_path(path) if path
       end
 
       def generate_solorb
@@ -233,8 +226,10 @@ class Chef
       end
 
       def rsync(source_path, target_path, extra_opts = '--delete')
-        cmd = %Q{rsync -rl #{rsync_permissions} --rsh="ssh #{ssh_args}" #{extra_opts} #{rsync_excludes.collect{ |ignore| "--exclude #{ignore} " }.join} #{adjust_rsync_path_on_client(source_path)} :#{adjust_rsync_path_on_node(target_path)}}
-        ui.msg cmd if debug?
+        cmd = %Q{rsync -rl #{rsync_debug} #{rsync_permissions} --rsh="ssh #{ssh_args}" #{extra_opts}}
+        cmd << rsync_excludes.map { |ignore| " --exclude '#{ignore}'" }.join
+        cmd << %Q{ #{adjust_rsync_path_on_client(source_path)} :#{adjust_rsync_path_on_node(target_path)}}
+        Chef::Log.debug cmd
         system! cmd
       end
 
@@ -247,13 +242,13 @@ class Chef
 
       # Parses "Chef: x.y.z" from the chef-solo version output
       def chef_version
-        v = run_command('sudo chef-solo --version').stdout.split(':')
-        v[0].strip == 'Chef' ? v[1].strip : ''
+        cmd = %q{sudo chef-solo --version 2>/dev/null | awk '$1 == "Chef:" {print $2}'}
+        run_command(cmd).stdout.strip
       end
 
       def cook
         ui.msg "Running Chef..."
-        cmd = "sudo chef-solo -c #{provisioning_path}/solo.rb -j #{provisioning_path}/#{node_config}"
+        cmd = "sudo chef-solo -c #{provisioning_path}/solo.rb -j #{provisioning_path}/dna.json"
         cmd << " -l debug" if debug?
         cmd << " -N #{config[:chef_node_name]}" if config[:chef_node_name]
         cmd << " -W" if config[:why_run]

data/lib/chef/knife/solo_init.rb

@@ -7,19 +7,25 @@ class Chef
       include FileUtils
 
       deps do
+        require 'knife-solo'
+        require 'knife-solo/cookbook_manager_selector'
         require 'knife-solo/gitignore'
+        require 'knife-solo/tools'
       end
 
       banner "knife solo init DIRECTORY"
 
       option :git,
-        :long => '--no-git',
-        :description => 'Do not generate .gitignore',
-        :default => true
+        :long        => '--no-git',
+        :description => 'Do not generate .gitignore'
+
+      option :berkshelf,
+        :long        => '--[no-]berkshelf',
+        :description => 'Generate files for Berkshelf support'
 
       option :librarian,
-        :long => '--librarian',
-        :description => 'Initialize Librarian'
+        :long        => '--[no-]librarian',
+        :description => 'Generate files for Librarian support'
 
       def run
         @base = @name_args.first
@@ -27,7 +33,10 @@ class Chef
         create_kitchen
         create_config
         create_cupboards %w[nodes roles data_bags site-cookbooks cookbooks]
-        librarian_init if config[:librarian]
+        gitignore %w[/cookbooks/]
+        if (cm = cookbook_manager)
+          cm.bootstrap(@base)
+        end
       end
 
       def validate!
@@ -38,6 +47,10 @@ class Chef
         end
       end
 
+      def config_value(key, default = nil)
+        KnifeSolo::Tools.config_value(config, key, default)
+      end
+
       def create_cupboards(dirs)
         ui.msg "Creating cupboards..."
         dirs.each do |dir|
@@ -63,19 +76,12 @@ class Chef
         end
       end
 
-      def librarian_init
-        ui.msg "Setting up Librarian..."
-        cheffile = File.join(@base, 'Cheffile')
-        unless File.exist?(cheffile)
-          File.open(cheffile, 'w') do |f|
-            f.puts("site 'http://community.opscode.com/api/v1'")
-          end
-        end
-        gitignore %w[/cookbooks/ /tmp/librarian/]
+      def cookbook_manager
+        KnifeSolo::CookbookManagerSelector.new(config, ui).select(@base)
       end
 
       def gitignore(*entries)
-        if config[:git]
+        if config_value(:git, true)
           KnifeSolo::Gitignore.new(@base).add(*entries)
         end
       end

data/lib/knife-solo.rb

@@ -1,4 +1,5 @@
 require 'knife-solo/info'
+require 'pathname'
 
 module KnifeSolo
   def self.resource(name)

data/lib/knife-solo/berkshelf.rb

@@ -0,0 +1,37 @@
+require 'digest/sha1'
+require 'knife-solo/cookbook_manager'
+require 'knife-solo/tools'
+
+module KnifeSolo
+  class Berkshelf
+    include CookbookManager
+
+    def self.gem_libraries
+      %w[berkshelf]
+    end
+
+    def self.conf_file_name
+      'Berksfile'
+    end
+
+    def install!
+      path = berkshelf_path
+      ui.msg "Installing Berkshelf cookbooks to '#{path}'..."
+      ::Berkshelf::Berksfile.from_file('Berksfile').install(:path => path)
+      path
+    end
+
+    def berkshelf_path
+      KnifeSolo::Tools.config_value(config, :berkshelf_path) || default_path
+    end
+
+    def default_path
+      File.join(::Berkshelf.berkshelf_path, 'knife-solo',
+        Digest::SHA1.hexdigest(File.expand_path('.')))
+    end
+
+    def initial_config
+      'site :opscode'
+    end
+  end
+end

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

@@ -1,8 +1,13 @@
 module KnifeSolo::Bootstraps
   class Linux < Base
-
     def issue
-      prepare.run_command("cat /etc/issue").stdout.strip || prepare.run_command("lsb_release -d -s").stdout.strip
+      commands = [
+        'lsb_release -d -s',
+        'cat /etc/redhat-release',
+        'cat /etc/issue'
+      ]
+      result = prepare.run_with_fallbacks(commands)
+      result.success? ? result.stdout.strip : nil
     end
 
     def x86?
@@ -66,25 +71,15 @@ module KnifeSolo::Bootstraps
         {:type => (x86? ? "debianoid_omnibus" : "debianoid_gem")}
       when %r{Linaro}
         {:type => "debianoid_gem"}
-      when %r{CentOS.*? 5}
-        {:type => "yum_omnibus"}
-      when %r{CentOS.*? 6}
+      when %r{CentOS}
         {:type => "yum_omnibus"}
       when %r{Amazon Linux}
         {:type => "yum_omnibus"}
-      when %r{Red Hat Enterprise.*? 5}
-        {:type => "yum_omnibus"}
-      when %r{Red Hat Enterprise.*? 6}
-        {:type => "yum_omnibus"}
-      when %r{Fedora release.*? 15}
-        {:type => "yum_omnibus"}
-      when %r{Fedora release.*? 16}
-        {:type => "yum_omnibus"}
-      when %r{Fedora release.*? 17}
+      when %r{Red Hat Enterprise}
         {:type => "yum_omnibus"}
-      when %r{Scientific Linux.*? 5}
+      when %r{Fedora release}
         {:type => "yum_omnibus"}
-      when %r{Scientific Linux.*? 6}
+      when %r{Scientific Linux}
         {:type => "yum_omnibus"}
       when %r{SUSE Linux Enterprise Server 1[12]}
         {:type => "omnibus"}
@@ -93,7 +88,7 @@ module KnifeSolo::Bootstraps
       when %r{This is \\n\.\\O \(\\s \\m \\r\) \\t}
         {:type => "emerge_gem"}
       else
-        raise "Distro not recognized from looking at /etc/issue. Please fork https://github.com/matschaffer/knife-solo and add support for your distro."
+        raise "Distribution not recognized. Please run again with `-VV` option and file an issue: https://github.com/matschaffer/knife-solo/issues"
       end
       Chef::Log.debug("Distro detection yielded: #{@distro}")
       @distro

data/lib/knife-solo/cookbook_manager.rb

@@ -0,0 +1,120 @@
+require 'chef/mixin/convert_to_class_name'
+require 'knife-solo/gitignore'
+require 'knife-solo/tools'
+
+module KnifeSolo
+  module CookbookManager
+    def self.included(base)
+      base.extend ClassMethods
+      base.send(:include, InstanceMethods)
+    end
+
+    module ClassMethods
+      include Chef::Mixin::ConvertToClassName
+
+      # Returns an Array of libraries to load
+      def gem_libraries
+        raise "Must be overridden by the including class"
+      end
+
+      def gem_name
+        gem_libraries.first
+      end
+
+      def load_gem
+        begin
+          gem_libraries.each { |lib| require lib }
+          true
+        rescue LoadError
+          false
+        end
+      end
+
+      # Key in Chef::Config and CLI options
+      def config_key
+        snake_case_basename(name).to_sym
+      end
+
+      # Returns the base name of the configuration file
+      def conf_file_name
+        raise "Must be overridden by the including class"
+      end
+    end
+
+    module InstanceMethods
+      attr_reader :config, :ui
+
+      def initialize(config, ui)
+        @config = config
+        @ui = ui
+      end
+
+      def to_s
+        name
+      end
+
+      def name
+        self.class.name.split('::').last
+      end
+
+      def gem_name
+        self.class.gem_name
+      end
+
+      def gem_installed?
+        self.class.load_gem
+      end
+
+      def conf_file(base = nil)
+        base ? File.join(base, self.class.conf_file_name) : self.class.conf_file_name
+      end
+
+      def enabled_by_chef_config?
+        KnifeSolo::Tools.config_value(config, self.class.config_key)
+      end
+
+      def conf_file_exists?(base = nil)
+        File.exists?(conf_file(base))
+      end
+
+      # Runs the manager and returns the path to the cookbook directory
+      def install!
+        raise "Must be overridden by the including class"
+      end
+
+      # Runs installer if the configuration file is found and gem installed
+      # Returns the cookbook path or nil
+      def install
+        if !conf_file_exists?
+          Chef::Log.debug "#{conf_file} not found"
+        elsif !self.class.load_gem
+          ui.warn "#{name} could not be loaded"
+          ui.warn "Please add the #{gem_name} gem to your Gemfile or install it manually with `gem install #{gem_name}`"
+        else
+          return install!
+        end
+        nil
+      end
+
+      def bootstrap(base)
+        ui.msg "Setting up #{name}..."
+        unless conf_file_exists?(base)
+          File.open(conf_file(base), 'w') { |f| f.puts(initial_config) }
+        end
+        if KnifeSolo::Tools.config_value(config, :git, true) && gitignores
+          KnifeSolo::Gitignore.new(base).add(gitignores)
+        end
+      end
+
+      # Returns content for configuration file when bootstrapping
+      def initial_config
+        raise "Must be overridden by the including class"
+      end
+
+      # Returns an array of strings to gitignore when bootstrapping
+      def gitignores
+        nil
+      end
+    end
+  end
+end