knife-solo 0.3.0.pre2 → 0.3.0.pre3

data/lib/chef/knife/solo_init.rb

@@ -1,4 +1,5 @@
 require 'chef/knife'
+require 'fileutils'
 
 class Chef
   class Knife
@@ -24,6 +25,7 @@ class Chef
         @base = @name_args.first
         validate!
         create_kitchen
+        create_config
         create_cupboards %w[nodes roles data_bags site-cookbooks cookbooks]
         librarian_init if config[:librarian]
       end
@@ -37,6 +39,7 @@ class Chef
       end
 
       def create_cupboards(dirs)
+        ui.msg "Creating cupboards..."
         dirs.each do |dir|
           cupboard_dir = File.join(@base, dir)
           unless File.exist?(cupboard_dir)
@@ -47,10 +50,21 @@ class Chef
       end
 
       def create_kitchen
+        ui.msg "Creating kitchen..."
         mkdir @base unless @base == '.'
       end
 
+      def create_config
+        ui.msg "Creating knife.rb in kitchen..."
+        mkdir_p File.join(@base, '.chef')
+        knife_rb = File.join(@base, '.chef', 'knife.rb')
+        unless File.exist?(knife_rb)
+          cp KnifeSolo.resource('knife.rb'), knife_rb
+        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|

data/lib/chef/knife/solo_prepare.rb

@@ -37,7 +37,7 @@ class Chef
 
       option :omnibus_version,
         :long        => '--omnibus-version VERSION',
-        :description => 'Deprecated. Replaced with --bootstrap-check.'
+        :description => 'Deprecated. Replaced with --bootstrap-version.'
 
       def run
         if config[:omnibus_version]

data/lib/knife-solo/bootstraps.rb

@@ -89,24 +89,6 @@ module KnifeSolo
         options
       end
 
-      def yum_omnibus_install
-        omnibus_install
-        # Avoid rsync not being found in package cache.
-        run_command("sudo yum clean all")
-        # Make sure we have rsync on builds that don't include it by default
-        # (for example Scientific Linux minimal, CentOS minimal)
-        run_command("sudo yum -y install rsync")
-      end
-
-      def debianoid_omnibus_install
-        omnibus_install
-        # Update to avoid out-of-date package caches
-        run_command("sudo apt-get update")
-        # Make sure we have rsync on builds that don't include it by default
-        # (for example linode's ubuntu 10.04 images)
-        run_command("sudo apt-get -y install rsync")
-      end
-
       def gem_install
         ui.msg "Installing rubygems from source..."
         release = "rubygems-1.8.10"

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

@@ -2,28 +2,16 @@ module KnifeSolo::Bootstraps
   class Darwin < Base
 
     def issue
-      run_command("sw_vers -productVersion").stdout.strip
+      @issue ||= run_command("sw_vers -productVersion").stdout.strip
     end
 
     def distro
       case issue
-      when %r{10.5}
-          {:type => 'gem', :version => 'leopard'}
-      when %r{10.6}
-          {:type => 'gem', :version => 'snow_leopard'}
+      when %r{10.[6-8]}
+        {:type => 'omnibus'}
       else
-          raise "OSX version #{issue} not supported"
+        raise "OS X version #{issue} not supported"
       end
     end
-
-    def has_xcode_installed?
-      result = run_command("xcodebuild -version")
-      result.success?
-    end
-
-    def run_pre_bootstrap_checks
-      raise 'xcode not installed, which is required to do anything.  please install and run again.' unless has_xcode_installed?
-    end
-
   end
 end

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

@@ -10,10 +10,6 @@ module KnifeSolo::Bootstraps
       %w{i686 x86 x86_64}.include?(machine)
     end
 
-    def lsb_release_codename
-      run_command("lsb_release -cs").stdout.strip
-    end
-
     def package_list
       @packages.join(' ')
     end
@@ -28,32 +24,7 @@ module KnifeSolo::Bootstraps
       gem_install
     end
 
-    def add_yum_repos(repo_path)
-      repo_url = "http://rbel.co/"
-
-      tmp_file = "/tmp/rbel"
-      installed = "is already installed"
-      run_command("sudo yum -y install curl")
-      run_command("curl #{repo_url}#{repo_path} -o #{tmp_file}")
-      result = run_command("sudo rpm -Uvh #{tmp_file} && rm #{tmp_file}")
-      raise result.stderr_or_stdout unless result.success? || result.stdout.match(installed)
-    end
-
-    def yum_install
-      ui.msg("Installing required packages...")
-
-      if distro[:version] == "RHEL5"
-        repo_path = "rbel5"
-      else
-        repo_path = "rbel6"
-      end
-
-      add_yum_repos(repo_path)
-      @packages = %w(rubygem-chef rsync)
-      run_command("sudo yum -y --disablerepo=* --enablerepo=#{repo_path} install #{package_list}")
-    end
-
-    def debian_gem_install
+    def debianoid_gem_install
       ui.msg "Updating apt caches..."
       run_command("sudo apt-get update")
 
@@ -67,43 +38,60 @@ module KnifeSolo::Bootstraps
       gem_install
     end
 
+    def debianoid_omnibus_install
+      run_command("sudo apt-get update")
+      run_command("sudo apt-get -y install rsync ca-certificates")
+      omnibus_install
+    end
+
+    def zypper_omnibus_install
+      run_command("sudo zypper --non-interactive install rsync")
+      omnibus_install
+    end
+
+    def yum_omnibus_install
+      run_command("sudo yum clean all")
+      run_command("sudo yum -y install rsync")
+      omnibus_install
+    end
+
     def distro
       return @distro if @distro
       @distro = case issue
       when %r{Debian GNU/Linux 6}
-        {:type => (x86? ? "debianoid_omnibus" : "debian_gem"), :version => "squeeze"}
+        {:type => (x86? ? "debianoid_omnibus" : "debianoid_gem")}
       when %r{Debian}
-        {:type => "debian_gem", :version => lsb_release_codename}
+        {:type => "debianoid_gem"}
       when %r{Ubuntu}i
-        {:type => (x86? ? "debianoid_omnibus" : "debian_gem"), :version => lsb_release_codename}
+        {:type => (x86? ? "debianoid_omnibus" : "debianoid_gem")}
       when %r{Linaro}
-        {:type => "debian_gem", :version => lsb_release_codename}
+        {:type => "debianoid_gem"}
       when %r{CentOS.*? 5}
-        {:type => "yum_omnibus", :version => "RHEL5"}
+        {:type => "yum_omnibus"}
       when %r{CentOS.*? 6}
-        {:type => "yum_omnibus", :version => "RHEL6"}
+        {:type => "yum_omnibus"}
       when %r{Amazon Linux}
-        {:type => "yum_omnibus", :version => "RHEL6"}
+        {:type => "yum_omnibus"}
       when %r{Red Hat Enterprise.*? 5}
-        {:type => "yum_omnibus", :version => "RHEL5"}
+        {:type => "yum_omnibus"}
       when %r{Red Hat Enterprise.*? 6}
-        {:type => "yum_omnibus", :version => "RHEL6"}
+        {:type => "yum_omnibus"}
       when %r{Fedora release.*? 15}
-        {:type => "yum_omnibus", :version => "FC15"}
+        {:type => "yum_omnibus"}
       when %r{Fedora release.*? 16}
-        {:type => "yum_omnibus", :version => "FC16"}
+        {:type => "yum_omnibus"}
       when %r{Fedora release.*? 17}
-        {:type => "yum_omnibus", :version => "FC17"}
+        {:type => "yum_omnibus"}
       when %r{Scientific Linux.*? 5}
-        {:type => "yum_omnibus", :version => "RHEL5"}
+        {:type => "yum_omnibus"}
       when %r{Scientific Linux.*? 6}
-        {:type => "yum_omnibus", :version => "RHEL6"}
+        {:type => "yum_omnibus"}
       when %r{SUSE Linux Enterprise Server 1[12]}
-        {:type => "omnibus", :version => "SLES11"}
-      when %r{openSUSE 1[12]}
-        {:type => "omnibus", :version => "openSUSE"}
+        {:type => "omnibus"}
+      when %r{openSUSE 12}
+        {:type => "zypper_omnibus"}
       when %r{This is \\n\.\\O \(\\s \\m \\r\) \\t}
-        {:type => "emerge_gem", :version => "Gentoo"}
+        {: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."
       end

data/lib/knife-solo/info.rb

@@ -1,6 +1,6 @@
 module KnifeSolo
   def self.version
-    '0.3.0.pre2'
+    '0.3.0.pre3'
   end
 
   def self.post_install_message

data/lib/knife-solo/resources/knife.rb

@@ -0,0 +1,4 @@
+cookbook_path ["cookbooks", "site-cookbooks"]
+role_path     "roles"
+data_bag_path "data_bags"
+#encrypted_data_bag_secret "data_bag_key"

data/lib/knife-solo/resources/patch_cookbooks/chef-solo-search/.travis.yml

@@ -0,0 +1,7 @@
+language: ruby
+rvm:
+  - "1.9.3"
+  - "1.9.2"
+  - "1.8.7"
+before_install: gem install chef
+script: ruby -Ilibraries tests/test_search.rb -v

data/lib/knife-solo/resources/patch_cookbooks/chef-solo-search/CHANGELOG

@@ -0,0 +1,16 @@
+==========================
+chef-solo-search Changelog
+==========================
+
+Version 0.4.0, March 8, 2013
+----------------------------
+* Added support for 'chef_environment:_default' to queries.
+* Special case for lucene "anything range" [* TO *]
+* Added support for ruby bundler
+* Added support for Berkshelf
+
+Version 0.3.0, July 27, 2011
+----------------------------
+First release of chef-solo-search as a self-contained project.
+Search functionality has been added to the original concept and the search
+extension as well as the data bags extension are shipped in libraries/

data/lib/knife-solo/resources/patch_cookbooks/chef-solo-search/LICENSE

@@ -0,0 +1,202 @@
+                              Apache License
+                        Version 2.0, January 2004
+                     http://www.apache.org/licenses/
+
+TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+1. Definitions.
+
+   "License" shall mean the terms and conditions for use, reproduction,
+   and distribution as defined by Sections 1 through 9 of this document.
+
+   "Licensor" shall mean the copyright owner or entity authorized by
+   the copyright owner that is granting the License.
+
+   "Legal Entity" shall mean the union of the acting entity and all
+   other entities that control, are controlled by, or are under common
+   control with that entity. For the purposes of this definition,
+   "control" means (i) the power, direct or indirect, to cause the
+   direction or management of such entity, whether by contract or
+   otherwise, or (ii) ownership of fifty percent (50%) or more of the
+   outstanding shares, or (iii) beneficial ownership of such entity.
+
+   "You" (or "Your") shall mean an individual or Legal Entity
+   exercising permissions granted by this License.
+
+   "Source" form shall mean the preferred form for making modifications,
+   including but not limited to software source code, documentation
+   source, and configuration files.
+
+   "Object" form shall mean any form resulting from mechanical
+   transformation or translation of a Source form, including but
+   not limited to compiled object code, generated documentation,
+   and conversions to other media types.
+
+   "Work" shall mean the work of authorship, whether in Source or
+   Object form, made available under the License, as indicated by a
+   copyright notice that is included in or attached to the work
+   (an example is provided in the Appendix below).
+
+   "Derivative Works" shall mean any work, whether in Source or Object
+   form, that is based on (or derived from) the Work and for which the
+   editorial revisions, annotations, elaborations, or other modifications
+   represent, as a whole, an original work of authorship. For the purposes
+   of this License, Derivative Works shall not include works that remain
+   separable from, or merely link (or bind by name) to the interfaces of,
+   the Work and Derivative Works thereof.
+
+   "Contribution" shall mean any work of authorship, including
+   the original version of the Work and any modifications or additions
+   to that Work or Derivative Works thereof, that is intentionally
+   submitted to Licensor for inclusion in the Work by the copyright owner
+   or by an individual or Legal Entity authorized to submit on behalf of
+   the copyright owner. For the purposes of this definition, "submitted"
+   means any form of electronic, verbal, or written communication sent
+   to the Licensor or its representatives, including but not limited to
+   communication on electronic mailing lists, source code control systems,
+   and issue tracking systems that are managed by, or on behalf of, the
+   Licensor for the purpose of discussing and improving the Work, but
+   excluding communication that is conspicuously marked or otherwise
+   designated in writing by the copyright owner as "Not a Contribution."
+
+   "Contributor" shall mean Licensor and any individual or Legal Entity
+   on behalf of whom a Contribution has been received by Licensor and
+   subsequently incorporated within the Work.
+
+2. Grant of Copyright License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   copyright license to reproduce, prepare Derivative Works of,
+   publicly display, publicly perform, sublicense, and distribute the
+   Work and such Derivative Works in Source or Object form.
+
+3. Grant of Patent License. Subject to the terms and conditions of
+   this License, each Contributor hereby grants to You a perpetual,
+   worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+   (except as stated in this section) patent license to make, have made,
+   use, offer to sell, sell, import, and otherwise transfer the Work,
+   where such license applies only to those patent claims licensable
+   by such Contributor that are necessarily infringed by their
+   Contribution(s) alone or by combination of their Contribution(s)
+   with the Work to which such Contribution(s) was submitted. If You
+   institute patent litigation against any entity (including a
+   cross-claim or counterclaim in a lawsuit) alleging that the Work
+   or a Contribution incorporated within the Work constitutes direct
+   or contributory patent infringement, then any patent licenses
+   granted to You under this License for that Work shall terminate
+   as of the date such litigation is filed.
+
+4. Redistribution. You may reproduce and distribute copies of the
+   Work or Derivative Works thereof in any medium, with or without
+   modifications, and in Source or Object form, provided that You
+   meet the following conditions:
+
+   (a) You must give any other recipients of the Work or
+       Derivative Works a copy of this License; and
+
+   (b) You must cause any modified files to carry prominent notices
+       stating that You changed the files; and
+
+   (c) You must retain, in the Source form of any Derivative Works
+       that You distribute, all copyright, patent, trademark, and
+       attribution notices from the Source form of the Work,
+       excluding those notices that do not pertain to any part of
+       the Derivative Works; and
+
+   (d) If the Work includes a "NOTICE" text file as part of its
+       distribution, then any Derivative Works that You distribute must
+       include a readable copy of the attribution notices contained
+       within such NOTICE file, excluding those notices that do not
+       pertain to any part of the Derivative Works, in at least one
+       of the following places: within a NOTICE text file distributed
+       as part of the Derivative Works; within the Source form or
+       documentation, if provided along with the Derivative Works; or,
+       within a display generated by the Derivative Works, if and
+       wherever such third-party notices normally appear. The contents
+       of the NOTICE file are for informational purposes only and
+       do not modify the License. You may add Your own attribution
+       notices within Derivative Works that You distribute, alongside
+       or as an addendum to the NOTICE text from the Work, provided
+       that such additional attribution notices cannot be construed
+       as modifying the License.
+
+   You may add Your own copyright statement to Your modifications and
+   may provide additional or different license terms and conditions
+   for use, reproduction, or distribution of Your modifications, or
+   for any such Derivative Works as a whole, provided Your use,
+   reproduction, and distribution of the Work otherwise complies with
+   the conditions stated in this License.
+
+5. Submission of Contributions. Unless You explicitly state otherwise,
+   any Contribution intentionally submitted for inclusion in the Work
+   by You to the Licensor shall be under the terms and conditions of
+   this License, without any additional terms or conditions.
+   Notwithstanding the above, nothing herein shall supersede or modify
+   the terms of any separate license agreement you may have executed
+   with Licensor regarding such Contributions.
+
+6. Trademarks. This License does not grant permission to use the trade
+   names, trademarks, service marks, or product names of the Licensor,
+   except as required for reasonable and customary use in describing the
+   origin of the Work and reproducing the content of the NOTICE file.
+
+7. Disclaimer of Warranty. Unless required by applicable law or
+   agreed to in writing, Licensor provides the Work (and each
+   Contributor provides its Contributions) on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+   implied, including, without limitation, any warranties or conditions
+   of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+   PARTICULAR PURPOSE. You are solely responsible for determining the
+   appropriateness of using or redistributing the Work and assume any
+   risks associated with Your exercise of permissions under this License.
+
+8. Limitation of Liability. In no event and under no legal theory,
+   whether in tort (including negligence), contract, or otherwise,
+   unless required by applicable law (such as deliberate and grossly
+   negligent acts) or agreed to in writing, shall any Contributor be
+   liable to You for damages, including any direct, indirect, special,
+   incidental, or consequential damages of any character arising as a
+   result of this License or out of the use or inability to use the
+   Work (including but not limited to damages for loss of goodwill,
+   work stoppage, computer failure or malfunction, or any and all
+   other commercial damages or losses), even if such Contributor
+   has been advised of the possibility of such damages.
+
+9. Accepting Warranty or Additional Liability. While redistributing
+   the Work or Derivative Works thereof, You may choose to offer,
+   and charge a fee for, acceptance of support, warranty, indemnity,
+   or other liability obligations and/or rights consistent with this
+   License. However, in accepting such obligations, You may act only
+   on Your own behalf and on Your sole responsibility, not on behalf
+   of any other Contributor, and only if You agree to indemnify,
+   defend, and hold each Contributor harmless for any liability
+   incurred by, or claims asserted against, such Contributor by reason
+   of your accepting any such warranty or additional liability.
+
+END OF TERMS AND CONDITIONS
+
+APPENDIX: How to apply the Apache License to your work.
+
+   To apply the Apache License to your work, attach the following
+   boilerplate notice, with the fields enclosed by brackets "[]"
+   replaced with your own identifying information. (Don't include
+   the brackets!) The text should be enclosed in the appropriate
+   comment syntax for the file format. We also recommend that a
+   file or class name and description of purpose be included on the
+   same "printed page" as the copyright notice for easier
+   identification within third-party archives.
+
+Copyright [yyyy] [name of copyright owner]
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+    http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+