whisk 0.1.0 → 0.1.1

data/README.md

@@ -9,7 +9,7 @@ exactly what you tell it, and will not resolve dependencies for you or make any
 decisions about which code gets downloaded for you.
 
 Whisk has been designed to work with git only and tries to help automating
-the more tedious aspects of working in with 'the single repository per
+the more tedious aspects of working with the 'single git repository per
 cookbook' model.
 
 # Configuration #
@@ -27,7 +27,7 @@ Whiskfile.
 
       ingredient "ntp" do
         source github % "ntp"
-        options { :ref => 'master' }
+        ref '1.1.2'
       end
     end
 
@@ -43,7 +43,7 @@ checkout a specified ref.
     Preparing bowl 'production' with path /home/msf/hack/whisk/production
     Cloning ingredient ntp, from git url git://github.com/cookbooks/ntp.git
     Cloning into 'ntp'...
-    Checking out ref 'master' for ingredient ntp
+    Checking out ref '1.1.2' for ingredient ntp
 
 You can also use specify an optional filter to run prepare on a subset of
 cookbooks using ruby regexes.

data/lib/whisk/bowl.rb

@@ -15,13 +15,17 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-require 'pp'
 require 'fileutils'
+require 'chef/mixin/params_validate'
+require 'whisk/exceptions'
 require 'whisk/ingredient'
 
 class Whisk
   class Bowl
-    attr_accessor :name, :ingredients
+
+    include Chef::Mixin::ParamsValidate
+
+    attr_reader :name, :ingredients
 
     def initialize(name, path=nil, &block)
       @name = name
@@ -31,14 +35,6 @@ class Whisk
       instance_eval(&block) if block_given?
     end
 
-    def path(pth=nil)
-      if pth
-        @path = pth
-      else
-        @path
-      end
-    end
-
     def ingredient(iname, &block)
       if ingredients.has_key? iname
         raise ArgumentError "Ingredient '#{iname}' has already added to bowl '#{name}'"
@@ -90,5 +86,9 @@ class Whisk
         ingredient.update
       end
     end
+
+    def path(arg=nil)
+      set_or_return(:path, arg, :default => File.join(Dir.getwd, name))
+    end
   end
 end

data/lib/whisk/exceptions.rb

@@ -0,0 +1,5 @@
+class Chef
+  class Exceptions
+    class ValidationFailed < ArgumentError; end
+  end
+end

data/lib/whisk/flavour/git.rb

@@ -26,17 +26,30 @@ class Whisk
 
       def clone
         if ::File.exists? File.join(Dir.pwd, name, ".git", "config")
-          Whisk.ui.info "Ingredient #{self.name} already prepared, moving on"
+          Whisk.ui.info "Ingredient '#{self.name}' already prepared"
         else
-          Whisk.ui.info "Cloning ingredient #{self.name}, " + "from git url #{self.source}"
+          Whisk.ui.info "Cloning ingredient '#{self.name}', " + "from url #{self.source}"
           shell_out("git clone #{self.source} #{self.name}")
         end
       end
 
-      def checkout(ref="master")
-        if self.options and self.options.has_key? :ref
-          Whisk.ui.info "Checking out ref '#{ref}' for ingredient #{self.name}"
-          shell_out("git checkout #{ref}", :cwd => self.name)
+      def current_ref
+        cref = run_command("git rev-parse --abbrev-ref HEAD", :cwd => self.name).stdout.chomp
+        if cref == 'HEAD'
+          return run_command("git describe", :cwd => self.name).stdout.chomp
+        else
+          return cref
+        end
+      end
+
+      def checkout
+        if self.ref
+          if self.current_ref == self.ref
+            Whisk.ui.info "Ingredient '#{self.name}' already at ref '#{self.ref}'"
+          else
+            Whisk.ui.info "Checking out ref '#{self.ref}' for ingredient '#{self.name}'"
+            shell_out("git checkout #{self.ref}", :cwd => self.name)
+          end
         end
       end
 

data/lib/whisk/ingredient.rb

@@ -16,6 +16,7 @@
 # limitations under the License.
 
 require 'chef/mixin/params_validate'
+require 'whisk/exceptions'
 require 'whisk/flavours'
 
 class Whisk
@@ -28,8 +29,8 @@ class Whisk
     def initialize(name, &block)
       @name = name
       @flavour = 'git'
+      @ref = nil
       @source = nil
-      @options = {}
 
       instance_eval(&block) if block_given?
 
@@ -44,8 +45,8 @@ class Whisk
       set_or_return(:flavour, arg, :default => 'git')
     end
 
-    def options(arg=nil)
-      set_or_return(:options, arg, :default => {})
+    def ref(arg=nil)
+      set_or_return(:ref, arg, :kind_of => String)
     end
   end
 end

data/lib/whisk/mixin/shellout.rb

@@ -31,6 +31,12 @@ class Whisk
         cmd.run_command
         cmd
       end
+
+      def run_command(*command_args)
+        cmd = Mixlib::ShellOut.new(*command_args)
+        cmd.run_command
+        cmd
+      end
     end
   end
 end

data/lib/whisk/version.rb

@@ -17,5 +17,5 @@
 #
 
 class Whisk
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whisk
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-17 00:00:00.000000000 Z
+date: 2012-08-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef
@@ -105,6 +105,7 @@ files:
 - lib/whisk/cli.rb
 - lib/whisk/flavours.rb
 - lib/whisk/whiskfile.rb
+- lib/whisk/exceptions.rb
 - lib/whisk/ingredient.rb
 - lib/whisk/version.rb
 - lib/whisk/bowl.rb