whisk 0.0.3 → 0.0.4

data/README.md

@@ -19,7 +19,11 @@ whisk.rb file.
 
     bowl "production" do
       path cb_path % name
-      ingredient "ntp", :source github % "ntp"
+
+      ingredient "ntp",
+        :source => github % "ntp",
+	:options => { :ref => 'master' }
+
     end 
 
 

data/bin/whisk

@@ -31,7 +31,13 @@ logger.formatter = Whisk::Log.logger.formatter
 Whisk::Log::Formatter.show_time = false
 Whisk::Log.loggers << logger
 
-whiskfile = File.join(ENV['HOME'], '.chef', 'whisk.rb')
+if File.exists?("Whiskfile")
+  whiskfile = "Whiskfile"
+else
+  whiskfile = File.join(ENV['HOME'], '.chef', 'whisk.rb')
+end
+
+Whisk::Log.info "Loading configuration from Whiskfile: #{whiskfile}"
 
 Whisk::Config.from_file(whiskfile)
 

data/lib/whisk/bowl.rb

@@ -22,11 +22,11 @@ require 'whisk/ingredient'
 
 class Whisk
   class Bowl
-    attr_accessor :name, :path, :ingredients
+    attr_accessor :name, :ingredients
 
     def initialize(name, path=nil, &block)
       @name = name
-      @path = path
+      @path = File.join(Dir.getwd, name)
       @ingredients = {}
 
       instance_eval(&block) if block_given?
@@ -52,8 +52,8 @@ class Whisk
       end
     end
 
-    def create
-      unless File.exists? path
+    def create!
+      if not path.nil? and Dir.exists? path
         begin
           Whisk::Log.info "creating bowl '#{name}' with path #{path}"
           ::FileUtils.mkdir_p path
@@ -64,16 +64,16 @@ class Whisk
     end
 
     def prepare
-      self.create unless File.exists? path
+      self.create!
       ::Dir.chdir path
 
       Whisk::Log.info "preparing bowl '#{name}' with path #{path}"
 
-      ingredients.keys.each do |i|
+      ingredients.each do |name, ingredient|
         begin
-          ingredients[i].prepare
+          ingredient.prepare
         rescue Exception => e
-          Whisk::Log.error "failed fetching ingredient #{i}! bailing"
+          Whisk::Log.error "failed fetching ingredient #{name}! bailing"
           raise
           exit 1
         end

data/lib/whisk/flavour/git.rb

@@ -34,7 +34,7 @@ class Whisk
 
       def checkout(ref="master")
           Whisk::Log.info "checking out ref '#{ref}' for ingredient #{self.name}"
-          shell_out("git checkout #{ref}")
+          shell_out("git checkout #{ref}", :cwd => self.name)
       end
 
       def post_fetch

data/lib/whisk/version.rb

@@ -17,5 +17,5 @@
 #
 
 class Whisk
-  VERSION = '0.0.3'
+  VERSION = '0.0.4'
 end

metadata

@@ -1,123 +1,91 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: whisk
-version: !ruby/object:Gem::Version 
-  hash: 25
+version: !ruby/object:Gem::Version
+  version: 0.0.4
   prerelease: 
-  segments: 
-  - 0
-  - 0
-  - 3
-  version: 0.0.3
 platform: ruby
-authors: 
+authors:
 - Mathieu Sauve-Frankel
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-02-10 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-06-07 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: mixlib-log
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &7955580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 27
-        segments: 
-        - 1
-        - 3
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.3.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: mixlib-shellout
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *7955580
+- !ruby/object:Gem::Dependency
+  name: mixlib-shellout
+  requirement: &7954280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 15424055
-        segments: 
-        - 1
-        - 0
-        - 0
-        - rc
-        - 1
-        version: 1.0.0.rc.1
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: rspec
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *7954280
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &7951860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *7951860
 description: A simple Chef cookbook dependency manager
 email: msf@kisoku.net
-executables: 
+executables:
 - whisk
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - LICENSE
 - README.md
-- lib/whisk.rb
+- lib/whisk/version.rb
+- lib/whisk/bowl.rb
+- lib/whisk/ingredient.rb
 - lib/whisk/mixin/shellout.rb
-- lib/whisk/config.rb
 - lib/whisk/flavour/git.rb
-- lib/whisk/bowl.rb
 - lib/whisk/flavours.rb
+- lib/whisk/config.rb
 - lib/whisk/log.rb
-- lib/whisk/version.rb
-- lib/whisk/ingredient.rb
+- lib/whisk.rb
 - bin/whisk
 homepage: http://github.com/kisoku/whisk
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A simple Chef cookbook dependency manager
 test_files: []
-
+has_rdoc: