whisk 0.2.1 → 0.2.2

data/README.md

@@ -19,32 +19,33 @@ Whiskfile.
 
 ## Example Whiskfile ##
 
-    cb_path = "/home/msf/hack/whisk/%s"
-    github = "git://github.com/cookbooks/%s.git"
+    whisk_dir = "#{ENV['HOME']}/whisk"
+    github = "git://github.com/opscode-cookbooks/%s.git"
 
-    bowl "production" do
-      path cb_path % name
-
-      ingredient "ntp" do
-        source github % "ntp"
-        ref '1.1.2'
+    bowl "testing" do
+      path File.join(whisk_dir, "testing")
+      ingredient 'openssh' do
+        source github % 'openssh'
       end
-    end
-
-    bowl "development" do
-      path cb_path % name
 
-      ingredient "ntp" do
-        source github % "ntp"
-        ref 'develop'
+      ingredient 'ntp' do
+        source github % 'ntp'
       end
+    end
 
-      ingredient "ssh" do
-        source github % "ssh"
-        ref 'develop'
+    bowl "production" do
+      path File.join(whisk_dir, "production")
+      ingredient 'openssh' do
+        source github % 'openssh'
+        ref '1.0.0'
       end
     end
 
+Additionally, whisk can take advantage of knife to upload cookbooks.
+Whisk requires that the following code be added to your knife.rb
+
+    cookbook_path ENV['WHISK_COOKBOOK_PATH']
+
 # Commands #
 
 ##  whisk list ##
@@ -55,11 +56,9 @@ separated by a forward slash. These short names maybe be used as filters for
 most other subcommands
 
     $ whisk list
-    production/ntp
-    production/ssh
-    development/ntp
-    development/ssh
-
+    testing/openssh
+    testing/ntp
+    production/openssh
 
 ##  whisk prepare ##
 
@@ -67,11 +66,20 @@ The prepare subcommand allows you to clone your ingredients and optional
 checkout a specified ref.
 
     $ whisk prepare
-    Creating bowl 'production' with path /home/msf/hack/whisk/production
-    Preparing bowl 'production' with path /home/msf/hack/whisk/production
-    Cloning ingredient ntp, from git url git://github.com/cookbooks/ntp.git
+    Creating bowl 'testing' with path /home/msf/whisk/testing
+    Preparing bowl 'testing' with path /home/msf/whisk/testing
+    Cloning ingredient 'openssh', from url
+    git://github.com/opscode-cookbooks/openssh.git
+    Cloning into 'openssh'...
+    Cloning ingredient 'ntp', from url
+    git://github.com/opscode-cookbooks/ntp.git
     Cloning into 'ntp'...
-    Checking out ref '1.1.2' for ingredient ntp
+    Creating bowl 'production' with path /home/msf/whisk/production
+    Preparing bowl 'production' with path /home/msf/whisk/production
+    Cloning ingredient 'openssh', from url
+    git://github.com/opscode-cookbooks/openssh.git
+    Cloning into 'openssh'...
+    Checking out ref '1.0.0' for ingredient 'openssh'
 
 You can also use specify a filter to run whisk subcommands on a subset of
 cookbooks by specifying the bowl and ingredient separated by a forward slash.
@@ -96,9 +104,18 @@ to run update on a subset of ingredients
 
     # show status for all configured bowls
     $ whisk status
-    Status for ingredient 'production/ntp'
+    Status for bowl 'testing' with path /home/msf/whisk/testing
+    Status for ingredient 'openssh'
+    # On branch master
+    nothing to commit (working directory clean)
+    Status for ingredient 'ntp'
     # On branch master
     nothing to commit (working directory clean)
+    Status for bowl 'production' with path /home/msf/whisk/production
+    Status for ingredient 'openssh'
+    # Not currently on any branch.
+    nothing to commit (working directory clean)
+
 
 ## whisk update ##
 
@@ -113,3 +130,18 @@ to run update on a subset of ingredients
 
     # only update the 'development bowl'
     $ whisk update dev
+
+## whisk upload ##
+
+Whisk upload will upload all bowls specified by the Whiskfile to a chef server
+
+    # upload all bowls to the chef server
+    $ whisk upload
+    $ ruby bin/whisk upload
+    Uploading ingredients in bowl 'testing'
+    Uploading ntp                 [1.2.0]
+    Uploading openssh             [1.0.0]
+    Uploaded 2 cookbooks.
+    Uploading ingredients in bowl 'production'
+    Uploading openssh             [1.0.0]
+    Uploaded 1 cookbook.

data/lib/whisk/cli.rb

@@ -93,5 +93,18 @@ class Whisk
       runner = Whisk::Runner.new(options[:whiskfile], filter)
       runner.run('update')
     end
+
+    method_option :whiskfile,
+      type: :string,
+      default: File.join(Dir.pwd, Whisk::DEFAULT_FILENAME),
+      desc: "Path to a Whiskfile to operate off of.",
+      aliases: "-w",
+      banner: "PATH"
+    desc "upload", "upload the specifiec bowls to a chef server" 
+    def upload(filter=nil)
+      runner = Whisk::Runner.new(options[:whiskfile], filter)
+      runner.run('upload')
+    end
+
   end
 end

data/lib/whisk/provider/bowl.rb

@@ -18,11 +18,14 @@
 
 require 'whisk'
 require 'whisk/provider'
+require 'whisk/mixin/shellout'
 
 class Whisk
   class Provider
     class Bowl < Provider
 
+      include Whisk::Mixin::ShellOut
+
       def exist?
         ::Dir.exist? resource.path
       end
@@ -33,6 +36,13 @@ class Whisk
         end
       end
 
+      def knife_env
+        cb_path = resource.path
+        return {
+          'WHISK_COOKBOOK_PATH' => cb_path
+        }
+      end
+
       def create
         unless self.exist?
           Whisk.ui.info "Creating bowl '#{resource.name}' with path #{resource.path}"
@@ -76,6 +86,13 @@ class Whisk
           ingredients_run("update")
         end
       end
+
+      def action_upload
+        if self.exist?
+          Whisk.ui.info "Uploading ingredients in bowl '#{resource.name}'"
+          shell_out!("knife cookbook upload --all", :env => knife_env)
+        end
+      end
     end
   end
 end

data/lib/whisk/resource/bowl.rb

@@ -35,9 +35,9 @@ class Whisk
 
       def ingredient(iname, &block)
         if ingredients.has_key? iname
-          raise ArgumentError, "Ingredient '#{iname}' has already added to bowl '#{name}'"
+          raise ArgumentError, "Ingredient '#{iname}' has already been added to bowl '#{name}'"
         else
-          ingredients[iname] = Whisk::Resource::Ingredient.new(iname, &block)
+          ingredients[iname] = Whisk::Resource::Ingredient.new(iname, self, &block)
         end
       end
 

data/lib/whisk/resource/ingredient.rb

@@ -25,7 +25,10 @@ class Whisk
 
       include Chef::Mixin::ParamsValidate
 
-      def initialize(name, &block)
+      attr_accessor :bowl
+
+      def initialize(name, bowl, &block)
+        @bowl = bowl
         @provider = Whisk::Provider::Ingredient
         @ref = nil
         @source = nil

data/lib/whisk/version.rb

@@ -17,5 +17,5 @@
 #
 
 class Whisk
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: whisk
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-09-12 00:00:00.000000000 Z
+date: 2012-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef