whisk 0.0.2 → 0.0.3

data/bin/whisk

@@ -24,7 +24,12 @@ require 'logger'
 require 'whisk/config'
 require 'whisk/log'
 
-Whisk::Log.logger = Logger.new(STDOUT)
+# borrowed from chef/chef/lib/chef/application.rb
+logger = Logger.new(STDOUT)
+STDOUT.sync = true
+logger.formatter = Whisk::Log.logger.formatter
+Whisk::Log::Formatter.show_time = false
+Whisk::Log.loggers << logger
 
 whiskfile = File.join(ENV['HOME'], '.chef', 'whisk.rb')
 

data/lib/whisk/bowl.rb

@@ -42,7 +42,7 @@ class Whisk
 
     def ingredient(iname, opts = {})
       if ingredients.has_key? iname
-        raise ArgumentError "ingredient #{iname} has already added to bowl #{name}"
+        raise ArgumentError "ingredient '#{iname}' has already added to bowl '#{name}'"
       else
         source = opts.delete :source
         flavour = opts.delete :flavour
@@ -55,7 +55,7 @@ class Whisk
     def create
       unless File.exists? path
         begin
-          Whisk::Log.info "Creating bowl #{name} with path #{path}"
+          Whisk::Log.info "creating bowl '#{name}' with path #{path}"
           ::FileUtils.mkdir_p path
         rescue Exception => e
           puts "#{e.backtrace} #{e.message}"
@@ -67,6 +67,8 @@ class Whisk
       self.create unless File.exists? path
       ::Dir.chdir path
 
+      Whisk::Log.info "preparing bowl '#{name}' with path #{path}"
+
       ingredients.keys.each do |i|
         begin
           ingredients[i].prepare

data/lib/whisk/config.rb

@@ -1,3 +1,24 @@
+#
+# Author:: Adam Jacob (<adam@opscode.com>)
+# Author:: Mathieu Sauve-Frankel <msf@kisoku.net>
+# Copyright:: Copyright (c) 2008 Opscode, Inc.
+# Copyright:: Copyright (c) 2012 Mathieu Sauve-Frankel
+# License:: Apache License, Version 2.0
+#
+# 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.
+#
+# from_file is derived from chef/chef/lib/chef/mixin/from_file.rb
+
 require 'whisk/bowl'
 
 class Whisk

data/lib/whisk/flavour/git.rb

@@ -33,7 +33,7 @@ class Whisk
       end
 
       def checkout(ref="master")
-          Whisk::Log.info "checking out ref #{ref} for ingredient #{self.name}"
+          Whisk::Log.info "checking out ref '#{ref}' for ingredient #{self.name}"
           shell_out("git checkout #{ref}")
       end
 
@@ -43,7 +43,7 @@ class Whisk
       end
 
       def fetch
-          Whisk::Log.info "fetching ingredient #{self.name}, from git url #{self.source}"
+          Whisk::Log.info "fetching ingredient '#{self.name}', from git url #{self.source}"
           shell_out("git fetch --all")
       end
 

data/lib/whisk/version.rb

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

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: whisk
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: 
   segments: 
   - 0
   - 0
-  - 2
-  version: 0.0.2
+  - 3
+  version: 0.0.3
 platform: ruby
 authors: 
 - Mathieu Sauve-Frankel
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-02-07 00:00:00 Z
+date: 2012-02-10 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: mixlib-log
@@ -41,14 +41,14 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15424063
+        hash: 15424055
         segments: 
         - 1
         - 0
-        - 1
+        - 0
         - rc
         - 1
-        version: 1.0.1.rc.1
+        version: 1.0.0.rc.1
   type: :runtime
   version_requirements: *id002
 - !ruby/object:Gem::Dependency