kitchenplan 2.1.1 → 2.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 45272d06331a4420f7df036e09fa2f6626867f90
-  data.tar.gz: de7f6c4078c608b2ca87ba8e87f011998496c56d
+  metadata.gz: 5ebb0db12e3ed09eb671248d12d8edf97a2334fb
+  data.tar.gz: 9b03987338deb36560b0c6fc6ea656961a5b1fd9
 SHA512:
-  metadata.gz: 3f99898b77d4b046d81a456ecbbea5eaedd59bde67f7d9f4832b9c0a0282bfc5b4f0f7a3626c6dbcbba948ff13cafcd40984ad24edad29f353fbb5a8baaf8623
-  data.tar.gz: c596e4d3db9b64737c9a92ef62fceb4335ef733f2a88ff6c53393b9670583e815ee38ef73f474e63775972419a2377b0d5cf4ef92cb43aa97c6fe0a14da6f6c5
+  metadata.gz: 401779d5cdf43c7ae19ac9e63e45fa406bfe4fc457cd4b71907074af5412e062ca705d66464bbc5b750a204aee5c8aea6f734486908e96386c31fad13f7badab
+  data.tar.gz: 5fd4f56c63ec48107a220e62036dd566a27a79967dc11735fdc25625222ae3b135248d1495e3af00b2f664cae4daadb85d47c1aea0edfb497d503ae1fb61c124

data/README.md

@@ -2,16 +2,9 @@
 
 Kitchenplan is a small tool to fully automate the installation and configuration of an OSX workstation (or server for that matter) using Chef. But while doing so manually is not a trivial undertaking, Kitchenplan has abstracted away all the hard parts.
 
-## Important
+## History
 
-I'm currently working on a brand new way of running Kitchenplan. If you are using Kitchenplan, please use [version2](https://github.com/kitchenplan/kitchenplan/blob/version2/README.md) for now.
-
-## To Do
-
-* debug options
-* installing a manual list of recipes
-* --no-chef
-* only update cookbooks if we run with -c
+This is a brand new implementation of Kitchenplan. If you have issues with this new versions, please use [version2](https://github.com/kitchenplan/kitchenplan/blob/version2/README.md) for now.
 
 ## Using kitchenplan
 
@@ -122,8 +115,14 @@ Running Kitchenplan is as easy as running `kitchenplan provision`
          run  sudo vendor/bin/chef-solo -c tmp/solo.rb -j tmp/kitchenplan-attributes.json -o applications::create_var_chef_cache,homebrewalt::default,nodejs::default,... from "/opt/kitchenplan"
 ```
 
-At this point Chef will start installing everything you configured. Depending on your install list, this might take a while.
+At this point Chef will start installing everything you configured. Depending on your install list, this might take a while. It will hopefully go smooth and end with
 
+```
+-> Cleanup parsed configuration files
+         run  rm -f kitchenplan-attributes.json from "/opt/kitchenplan"
+         run  rm -f solo.rb from "/opt/kitchenplan"
+=> Installation complete!
+```
 
 ## Some blogposts about Kitchenplan
 

data/lib/kitchenplan/cli.rb

@@ -7,7 +7,7 @@ module Kitchenplan
     desc 'setup [<GITREPO>] [<TARGET DIRECTORY>]', 'setup Kitchenplan'
     def setup(gitrepo=nil, targetdir='/opt')
       logo
-      install_clt
+      install_clt unless File.exists?("/usr/bin/cc")
       if gitrepo
         fetch(gitrepo, targetdir)
       else
@@ -21,43 +21,49 @@ module Kitchenplan
       end
     end
 
-    desc 'provision [<TARGET DIRECTORY>]', 'run Kitchenplan'
+    option :debug, :type => :boolean
+    option :recipes, :type => :array
+    desc 'provision [<TARGET DIRECTORY>] [--debug] [--recipes=x y z]', 'run Kitchenplan, using debug will show more command output'
     def provision(targetdir='/opt')
       logo
       prepare_folders(targetdir)
       install_bundler(targetdir)
       send_ping
       recipes = parse_config(targetdir)
-      fetch_cookbooks(targetdir)
-      run_chef(targetdir, recipes)
-      cleanup(targetdir)
+      fetch_cookbooks(targetdir, options[:debug])
+      run_chef(targetdir, (options[:recipes] ? options[:recipes] : recipes), options[:debug])
+      cleanup(targetdir, options[:debug])
       print_notice('Installation complete!')
     end
 
     no_commands do
 
-      def run_chef(targetdir, recipes)
+      def run_chef(targetdir, recipes, debug=false)
         inside("#{targetdir}/kitchenplan") do
-          dorun "sudo vendor/bin/chef-solo -c tmp/solo.rb -j tmp/kitchenplan-attributes.json -o #{recipes.join(',')}"
+          dorun "sudo vendor/bin/chef-solo #{( debug ? ' --log_level debug' : ' ' )} -c tmp/solo.rb -j tmp/kitchenplan-attributes.json -o #{recipes.join(',')}"
         end
       end
 
-      def fetch_cookbooks(targetdir)
+      def fetch_cookbooks(targetdir,debug=false)
         print_step('Fetch the chef cookbooks')
         inside("#{targetdir}/kitchenplan") do
           if File.exists?('vendor/cookbooks')
-            dorun 'vendor/bin/librarian-chef update 2>&1 > /dev/null'
+            dorun "vendor/bin/librarian-chef update #{( debug ? ' ' : '2>&1 > /dev/null' )}"
           else
-            dorun 'vendor/bin/librarian-chef install --clean --quiet --path=vendor/cookbooks'
+            dorun "vendor/bin/librarian-chef install --clean #{( debug ? ' ' : '--quiet' )} --path=vendor/cookbooks"
           end
         end
       end
 
-      def cleanup(targetdir)
-        print_step('Cleanup parsed configuration files')
-        inside("#{targetdir}/kitchenplan") do
-          dorun('rm -f kitchenplan-attributes.json')
-          dorun('rm -f solo.rb')
+      def cleanup(targetdir,debug=false)
+        unless debug
+          print_step('Cleanup parsed configuration files')
+          inside("#{targetdir}/kitchenplan") do
+            dorun('rm -f kitchenplan-attributes.json')
+            dorun('rm -f solo.rb')
+          end
+        else
+            print_step('Skipping cleanup parsed configuration files')
         end
       end
 
@@ -90,11 +96,16 @@ module Kitchenplan
           print_step "#{targetdir}/kitchenplan already exists, updating from git."
           inside("#{targetdir}/kitchenplan") do
             dorun('git pull -q')
+            dorun('git submodule update')
           end
         else
           print_step "Fetching #{gitrepo} to #{targetdir}/kitchenplan."
           inside("#{targetdir}") do
             dorun("git clone -q #{gitrepo} kitchenplan")
+            inside("#{targetdir}/kitchenplan") do
+              dorun('git submodule init')
+              dorun('git submodule update')
+            end
           end
         end
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchenplan
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 2.1.2
 platform: ruby
 authors:
 - Roderik van der Veer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-08 00:00:00.000000000 Z
+date: 2014-03-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor