kitchenplan 2.1.2 → 2.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5ebb0db12e3ed09eb671248d12d8edf97a2334fb
-  data.tar.gz: 9b03987338deb36560b0c6fc6ea656961a5b1fd9
+  metadata.gz: 32cea34fe7a07775c3d8da0a3d19db85f64f814c
+  data.tar.gz: 42934cf8be540fe51b4ef094e05964a0e01eb37c
 SHA512:
-  metadata.gz: 401779d5cdf43c7ae19ac9e63e45fa406bfe4fc457cd4b71907074af5412e062ca705d66464bbc5b750a204aee5c8aea6f734486908e96386c31fad13f7badab
-  data.tar.gz: 5fd4f56c63ec48107a220e62036dd566a27a79967dc11735fdc25625222ae3b135248d1495e3af00b2f664cae4daadb85d47c1aea0edfb497d503ae1fb61c124
+  metadata.gz: a5f8ade19c1a676ce9d9356aad0e879e5eb33a60a101bb57d11affdc62647d47c97ab802aa663a0c83538af53a9b205ea888c60184336a52dfe26e28329f4745
+  data.tar.gz: a4697996d5046df36f96d555f847ee6ff00af505aebde83e4f00facfcf954ee65cc6d8400f94fb5d9da72e8ee1573eb4abf90c55d8631ae90a609ed174d8d655

data/lib/kitchenplan/cli.rb

@@ -1,13 +1,21 @@
+
 require 'thor'
 
 module Kitchenplan
   class Cli < Thor
     include Thor::Actions
 
-    desc 'setup [<GITREPO>] [<TARGET DIRECTORY>]', 'setup Kitchenplan'
+    desc 'setup [<gitrepo>] [<target directory>]', '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.
+
+    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')
       logo
-      install_clt unless File.exists?("/usr/bin/cc")
+      install_clt unless `xcode-select --print-path`
       if gitrepo
         fetch(gitrepo, targetdir)
       else
@@ -19,11 +27,25 @@ module Kitchenplan
           create(targetdir)
         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)
+        if user_create
+          create_user(targetdir)
+        end
+      end
     end
 
     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'
+    desc 'provision [<target directory>] [--debug] [--recipes=x y z]', '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 happeling.
+
+    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
       prepare_folders(targetdir)
@@ -147,6 +169,19 @@ module Kitchenplan
         print_notice("Now start editing the config files in #{targetdir}/kitchenplan/config, push them to a git server and run 'kitchenplan provision'")
       end
 
+      def create_user(targetdir)
+        print_step("Creating #{ENV['USER']}.yml config")
+
+        template('user.yml.erb', "#{targetdir}/kitchenplan/config/people/#{ENV['USER']}.yml")
+
+        inside("#{targetdir}/kitchenplan") do
+          dorun("git add -A config/people/#{ENV['USER']}.yml")
+          dorun("git commit -q -m 'Initial commit for user #{ENV['USER']}'")
+        end
+
+        print_notice("Now start editing #{ENV['USER']}.yml in #{targetdir}/kitchenplan/config/people, and push it to a git server and run 'kitchenplan provision'")
+      end
+
       def install_bundler(targetdir)
         print_step('Setting up bundler')
         template('Gemfile.erb', "#{targetdir}/kitchenplan/Gemfile")

data/lib/kitchenplan/config.rb

@@ -35,7 +35,7 @@ module Kitchenplan
 
     def parse_people_config
       people_config_path = "config/people/#{Etc.getlogin}.yml"
-      @people_config = (YAML.load(ERB.new(File.read(people_config_path)).result) if File.exist?(people_config_path)) || YAML.load(ERB.new(File.read('config/people/roderik.yml')).result)
+      @people_config = (YAML.load(ERB.new(File.read(people_config_path)).result) if File.exist?(people_config_path)) || {}
     end
 
     def parse_group_configs(group = (( @default_config['groups'] || [] ) | ( @people_config['groups'] || [] )))

data/templates/Cheffile.erb

@@ -1,11 +1,11 @@
 site "http://community.opscode.com/api/v1"
 
-cookbook "homebrewalt",           :github => "kitchenplan/chef-homebrewalt",    :ref => "v1.8.1"
+cookbook "homebrewalt",           :github => "kitchenplan/chef-homebrewalt",    :ref => "v1.8.2"
 cookbook "nodejs",                :github => "kitchenplan/chef-nodejs",         :ref => "v1.1"
-cookbook "applications",          :github => "kitchenplan/chef-applications",   :ref => "v2.0.1"
+cookbook "applications",          :github => "kitchenplan/chef-applications",   :ref => "v2.0.2"
 cookbook "osxdefaults",           :github => "kitchenplan/chef-osxdefaults",    :ref => "v1.0.1"
 cookbook "dotfiles",              :github => "kitchenplan/chef-dotfiles",       :ref => "v1.1"
 cookbook "drivers",               :github => "kitchenplan/chef-drivers",        :ref => "v1.0"
 cookbook "sudoalt",               :github => "kitchenplan/chef-sudoalt",        :ref => "v2.4"
 cookbook "dmg",                   :github => "opscode-cookbooks/dmg",           :ref => "v2.1.4"
-cookbook "composer",              :github => "kitchenplan/chef-composer",       :ref => "v1.0"
+cookbook "composer",              :github => "kitchenplan/chef-composer",       :ref => "v1.0"

metadata

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