kitchenplan 2.1.16 → 2.1.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d46b1bd5831d618ca09aa815b29efd483e2def87
-  data.tar.gz: e95a103eece0602bb829a96f8d66283af0404eb8
+  metadata.gz: ca95e10b1683c13bfb0d0d657df2f1511e1ca229
+  data.tar.gz: 7181e239dd59ee7aa0dbd1fe58d6900cdb648f5c
 SHA512:
-  metadata.gz: e6e4a94c91c3e314dd38f665892996ac2295ab868731420183863c0d0dd397c74e4d7780cc8297c5cf393ca43ab9269caaa48b544686ead38e017c17c96cfb4a
-  data.tar.gz: 03fcd97fb043eda7a87c438a5e4663771acccebf5c2996e3c9acc03d03bfc5748fa9198b2ae708bba475d3043628751b5d8fc8860931e6e6f5ebcff4d71b184d
+  metadata.gz: ada6b96f543516c6c233b485181c4ebd4fb07a9b8d741266c04d1fba8393387da2b1a0e294e8ad94f9f6d84a0ac66f0d0c8c26389f9663d7de8ebaae7d5e9ef4
+  data.tar.gz: 2b2e37c37cd5c0ea57f3e5e45b4dc167b5c723f0ff118b6a62aa3dd12a9138baa90b8f3c0f7767b556d0a6d37854f0a52113e7c66acf11b33127c4d993190acb

data/README.md

@@ -2,10 +2,6 @@
 
 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.
 
-## History
-
-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
 
 ### Installation
@@ -78,6 +74,15 @@ Please enter the clone URL of your git config repository: https://github.com/rod
          run  git clone -q https://github.com/roderik/kitchenplan-config.git kitchenplan from "/opt"
 ```
 
+*WARNING: Chef v12 breaks everyhting related to the way users work in Kitchenplan. Please update your Gemfile to look like:*
+
+```
+source "https://rubygems.org"
+
+gem "chef", "~> 11.0"
+gem "librarian-chef", "~> 0.0.2"
+```
+
 ### Editing the config files in /opt/kitchenplan/config
 
 The most important file is named after your user in config/people/. In my case a roderik.yml file since my username on my Mac is roderik. When running `kitchenplan setup` will create a YAML file in this folder with your username. You can use your config repository for everyone in your organisation by adding a file per username in the people folder.
@@ -129,6 +134,10 @@ At this point Chef will start installing everything you configured. Depending on
 * [Setting up my perfect dev environment on OSX 10.9 using Chef / Kitchenplan](http://vanderveer.be/setting-up-my-perfect-dev-environment-on-osx-10-9-using-chef-kitchenplan/)
 * [Presenting Kitchenplan @ vanderveer.be](http://vanderveer.be/blog/2013/04/14/presenting-kitchenplan/)
 
+## History
+
+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.
+
 ## Contributing to kitchenplan
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.

data/lib/kitchenplan/cli.rb

@@ -4,7 +4,9 @@ module Kitchenplan
   class Cli < Thor
     include Thor::Actions
 
-    desc 'setup [<gitrepo>] [<target directory>]', 'Setup your workstation to run Kitchenplan and create an example configuration'
+    option :gitrepo, :type => :string, :desc => 'Repo with kitchenplan configs', :default => nil
+    option :config, :type => :boolean, :desc => 'Create <username>.yml'
+    desc 'setup [<target directory>] [--config] [--gitrepo=http://...]', 'Setup your workstation to run Kitchenplan and create an example configuration'
     long_desc <<-LONGDESC
     `kitchenplan setup` will install the dependencies of Kitchenplan and create a configuration in /opt/kitchenplan (or <target directory>
     if you pass it along) to use with the `kitchenplan provision` command.
@@ -12,7 +14,8 @@ module Kitchenplan
     If you already have a configuration stored in git somewhere, it will ask you to pass the git repo url. If you want to bypass the
     prompt, pass it along on the commandline. (see .travis.yml for an example)
     LONGDESC
-    def setup(gitrepo=nil, targetdir='/opt')
+    def setup(targetdir='/opt')
+      gitrepo = options[:gitrepo]
       logo
       install_clt unless File.exist? "/Library/Developer/CommandLineTools/usr/bin/clang"
       if gitrepo || File.exists?("#{targetdir}/kitchenplan")
@@ -27,7 +30,8 @@ module Kitchenplan
         end
       end
       unless File.exists?("#{targetdir}/kitchenplan/config/people/#{ENV['USER']}.yml")
-        user_create = yes?("config/people/#{ENV['USER']}.yml does not exist. Do you wish to create it? [y,n]", :green)
+        user_create = options[:config]
+        user_create = yes?("config/people/#{ENV['USER']}.yml does not exist. Do you wish to create it? [y,n]", :green) if user_create.nil?
         if user_create
           create_user(targetdir)
         end
@@ -35,33 +39,42 @@ module Kitchenplan
     end
 
     option :debug, :type => :boolean
+    option 'no-fetch', :type => :boolean
     option :recipes, :type => :array
-    desc 'provision [<target directory>] [--debug] [--recipes=x y z]', 'Provision your workstation with Kitchenplan'
+    option :solorb, :type => :string, :default => 'tmp/solo.rb'
+    desc 'provision [<target directory>] [--debug] [--recipes=x y z] [--solorb=path] [--no-fetch]', 'Provision your workstation with Kitchenplan'
     long_desc <<-LONGDESC
     `kitchenplan provision` will use the configuration in /opt/kitchenplan (or <target directory>
     if you pass it along) to provision your workstation using Chef.
 
     You can optionally pass --debug to see more detail of what's happening.
 
+    Passing --no-fetch will skip updating the librarian sources from remote sources.
+
     If you just want to install a few recipes pass them along with --recipes and it will override the run list (not the attributes!)
     LONGDESC
     def provision(targetdir='/opt')
       logo
+      inside("#{targetdir}/kitchenplan") do
+          pid = Process.fork do
+            dorun "while true; do sudo -n true; sleep 60; kill -0 \"$$\" || exit; done 2>/dev/null"
+          end
+          Process.detach pid
+      end
       prepare_folders(targetdir)
       install_bundler(targetdir)
-      send_ping
       recipes = parse_config(targetdir)
-      fetch_cookbooks(targetdir, options[:debug])
-      run_chef(targetdir, (options[:recipes] ? options[:recipes] : recipes), options[:debug])
+      fetch_cookbooks(targetdir, options[:debug]) unless options['no-fetch']
+      run_chef(targetdir, (options[:recipes] ? options[:recipes] : recipes), options[:solorb], options[:debug])
       cleanup(targetdir, options[:debug])
       print_notice('Installation complete!')
     end
 
     no_commands do
 
-      def run_chef(targetdir, recipes, debug=false)
+      def run_chef(targetdir, recipes, solo_rb, debug=false)
         inside("#{targetdir}/kitchenplan") do
-          dorun "sudo vendor/bin/chef-solo #{( debug ? ' --log_level debug' : ' ' )} -c tmp/solo.rb -j tmp/kitchenplan-attributes.json -o #{recipes.join(',')}"
+          dorun "sudo vendor/bin/chef-solo #{( debug ? ' --log_level debug' : ' ' )} -c #{solo_rb} -j tmp/kitchenplan-attributes.json -o #{recipes.join(',')}"
         end
       end
 
@@ -106,15 +119,9 @@ module Kitchenplan
         end
       end
 
-      def send_ping
-        print_step('Sending a ping to Google Analytics')
-        require 'gabba'
-        Gabba::Gabba.new('UA-46288146-1', 'github.com').event('Kitchenplan', 'Run', ENV['USER'])
-      end
-
       def fetch(gitrepo, targetdir)
         prepare_folders(targetdir)
-        if File.exists?("#{targetdir}/kitchenplan")
+        if system("cd #{File.join(targetdir, 'kitchenplan')} && git remote -v | grep origin")
           print_step "#{targetdir}/kitchenplan already exists, updating from git."
           inside("#{targetdir}/kitchenplan") do
             dorun('git pull -q')
@@ -197,9 +204,6 @@ module Kitchenplan
         print_step('Installing XCode CLT')
         osx_ver = dorun('sw_vers -productVersion | awk -F "." \'{print $2}\'', true).to_i
         if osx_ver >= 9
-          if osx_ver >= 10
-            print_failure('Until CLT is available via softwareupdate, please install both the CLT and XCode from https://developer.apple.com')
-          end
           dorun('touch /tmp/.com.apple.dt.CommandLineTools.installondemand.in-progress')
           prod = dorun('softwareupdate -l | grep -B 1 "Developer" | head -n 1 | awk -F"*" \'{print $2}\'', true)
           dorun("softwareupdate -i #{prod.chomp} -v")

data/templates/Gemfile.erb

@@ -1,3 +1,4 @@
 source "https://rubygems.org"
 
-gem "librarian-chef", "~> 0.0.2"
+gem "chef", "~> 11.0"
+gem 'librarian-chef', '~> 0.0.4'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: kitchenplan
 version: !ruby/object:Gem::Version
-  version: 2.1.16
+  version: 2.1.17
 platform: ruby
 authors:
 - Roderik van der Veer
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-10 00:00:00.000000000 Z
+date: 2014-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: thor